Merge remote-tracking branch 'origin/2025鹅状元dev' into 2025鹅状元dev

# Conflicts:
#	components/catalogue/catalogue.vue

components/catalogue/catalogue.vue

@@ -3,50 +3,48 @@
 		mask-background-color="rgba(255, 255, 255, 0.6);" :is-shadow="false">
 		<view class="ezy-catalogue-dialog" :style="{backgroundImage: 'url(' + catalogueBjFun() + ')'}">
 			<uni-icons @click="handleClose" class="catalogue-close-btn"></uni-icons>
-			<scroll-view :scroll-y="true" :scroll-top="scrollTop" >
-				<!-- 当前上下册只针对数学 -->
-		  <view v-if="subjectId == 1" class="catalogue-nianji-title">{{ jieTexts ? jieTexts[0]: ''}}</view>
-		  <!-- 当前只针对新版英语     -->
-		  <view v-if="subjectId == 2 && typeId == 1" class="catalogue-nianji-title">{{ jieTexts ? jieTexts[0]: ''}}</view>
-				<!-- 目录区域 -->
-				<uni-collapse v-model="activeCollapse" class="ezy-catalogue-collapse"
-					:class="{ 'ezy-catalogue-collapse-vip': AuthCode === 'VIP'}" accordion>
-					<template v-for="(item,index) in list">
-						<!-- 当前上下册只针对数学 -->
-						<view v-if="subjectId == 1 && index == shuxueShangxia" class="catalogue-nianji-title catalogue-mt">
-							{{jieTexts ? jieTexts[1]: ''}}
-						</view>
-			  <view v-if="subjectId == 2 && typeId == 1 && index == shuxueShangxia" class="catalogue-nianji-title catalogue-mt">
-				{{jieTexts ? jieTexts[1]: ''}}
-			  </view>
-						<uni-collapse-item title-border="none" :border="false" :name="index+''" class="collapse-item-box"
-							:class="{ 'collapse-active': activeCollapse === index+''}">
-							<template v-slot:title>
-								<view @click.stop="handleSelectZhang(item,index)" class="collapse-title">
-									<view class="collapse-num-box">{{index+1}}</view>
-									<!-- 章名 -->
-									<text class="collapse-name">{{item.zhangName}}</text>
-									<!-- 锁 -->
-									<!-- <template v-if="AuthCode !== 'VIP'">
-										<view class="collapse-lock" v-if="index!=0"></view>
-									</template> -->
-								</view>
-							</template>
-							<view class="collapse-content-box">
-								<view v-for="(jie,cindex) in item.jieList" class="collapse-content-item"
-									@click="handleJieClick(item,jie,index,cindex)">
-									<text class="jie-index">{{`${index+1}.${cindex+1}`}}</text>
-									<text class="text">{{jie.jieName}}</text>
-								</view>
+			<!-- 当前上下册只针对数学 -->
+      <view v-if="subjectId == 1" class="catalogue-nianji-title">{{ jieTexts ? jieTexts[0]: ''}}</view>
+      <!-- 当前只针对新版英语     -->
+      <view v-if="subjectId == 2 && typeId == 1" class="catalogue-nianji-title">{{ jieTexts ? jieTexts[0]: ''}}</view>
+			<!-- 目录区域 -->
+			<uni-collapse v-model="activeCollapse" class="ezy-catalogue-collapse"
+				:class="{ 'ezy-catalogue-collapse-vip': AuthCode === 'VIP'}" accordion>
+				<template v-for="(item,index) in list">
+					<!-- 当前上下册只针对数学 -->
+					<view v-if="subjectId == 1 && index == shuxueShangxia" class="catalogue-nianji-title catalogue-mt">
+						{{jieTexts ? jieTexts[1]: ''}}
+					</view>
+          <view v-if="subjectId == 2 && typeId == 1 && index == shuxueShangxia" class="catalogue-nianji-title catalogue-mt">
+            {{jieTexts ? jieTexts[1]: ''}}
+          </view>
+					<uni-collapse-item title-border="none" :border="false" :name="index+''" class="collapse-item-box"
+						:class="{ 'collapse-active': activeCollapse === index+''}">
+						<template v-slot:title>
+							<view  class="collapse-title">
+								<view class="collapse-num-box">{{index+1}}</view>
+								<!-- 章名 -->
+								<text class="collapse-name">{{item.zhangName}}</text>
+								<!-- 锁 -->
+								<!-- <template v-if="AuthCode !== 'VIP'">
+									<view class="collapse-lock" v-if="index!=0"></view>
+								</template> -->
+							</view>
+						</template>
+						<view class="collapse-content-box">
+							<view v-for="(jie,cindex) in item.jieList" class="collapse-content-item"
+								@click="handleJieClick(item,jie,index,cindex)">
+								<text class="jie-index">{{`${index+1}.${cindex+1}`}}</text>
+								<text class="text">{{jie.jieName}}</text>
 							</view>
-						</uni-collapse-item>
-					</template>
-				</uni-collapse>
-				<tip-small-dialog ref="confirmDialogRef" @confirm-btn="handleConfirmPay"
-					:content="Message"></tip-small-dialog>
-				<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="true"></tip-big-dialog>
-			</scroll-view>
-		</view>
+						</view>
+					</uni-collapse-item>
+				</template>
+			</uni-collapse>
+			<tip-small-dialog ref="confirmDialogRef" @confirm-btn="handleConfirmPay"
+				:content="Message"></tip-small-dialog>
+			<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="true"></tip-big-dialog>
+		</scroll-view>
 	</uni-popup>
 </template>
 
@@ -241,4 +239,4 @@
 	defineExpose({
 		showPopup
 	})
-</script>
+</script>

components/payComponents/index.vue

@@ -185,7 +185,7 @@
 		console.log('123123');
 		if (!productId.value) {
 			uni.showToast({
-				title: '苹果内购ID缺失，请选择其它支付方式或联系客服',
+				title: '产品错误,请联系客服',
 				icon: "none"
 			});
 			return false;

config.js

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

manifest.json

@@ -1,149 +1,153 @@
 {
-	"name": "鹅状元",
-	"appid": "__UNI__CB9D85D",
-	"description": "",
-	"versionName": "1.1.1",
-	"versionCode": 34,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": false,
-			"waiting": true,
-			"autoclose": false,
-			"delay": 0
-		},
-		"screenOrientation": [
-			"portrait-primary",
-			"portrait-secondary",
-			"landscape-primary",
-			"landscape-secondary"
-		],
-		/* 禁止左右滑动 */
-		"disableSwipeBack": true,
-		/*底部安全区*/
-		"safearea": {
-			"bottom": {
-				"offset": "none"
-			}
-		},
-		/* 模块配置 */
-		"modules": {
-			"VideoPlayer": {},
-			"OAuth": {},
-			"Payment": {},
-			"Gallery": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* 横竖屏设置 */
-			"screenOrientation": ["portrait-primary", "landscape-primary"],
-			"distribute": {
-				"screenOrientation": ["portrait-primary", "landscape-primary"]
-			},
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				],
-				"abiFilters": ["arm64-v8a"],
-				"minSdkVersion": 28,
-				"targetSdkVersion": 30,
-				"excludePermissions": []
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false,
-				"idfa": false,
-				"privacyDescription": {
-					"NSPhotoLibraryUsageDescription": "需要访问相册来选择图片"
-				}
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"oauth": {
-					"weixin": {
-						"appid": "wxd6a8954fa7b0f8a0"
-					},
-					"apple": {}
-				},
-				"payment": {
-					"appleiap": {}
-				},
-				"maps": {}
-			},
-			"splashscreen": {
-				"androidStyle": "common",
-				"iosStyle": "common",
-				"useOriginalMsgbox": true
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx3a4f7c01eb080d14",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "3",
-	"h5": {
-		"router": {
-			"base": "/mdist/"
-		},
-		"title": "鹅状元"
-	},
-	"fallbackLocale": "zh-Hans"
+    "name" : "鹅状元",
+    "appid" : "__UNI__CB9D85D",
+    "description" : "",
+    "versionName" : "2.0.0",
+    "versionCode" : 42,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : false,
+            "waiting" : true,
+            "autoclose" : false,
+            "delay" : 0
+        },
+        "screenOrientation" : [
+            "portrait-primary",
+            "portrait-secondary",
+            "landscape-primary",
+            "landscape-secondary"
+        ],
+        /* 禁止左右滑动 */
+        "disableSwipeBack" : true,
+        /*底部安全区*/
+        "safearea" : {
+            "bottom" : {
+                "offset" : "none"
+            }
+        },
+        /* 模块配置 */
+        "modules" : {
+            "VideoPlayer" : {},
+            "OAuth" : {},
+            "Payment" : {},
+            "Gallery" : {},
+			"Camera": {} 
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* 横竖屏设置 */
+            "screenOrientation" : [ "portrait-primary", "landscape-primary" ],
+            "distribute" : {
+                "screenOrientation" : [ "portrait-primary", "landscape-primary" ]
+            },
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "arm64-v8a" ],
+                "minSdkVersion" : 28,
+                "targetSdkVersion" : 30,
+                "excludePermissions" : []
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false,
+                "idfa" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "需要访问相册来选择图片"
+                }
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wxd6a8954fa7b0f8a0"
+                    },
+                    "apple" : {}
+                },
+                "payment" : {
+                    "appleiap" : {}
+                },
+                "maps" : {}
+            },
+            "splashscreen" : {
+                "androidStyle" : "common",
+                "iosStyle" : "common",
+                "useOriginalMsgbox" : true
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx3a4f7c01eb080d14",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3",
+    "h5" : {
+        "router" : {
+            "base" : "/mdist/"
+        },
+        "title" : "鹅状元"
+    },
+    "fallbackLocale" : "zh-Hans"
 }

pages/mall/detailDialog.vue

@@ -188,7 +188,9 @@
 			26: 'ezyYyZrpdL4', //自然拼读 L4
 			27: 'ezyYyZrpdL5', //自然拼读 L5
 			28: 'ezyYyZrpdL1L5', //自然拼读 L1-l5
-			29: ' ezySxJstxL1L6' //计算特训 L1-L6
+			29: ' ezySxJstxL1L6', //计算特训 L1-L6
+			30: ' ezySxTjmtL3L6', //图解母题L3-L6
+			31: ' ezySxTjmtL5L6' //图解母题L5-L6
 		};
 		const firstId = cardIds.length > 0 ? cardIds[0] : null;
 		if (firstId) {
@@ -288,7 +290,7 @@
 		console.log('123123');
 		if (!productId.value) {
 			uni.showToast({
-				title: '苹果内购ID缺失，请选择其它支付方式或联系客服',
+				title: '产品错误,请联系客服',
 				icon: "none"
 			});
 			return false;

pages/mall/mallPage.vue

@@ -99,7 +99,7 @@
 
 			<view v-if="currentPlatform =='android'" class="pay-btn" @touchstart="creatOrder">立即支付
 			</view>
-			<view  class="pay-btn" v-if="currentPlatform =='ios'" @touchstart="creatOrderIos">立即支付</view>
+			<view class="pay-btn" v-if="currentPlatform =='ios'" @touchstart="creatOrderIos">立即支付</view>
 		</view>
 		<detail-dialog ref="mallDetailPopup" :selected-list="getSelectedProducts"></detail-dialog>
 
@@ -186,6 +186,8 @@
 	}
 
 	function productBtn(item) {
+		console.log('item', item);
+		return
 		mallProductPopup.value.detailShow(item);
 	}
 
@@ -299,7 +301,9 @@
 				26: 'ezyYyZrpdL4', //自然拼读 L4
 				27: 'ezyYyZrpdL5', //自然拼读 L5
 				28: 'ezyYyZrpdL1L5', //自然拼读 L1-l5
-				29: ' ezySxJstxL1L6' //计算特训 L1-L6
+				29: ' ezySxJstxL1L6', //计算特训 L1-L6
+				30: ' ezySxTjmtL3L6', //图解母题L3-L6
+				31: ' ezySxTjmtL5L6' //图解母题L5-L6
 			};
 			const firstId = cardIds.length > 0 ? cardIds[0] : null;
 			if (firstId) {
@@ -406,7 +410,7 @@
 		console.log('123123');
 		if (!productId.value) {
 			uni.showToast({
-				title: '苹果内购ID缺失，请选择其它支付方式或联系客服',
+				title: '产品错误,请联系客服',
 				icon: "none"
 			});
 			return false;
@@ -447,7 +451,7 @@
 										fail: (e) => {
 											uni.hideLoading();
 											toast("失败或取消支付")
-											
+
 										},
 									})
 								},

pages/pay/order.vue

@@ -376,7 +376,9 @@
 			26: 'ezyYyZrpdL4', //自然拼读 L4
 			27: 'ezyYyZrpdL5', //自然拼读 L5
 			28: 'ezyYyZrpdL1L5', //自然拼读 L1-l5
-			29: ' ezySxJstxL1L6' //计算特训 L1-L6
+			29: ' ezySxJstxL1L6', //计算特训 L1-L6
+			30: ' ezySxTjmtL3L6', //图解母题L3-L6
+			31: ' ezySxTjmtL5L6' //图解母题L5-L6
 		};
 		const firstId = data.length > 0 ? data[0].cardId : null;
 		if (firstId) {
@@ -466,7 +468,7 @@
 		console.log('123123');
 		if (!productId.value) {
 			uni.showToast({
-				title: '苹果内购ID缺失，请选择其它支付方式或联系客服',
+				title: '产品错误,请联系客服',
 				icon: "none"
 			});
 			return false;

pages/pay/svip.vue

@@ -266,7 +266,7 @@
 		console.log('123123');
 		if (!productId.value) {
 			uni.showToast({
-				title: '苹果内购ID缺失，请选择其它支付方式或联系客服',
+				title: '产品错误,请联系客服',
 				icon: "none"
 			});
 			return false;