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

# Conflicts:
#	api/my.js
#	common/styles/global/pages.scss
#	config.js
#	pages.json
#	pages/my/index.vue
#	pages/study/index.vue
#	static/images/my/list-icon10.png

common/styles/global/components.scss

@@ -281,25 +281,6 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	.tip-content{min-height: 240rpx;text-align: justify;}
 }
 
-.sxtk-sc-dialog{
-	.tip-title{color: #343434;font-size: 38rpx;margin-bottom: 24rpx;}
-	.tip-content-box{
-		width: 625rpx;height: 587rpx;padding: 42rpx 48rpx;box-sizing: border-box;
-		background-image: url("@/static/images/my/tk-dialog-bj.png");
-		@include ezy-no-repeat-cover;box-sizing: border-box;text-align:center;
-	}
-	.tip-content{
-		min-height: 180rpx;text-align: justify;border-bottom: 1px dashed #70cbf4;
-		margin-bottom: 30rpx;color: #666;font-size: 32rpx;padding-bottom: 42rpx;
-		border-bottom: 1px dashed #70cbf4;line-height: 1.8;}
-	.not-confirm-btn,.confirm-btn{
-		width: 519rpx;height: 98rpx;line-height: 98rpx;@include ezy-no-repeat-cover;
-		color: #fff;
-		}
-	.not-confirm-btn{background-image: url("@/static/images/my/tk-dialog-qx.png");margin-top: 16rpx;}
-	.confirm-btn{background-image: url("@/static/images/my/tk-dialog-sc.png");}
-}
-
 /*积分框*/
 .ezy-jf-box{
 	width: 142rpx;height: 46rpx;display: flex;align-items: center;line-height: 1.2;font-size: 26rpx;

components/dialog/tipSmallDialog.vue

@@ -44,7 +44,7 @@
 		tipSmallPopup.value.close();
 	}
 	defineExpose({
-			handleShow,handleClose
+			handleShow
 		})
 </script>
 

pages/login/login.vue

@@ -16,7 +16,7 @@
 				<text class="cxfs-btn" @click="startCountdown"
 					:class="{ 'cxfs-btn-disabled': loginData.isDisabled}">{{loginData.buttonText}}</text>
 				<text class="login-text" @click="goIndex">无法收到验证码</text>
-				<text class="login-text">客服电话:4001750778</text>
+				<text class="login-text">客服电话:17304117625</text>
 			</view>
 		</view>
 		<captcha ref="captcha" :config="config" @captchaSuccess="captchaSuccess" @captchaError="captchaError"

pages/my/aboutPage.vue

@@ -10,7 +10,7 @@
 					<icon class="about-icon-box"></icon>
 					<view class="top-text-box">
 						<view class="about-name">鹅状元</view>
-						<view class="about-text">客服电话：4001750778</view>
+						<view class="about-text">客服电话：17304117625</view>
 						<view class="about-text">备案号：辽ICP备15006970号-7A</view>
 					</view>
 				</view>
@@ -43,16 +43,13 @@
 		if(cacheManager.get('auth')){
 			// 非游客
 			uni.redirectTo({
-				url: '/pages/my/yingyongshezhi'
-			});
-		}else{
-			uni.redirectTo({
-				url: '/pages/my/yingyongshezhi'
+				url: '/pages/my/index'
 			});
+		}else{
 			// 游客
-			// uni.redirectTo({
-			// 	url: `/pages/my/index?typeId=${routerOpt.typeId}&levelId=${routerOpt.levelId}&subjectId=${routerOpt.subjectId}&tipFlag=${routerOpt.tipFlag}`
-			// });
+			uni.redirectTo({
+				url: `/pages/my/index?typeId=${routerOpt.typeId}&levelId=${routerOpt.levelId}&subjectId=${routerOpt.subjectId}&tipFlag=${routerOpt.tipFlag}`
+			});
 		}
 		
 	}