wangguoyu hai 1 semana
pai
achega
a559b49e67
Modificáronse 2 ficheiros con 41 adicións e 35 borrados
  1. 2 2
      config.js
  2. 39 33
      pages/mall/mallPage.vue

+ 2 - 2
config.js

@@ -1,7 +1,7 @@
 // 应用全局配置
 export default   {
- // baseUrl: 'https://goosechampion.com/api',
-   baseUrl: 'https://kf1.mtavip.com/api',
+  baseUrl: 'https://goosechampion.com/api',
+ //  baseUrl: 'https://kf1.mtavip.com/api',
   // 应用信息
   appInfo: {
     // 应用名称

+ 39 - 33
pages/mall/mallPage.vue

@@ -275,36 +275,41 @@
 			title: '',
 			mask: true
 		});
-		const productMap = {
-			4: 'ezySxJstxL1', //计算特训 L1
-			6: 'ezySxTjmtL1',//图解母题 L1
-			7: 'ezySxJstxL2',//计算特训 L2
-			8: 'ezySxJstxL3',//计算特训 L3
-			9: 'ezySxJstxL4',//计算特训 L4
-			10: 'ezySxJstxL5',//计算特训 L5
-			11: 'ezySxJstxL6',//计算特训 L6
-			12: 'ezySxTjmtL2',//图解母题 L2
-			13: 'ezySxTjmtL3',//图解母题 L3
-			14: 'ezySxTjmtL4',//图解母题 L4
-			15: 'ezySxTjmtL5',//图解母题 L5
-			16: 'ezySxTjmtL6',//图解母题 L6
-			22: 'ezySxTjmtL1L6',//图解母题 L1-6
-			23: 'ezyYyZrpdL1',//自然拼读 L1
-			24: 'ezyYyZrpdL2',//自然拼读 L2
-			25: 'ezyYyZrpdL3',//自然拼读 L3
-			26: 'ezyYyZrpdL4',//自然拼读 L4
-			27: 'ezyYyZrpdL5',//自然拼读 L5
-			28: 'ezyYyZrpdL1L5',//自然拼读 L1-l5
-			29: ' ezySxJstxL1L6'//计算特训 L1-L6
-		};
-		const firstId = cardIds.length > 0 ? cardIds[0] : null;
-		if (firstId) {
-			productId.value = productMap[firstId]
-			console.log('productId.value',productId.value);
+
+		if (appleFlag.value.toString() == 'true') {
+			productId.value = 'llisoftEzhuangyuanceshi'
 		} else {
-			toast("无对应产品Id,请练习管理员")
-			uni.hideLoading();
-			return false
+			const productMap = {
+				4: 'ezySxJstxL1', //计算特训 L1
+				6: 'ezySxTjmtL1', //图解母题 L1
+				7: 'ezySxJstxL2', //计算特训 L2
+				8: 'ezySxJstxL3', //计算特训 L3
+				9: 'ezySxJstxL4', //计算特训 L4
+				10: 'ezySxJstxL5', //计算特训 L5
+				11: 'ezySxJstxL6', //计算特训 L6
+				12: 'ezySxTjmtL2', //图解母题 L2
+				13: 'ezySxTjmtL3', //图解母题 L3
+				14: 'ezySxTjmtL4', //图解母题 L4
+				15: 'ezySxTjmtL5', //图解母题 L5
+				16: 'ezySxTjmtL6', //图解母题 L6
+				22: 'ezySxTjmtL1L6', //图解母题 L1-6
+				23: 'ezyYyZrpdL1', //自然拼读 L1
+				24: 'ezyYyZrpdL2', //自然拼读 L2
+				25: 'ezyYyZrpdL3', //自然拼读 L3
+				26: 'ezyYyZrpdL4', //自然拼读 L4
+				27: 'ezyYyZrpdL5', //自然拼读 L5
+				28: 'ezyYyZrpdL1L5', //自然拼读 L1-l5
+				29: ' ezySxJstxL1L6' //计算特训 L1-L6
+			};
+			const firstId = cardIds.length > 0 ? cardIds[0] : null;
+			if (firstId) {
+				productId.value = productMap[firstId]
+				console.log('productId.value', productId.value);
+			} else {
+				toast("无对应产品Id,请练习管理员")
+				uni.hideLoading();
+				return false
+			}
 		}
 		let req = {
 			cardIds: cardIds
@@ -814,14 +819,15 @@
 			productData.current = Number(options.subjectId) - 1
 			getMoreYk()
 		} else {
+			appleFlag.value = cacheManager.get("auth").appleFlag
 			if (options.from == 'daoPage') {
 				productData.current = Number(options.subjectId) - 1
 				productData.cardId = options.cardId
 				productData.from = options.from
-			}else if(options.from == 'myPage'){
-				productData.current = Number(options.subjectId) - 1
-				productData.cardId = options.cardId
-				productData.from = options.from
+			} else if (options.from == 'myPage') {
+				productData.current = Number(options.subjectId) - 1
+				productData.cardId = options.cardId
+				productData.from = options.from
 			} else {
 				productData.current = Number(cacheManager.get('auth').subjectId) - 1
 			}