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

common/styles/global/pages.scss

@@ -627,8 +627,12 @@
 	width: 750rpx;height: 1250rpx;margin-bottom: 24%;position: relative;
 	@include ezy-no-repeat-cover;
 	.score-content-box{
-		position: absolute;top: 746rpx;left: 200rpx;word-spacing: 18rpx;
+		position: absolute;top: 700rpx;left: 200rpx;word-spacing: 18rpx;
 		font-size: 38rpx;font-weight: 800; color: #000;
+		icon{width: 48rpx;height: 48rpx;@include ezy-no-repeat-cover;margin: 0 6rpx;}
+		.right-error-row{display: flex;align-items: center;}
+		.right-icon{background-image: url("@/static/images/exam/score-right-icon.png");}
+		.error-icon{background-image: url("@/static/images/exam/score-error-icon.png");margin-left:56rpx;}
 		.text-red{color: #ff6500;margin: 0 8rpx;}
 		.text-score{
 			width: 160rpx;font-size: 82rpx;font-weight: 800;color: #ff6701;
@@ -644,11 +648,11 @@
 }
 
 .score-study-dialog{
-	background-image: url("@/static/images/exam/score-bj.png");
+	background-image: url("@/static/images/exam/score-bj.gif");
 	.score-btn-box{bottom: 0;}
 }
 .score-finish-dialog{
-	background-image: url("@/static/images/exam/score-finish-bj.png");
+	background-image: url("@/static/images/exam/score-finish-bj.gif");
 	.score-btn-box{bottom: 220rpx;}
 }
 
@@ -899,13 +903,13 @@
 	.tel-close{width: 50rpx;height: 50rpx;@include ezy-no-repeat-cover;position: absolute;right: 30rpx;top: 30rpx;
 	background-image: url("@/static/images/common/close-icon.png");}
 	.my-tel-content{
-		width: 625rpx;height: 740rpx;box-sizing: border-box;padding: 56rpx 62rpx;
+		width: 625rpx;height: 740rpx;box-sizing: border-box;padding: 100rpx 62rpx;
 		background-image: url("@/static/images/my/my-tel-bj.png");@include ezy-no-repeat-cover;position: relative;
 		
 	}
 	.my-tel-title{font-size: 40rpx;color: #333;text-align:center;margin-bottom: 24rpx;}
 	.tel-row{border-bottom: 1px dashed #70cbf4;}
-	.yzm-row{padding-top: 24rpx;}
+	.yzm-row{padding-top: 32rpx;}
 	/***** 输入手机号页面*****/
 	.my-input-box{
 		width:500rpx;height: 88rpx;box-sizing: border-box;
@@ -917,24 +921,13 @@
 		background-image: url("@/static/images/login/login-close-icon.png");flex-shrink: 0;}
 	}
 	
-	// 滑块
-	.nc-container{
-		position: unset;padding: 24rpx 0 36rpx;box-sizing: border-box;
-		.nc_wrapper{width: 100%!important;}
-		.nc_iconfont.btn_ok{font-family: unset;font-size: 0;}
-		.nc_iconfont.btn_ok::before{content: '';width: 20px;height:20px;display: block;position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);
-		@include ezy-no-repeat-cover;background-image: url("@/static/images/login/slider-right-icon.png");z-index: 4;}
-	}
-	
-	.get-yzm-btn{color: #3b73bf;margin-bottom: 16rpx;font-size: 25rpx;}
+	.get-yzm-btn{color: #3b73bf;margin:24rpx 0 36rpx;font-size: 25rpx;}
 	.get-yzm-disabled{color: #666;}
 	
-	.yzm-tip{
-		color: #3b73bf;margin:0 0 16rpx;font-size: 25rpx;
-	}
+	.yzm-tip{color: #3b73bf;margin:0 0 24rpx;font-size: 25rpx;}
 	
 	.my-bind-btn{
-		width:500rpx;height: 88rpx;text-align: center;line-height: 88rpx;color: #fff;margin-top: 16rpx;
+		width:500rpx;height: 88rpx;text-align: center;line-height: 88rpx;color: #fff;margin-top: 24rpx;
 		background-image: url("@/static/images/my/my-tel-btn.png");@include ezy-no-repeat-cover;
 	}
 }

components/points/uni-points.vue

@@ -3,7 +3,10 @@
 	 mask-background-color="rgba(51, 137, 217, 0.65);">
 		<view class="exam-score-dialog" :class="getDialogClass()">
 			<view class="score-content-box">
-				<view>答对:<text class="text-red">{{data.right}}</text>题  答错:<text class="text-red">{{data.wrong}}</text>题</view>
+				<view class="right-error-row">
+					<icon class="right-icon"></icon><text class="text-red">{{data.right}}</text>题
+					<icon class="error-icon"></icon><text class="text-red">{{data.wrong}}</text>题
+				</view>
 				<view class="text-score" v-if="!studyFlag">{{data.jifen}}</view>
 			</view>
 			<view class="score-btn-box">

pages/login/login.vue

@@ -54,7 +54,7 @@
 				sliderData: {},
 				sliderDialogRef: null,
 				config: {
-					captchaId: "16e4de331cee10dfe36bcf55810c6041",
+					captchaId: "9d5837b0807b8de44da0de310a0b2813",
 				},
 
 			}

pages/login/telDialog.vue

@@ -63,7 +63,7 @@
 					getYzmFlag: false, // 是否发送验证码
 				},
 				config: {
-					captchaId: "16e4de331cee10dfe36bcf55810c6041",
+					captchaId: "9d5837b0807b8de44da0de310a0b2813",
 				},
 			}
 		},

pages/my/bindDialog.vue

@@ -1,93 +0,0 @@
-<template>
-	<view class="my-tel-dialog">
-		<view class="my-tel-content">
-			<view class="tel-close" @click="telClose"></view>
-			<view class="yzm-row">
-				<view class="my-tel-title">绑定新手机号</view>
-				<view class="yzm-tip" v-if="bindObj.getYzmFlag">验证码已发送至：{{bindObj.telNumber}}</view>
-				<view class="my-input-box">
-					<input class="my-input" type="text" v-model="bindObj.yzmNumber" placeholder="请输入验证码" maxlength="6"
-						@input="changeYzmInput" />
-					<view class="close-btn" v-if="bindObj.clearYzmIcon" @click="clearYzm"></view>
-				</view>
-				<view @click="bindBtn" class="my-bind-btn">绑定</view>
-			</view>
-
-		</view>
-	</view>
-</template>
-<script>
-	import captcha from "../../components/captcha4/index.vue";
-	import cacheManager from '@/utils/cacheManager.js';
-	import {
-		telBind,
-		sendCode
-	} from "@/api/login.js"
-	import {
-		toast
-	} from "../../utils/common";
-	export default {
-		data() {
-			return {
-				bindObj: {
-					telNumber: '',
-					yzmNumber: '',
-					clearYzmIcon: false,
-					/*** 验证码 ***/
-					yzmStatus: 'login-btn-disabled',
-					timeLeft: 60, // 初始倒计时时间（秒）
-					intervalId: null, // 定时器ID
-				},
-			}
-		},
-		methods: {
-			telClose() {
-				this.$emit('telClose')
-			},
-			
-
-			// 清空验证码
-			clearYzm() {
-				this.bindObj.yzmNumber = '';
-				this.bindObj.clearYzmIcon = false;
-			},
-
-			// 判断是否显示验证码的清除按钮
-			changeYzmInput(event) {
-				if (event.detail.value.length > 0) {
-					this.bindObj.clearYzmIcon = true;
-				} else {
-					this.bindObj.clearYzmIcon = false;
-				}
-			},
-
-			// 绑定按钮
-			bindBtn() {
-				if (this.bindObj.yzmNumber === '') {
-					toast('验证码不能为空')
-					return;
-				}
-
-				let req = {
-					tel: this.bindObj.telNumber,
-					code: this.bindObj.yzmNumber,
-				}
-				telBind(req).then(res => {
-					if (res.code == 0) {
-						toast('手机号绑定成功')
-						this.updataTel(this.bindObj.telNumber);
-						this.telReset();
-						this.$emit('bindBtn')
-					}
-				})
-			},
-
-			// 在缓存中修改手机号
-			updataTel(data) {
-				cacheManager.updateObject('auth', {
-					userName: data
-				})
-			}
-		}
-	}
-</script>

pages/my/telDialog.vue

@@ -65,7 +65,7 @@
 					getYzmFlag: false, // 是否发送验证码
 				},
 				config: {
-					captchaId: "16e4de331cee10dfe36bcf55810c6041",
+					captchaId: "9d5837b0807b8de44da0de310a0b2813",
 				},
 			}
 		},
@@ -156,6 +156,7 @@
 				sendCode(req).then(res => {
 					this.bindObj.getYzmFlag = true;
 				}).catch(err => {
+					this.bindObj.getYzmFlag = false;
 					toast('验证码获取失败：' + err)
 				})
 			},

pages/study/lookShipin.vue

@@ -26,7 +26,7 @@
 			</view>
 		</view>
 		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
-			mask-background-color="rgba(255, 255, 255, 0.6);">
+			mask-background-color="rgba(51, 137, 217, 0.65);">
 			<view :class="courseClass">
 				<view class="text-score">{{credit}}</view>
 				<view class="course-btn-box">