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

common/styles/global/components.scss

@@ -29,11 +29,11 @@ view{box-sizing: border-box;}
 
 /***** tabbar  *****/
 .phone-custom-tabbar,.phone-client-tabbar{
-	width: 100%;height: 130rpx;background-color: #fff;border-top: 1rpx solid #e5e4e4;z-index: 9;
+	width: 100%;height: 100rpx;background-color: #fff;border-top: 1rpx solid #e5e4e4;z-index: 9;
 	position: fixed;left: var(-window-left);right: var(-window right);bottom: var(--window-bottom);
 	box-sizing: border-box;padding-bottom: env(safe-area-inset-bottom);display: flex;justify-content: space-around;align-items: center;
 	.tabbar-item{text-align: center;width: 160rpx;}
-	.tabbar-item-icon{width: 50rpx;height: 50rpx;display: block;@include ezy-no-repeat-cover();margin: 0 auto 8rpx;}
+	.tabbar-item-icon{width: 40rpx;height: 40rpx;display: block;@include ezy-no-repeat-cover();margin: 0 auto 2rpx;}
 	.tabbar-item-text{font-size: 28rpx;color: #333;}
 	.active .tabbar-item-text{color: #3fd2a1;}
 }
@@ -178,7 +178,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		.option-question{font-size: 32rpx;line-height: 1.6;margin-left: 6rpx;@include ezy-rich-text;
 		text-align: justify;word-wrap: break-word;word-break: break-all;display: block;}
 	}
-	.danxuan-option-box.active .option-change{color: #FFF;background-color:#cbcbcb;border-color:#cbcbcb;}
+	.danxuan-option-box.active .option-change{color: #FFF;background-color:#6186fb;border-color:#6186fb;}
 	.danxuan-option-box.showError .option-change{color: #FFF;background-color:#ff5757;border-color:#ff5757;}
 	.danxuan-option-box.active_right .option-change{color: #FFF;background-color:#1ac136;border-color:#1ac136;}
 }
@@ -198,7 +198,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		text-align: justify;word-wrap: break-word;word-break: break-all;display: block;}
 	}
 	// active background-color:#0589e9;
-	.duoxuan-option-box.active .option-change{color: #FFF;background-color:#cbcbcb;border-color:#cbcbcb;}
+	.duoxuan-option-box.active .option-change{color: #FFF;background-color:#6186fb;border-color:#6186fb;}
 	.duoxuan-option-box.showError .option-change{color: #FFF;background-color:#ff5757;border-color:#ff5757;}
 	.duoxuan-option-box.active_right .option-change{color: #FFF;background-color:#1ac136;border-color:#1ac136;}
 }
@@ -215,7 +215,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		}
 	}
 	// active background-color:#0589e9;
-	.option-question.active .uni-radio-input{color: #FFF;background-color:#cbcbcb!important;border-color:#cbcbcb!important;}
+	.option-question.active .uni-radio-input{color: #FFF;background-color:#6186fb!important;border-color:#6186fb!important;}
 	.option-question.showError .uni-radio-input{color: #FFF;background-color:#ff5757!important;border-color:#ff5757!important;}
 	.option-question.active_right .uni-radio-input{color: #FFF;background-color:#1ac136!important;border-color:#1ac136!important;}
 }
@@ -249,6 +249,10 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		>view{margin-bottom: 12rpx;line-height: 1.6;}
 		.ksms-row{margin-bottom: 12rpx;}
 		.ksms-intro{color: #666;}
+		.phone-name-box{
+			text-align: center;
+			img{max-width: 100%;max-height: 260rpx;}
+		}
 	}
 	
 }

common/styles/global/pages.scss

@@ -40,13 +40,13 @@
 		.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;
+			font-size: 24rpx;color: #fff;margin-left: auto;display: flex;align-items: center;
 			.more-num{border: 1rpx solid;border-radius: 50%;box-sizing:border-box;
-			min-width: 26rpx;display: inline-flex;justify-content: center;margin-left:6rpx;
+			min-width: 26rpx;display: inline-flex;margin-left:6rpx;justify-content: center;
 			span{font-size: 18rpx;}
 			}
 			.more-jt{
-				width: 0;height: 0;display: inline-block;vertical-align: middle;
+				width: 0;height: 0;
 				border-right: 5px solid transparent;border-bottom: 5px solid transparent;border-left: 6px solid #fff;
 				margin-left: 8rpx;border-top: 5px solid transparent; 
 			}
@@ -67,7 +67,7 @@
 	.card-content-box{
 		display: flex;display: flex;flex-wrap: wrap;padding: 20rpx 0;
 		.card-content-item{
-			display: flex;flex-direction: row;justify-content: center;align-items: center;margin: 10rpx 0;
+			width: 50%;display: flex;flex-direction: row;justify-content: center;align-items: center;margin: 10rpx 0;
 			icon{width: 70rpx;height: 70rpx;@include ezy-no-repeat-cover;margin-right: 10rpx;}
 			.card-time-icon{background-image: url("@/static/images/index/index-content-icon1.png");}
 			.card-sum-icon{background-image: url("@/static/images/index/index-content-icon3.png");}
@@ -91,10 +91,10 @@
 	.kaoshi-card-box{
 		border-color:#3fd2a1;
 		.card-head-box{background-color:#4fe1b0;}
+		.card-content-box{padding: 10rpx 0;}
 		.card-level{color:#00a573;}
 		.card-name{color:#1e9472;}
 		.card-name icon{background-color:#1e9472;}
-		.kaoshi-content-box .card-content-item{width: 50%;}
 		.index-card-btn[type='default']{background-color: #4fe1b0;color: #fff;}
 	}
 	
@@ -104,10 +104,6 @@
 		.card-head-box{background-color:#6186fb;}
 		.card-level{color:#4794ff;}
 		.card-name{color:#4794ff;}
-		.kaoshi-content-box{
-			padding: 42rpx 0;
-			.card-content-item{width: 33.33%;}
-		} 
 		.index-card-btn[type='default']{background-color: #6186fb;color: #fff;}
 	}
 	
@@ -211,13 +207,20 @@
 		.kecheng-video{height: 460rpx!important;}
 		.prism-big-play-btn{display: none!important;}
 	}
-	.kc-info-box{width: 100%;box-sizing: border-box;padding: 24rpx 36rpx;border-bottom: 1rpx solid #ebebeb;
-		display: flex;align-items: center;justify-content: space-between;color: #555;}
+	.kc-name-box{
+		display: flex;align-items: center;box-sizing: border-box;padding: 24rpx 36rpx 6rpx;
+		icon{
+			width: 20rpx;height: 32rpx;margin-right: 10rpx;font-size: 32rpx;
+			background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
+		}
+	}
+	.kc-info-box{width: 100%;box-sizing: border-box;padding: 6rpx 36rpx 24rpx;border-bottom: 1rpx solid #ebebeb;
+		display: flex;align-items: center;justify-content: space-between;color: #555;font-size: 30rpx;}
 	.kecheng-mulu-box{
 		width: 100%;box-sizing: border-box;padding: 0 36rpx;
 		.collapse-item-icon,.kejian-item-icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover();}
 		.my-collapse-item {
-			border-bottom: 1rpx solid #ebebeb;padding: 32rpx 0;
+			border-bottom: 1rpx solid #ebebeb;padding: 16rpx 0;
 			display: flex;align-items: center;justify-content: space-between;
 			
 			}
@@ -225,10 +228,10 @@
 		.collapse-item-icon{background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");flex-shrink: 0;margin-left: 10rpx;}
 		.item-open .collapse-item-icon{transform: rotate(180deg);}
 		
-		.my-card-content {height: 0rpx;overflow: hidden;margin: 0 32rpx;}
+		.my-card-content {height: 0rpx;overflow: hidden;margin: 0 20rpx;}
 		.content-open{
 			display: block;height: auto;
-			.content-open{margin: 0 16rpx;}
+			.content-open{margin: 0;}
 			.item-open{
 				border:0;
 				.collapse-text{color: #333;}
@@ -236,7 +239,7 @@
 		}
 		
 		.kejian-item{display: flex;align-items: center;padding: 16rpx;font-size: 28rpx;
-		color: #666;border-radius: 4rpx;background-color: #f4f7ff;margin-bottom:20rpx;}
+		color: #666;border-radius: 4rpx;background-color: #f4f7ff;margin-bottom:16rpx;}
 		.kejian-item-icon{background-image: url("@/static/images/common/play-icon.svg");flex-shrink: 0;margin-right: 8rpx;}
 		.kejian-active{
 			color: #3fd2a1;background-color: #3fd2a11a;
@@ -298,7 +301,7 @@
 	}
 	// 答题卡 答完样式
 	.paragraph-qa-block-done {
-		background-color: #cbcbcb;color: #fff;border: 1rpx solid transparent;
+		background-color: #6186fb;color: #fff;border: 1rpx solid transparent;
 	}
 	// 答题卡 未答完样式
 	.paragraph-qa-block-init {
@@ -336,8 +339,8 @@
 	background-color:#f8f9fd;height: 100vh;
 	// head
 	.my-head-box{
-		width: 100%;height:372rpx;display: flex;align-items: center;box-sizing: border-box;padding: 52rpx 52rpx 0 52rpx;
-		background-image: url("@/static/images/my/client-my-bj.png");@include ezy-no-repeat-cover();
+		width: 100%;height:300rpx;display: flex;align-items: center;box-sizing: border-box;padding: 24rpx 52rpx;
+		background-image: url("@/static/images/my/client-my-bj.png");@include ezy-no-repeat-cover(top);
 	}
 	.head-img-box,.head-icon-box{
 		max-width: 160rpx;max-height: 200rpx;
@@ -345,15 +348,15 @@
 	}
 	.head-icon-box{width: 413rpx;height: 582rpx;background-image: url("@/static/images/my/client-default-icon.png");@include ezy-no-repeat-cover();}
 	.head-content-box{
-		font-size: 46rpx;color: #fff;
+		font-size: 36rpx;color: #fff;
 		.idcard-row-box{display: flex;align-items: center;margin-top: 24rpx;}
 		.idcard-icon{width: 56rpx;height:56rpx;background-image: url("@/static/images/my/my-card-icon.png");@include ezy-no-repeat-cover();flex-shrink: 0;}
-		.idcard-text{font-size: 36rpx;margin-left: 10rpx;}
+		.idcard-text{font-size: 32rpx;margin-left: 10rpx;}
 	}
 	
 	// num
 	.my-num-box{
-		background-color: #fff;box-sizing: border-box;padding: 36rpx;border-radius: 8rpx;
+		background-color: #fff;box-sizing: border-box;padding: 24rpx 36rpx;border-radius: 8rpx;
 		display: flex;justify-content: space-around;margin: 20rpx;
 		.num-item-box{
 			display: flex;flex-direction: column;align-items: center;position: relative;
@@ -369,7 +372,7 @@
 	// list
 	.my-list-box{
 		width:700rpx;margin: 0 auto;background-color: #fff;border-radius: 8rpx;padding: 0 36rpx;
-		.list-row{border-bottom: 2rpx solid #eee;color: #333;box-sizing: border-box;padding: 42rpx 0;
+		.list-row{border-bottom: 2rpx solid #eee;color: #333;box-sizing: border-box;padding: 36rpx 0;
 		display: flex;align-items: center;position: relative;}
 		.list-row::after{
 			content: '';width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;

components/identification/identification.vue

@@ -5,8 +5,11 @@
 			<uni-popup-dialog mode="input" class="phone-ksxz-dialog" title="身份确认" :duration="2000" :before-close="true"
 				cancelText="修改" @close="handleClose" @confirm="handleConfirm">
 				<view class="ksxz-content-box">
-					<view>头像：
-						<image :src="data.icon" />
+					<view class="phone-name-box">
+						<!-- #ifdef H5 -->
+							<img :src="data.icon" alt="">
+						<!-- <image :src="data.icon" /> -->
+						<!-- #endif -->
 					</view>
 					<view>姓名：{{data.realName}}</view>
 					<view>电话：{{data.userName}}</view>

pages/client/Kecheng/study.vue

@@ -1,13 +1,17 @@
 <template>
 	<view class="kecheng-study-page">
-		<view class="icon-title-bjcolor-navBar-box">
+		<!-- <view class="icon-title-bjcolor-navBar-box">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{name}}</text>
-		</view>
+		</view> -->
 		<!-- 播放器 -->
 		<videoPlayVue ref="videoRef" class="phone-video-box" @play-end="onPlayEnd" @play-play="onPlay"
 			@play-pause="onPause" @play-timeupdate="onTimeupdate"></videoPlayVue>
 		<!-- 中间区域 -->
+		<view class="kc-name-box">
+			<icon @click="goUpPage"></icon>
+			<view>{{name}}</view>
+		</view>
 		<view class="kc-info-box">
 			<view>时长：{{period}}分钟</view>
 			<view>{{userCount}}人学习</view>

pages/client/ShouYe/shouye.vue

@@ -1,8 +1,8 @@
 <template>
 	<view className="client-shouye-page">
-		<view class="icon-title-bjcolor-navBar-box">
+		<!-- <view class="icon-title-bjcolor-navBar-box">
 			<text class="nav-bar-title">{{data.realName}}</text>
-		</view>
+		</view> -->
 		<!-- 考试 -->
 		<kaoshiCardVue v-if="data.kaoshiList.length" :data="{ count: data.kaoshiCount, ...data.kaoshiList[0] }"></kaoshiCardVue>
 		<!-- 练习 -->