身份证扫描

.hbuilderx/launch.json

@@ -6,6 +6,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"mp-weixin" : 
      	{
      		"launchtype" : "local"

common/methodTool.js

@@ -130,8 +130,9 @@ export default {
 							quality: 75,
 							width: '35%',
 							height: '35%',
-							success: rest => {
-								resolve(rest.tempFilePath);
+							success:async rest => {
+								const waitUpload = await self.uploadFile(rest.tempFilePath, 0);
+								resolve();
 							}
 						});
 					} else if(canvasWidth > 1000 || canvasHeight > 1000){
@@ -140,8 +141,9 @@ export default {
 							quality: 75,
 							width: '50%',
 							height: '50%',
-							success: rest => {
-								resolve(rest.tempFilePath);
+							success: async rest => {
+								const waitUpload = await self.uploadFile(rest.tempFilePath, 0);
+								resolve();
 							}
 						});
 					} else {

common/request.js

@@ -45,7 +45,10 @@ export const myRequest = (options) => {
 						}
 
 					}else{
-						uni.removeStorageSync('user_account')
+						uni.removeStorageSync('user_account');
+						uni.navigateTo({
+							url: '/pages/login/login'
+						});
 					}
 				}
 				resolve(res)

components/course/courseSection.vue

@@ -94,7 +94,8 @@ export default {
 	data() {
 		return {
 			nowTime:0,
-			newId:0
+			newId:0,
+			clickLock:false, //点击锁，防止连续点击多次
 		};
 	},
 	onLoad() {},
@@ -157,12 +158,17 @@ export default {
 	},
 	methods: {
 		getVideo(){
+			if(this.clickLock) {
+				return;
+			}
+			this.clickLock = true;
 			if(this.menuItem.sectionType==1||this.menuItem.sectionType==3){
 				//录播
 				if(!this.isBuy){
 					//非购买
 					if(!this.menuItem.tryListen){
 						//不允许试听
+						this.clickLock = false;
 						return
 					}
 					
@@ -172,6 +178,8 @@ export default {
 						title: '暂无播放地址数据',
 						icon: 'error'
 					});
+					this.clickLock = false;
+					return;
 				}
 				/* if(this.playSectionId==this.newId){
 					//切换为同一节
@@ -200,6 +208,7 @@ export default {
 				//直播
 				if(!this.isBuy){
 					//非购买
+					this.clickLock = false;
 					return
 				}
 				if(!this.menuItem.liveUrl){
@@ -210,6 +219,7 @@ export default {
 				}
 				if(this.playSectionId==this.newId){
 					//切换为同一频道
+					this.clickLock = false;
 					return
 				}
 				//设置播放的节ID
@@ -228,6 +238,10 @@ export default {
 
 			}
 			
+			setTimeout(() => {
+				this.clickLock = false;
+			},3000)
+			
 		}
 	},
 	computed: { ...mapGetters(['playSectionId','playChannelId','playVID']) }

pages/index/index.vue

@@ -148,7 +148,7 @@ export default {
 			interval: 2000,
 			duration: 500,
 			swiperHeight:0,
-			nearByDay:'', //距离最近一天考试时间
+			nearByDay:'', //距离最近一天考试
 			menu: [{
 					name: '推荐课程',
 				}, {
@@ -276,7 +276,13 @@ export default {
 		
 		getUserSubscribeRecentExam() {
 			this.$api.getUserSubscribeRecentExam().then(res => {
-				this.nearByDay = res.data.data;
+				if(res.data.code == 200) {
+					if(res.data.data) {
+						this.nearByDay = +this.$method.GetRTime(res.data.data.applySiteExamTime);
+						
+					}
+				}
+				
 				console.log(res)
 			})
 		},
@@ -329,95 +335,98 @@ export default {
 		 * 跳转课程详情
 		 */
 		async jumpGoodsDetail(item){
-			let currentTime = this.$method.getZeroTime();
+			uni.navigateTo({
+				url:'/pages2/wd/class'
+			})
+			// let currentTime = this.$method.getZeroTime();
 			
-			if(currentTime < item.studyStartTime || currentTime > item.studyEndTime) {
-				uni.showToast({
-					title:'不在学习有效期，不可以学习了哦',
-					icon:'none'
-				})
-				return;
-			}
+			// if(currentTime < item.studyStartTime || currentTime > item.studyEndTime) {
+			// 	uni.showToast({
+			// 		title:'不在学习有效期，不可以学习了哦',
+			// 		icon:'none'
+			// 	})
+			// 	return;
+			// }
 			
-			if( (item.classStartTime && currentTime <= item.classStartTime) || (item.classEndTime && currentTime >= item.classEndTime) ) {
-				uni.showToast({
-					title:'不在班级有效期，不能进入学习',
-					icon:'none'
-				})
-				return;
-			}
+			// if( (item.classStartTime && currentTime <= item.classStartTime) || (item.classEndTime && currentTime >= item.classEndTime) ) {
+			// 	uni.showToast({
+			// 		title:'不在班级有效期，不能进入学习',
+			// 		icon:'none'
+			// 	})
+			// 	return;
+			// }
 			
-			if(item.learningStatus == 2) {
-				uni.showToast({
-					title:'开放学习时间待定，不能进入学习',
-					icon:'none'
-				})
-				return;
-			}
+			// if(item.learningStatus == 2) {
+			// 	uni.showToast({
+			// 		title:'开放学习时间待定，不能进入学习',
+			// 		icon:'none'
+			// 	})
+			// 	return;
+			// }
 			
-			if(item.classStatus == 0 ) {
-				uni.showToast({
-					title:'尚未开班，不能进入学习',
-					icon:'none'
-				})
-				return;
-			}
+			// if(item.classStatus == 0 ) {
+			// 	uni.showToast({
+			// 		title:'尚未开班，不能进入学习',
+			// 		icon:'none'
+			// 	})
+			// 	return;
+			// }
 			
-			if(item.learningStatus == 3 && (currentTime < item.learningTimeStart) ) {
-				uni.showToast({
-					title:'不在开放学习时间,不能进入学习',
-					icon:'none'
-				})
-				return;
-			}
+			// if(item.learningStatus == 3 && (currentTime < item.learningTimeStart) ) {
+			// 	uni.showToast({
+			// 		title:'不在开放学习时间,不能进入学习',
+			// 		icon:'none'
+			// 	})
+			// 	return;
+			// }
 			
-			if(item.gradeStatus == 1 && item.status == 1 && (item.studyEndTime > currentTime) &&  (item.classEndTime && (item.classEndTime < currentTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0) {
+			// if(item.gradeStatus == 1 && item.status == 1 && (item.studyEndTime > currentTime) &&  (item.classEndTime && (item.classEndTime < currentTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0) {
 				
-				uni.showModal({
-					title:'提示',
-					content:'班级已过期，需要重新选班',
-					showCancel:false,
-					success:() => {
-						uni.navigateTo({
-							url:"/pages2/wd/class"
-						})
-					}
-				})
-				return;
-			}
+			// 	uni.showModal({
+			// 		title:'提示',
+			// 		content:'班级已过期，需要重新选班',
+			// 		showCancel:false,
+			// 		success:() => {
+			// 			uni.navigateTo({
+			// 				url:"/pages2/wd/class"
+			// 			})
+			// 		}
+			// 	})
+			// 	return;
+			// }
 			
-			let rebuildStatus = await this.courseGoodsRebuildStatus(item.goodsId,item.gradeId);
+			// let rebuildStatus = await this.courseGoodsRebuildStatus(item.goodsId,item.gradeId);
 			
-			if(rebuildStatus == 0) {
-				this.$navTo.togo('/pages2/learn/details', {
-					gradeId:item.gradeId,
-					goodsId: item.goodsId
-				})
-				return;
-			}
+			// if(rebuildStatus == 0) {
+			// 	this.$navTo.togo('/pages2/learn/details', {
+			// 		gradeId:item.gradeId,
+			// 		goodsId: item.goodsId
+			// 	})
+			// 	return;
+			// }
 			
-			if(item.courseNum == 1 ) {
+			// if(item.courseNum == 1 ) {
 				
-				this.$api.courseCourseList({
-					pageNum:1,
-					pageSize:1,
-					goodsId:item.goodsId,
-					gradeId:item.gradeId
-				}).then(res => {
-					if(res.data.code == 200) {
-						uni.navigateTo({
-							url:`/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}`
-						})
-					}
-				});
-				return;
-			}
+			// 	this.$api.courseCourseList({
+			// 		pageNum:1,
+			// 		pageSize:1,
+			// 		goodsId:item.goodsId,
+			// 		gradeId:item.gradeId
+			// 	}).then(res => {
+			// 		if(res.data.code == 200) {
+			// 			uni.navigateTo({
+			// 				url:`/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}`
+			// 			})
+			// 		}
+			// 	});
+			// 	return;
+			// }
 			
 			
-			this.$navTo.togo('/pages2/wd/course', {
-				id: item.goodsId,
-				gid:item.gradeId
-			});
+			// this.$navTo.togo('/pages2/wd/course', {
+			// 	id: item.goodsId,
+			// 	gid:item.gradeId
+			// });
 		},
 		/**
 		 * @param {Object} goodsId 商品id
@@ -817,7 +826,7 @@ export default {
 			border-radius: 16rpx ;
 			
 			.item {
-				padding:8rpx 0;
+				padding:16rpx 0;
 				border-bottom:1rpx solid #eeeeee;
 				display: flex;
 				

pages2/appointment/kporder.vue

@@ -36,7 +36,15 @@
 				</view>
 			</view>
 			<view v-else class="appointmentItem">
-				<view class="title">当前考培地点无考前培训时间点</view>
+				<view class="title">
+					<text v-if="addressName">
+						该考试地点暂无考试时间，建议重新选择考试地点
+					</text>
+					<text v-else>
+						当前考培地点无考前培训时间点
+					</text>
+					
+				</view>
 			</view>
 			<view class="btnMain">
 				<view class="return" @click="backPage">上一步</view>

pages2/bank/question_detail.vue

@@ -37,7 +37,7 @@
 						错题集
 						<u-icon name="arrow-right"></u-icon>
 					</view>
-					<view class="number">{{ goodsCount.wrongNum }}</view>
+					<view class="number">{{ goodsCount.wrongNum || '0' }}</view>
 				</view>
 			</navigator>
 			<navigator  hover-class="none" :url="'/pages2/bank/collectById?goodsid=' + id">
@@ -46,7 +46,7 @@
 						收藏集
 						<u-icon name="arrow-right"></u-icon>
 					</view>
-					<view class="number">{{ goodsCount.collectNum }}</view>
+					<view class="number">{{ goodsCount.collectNum || '0' }}</view>
 				</view>
 			</navigator>
 		</view>
@@ -462,7 +462,7 @@ page {
 }
 
 .courseName {
-	font-size: 24rpx;
+	font-size: 30rpx;
 	color:#666;
 	white-space: nowrap;
 	overflow: hidden;
@@ -505,7 +505,7 @@ page {
 			}
 
 			.section {
-				font-size: 24rpx;
+				font-size: 28rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #666;
@@ -522,7 +522,7 @@ page {
 				display: flex;
 				align-items: center;
 
-				font-size: 24rpx;
+				font-size: 26rpx;
 				color: #666666;
 				border-bottom: 1rpx solid #eeeeee;
 				display: flex;

pages2/class/questionBank.vue

@@ -777,8 +777,9 @@ export default {
 								quality: 75,
 								width: '35%',
 								height: '35%',
-								success: rest => {
-									resolve(rest.tempFilePath);
+								success: async rest => {
+									const waitUpload = await self.uploadFile(rest.tempFilePath, 0);
+									resolve();
 								}
 							});
 						} else if(canvasWidth > 1000 || canvasHeight > 1000){
@@ -787,8 +788,9 @@ export default {
 								quality: 75,
 								width: '50%',
 								height: '50%',
-								success: rest => {
-									resolve(rest.tempFilePath);
+								success: async rest => {
+									const waitUpload = await self.uploadFile(rest.tempFilePath, 0);
+									resolve();
 								}
 							});
 						}  else {

pages2/learn/my_learn.vue

@@ -241,9 +241,10 @@ export default {
 			}
 		},
 		showPhoto(item) {
+			
 			// 预览图片
 			uni.previewImage({
-				urls: [this.$method.splitImgHost(item.certificatePath,true)],
+				urls: [this.$method.splitImgHost(item.certificatePath,true,1000)],
 				longPressActions: {
 					itemList: ['发送给朋友', '保存图片', '收藏'],
 					success: function(data) {

pages2/plan/index.vue

@@ -64,8 +64,8 @@
 							</u-row>
 							<scroll-view style="white-space: nowrap" class="scroll-view_H" scroll-x="true">
 								<view style="margin-top: 30rpx;display: inline-block;width:296rpx;margin-right: 30rpx;" v-for="(items, indexs) in item.goodsVos" :key="indexs">
-									<image :src="$method.splitImgHost(item.goodsVos[0].coverUrl)" class="r_image"></image>
-									<view class="r_t2">{{ item.goodsVos[0].goodsName }}</view>
+									<image :src="$method.splitImgHost(items.coverUrl)" class="r_image"></image>
+									<view class="r_t2">{{ items.goodsName }}</view>
 								</view>
 							</scroll-view>
 
@@ -93,14 +93,17 @@
 			<view class="newPlan" @click="newPlan()">新建计划</view>
 		</view>
 		<view v-else class="tipBox">
-			<view class="dis_ffs" v-if="goodsList.length">
-				<view class="tip">您暂无相关计划哦~</view>
-				<view class="tipBtn" @click="newPlan()">马上制定</view>
-			</view>
-			<view class="dis_ffs" v-else>
-				<view class="tip">您暂无课程可以制定计划哦~</view>
-				<view class="tipBtn" @click="planNow()">马上选课</view>
-			</view>
+			<template v-if="isLoaded">
+				<view class="dis_ffs" v-if="goodsList.length">
+					<view class="tip">您暂无相关计划哦~</view>
+					<view class="tipBtn" @click="newPlan()">马上制定</view>
+				</view>
+				<view class="dis_ffs" v-else>
+					<view class="tip">您暂无课程可以制定计划哦~</view>
+					<view class="tipBtn" @click="planNow()">马上选课</view>
+				</view>
+			</template>
+			
 		</view>
 	</view>
 </template>
@@ -109,6 +112,7 @@
 export default {
 	data() {
 		return {
+			isLoaded:false, //是否请求完毕
 			monthIndex: 0,
 			haveNextMonth: false,
 			havePreviousMonth: false,
@@ -232,6 +236,7 @@ export default {
 		getUserGoodsList() {
 			this.$api.courseGoodsList().then(res => {
 				if (res.data.code === 200) {
+					this.isLoaded = true;
 					this.goodsList = res.data.rows;
 				}
 			});

pages2/verify/input.vue

@@ -97,7 +97,7 @@
 							:label-width="auto"
 							:prop="item.required ? item.fieldKey : ''"
 						>
-							<u-input v-model="form.apply_post" :placeholder="`请输入${item.fieldName}`" />
+							<u-input v-model="form.apply_post" disabled :placeholder="`请输入${item.fieldName}`" />
 						</u-form-item>
 						<u-form-item
 							:key="index"
@@ -543,6 +543,9 @@ export default {
 				
 				this.$api.goodsDetail(this.goodsId).then(res => {
 					this.goodsData = res.data.data;
+					if(this.goodsData.categoryName) {
+						this.form.apply_post = this.goodsData.categoryName;
+					}
 					resolve()
 				})
 			})

pages3/polyv/detail.vue

@@ -130,10 +130,10 @@
 				<view v-for="(item, index) in answerList" :key="index" style="background-color: #FFFFFF;margin-bottom: 20rpx;">
 					<view class="chat_box" @click.stop="clearCtx">
 						<view style="display: flex;">
-							<view><image :src="$method.splitImgHost(item.avatar)" style="width: 64rpx;height: 64rpx;"></image></view>
+							<view><image :src="item.assignUserId > 0 ? '/static/logo_xcx.png' :$method.splitImgHost(item.avatar)" style="width: 64rpx;height: 64rpx;"></image></view>
 							<view style="margin-left: 15rpx;">
-								<view class="chat1">{{ item.realname }}</view>
-								<view class="chat2">{{ $method.timestampToTime(item.createTime) }}</view>
+								<view class="chat1">{{ item.assignUserId > 0 ? '祥粤老师' : item.realname }}</view>
+								<view class="chat2">{{ $method.timestampToTime(item.createTime,false) }}</view>
 								<view class="chat3">
 									<text v-if="item.assignUserId > 0">回复</text>
 									<text v-if="item.assignUserId > 0" style="color: #007AFF;">@{{ item.assignRealname }}</text>