Просмотр исходного кода

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

wangxy 1 месяц назад
Родитель
Сommit
df967724a6

+ 1 - 4
common/styles/global/components.scss

@@ -345,9 +345,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 
 
 /***** 默认头像  *****/
-.phone-default-userImg{
-	width: 170rpx;height: 170rpx;margin: 0 auto;
-	background-image: url("@/static/images/my/user-default-img.png");@include ezy-no-repeat-cover();}
+.phone-default-userImg{width: 170rpx;height: 170rpx;margin: 0 auto;@include ezy-no-repeat-cover();}
 
 /***** form  *****/
 // label-input
@@ -364,7 +362,6 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	.uni-easyinput__placeholder-class{font-size: 30rpx!important;}
 	.content-clear-icon{color: rgb(192, 196, 204)!important;}
 	icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;flex-shrink: 0;
-		background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
 		transform: rotate(270deg);margin-left: 4rpx;}
 		
 		// 文字行

+ 9 - 222
common/styles/global/pages.scss

@@ -411,35 +411,20 @@
 	background-color:#f8f9fd;height: 100vh;box-sizing: border-box;padding-bottom: 120rpx;overflow: auto;
 	// head
 	.my-head-box{
-		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);
+		width: 100%;height:300rpx;display: flex;align-items: center;box-sizing: border-box;
+		@include ezy-no-repeat-cover(top);padding: 60rpx 52rpx 0;
 	}
 	.head-img-box{
 		width: 170rpx;height: 170rpx;margin-right: 32rpx;display: flex;align-items: center;
 		border-radius: 50%;overflow: hidden;
 	}
-	.head-img{width: 100%;height: auto;}
+	.head-img{width: 100%;height: 170rpx;}
 	.head-content-box{
 		font-size: 32rpx;color: #fff;
 		.head-content-row-box{display: flex;align-items: center;margin-top: 20rpx;}
-		.tel-icon,.idcard-icon{width: 40rpx;height:40rpx;@include ezy-no-repeat-cover();flex-shrink: 0;}
-		.tel-icon{background-image: url("@/static/images/my/my-tel-icon.png");}
-		.idcard-icon{background-image: url("@/static/images/my/my-idcard-icon.png");}
+		icon{width: 40rpx;height:40rpx;@include ezy-no-repeat-cover();flex-shrink: 0;}
 		.content-text{font-size: 30rpx;margin-left: 10rpx;}
 	}
-	// admin
-	.admin-head-box{
-		background-color: #fff;box-sizing: border-box;padding: 30rpx 36rpx;border-radius: 12rpx;
-		display: flex;align-items: center;margin: -180rpx 20rpx 20rpx;
-		.head-content-box{font-size: 32rpx;color: #333;margin-left: 20rpx;}
-		.tel-icon{background-image: url("@/static/images/login/login-tel-icon.png");}
-	}
-	.jzgs-name-box{
-		width: 100%;text-align: center;font-size: 34rpx;color: #fff;
-		box-sizing: border-box;font-weight: 600;@include ezy-no-repeat-cover(bottom);
-		background-image: url("@/static/images/my/admin-my-bj.png");
-		height: 376rpx;padding-top: 100rpx;
-	}
 	
 	// num
 	.my-num-box{
@@ -448,9 +433,6 @@
 		.num-item-box{
 			display: flex;flex-direction: column;align-items: center;position: relative;
 			icon{width: 100rpx;height: 100rpx;@include ezy-no-repeat-cover();margin-bottom: 10rpx;}
-			.ks-icon{background-image: url("@/static/images/my/my-ks-icon.png");}
-			.lx-icon{background-image: url("@/static/images/my/my-lx-icon.png");}
-			.kc-icon{background-image: url("@/static/images/my/my-kc-icon.png");}
 			.my-num-badge{position: absolute;right: -8rpx;top: -12rpx;}
 			.num-title{font-size: 28rpx;color: #333;}
 		}
@@ -461,20 +443,12 @@
 		margin: 0 20rpx;background-color: #fff;border-radius: 8rpx;padding: 0 36rpx;
 		.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;
-			background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
+		.jt-icon{
+			width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
 			position: absolute;right: 0;transform: rotate(270deg);
 		}
 		.list-row:last-child{border: 0;}
 		.list-icon{width: 42rpx;height: 42rpx;@include ezy-no-repeat-cover;margin-right: 32rpx;}
-		.user-icon{background-image: url("@/static/images/my/my-editor-icon.png");}
-		.mm-icon{background-image: url("@/static/images/login/login-lock-icon.png");}
-		.code-icon{background-image: url("@/static/images/my/two-code-icon.png");}
-		.score-icon{background-image: url("@/static/images/my/my-score-icon.png");}
-		.login-out-icon{background-image: url("@/static/images/my/login-out-icon.png");}
-		.sxtcs-icon{background-image: url("@/static/images/my/my-sxtcs-icon.png");}
-		.sxtsm-icon{background-image: url("@/static/images/my/my-sxtsm-icon.png");}
 	}
 }
 
@@ -753,76 +727,7 @@
 	.tongzhi-time{font-size: 28rpx;color:#969495;margin-bottom: 24rpx;}
 	.tongzhi-content{font-size: 28rpx;color:#666;text-align: left;line-height: 1.6;;}
 }
-/*** 办证 ***/
-.phone-banzheng-page{
-	// width: 100%;height: 100vh;background-color: #f4f6fa;
-	.banzheng-list-item-box{
-		background-color: #f4f6fa!important;
-		.uni-list--border{display: none!important;}
-		.uni-list-item__container{padding: 0 24rpx 24rpx;}
-	}
-	.uni-list .banzheng-list-item-box:nth-child(2){padding-top: 20rpx;}
-	.banzheng-list-card-box{
-		width: 100%;
-		.card-head-row{
-			background-color:#e5f8f4;display: flex;justify-content: space-between;align-items: center;
-			box-sizing: border-box;padding: 24rpx;border-radius: 10rpx 10rpx 0 0;
-			.head-name{font-size: 28rpx;color: #000;font-weight: 600;}
-			.head-status{font-size: 26rpx;color: #39c194;}
-			.status-line{margin: 0 8rpx;}
-			.head-clear{width: 30rpx;height: 30rpx;display: inline-block;vertical-align: middle;margin-left: 24rpx;
-			@include ezy-no-repeat-cover;background-image: url("@/static/images/common/clear-bz-icon.svg");}
-		}
-		.card-body-row{
-			display: flex;box-sizing: border-box;padding:16rpx 24rpx;background-color:#fff;border-radius: 0 0 10rpx 10rpx;
-			.body-content-row{width: 100%;display: flex;flex-direction: column;justify-content: center;}
-			.card-img-box{width: 180rpx;max-height: 240rpx;display: flex;align-items: center;margin-right: 24rpx;flex-shrink: 0;}
-			img{max-width: 180rpx;max-height: 240rpx;border-radius: 8rpx;}
-			.content-text-row{
-				display: flex;align-items: center;font-size: 28rpx;color: #333;line-height: 46rpx;
-				text{color: #000;font-weight: 600;flex-shrink: 0;}
-				}
-			.bz-tel-btn{font-size: 24rpx;width: 100rpx;padding: 0 10rpx;flex-shrink: 0;
-			line-height: 50rpx;border-radius: 8rpx;margin: 0;margin-left: auto;}
-			.jg-zy-box{
-				background-color:#f4f6fa;border-radius: 10rpx;font-size: 26rpx;color: #666;
-				box-sizing: border-box;padding: 16rpx;line-height: 1.4;
-				.jg-zy-row{display: flex;align-items: flex-start;}
-				.jg-zy-row +.jg-zy-row{margin-top: 6rpx;}
-				text{@include multi-line-ellipsis(2);}
-				icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;margin-right: 10rpx;flex-shrink: 0;}
-				.bz-icon{background-image: url("@/static/images/common/bz-icon.png");}
-				.zy-icon{background-image: url("@/static/images/common/zy-icon.png");}
-			}
-		}
-	}
-	// 办证状态
-	.banzheng-search-box{
-		width: 100%;box-sizing: border-box;padding: 20rpx 20rpx;position: relative;
-		display: flex;justify-content: space-between;align-items: center;border-top: 1rpx solid #f4f6fa;
-		.select-item-box{
-			font-size: 30rpx;
-			.select-jt-default,.select-jt-click{
-				width: 16rpx;height: 16rpx;vertical-align: middle;margin-left: 10rpx;
-				background-image: url("@/static/images/common/sanjiao-shixin-icon.svg");@include ezy-no-repeat-contain();
-			}
-			.select-jt-click{transform: rotate(180deg);}
-		}
-		
-		// 带筛选按钮的
-		.filter-btn{font-size: 28rpx;color: #666;position: relative;margin-right: 20rpx;}
-		.filter-btn::after{
-			content: '';width: 0;height: 0;position: absolute;bottom: 5rpx;right: -12rpx;
-			border-left: 4rpx solid transparent;border-top: 4rpx solid transparent;
-			border-bottom: 4rpx solid #666;border-right: 4rpx solid #666;
-		}
-	}
-	.banzheng-type-box{
-		position: absolute;top: 80rpx;left: 0;right: 0;bottom: 0;
-		z-index: 2;background-color: rgba(0,0,0,0.3);
-		.data-check-radio-group{height: 500rpx;border:1rpx solid #f5f5f5;align-content: flex-start;}
-	}
-}
+
 /*** 筛选 ***/
 .phone-filter-page{
 	width: 100%;height: 100vh;background-color: #f8f9fd;
@@ -840,62 +745,6 @@
 	.filter-btn + .filter-btn{margin-left: 60rpx;}
 }
 
-/*** 家政人员简历 ***/
-.phone-jianli-page{
-	width: 100%;background-color: #f8f9fd;display: flex;flex-direction: column;
-	height: 100vh;
-	.right-icon-delete-btn{
-		width: 35rpx;height: 35rpx;@include ezy-no-repeat-cover();margin-right: 10rpx;
-		background-image: url("@/static/images/common/clear-icon.svg");
-	}
-	.jianli-wrap-box{overflow: auto;box-sizing: border-box;padding-bottom: 120rpx;}
-	.jianli-head-box{
-		display: flex;background-color:#3fd2a1;box-sizing: border-box;padding: 24rpx 36rpx;
-		margin: 24rpx 32rpx;border-radius: 10rpx;
-		.head-img-box{
-			width: 180rpx;height: 240rpx;margin-right: 32rpx;display: flex;align-items: center;
-			border-radius: 10rpx;overflow: hidden;position: relative;
-			.head-img{width: 180rpx;height: auto;}
-			.head-status{
-				height: 32rpx;line-height: 32rpx;padding: 0 16rpx;
-				position: absolute;right:0;bottom:0;border-radius: 10rpx 0 10rpx 0;text-align: center;
-				font-size: 24rpx;color: #fff;background-image: linear-gradient(to right, #fbba31, #fea32b);}
-		}
-		
-		.head-content-box{
-			display: flex;flex-direction: column;justify-content: space-around;font-size: 28rpx;color:#fff;
-			.name-row{font-size: 34rpx;font-weight: bold;}
-		}
-	}
-	
-	.jianli-body-box{background-color: #fff;box-sizing: border-box;padding: 24rpx 36rpx;}
-	.jbxx-label{word-spacing: 48rpx;margin-right: 10rpx;color: #666;flex-shrink: 0;}
-	.leixing-row{
-		display: flex;background-color: #e7f8f2;border-radius: 10rpx;
-		box-sizing: border-box;padding: 24rpx 32rpx;font-size: 30rpx;
-		.leixing-content{color: #333;font-weight: bold;line-height: 1.6;}
-	}
-	
-	.body-jbxx-box{
-		box-sizing: border-box;padding: 24rpx 32rpx 0;
-		>view{color: #333;font-size: 32rpx;display: flex;margin-bottom: 20rpx;line-height: 1.5;}
-		.jbxx-title{font-size: 30rpx;color: #3fd2a1;font-weight: bold;}
-	}
-	.jbxx-tip{font-size: 24rpx;color: #666;text-align:center;
-	box-sizing: border-box;padding: 20rpx 32rpx 0;justify-content: center;margin-bottom: 0;}
-	
-	.jianli-bottom-box{
-		width: 100%;height: 100rpx;background-color: #f9f9f9;border-top: 1rpx solid #eeeeee;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;
-		.bottom-icon{width: 36rpx;height: 36rpx;display: block;@include ezy-no-repeat-cover();margin: 0 auto 2rpx;}
-		.zl-icon{background-image: url("@/static/images/common/jz-editor-icon.png");}
-		.tel-icon{background-image: url("@/static/images/common/jz-tel-icon.png");}
-		.bottom-text{font-size: 24rpx;color: #333;}
-	}
-	
-	.jbxx-tel-btn{width: 240rpx;margin-top: 32rpx;font-size: 28rpx;}
-}
 
 /*** 地图浮层 ***/
 .map-popup-box{
@@ -930,43 +779,8 @@
 	}
 }
 
-/*** 课程绑定 ***/
-.kc-bind-page{
-	
-	.kc-bind-scroll-view{height: calc(100vh - 240rpx - var(--status-bar-height));overflow-y: auto;}
-	.kc-notbind-scroll-view{height: calc(100vh - 158rpx - var(--status-bar-height));overflow-y: auto;}
-	.admin-list-box{
-		.kecheng-list-card{
-			.item-card-row {display: flex;flex-direction: column;justify-content: space-between;box-sizing: border-box;padding: 12rpx 0;}
-			.bind-btn-row{display: flex;align-items:center;}
-			.kc-bind-btn {width: 160rpx;font-size: 26rpx;margin:0;line-height: 2.4;}
-			.kc-bind-btn + .kc-bind-btn{margin-left: 24rpx;}
-		}
-	}
-}
 
-/*** 子账号***/
-.phone-zzh-page{
-	.zzh-saixuan-view{height: calc(100vh - 320rpx - var(--status-bar-height));}
-	.zzh-new-btn-box{
-		padding: 20rpx 24rpx 20rpx;background-color: #f4f6fa;box-sizing: border-box;
-		.phone-green-btn{font-size: 28rpx;}
-	}
-	.zzh-list-item-box{border-bottom: 20rpx solid #f4f6fa;background-color: transparent!important;}
-	.zzh-item-card{width: 100%;padding: 16rpx 0;}
-	.zzh-name-row{
-		font-size: 32rpx;color: #000;margin-bottom: 32rpx;border-bottom: 1rpx dashed #ccc;padding:0 12rpx 12rpx;
-		.row-item{width: 100%;line-height: 1.6;display: flex;align-items: center;margin-bottom: 20rpx;}
-		.user-icon,.tel-icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover();margin-right: 20rpx;}
-		.user-icon{background-image: url("@/static/images/common/user-green-icon.png");}
-		.tel-icon{background-image: url("@/static/images/common/tel-green-icon.png");}
-		}
-	.zzh-btn-row{
-		display: flex;justify-content: center;
-		.zzh-btn{width: 180rpx;font-size: 26rpx;margin:0;line-height: 2;}
-		.zzh-btn + .zzh-btn{margin-left: 32rpx;}
-	}
-}
+
 
 /*** 已售课程***/
 .phone-yishou-page{
@@ -982,34 +796,7 @@
 	}
 }
 
-/*** 子家政公司 ***/
-.phone-zjzgs-page{
-	background-color: #f8f9fd;display: flex;flex-direction: column;
-	height: 100vh;
-	.zjzgs-body-box{flex: 1;overflow-y: auto;}
-	.zjzgs-num-box{
-		border:1rpx solid #3fd2a1;
-		background-color: #fff;margin: 0 20rpx 24rpx;padding: 16rpx 0;border-radius: 8rpx;
-		.zjzgs-title{font-size:32rpx ;margin: 0 24rpx;color:#3fd2a1;text-align:center;font-weight: bold;margin-bottom:10rpx;}
-		.num-item-box{
-			border-bottom:1rpx dashed #3fd2a1;display: flex;align-items: center;justify-content: space-between;
-			font-size: 32rpx;text-align: center;color: #333;padding: 24rpx 0;margin: 0 24rpx;
-			.num-btn{font-size: 26rpx;padding: 8rpx 20rpx;border-radius: 8rpx;line-height: 1.1;flex-shrink: 0;
-			// background-color: #fff;color: #3fd2a1;border: 1rpx solid #3fd2a1;
-			font-size: 28rpx;background-color: #3fd2a1;color: #fff;margin-left: auto;}
-			>view{@include single-line-ellipsis();}
-		}
-		.num-item-box:nth-child(4){border-bottom: 0;}
-	}
-	.list-btn-box{
-		width: 100%;margin-top: 24rpx;
-		.list-btn{
-			padding: 14rpx 20rpx;border-radius: 8rpx;line-height: 1.1;
-			font-size: 28rpx;background-color: #3fd2a1;color: #fff;
-			margin:36rpx auto 20rpx;width: 200rpx;text-align: center;
-		}
-	}
-}
+
 
 /* 职业等级选择页 */
 .phone-zydj-popup{

+ 1 - 1
components/dialog/shexiangDialog.vue

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

+ 44 - 95
pages/client/Kecheng/study.vue

@@ -96,42 +96,15 @@
 		},
 		methods: {
 			handlePlayFirst() {
-				let sectionPage = getKechengSectionPageFromHistory(this.operId)
-				if (sectionPage) {
-					const {
-						zhangIndex,
-						jieIndex
-					} = getCurKjIndex(sectionPage.kjId,this.operId)
-					sectionPage.iChapter = zhangIndex;
-					sectionPage.iSection = jieIndex;
-					sectionPage.kjId = sectionPage.kjId;
-					sectionPage.operId = this.operId;
-					
+				if (this.list && this.list[0].jieList && this.list[0].jieList[0].kejianList) {
 					// 设置默认展开项
-					this.list[zhangIndex].open = true;
-					this.list[zhangIndex].jieList[jieIndex].open = true;
-					
-					const kejian = this.list[0].jieList && this.list[zhangIndex].jieList[jieIndex].kejianList.find(item => item.kjId ==sectionPage.kjId )
+					this.list[0].open = true;
+					this.list[0].jieList[0].open = true;
+					// 设置播放可见
+					const kejian = this.list[0].jieList[0].kejianList[0];
 					this.handlePlay(kejian)
-				} else {
-					if (this.list && this.list[0].jieList && this.list[0].jieList[0].kejianList) {
-						// 设置默认展开项
-						this.list[0].open = true;
-						this.list[0].jieList[0].open = true;
-						// 设置播放可见
-						const kejian = this.list[0].jieList[0].kejianList[0];
-						this.handlePlay(kejian)
-						// 更新缓存
-						sectionPage = {
-							kjId: kejian.kjId,
-							iChapter: 0,
-							iSection: 0,
-							operId: this.operId
-						}
-					}
+					
 				}
-						
-				saveKechengSectionPage(this.operId, sectionPage)
 			},
 			onPause() {
 				clearInterval(this.timer1);
@@ -140,9 +113,9 @@
 			onPlay() {
 				clearInterval(this.timer1);
 				this.timer1 = null;
-				this.timer = setInterval(() => {
-					updateSectionProgress(this.operId);
-				}, 1000 * 1 * 60) // 自动保存进度 1分钟已保存
+			// 	this.timer = setInterval(() => {
+			// 		updateSectionProgress(this.operId);
+			// 	}, 1000 * 1 * 60) // 自动保存进度 1分钟已保存
 			
 			},
 			sectionPlayerProgress(progress) {
@@ -166,18 +139,18 @@
 				const progress = parseInt(time / this.curPlayData.duration * 100);
 				this.curPlayData.curProgress = parseInt(progress >= 100 ? '99' : progress);
 				// 保存进度
-				saveCourseProgress(time, this.curPlayData.duration, this.operId)
+			//	saveCourseProgress(time, this.curPlayData.duration, this.operId)
 				// 更新进度
-				this.sectionPlayerProgress(progress)
+			//	this.sectionPlayerProgress(progress)
 			},
 			onPlayEnd() {
 				clearInterval(this.timer1);
 				this.timer1 = null;
-				saveCourseProgress(this.curPlayData.duration, this.curPlayData.duration, this.operId, 'end');
-				updateSectionProgress(this.operId, 'end', 'video', () => {
-					this.curPlayData.maxProcess = 99;
-					this.curPlayData.curProcess = 99;
-				});
+				// saveCourseProgress(this.curPlayData.duration, this.curPlayData.duration, this.operId, 'end');
+				// updateSectionProgress(this.operId, 'end', 'video', () => {
+				// 	this.curPlayData.maxProcess = 99;
+				// 	this.curPlayData.curProcess = 99;
+				// });
 				console.log('end')
 			},
 			goUpPage() {
@@ -231,7 +204,7 @@
 				sectionPage.iSection = jieIndex;
 				sectionPage.kjId = data.kjId;
 				sectionPage.operId = this.operId;
-				saveKechengSectionPage(this.operId, sectionPage)
+			//	saveKechengSectionPage(this.operId, sectionPage)
 				kechengApi.getVideoAuth({
 					videoId: data.url
 				}).then(res => {
@@ -246,42 +219,18 @@
 				})
 			},
 			initFirstVideo() {
-				let sectionPage = getKechengSectionPageFromHistory(this.operId)
-				if (sectionPage) {
-					const {
-						zhangIndex,
-						jieIndex
-					} = getCurKjIndex(sectionPage.kjId,this.operId)
-					sectionPage.iChapter = zhangIndex;
-					sectionPage.iSection = jieIndex;
-					sectionPage.kjId = sectionPage.kjId;
-					sectionPage.operId = this.operId;
-					
-					// 设置默认展开项
-					this.list[zhangIndex].open = true;
-					this.list[zhangIndex].jieList[jieIndex].open = true;
-					
-					const kejian = this.list[0].jieList && this.list[zhangIndex].jieList[jieIndex].kejianList.find(item => item.kjId ==sectionPage.kjId )
-					// this.handlePlay(kejian)
-				} else {
-					if (this.list && this.list[0].jieList && this.list[0].jieList[0].kejianList) {
-						// 设置默认展开项
-						this.list[0].open = true;
-						this.list[0].jieList[0].open = true;
-						// 设置播放可见
-						const kejian = this.list[0].jieList[0].kejianList[0];
-						// this.handlePlay(kejian)
-						// 更新缓存
-						sectionPage = {
-							kjId: kejian.kjId,
-							iChapter: 0,
-							iSection: 0,
-							operId: this.operId
-						}
-					}
-				}
+				
+			if (this.list && this.list[0].jieList && this.list[0].jieList[0].kejianList) {
+				// 设置默认展开项
+				this.list[0].open = true;
+				this.list[0].jieList[0].open = true;
+				// 设置播放可见
+				const kejian = this.list[0].jieList[0].kejianList[0];
+				// this.handlePlay(kejian)
+			
+			}
 		
-				saveKechengSectionPage(this.operId, sectionPage)
+				//saveKechengSectionPage(this.operId, sectionPage)
 			},
 
 			init() {
@@ -304,25 +253,25 @@
 					this.list = kejianUserVo.zhangList;
 					this.intro = intro;
 					this.operId = operId;
-
+					
 					// 获取课程缓存 && 课件缓存(课件缓存点击后产生)
-					let historyArrKecheng = getKechengDataFromHistory(this.operId)
-					let sectionPageHistory = getKechengSectionPageFromHistory(this.operId)
-					// 判断是否有前台缓存
-					if (historyArrKecheng && sectionPageHistory) {
-						// 有缓存---- 把start接口中,返回数据进度100%,更新到前台缓存
-						const arrKecheng = mergeProgress(kejianUserVo && kejianUserVo.zhangList,
-							historyArrKecheng);
-						// 后台数据 同步前台缓存
-						saveKechengData(this.operId, arrKecheng)
-					} else {
-						// 无缓存----把start接口中,返回的所有数据,更新到前台缓存
-						saveKechengData(this.operId, kejianUserVo && kejianUserVo.zhangList)
-					}
+					//let historyArrKecheng = getKechengDataFromHistory(this.operId)
+				//	let sectionPageHistory = getKechengSectionPageFromHistory(this.operId)
+					// // 判断是否有前台缓存
+					// if (historyArrKecheng && sectionPageHistory) {
+					// 	// 有缓存---- 把start接口中,返回数据进度100%,更新到前台缓存
+					// 	const arrKecheng = mergeProgress(kejianUserVo && kejianUserVo.zhangList,
+					// 		historyArrKecheng);
+					// 	// 后台数据 同步前台缓存
+					// 	saveKechengData(this.operId, arrKecheng)
+					// } else {
+					// 	// 无缓存----把start接口中,返回的所有数据,更新到前台缓存
+					// 	saveKechengData(this.operId, kejianUserVo && kejianUserVo.zhangList)
+					// }
 					// 初始化页面 常规数据
-					initCourseProgressAll(this.operId)
+					//initCourseProgressAll(this.operId)
 
-					console.log('初始化播放首次')
+					console.log('初始化播放首1123次')
 					// 设置播放视频
 					this.initFirstVideo();
 				}).catch(err => {

+ 46 - 15
pages/client/my/index.vue

@@ -1,18 +1,18 @@
 <template>
 	<view class="client-my-page">
-		<view class="my-head-box">
+		<view class="my-head-box" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.myHeadBj + ')' }">
 			<view class="head-img-box">
-				<img class="head-img" :src="myInfoData.userImg" v-if="myInfoData.userImg">
-				<icon class="phone-default-userImg" v-else></icon>
+				<image class="head-img" :src="myInfoData.userImg" v-if="myInfoData.userImg"></image>
+				<icon class="phone-default-userImg" v-else :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.defaultUserImg + ')' }"></icon>
 			</view>
 			<view class="head-content-box">
 				<text>{{myInfoData.realName}}</text>
 				<view class="head-content-row-box" v-if="myInfoData.userName">
-					<icon class="tel-icon"></icon>
+					<icon :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.telIcon + ')' }"></icon>
 					<text class="content-text" >{{myInfoData.userName}}</text>
 				</view>
 				<view class="head-content-row-box" v-if="myInfoData.idcard">
-					<icon class="idcard-icon"></icon>
+					<icon :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.idcardIcon + ')' }"></icon>
 					<text class="content-text" >{{myInfoData.idcard}}</text>
 				</view>
 			</view>
@@ -22,43 +22,48 @@
 			<view class="num-item-box" @click="goToPage('ks')">
 				<uni-badge class="uni-badge-left-margin my-num-badge" v-if="myInfoData.kaoshiCount"
 				:customStyle="{background: '#ff2527'}" :text="myInfoData.kaoshiCount" />
-				<icon class="ks-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.ksIcon + ')' }"></icon>
 				<text class="num-title">考试管理</text>
 			</view>
 			<view class="num-item-box" @click="goToPage('lx')">
 				<uni-badge class="uni-badge-left-margin my-num-badge" v-if="myInfoData.lianxiCount"
 				:customStyle="{background: '#ff2527'}" :text="myInfoData.lianxiCount" />
-				<icon class="lx-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.lxIcon + ')' }"></icon>
 				<text class="num-title">练习管理</text>
 			</view>
 			<view class="num-item-box" @click="goToPage('kc')">
 				<uni-badge class="uni-badge-left-margin my-num-badge" v-if="myInfoData.kechengCount"
 				:customStyle="{background: '#ff2527'}" :text="myInfoData.kechengCount" />
-				<icon class="kc-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.kcIcon + ')' }"></icon>
 				<text class="num-title">课程管理</text>
 			</view>
 		</view>
 		
 		<view class="my-list-box">
 			<view class="list-row" @click="goToPage('grcj')">
-				<icon class="list-icon user-icon"></icon>
+				<icon class="list-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.userListIcon + ')' }"></icon>
 				<text>修改个人信息</text>
+				<icon class="jt-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.jtIcon + ')' }"></icon>
 			</view>
 			<view class="list-row" @click="goToPage('cj')">
-				<icon class="list-icon score-icon"></icon>
+				<icon class="list-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.scoreListIcon + ')' }"></icon>
 				<text>我的成绩</text>
+				<icon class="jt-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.jtIcon + ')' }"></icon>
 			</view>
 			<view class="list-row" @click="showZhuaPaiConfirm">
-				<icon class="list-icon sxtcs-icon"></icon>
+				<icon class="list-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.sxtcsListIcon + ')' }"></icon>
 				<text>摄像头测试</text>
+				<icon class="jt-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.jtIcon + ')' }"></icon>
 			</view>
 			<view class="list-row" @click="showMessageDl">
-				<icon class="list-icon sxtsm-icon"></icon>
+				<icon class="list-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.sxtsmListIcon + ')' }"></icon>
 				<text>摄像头说明</text>
+				<icon class="jt-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.jtIcon + ')' }"></icon>
 			</view>
 			<view class="list-row" @click="exitLogin">
-				<icon class="list-icon login-out-icon"></icon>
+				<icon class="list-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.loginOutListIcon + ')' }"></icon>
 				<text>退出登录</text>
+				<icon class="jt-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.jtIcon + ')' }"></icon>
 			</view>
 		</view>
 		<!-- 底部区域 -->
@@ -90,7 +95,21 @@
 		kaoshiCount: '',
 		kechengCount: '',
 		lianxiCount: '',
-		from:''
+		from:'',
+		imgsArr: {
+			myHeadBj: '',
+			defaultUserImg: '',
+			telIcon: '',
+			idcardIcon: '',
+			ksIcon: '',
+			lxIcon: '',
+			kcIcon: '',
+			userListIcon: '',
+			scoreListIcon: '',
+			sxtcsListIcon: '',
+			sxtsmListIcon: '',
+			loginOutListIcon: '',
+		},
 	});
 	const commonDialogRef = ref(null);
 	const shexiangRef = ref(null);
@@ -182,7 +201,19 @@
 	}
 	
 	onLoad(() => {
-    
+		myInfoData.imgsArr.myHeadBj = cacheManager.get('projectImg').client_my_bj;
+		myInfoData.imgsArr.defaultUserImg = cacheManager.get('projectImg').user_default_img;
+		myInfoData.imgsArr.telIcon = cacheManager.get('projectImg').my_tel_icon;
+		myInfoData.imgsArr.idcardIcon = cacheManager.get('projectImg').my_idcard_icon;
+		myInfoData.imgsArr.ksIcon = cacheManager.get('projectImg').my_ks_icon;
+		myInfoData.imgsArr.lxIcon = cacheManager.get('projectImg').my_lx_icon;
+		myInfoData.imgsArr.kcIcon = cacheManager.get('projectImg').my_kc_icon;
+		myInfoData.imgsArr.userListIcon = cacheManager.get('projectImg').my_editor_icon;
+		myInfoData.imgsArr.scoreListIcon = cacheManager.get('projectImg').my_score_icon;
+		myInfoData.imgsArr.sxtcsListIcon = cacheManager.get('projectImg').my_sxtcs_icon;
+		myInfoData.imgsArr.sxtsmListIcon = cacheManager.get('projectImg').my_sxtsm_icon;
+		myInfoData.imgsArr.loginOutListIcon = cacheManager.get('projectImg').login_out_icon;
+		myInfoData.imgsArr.jtIcon= cacheManager.get('projectImg').nav_bar_jt_bottom;
 	})
 
   onShow(() => {

+ 11 - 11
pages/client/my/myInfo.vue

@@ -1,10 +1,7 @@
 <template>
 	<view class="my-info-page">
 		<!-- 导航区域 -->
-		<view class="icon-title-bjcolor-navBar-box">
-			<view @click="handleBack" class="nav-bar-icon"></view>
-			<text class="nav-bar-title">个人信息</text>
-		</view>
+		<customNavbarVue title="个人信息" :show-back-btn="true" @back="handleBack"></customNavbarVue>
 		<!-- 头像 -->
 		<view class="user-img-box">
 			<view class="user-title">头像</view>
@@ -17,19 +14,19 @@
 		<view class="form-label-input">
 			<view class="phone-form-label"><text class="form-label-require">*</text>姓名</view>
 			<input v-model="data.realName"  placeholder="请输入姓名" />
-			<icon></icon>
+			<icon :style="{ backgroundImage: 'url(' + data.jtIcon + ')' }"></icon>
 		</view>
 		<!-- 手机号 -->
 		<view class="form-label-input">
 			<view class="phone-form-label"><text class="form-label-require">*</text>手机号</view>
 			<input v-model="data.userName"  placeholder="请输入手机号" />
-			<icon></icon>
+			<icon :style="{ backgroundImage: 'url(' + data.jtIcon + ')' }"></icon>
 		</view>
 		<!-- 证件号 -->
 		<view class="form-label-input">
 			<view class="phone-form-label"><text class="form-label-require">*</text>证件号</view>
 			<input v-model="data.idcard"  placeholder="请输入证件号" />
-			<icon></icon>
+			<icon :style="{ backgroundImage: 'url(' + data.jtIcon + ')' }"></icon>
 		</view>
 		<!-- 电话 -->
 		<view></view>
@@ -47,14 +44,14 @@
 </template>
 
 <script setup>
+	import customNavbarVue from "@/components/custom-navbar/custom-navbar.vue";
 	import * as myApi from "@/api/my.js";
 	import {getAliyunPolicy} from "@/api/jiazheng.js"
 	import {ref,reactive} from "vue"
 	import {onLoad} from "@dcloudio/uni-app"
-	import defaultImage from "@/static/images/my/user-default-img.png"
-	
+	import cacheManager from '@/utils/cacheManager.js';
 	const defaultImage1 = ref({
-		url:defaultImage, extname: 'png', name: 'moren.png'
+		url:'', extname: 'png', name: 'moren.png'
 	})
 
 	const imageStyles = ref({
@@ -71,11 +68,14 @@
 		idcard: '',
 		userName: '',
 		userId: null,
-		images: null
+		images: null,
+		jtIcon: '',
 	})
 
 	onLoad((options) => {
 		data.from = options.from || 'shouye';
+		data.jtIcon= cacheManager.get('projectImg').nav_bar_jt_bottom;
+		defaultImage1.url= cacheManager.get('projectImg').user_default_img;
 		initPage();
 	})
 

BIN
static/images/my/admin-my-bj.png


BIN
static/images/my/client-my-bj.png


BIN
static/images/my/login-out-icon.png


BIN
static/images/my/my-card-icon.png


BIN
static/images/my/my-editor-icon.png


BIN
static/images/my/my-idcard-icon.png


BIN
static/images/my/my-kc-icon.png


BIN
static/images/my/my-ks-icon.png


BIN
static/images/my/my-lx-icon.png


BIN
static/images/my/my-score-icon.png


BIN
static/images/my/my-sxtcs-icon.png


BIN
static/images/my/my-sxtsm-icon.png


BIN
static/images/my/my-tel-icon.png


BIN
static/images/my/two-code-icon.png


BIN
static/images/my/user-default-img.png