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

common/styles/global/pages.scss

@@ -1907,6 +1907,25 @@
 	}
 	.sxtk-confirm-btn:after{display: none;}
 }
+// 数学题库 -温馨提示弹窗
+.sxtk-sc-dialog{
+	width: 650rpx;height: 610rpx;background-color: transparent;
+	background-image: url("@/static/images/my/tk-dialog-bj.png");@include ezy-no-repeat-cover;
+	.sxtk-content{
+		min-height: 130rpx;display: flex;align-items: center;
+		margin:32rpx 24rpx;
+		.content-text{@include multi-line-ellipsis(3);}
+		}
+	.sxtk-btn-box{
+		border-top: 1rpx dashed #068aea;margin: 0 24rpx;padding: 12rpx 0;
+		.down-btn,.cancel-btn{
+			width: 540rpx;height: 102rpx;line-height: 102rpx;margin:16rpx 0;
+			@include ezy-no-repeat-cover;text-align: center;color: #fff;
+		}
+		.down-btn{background-image: url("@/static/images/my/tk-dialog-sc.png");}
+		.cancel-btn{background-image: url("@/static/images/my/tk-dialog-qx.png");}
+	}
+}
 
 
 // 更换头像

config.js

@@ -1,14 +1,14 @@
 // 应用全局配置
 export default   {
   //baseUrl: 'https://goosechampion.com/api',
-   baseUrl: 'https://kf1.mtavip.com/api',
-  //baseUrl: 'https://goosechampion.com/api/v103',
+   // baseUrl: 'https://kf1.mtavip.com/api',
+  baseUrl: 'https://goosechampion.com/api/v20',
   // 应用信息
   appInfo: {
     // 应用名称
     name: "鹅状元",
     // 应用版本
-    version: "1.0.0",
+    version: "2.0",
     // 应用logo
     logo: "/static/logo.png",
     // 官方网站

pages/my/banbenConfirmDialog.vue

@@ -2,13 +2,15 @@
 <template>
  <uni-popup ref="tipBigPopup" :animation="false" :is-mask-click="false"
   mask-background-color="rgba(255, 255, 255, 0.6);">
-  <view class="sxtk-sc-dialog">
+  <view class="phone-tip-dialog sxtk-sc-dialog">
   <view class="tip-content-box">
    <view class="tip-title">{{title}}</view>
-   <view class="tip-content" v-if="content">{{content}}</view>
-   <view class="tip-btn-box">
-    <view class="confirm-btn" @click="confirmBtn">生成</view>
-    <view class="not-confirm-btn" @click="handleClose">取消</view>
+   <view class="tip-content sxtk-content" v-if="content">
+	<view class="content-text">{{content}}</view>
+   </view>
+   <view class="tip-btn-box sxtk-btn-box">
+    <view class="confirm-btn down-btn" @click="confirmBtn">下载到手机</view>
+    <view class="not-confirm-btn cancel-btn" @click="handleClose">取消</view>
    </view>
   </view>
   </view>

pages/my/sxtkPage.vue

@@ -108,7 +108,7 @@
 	function handleConfirm() {
 		// 确认逻辑
 		if (banbenName.value && currentNianjiName.value) {
-			jcContent.value = "用户你好，鹅状元将为您随机生成《" + banbenName.value + "》100道试题."
+			jcContent.value = "用户你好，鹅状元将为您随机生成《" + banbenName.value + "》100道试题。"
 			console.log('jcContent.value', jcContent.value);
 			jiaocaiRef.value.handleShow();
 		} else {