1

pages/mall/mallPage.vue

@@ -103,7 +103,7 @@
 		<detail-dialog ref="mallDetailPopup" :selected-list="getSelectedProducts"></detail-dialog>
 
 
-		<product-dialog ref="mallProductPopup" @payBtn="payBtn"></product-dialog>
+		<product-dialog ref="mallProductPopup"></product-dialog>
 	</view>
 </template>
 
@@ -677,7 +677,7 @@
 		} else {
 			productData.current = Number(cacheManager.get('auth').subjectId) - 1
 		}
-		isIOSorAndroid()
+		//isIOSorAndroid()
 		getMore();
 
 	})

pages/pay/order.vue

@@ -29,7 +29,7 @@
 											<text v-if="item.status ==1" class="pay-status">待付款</text>
 										</view>
 									</view>
-									<view class="order-content-box" v-for="(item2,index2) in item.cardList"
+									<view class="order-content-box" @click="goDao(item2,index2)" v-for="(item2,index2) in item.cardList"
 										:key="index2">
 										<!-- 需要改成从接口获取的 wgy-->
 										<img class="content-img" :src="item2.cover">
@@ -318,7 +318,13 @@
 		},
 	})
 
-
+	function goDao(data,index){
+		console.log('data',data);
+		console.log('index',index);
+		if(data.type == 0){
+			
+		}
+	}
 	function genggaiVip(data) {
 		uni.hideLoading();
 		const localList = cacheManager.get('auth').levelIdList || []

pages/study/index.vue

@@ -409,7 +409,7 @@
 		// 	})
 		// }
 		uni.navigateTo({
-			url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}`,
+			url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}&from='daoPage'`,
 		})
 	}
 	// 游客弹窗---确定