Merge remote-tracking branch 'origin/2025北京诚祥-家政版' into 2025北京诚祥-家政版

common/styles/global/components.scss

@@ -103,10 +103,10 @@ view{box-sizing: border-box;}
 .icon-title-navBar-box{
 	background-color: #fff;box-sizing: border-box;
 	.icon-title-box{display: flex;align-items: center;justify-content: center;padding:10rpx 10rpx 20rpx;position: relative;}
-	.nav-bar-title{font-size: 32rpx;height: 64rpx;line-height: 64rpx;color: #333;max-width: 70%;}
-	.nav-bar-box{width: 64rpx;height: 64rpx;line-height: 64rpx;position: absolute;left: 10rpx;top: 10rpx;
+	.nav-bar-title{font-size: 32rpx;height: 64rpx;line-height: 64rpx;color: #333;max-width: 65%;@include single-line-ellipsis();margin-right: 10%;}
+	.nav-bar-box{width: 100rpx;height: 64rpx;line-height: 64rpx;position: absolute;left: 10rpx;top: 10rpx;
 	display: flex;align-items: center;justify-content: center;}
-	.nav-bar-icon{width: 24rpx;height: 38rpx;@include ezy-no-repeat-cover();}
+	.nav-bar-icon{width: 24rpx;height: 38rpx;@include ezy-no-repeat-cover();margin-right: 36rpx;}
 	.bar-ml10{margin-left: 10rpx;}
 	.nav-bar-btn{font-size: 24rpx;position: absolute;right: 20rpx;
 			line-height: 50rpx;border-radius: 8rpx;padding: 0 10rpx;}
@@ -278,8 +278,11 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		padding: 24rpx 0!important;font-size: 30rpx;border-bottom: 1px solid #f5f5f5;
 		.uni-popup__info{color: #333!important;}
 	}
-	.ksxz-close-icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover;
-	position: absolute;top: -100rpx;right: 20rpx;}
+	.uni-dialog-content{padding: 32rpx;}
+	.ksxz-close-icon{
+		width: 100rpx;height: 80rpx;position: absolute;top: -124rpx;right: -36rpx;
+		icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover;display: block;margin: 24rpx auto;}
+	}
 	.uni-dialog-content{justify-content: flex-start!important;}
 	
 	.uni-dialog-button-text{color: #999!important;}
@@ -288,6 +291,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	.ksxz-content-box{
 		width: 100%;font-size: 28rpx;color: #333;max-height: 70vh;overflow: auto;
 		>view{margin-bottom: 12rpx;line-height: 1.6;}
+		.ksxz-user-img{border-radius: 50%;display: block;margin-bottom: 10rpx;}
 		.ksms-row{margin-bottom: 12rpx;}
 		.ksms-intro{color: #666;}
 		.ksxz-img-box{
@@ -296,6 +300,11 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		}
 	}
 	
+	.ksxz-sxt-tip{
+		color: #3fd2a1;font-size: 24rpx;text-align: justify;
+		border: 1rpx dashed #3fd2a1;padding: 4rpx 8rpx;margin-top: 20rpx;
+	}
+	
 }
 
 
@@ -424,4 +433,6 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	    margin: 62rpx auto 24rpx;
 	    font-size: 30rpx;
 	}
+	.sztqr-tip-content{width:680rpx;color: #3fd2a1;font-size: 28rpx;border-top: 1rpx dashed #3fd2a1;
+	padding: 24rpx 4rpx;line-height: 1.6;text-align: justify;margin: 84rpx auto 0;}
 }

common/styles/global/pages.scss

@@ -45,7 +45,7 @@
 		.card-line-title:before{content: ' ';width: 6rpx;height: 28rpx;background-color:#fff;
 		margin-right: 12rpx;display: inline-block;vertical-align: middle;}
 		.card-more{
-			font-size: 24rpx;color: #fff;margin-left: auto;display: flex;align-items: center;
+			font-size: 24rpx;color: #fff;margin-left: auto;display: flex;align-items: center;padding: 20rpx 0 20rpx 32rpx;
 			.more-num{border: 1rpx solid;border-radius: 20rpx;box-sizing:border-box;font-size: 18rpx;padding: 2rpx 4rpx;
 			min-width: 26rpx;display: inline-flex;margin-left:6rpx;justify-content: center;line-height: 18rpx;
 			}
@@ -217,6 +217,7 @@
 			.bj-btn,.jx-btn,.save-btn{height: 60rpx;line-height: 58rpx;box-sizing: border-box;}
 			.bj-btn{margin-left: unset;}
 			.jx-btn,.save-btn{margin-right: unset;}
+			.shiti-num-box{padding: 24rpx 10rpx;}
 			.shiti-num-icon{
 				width: 27px;height: 24px;vertical-align: middle;
 				@include ezy-no-repeat-cover();
@@ -238,14 +239,15 @@
 		color: #666;font-size: 30rpx;margin-bottom:4rpx;
 		text{font-size: 64rpx;color:#ff6c6c;margin-right: 4rpx;}
 		}
-	.score-dialog-btn{width: 360rpx;margin: 100rpx auto 24rpx;font-size: 30rpx;}
-	.progress-circle-box{}
+	.score-dialog-btn,.score-dialog-return-btn{width: 360rpx;margin: 100rpx auto 24rpx;font-size: 30rpx;}
+	.score-dialog-return-btn{margin: 24rpx auto;}
 	.progress-text-btn-box{
 		display: flex;flex-direction: column;align-items: center;
 		.cneter-box{font-size: 32rpx!important;color: #3fd2a1;}
 		.progress-text{margin-bottom: 16rpx;}
 		.container .rightcircle,.container .left .leftcircle{z-index: 2;border-color:#ecedef;}
 	}
+	
 }
 	
 /*** 课程学习 ***/
@@ -336,6 +338,7 @@
 		width: 100%;height: 100rpx;background-color: #f0f0f0;
 		display: flex;align-items: center;justify-content: space-between;
 		padding: 0 24rpx;box-sizing: border-box;position: fixed;bottom: var(--window-bottom);
+		.score-num-box{padding: 20rpx 32rpx 20rpx 0;}
 		.score-num-icon{
 			width: 27px;height: 24px;vertical-align: middle;
 			@include ezy-no-repeat-cover();

components/dialog/shexiangDialog.vue

@@ -7,14 +7,7 @@
 				<view class="common-title">{{title}}</view>
 				<view class="common-content" :class="dialogContentClass">
 				  <view>
-						<!-- IOS-->
-						<view v-if="platformType === 'ios'" class="content-margin-bottom">推荐使用微信或safari浏览器，使用其他浏览器可能会在考试过程中出现摄像头问题，影响考试结果，导致重考，不建议使用其他浏览器。
-						</view>
-						<!-- 安卓-->
-						<view v-if="platformType === 'Android'" class="content-margin-bottom">
-							推荐使用微信或火狐浏览器、谷歌浏览器，使用其他浏览器可能会在考试过程中出现摄像头问题，影响考试结果，导致重考，不建议使用其他浏览器。
-						</view>
-						<view class="content-margin-bottom">请在考试前使用摄像头测试功能，测试摄像头是否可以正常工作，在测试前请先确保摄像头设备可以正常使用，并且使用推荐浏览器并赋予了浏览器摄像头权限。</view>
+						<view class="content-margin-bottom">请在考试前使用摄像头测试功能，测试摄像头是否可以正常工作，在测试前请先确保摄像头设备可以正常使用，并赋予了小程序摄像头权限。</view>
 						<view>若摄像头测试中图像显示异常，请及时更换手机，以免影响考试结果。</view>
 					</view>
 				</view>

components/identification/identification.vue

@@ -5,14 +5,13 @@
 			<uni-popup-dialog mode="input" class="phone-ksxz-dialog" title="身份确认" :duration="2000" :before-close="true"
 				cancelText="修改" @close="handleClose" @confirm="handleConfirm">
 				<view class="phone-ksxz-body">
-					<view @click="handleCloseOnly" class="ksxz-close-icon"
-					:style="{ backgroundImage: 'url(' + data.iconsArr.closeIcon + ')' }"></view>
+					<view @click="handleCloseOnly" class="ksxz-close-icon" >
+						<icon :style="{ backgroundImage: 'url(' + data.iconsArr.closeIcon + ')' }"></icon>
+					</view>
 					<view class="ksxz-content-box">
             <!--  Fixme 图形   -->
-						<view class="ksxz-img-box">
-								<img :src="data.icon" v-if="data.icon" alt="">
-								<icon class="phone-default-userImg" v-else></icon>
-						</view>
+						<img class="phone-default-userImg ksxz-user-img" :src="data.icon" v-if="data.icon" alt=""/>
+						<icon class="phone-default-userImg ksxz-user-img" v-else :style="{ backgroundImage: 'url(' + data.iconsArr.defaultUserImg + ')' }"></icon>
 						<view :class="{isEmpty: !data.realName}">姓名：{{data.realName}}</view>
 						<view :class="{isEmpty: !data.realName}">电话：{{data.userName}}</view>
 						<view>职业：{{data.zyName}}</view>
@@ -40,12 +39,14 @@
 		userId: '',
 		iconsArr:{
 			closeIcon: '',
+			defaultUserImg: '',
 		}
 	})
 
 	const emits = defineEmits(['confirm', 'changeData'])
 	onMounted(() => {
 			data.iconsArr.closeIcon = cacheManager.get('projectImg').closeIcon;
+			data.iconsArr.defaultUserImg = cacheManager.get('projectImg').user_default_img;
 		});
 	function handleCloseOnly() {
 		popupRef.value.close()

components/zhuapaiConfirm/submitScore.vue

@@ -22,6 +22,7 @@
 				<c-progress-circle :progress='data.userAccuracy/100' color='#3fd2a1' size='240rpx'
 					boderWidth="240rpx" class="progress-circle-box"></c-progress-circle>
 				<button type="default" class="phone-green-btn score-dialog-btn" @click="handleCheckSj">查看成绩</button>
+				<button type="default" class="phone-white-btn score-dialog-return-btn" @click="goIndex">退出</button>
 			</view>
 		</view>
 	</uni-popup>
@@ -62,6 +63,13 @@
 		emits('close');
 		popupRef.value.close()
 	}
+	
+	function goIndex(){
+		uni.navigateTo({
+		  url: `/pages/client/ShouYe/shouye`
+		})
+	}
+	
 
 	function handleCheckSj() {
 		emits('confirm', data);

pages/client/Kecheng/study.vue

@@ -6,7 +6,7 @@
 			@play-pause="onPause" @play-timeupdate="onTimeupdate"></videoPlayVue> -->
 
 		<video v-if="showVideo" :src="videoUrl" :poster="videoPoster" controls class="phone-video-box"
-			@play="onVideoPlay" @pause="onVideoPause" @ended="onVideoEnd" @error="onVideoError" id="myVideo"></video>
+			@play="onVideoPlay" @pause="onVideoPause" @ended="onVideoEnd" @error="onVideoError" id="myVideo" ></video>
 
 		<!-- 视频背景图 -->
 		<view v-else class="phone-video-box master-image" :style="{ backgroundImage: 'url(' + imgsArr.videoBj + ')' }">
@@ -293,10 +293,12 @@
 				}
 				console.log('data', data);
 				this.curPlayData = data;
+				
+				//this.videoUrl = 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4'
+				
 				kechengApi.getVideoId({
 					videoId: data.url
 				}).then(res => {
-
 					this.videoUrl = res.data
 					console.log('res', res);
 					// const progress = data.curProcess || 0;