修复bug

common/methodTool.js

@@ -38,7 +38,7 @@ export default {
 	splitImgHost(url, scale = false, width = 250) {
 		if (!url) {
 			return ''
-		} else if (url.indexOf("http") != -1 || url.indexOf("https") != -1) {
+		} else if (url.indexOf("http") != -1 || url.indexOf("https") != -1 || url.indexOf("wxfile") != -1) {
 
 		} else {
 			url = baseUrls.BASE_IMG_URL + url
@@ -260,14 +260,31 @@ export default {
 	                    },1000)
 	            },
 	secondToDate(result){
-	            	var h = Math.floor(result / 3600) < 10 ? '0'+Math.floor(result / 3600) : Math.floor(result / 3600);
-				    var m = Math.floor((result / 60 % 60)) < 10 ? '0' + Math.floor((result / 60 % 60)) : Math.floor((result / 60 % 60));
-				    var s = Math.floor((result % 60)) < 10 ? '0' + Math.floor((result % 60)) : Math.floor((result % 60));
-				        if(h==0){
-				        	result = m + ":" + s;
-				        }else{
-				        	result = h+':'+m + ":" + s
-				        }
-				    return result;
-	 }
+		var h = Math.floor(result / 3600) < 10 ? '0'+Math.floor(result / 3600) : Math.floor(result / 3600);
+		var m = Math.floor((result / 60 % 60)) < 10 ? '0' + Math.floor((result / 60 % 60)) : Math.floor((result / 60 % 60));
+		var s = Math.floor((result % 60)) < 10 ? '0' + Math.floor((result % 60)) : Math.floor((result % 60));
+			if(h==0){
+				result = m + ":" + s;
+			}else{
+				result = h+':'+m + ":" + s
+			}
+		return result;
+	 },
+	 /**
+      * 
+      * @param {int} result 
+      * @returns {string}
+      * @remard 单位S转小时分钟秒
+      */
+     secondToTime(result,Diszing = true) {
+         var h = Math.floor(result / 3600) < 10 ? '0' + Math.floor(result / 3600) : Math.floor(result / 3600);
+         var m = Math.floor((result / 60 % 60)) < 10 ? '0' + Math.floor((result / 60 % 60)) : Math.floor((result / 60 % 60));
+         var s = Math.floor((result % 60)) < 10 ? '0' + Math.floor((result % 60)) : Math.floor((result % 60));
+         if (h == 0 && Diszing) {
+             result = m + ":" + s;
+         } else {
+             result = h + ':' + m + ":" + s
+         }
+         return result;
+     },
 }

pages2/appointment/appointment_success.vue

@@ -100,16 +100,16 @@ export default {
 			this.$api.getApplylist({ subscribeId: this.subscribeId }).then(res => {
 				if (res.data.code === 200 && res.data.rows.length) {
 					if(res.data.rows[0].applySiteStartTime){
-						res.data.rows[0].applySiteStartTime = res.data.rows[0].applySiteStartTime.replace("-",":")
+						res.data.rows[0].applySiteStartTime = res.data.rows[0].applySiteStartTime
 					}
 					if(res.data.rows[0].applySiteEndTime){
-						res.data.rows[0].applySiteEndTime = res.data.rows[0].applySiteEndTime.replace("-",":")
+						res.data.rows[0].applySiteEndTime = res.data.rows[0].applySiteEndTime
 					}
 					if(res.data.rows[0].applySiteStartTrainTime){
-						res.data.rows[0].applySiteStartTrainTime = res.data.rows[0].applySiteStartTrainTime.replace("-",":")
+						res.data.rows[0].applySiteStartTrainTime = res.data.rows[0].applySiteStartTrainTime
 					}
 					if(res.data.rows[0].applySiteEndTrainTime){
-						res.data.rows[0].applySiteEndTrainTime = res.data.rows[0].applySiteEndTrainTime.replace("-",":")
+						res.data.rows[0].applySiteEndTrainTime = res.data.rows[0].applySiteEndTrainTime
 					}
 					this.listData = res.data.rows[0];
 				}

pages2/appointment/kporder.vue

@@ -141,8 +141,8 @@ export default {
 						startTimeC: items.startTime,
 						endTimeC: items.endTime,
 						dataTime: self.$method.timestampToTime(item.examTime),
-						startTime: items.startTime.replace('-', ':'),
-						endTime: items.endTime.replace('-', ':'),
+						startTime: items.startTime,
+						endTime: items.endTime,
 						num: items.num,
 						registration: items.registration,
 						checked: false,

pages2/appointment/order.vue

@@ -122,8 +122,8 @@ export default {
 						startTimeC: items.startTime,
 						endTimeC: items.endTime,
 						dataTime: self.$method.timestampToTime(item.examTime),
-						startTime: items.startTime.replace('-', ':'),
-						endTime: items.endTime.replace('-', ':'),
+						startTime: items.startTime,
+						endTime: items.endTime,
 						num: items.num,
 						registration: items.registration,
 						checked: false,

pages2/exam/exam_appointment.vue

@@ -24,8 +24,8 @@
 						<view class="item">
 							<view class="left">考试时间</view>
 							<view class="right">
-								{{ $method.timestampToTime(item.applySiteExamTime) }} {{ item.applySiteStartTime.replace('-', ':') }} ~
-								{{ item.applySiteEndTime.replace('-', ':') }}
+								{{ $method.timestampToTime(item.applySiteExamTime) }} {{ item.applySiteStartTime }} ~
+								{{ item.applySiteEndTime }}
 							</view>
 						</view>
 						<view class="item" v-if="item.applySiteAddressTrain">
@@ -35,8 +35,8 @@
 						<view class="item" v-if="item.applySiteExamTrainTime && item.applySiteStartTrainTime && item.applySiteEndTrainTime">
 							<view class="left">考前培训时间</view>
 							<view class="right">
-								{{ $method.timestampToTime(item.applySiteExamTrainTime) }} {{ item.applySiteStartTrainTime.replace('-', ':') }} ~
-								{{ item.applySiteEndTrainTime.replace('-', ':') }}
+								{{ $method.timestampToTime(item.applySiteExamTrainTime) }} {{ item.applySiteStartTrainTime }} ~
+								{{ item.applySiteEndTrainTime }}
 							</view>
 						</view>
 					</view>
@@ -86,9 +86,9 @@
 							{{
 								$method.timestampToTime(activeList.applySiteExamTime) +
 									' ' +
-									activeList.applySiteStartTime.replace('-', ':') +
+									activeList.applySiteStartTime +
 									'~' +
-									activeList.applySiteEndTime.replace('-', ':')
+									activeList.applySiteEndTime
 							}}
 						</text>
 					</view>
@@ -102,9 +102,9 @@
 							{{
 								$method.timestampToTime(activeList.applySiteExamTrainTime) +
 									' ' +
-									activeList.applySiteStartTrainTime.replace('-', ':') +
+									activeList.applySiteStartTrainTime +
 									'~' +
-									activeList.applySiteEndTrainTime.replace('-', ':')
+									activeList.applySiteEndTrainTime
 							}}
 						</text>
 					</view>

pages2/exam/exam_result.vue

@@ -24,8 +24,8 @@
 						<view class="item">
 							<view class="left">考试时间</view>
 							<view class="right">
-								{{ $method.timestampToTime(item.applySiteExamTime) }} {{ item.applySiteStartTime.replace('-', ':') }} ~
-								{{ item.applySiteEndTime.replace('-', ':') }}
+								{{ $method.timestampToTime(item.applySiteExamTime) }} {{ item.applySiteStartTime }} ~
+								{{ item.applySiteEndTime }}
 							</view>
 						</view>
 						<view class="item">
@@ -87,9 +87,9 @@
 						<text class="val">{{
 								$method.timestampToTime(activeList.applySiteExamTime) +
 									' ' +
-									activeList.applySiteStartTime.replace('-', ':') +
+									activeList.applySiteStartTime +
 									'~' +
-									activeList.applySiteEndTime.replace('-', ':')
+									activeList.applySiteEndTime
 							}}</text>
 					</view>
 					<view class="item" v-if="activeList.applySiteAddressTrain">
@@ -101,9 +101,9 @@
 						<text class="val">{{
 								$method.timestampToTime(activeList.applySiteExamTrainTime) +
 									' ' +
-									activeList.applySiteStartTrainTime.replace('-', ':') +
+									activeList.applySiteStartTrainTime +
 									'~' +
-									activeList.applySiteEndTrainTime.replace('-', ':')
+									activeList.applySiteEndTrainTime
 							}}</text>
 					</view>
 				</view>

pages2/msg/detail.vue

@@ -5,7 +5,7 @@
 			<view class="time">{{ $method.timestampToTime(listData.sendTime, false) }}</view>
 			<view v-if="listData.systemStatus === 2" class="content" v-html="listData.informVo.affiche" style="width: 100%;"></view>
 			<view v-if="listData.systemStatus === 1" class="content" style="width: 100%;">{{ listData.text }}</view>
-			<view class="boxstistyle">
+			<view class="boxstistyle" v-if="listData.informVo">
 				<view class="lsow" style="border-bottom: 1rpx solid #eee;margin-top: 10rpx;" v-for="(item, index) in listData.informVo.informCourseVo" :key="index">
 					<view class="h4">{{ item.goodsName }}</view>
 					<view class="h33">
@@ -13,7 +13,7 @@
 					</view>
 					<view style="display: flex;align-items: center;margin:28rpx 0rpx;" @click="jumpSection(item)">
 						<image style="width: 35rpx;height: 35rpx;" src="@/static/courseIcon.png" mode=""></image>
-						<text class="timeStys">第{{ item.topicNum }}分钟</text>
+						<text class="timeStys">{{ $method.secondToTime(item.topicNum) }}</text>
 						<text class="aSty">点击可直接跳转</text>
 					</view>
 				</view>
@@ -292,22 +292,24 @@ export default {
 						res.data.data.informVo.affiche = res.data.data.informVo.affiche.replace(/<img/gi, '<img style="max-width:100%;"');
 					}
 					this.listData = res.data.data;
-					this.$api.goodsDetail(res.data.data.goodsId).then(rs => {
-						this.goodsData = rs.data.data
-						if (
-							rs.data.data.goodsType === 3 &&
-							(res.data.data.remindId === 1 ||
-								res.data.data.remindId === 3 ||
-								res.data.data.remindId === 5 ||
-								res.data.data.remindId === 6 ||
-								res.data.data.remindId === 7 ||
-								res.data.data.remindId === 19 ||
-								res.data.data.remindId === 21 ||
-								res.data.data.remindId === 22)
-						) {
-							this.statusGO = false;
-						}
-					});
+					if(res.data.data.goodsId) {
+						this.$api.goodsDetail(res.data.data.goodsId).then(rs => {
+							this.goodsData = rs.data.data
+							if (
+								rs.data.data.goodsType === 3 &&
+								(res.data.data.remindId === 1 ||
+									res.data.data.remindId === 3 ||
+									res.data.data.remindId === 5 ||
+									res.data.data.remindId === 6 ||
+									res.data.data.remindId === 7 ||
+									res.data.data.remindId === 19 ||
+									res.data.data.remindId === 21 ||
+									res.data.data.remindId === 22)
+							) {
+								this.statusGO = false;
+							}
+						});
+					}
 				}
 			});
 		},

pages2/verify/input.vue

@@ -17,7 +17,7 @@
 				</u-collapse-item>
 			</u-collapse>
 			<view class="bodyBox" style="margin-top: 30rpx;padding:0 20rpx;">
-				<u-form :model="form" ref="uForm">
+				<u-form :model="form" ref="uForm" :error-type="errorType">
 					<template v-for="(item,index) in listData" >
 						<u-form-item
 							:key="index"
@@ -302,6 +302,7 @@ import Handwriting from '@/common/signature.js';
 export default {
 	data() {
 		return {
+			errorType: ['message'],
 			agreementModal:true,
 			goodsData:{},
 			itemStyle: {
@@ -691,15 +692,24 @@ export default {
 				if (this.isRequired) {
 					this.submitApi();
 				} else {
-					this.$refs.uForm.validate(valid => {
-						if (valid) {
-							if (int === 1) {
-								this.submitApi();
+					if(int === 1) {
+						this.errorType = ['toast'];
+					} else {
+						this.errorType = ['message'];
+					}
+					this.$nextTick(() => {
+						this.$refs.uForm.validate(valid => {
+							if (valid) {
+								if (int === 1) {
+									this.submitApi();
+								}
+							} else {
+								this.errorType = ['message'];
+								console.log('验证失败');
 							}
-						} else {
-							console.log('验证失败');
-						}
-					});
+						});
+					})
+					
 				}
 			}
 		},
@@ -972,6 +982,7 @@ export default {
 				self.handwriting
 					.saveCanvas()
 					.then(res => {
+						console.log(res,'res')
 						if (this.handwriting.linePrack.length) {
 							this.$set(this.form, 'commitment_electr_signature', res);
 						}

pages2/wd/class.vue

@@ -117,16 +117,29 @@
 									<view class="class-warm" v-if="item.applyStatus == 1 && item.periodStatus == 1">
 										<view class="class-warm__text">
 											<view class="date">
-												<text v-if="item.subExamStatus === null">待预约考试</text>
-												<text v-else-if="item.subExamStatus === 0 &&  sysTime < subApplySiteStartTime">
+												<view v-if="item.subExamStatus === null">待预约考试</view>
+												<view v-else-if="item.subExamStatus === 0 &&  sysTime < subApplySiteStartTime">
 													待考试，考试时间：{{$method.timestampToTime(item.subApplySiteStartTime)}} - {{$method.timestampToTime(item.subaApplySiteEndTime)}}
-												</text>
-												<text v-else-if="item.subExamStatus === 1">待出考试结果</text>
-												<text v-else-if="item.subExamStatus === 2">缺考</text>
-												<text v-else-if="item.subExamStatus === 3">作弊</text>
-												<text v-else-if="item.subExamStatus === 4">替考</text>
-												<text v-else-if="item.subResult === 0">考试结果：不通过，需补考</text>
-												<text v-else-if="item.subResult === 1">考试结果：通过，考试成绩为{{item.subPerformance}}</text>
+												</view>
+												<view v-if="item.subResult === 0">
+													考试结果：不通过，需补考
+													<view>
+														
+														<text v-if="item.subExamStatus === 2">原因：缺考</text>
+														<text v-else-if="item.subExamStatus === 3">原因：作弊</text>
+														<text v-else-if="item.subExamStatus === 4">原因：替考</text>
+													</view>
+												</view>
+												<view v-else-if="item.subResult === 1">考试结果：通过，考试成绩为{{item.subPerformance}}</view>
+												<view v-else>
+													待出考试结果
+												</view>
+												<!-- <view v-else-if="item.subExamStatus === 1">待出考试结果</view>
+												<view v-else-if="item.subExamStatus === 2">缺考</view>
+												<view v-else-if="item.subExamStatus === 3">作弊</view>
+												<view v-else-if="item.subExamStatus === 4">替考</view>
+												<view v-else-if="item.subResult === 0">考试结果：不通过，需补考</view>
+												<view v-else-if="item.subResult === 1">考试结果：通过，考试成绩为{{item.subPerformance}}</view> -->
 												
 											</view>
 										</view>

pages3/polyv/detail.vue

@@ -300,6 +300,7 @@ export default {
 				noteSecond:noteSecond
 			}
 			this.$store.commit('setPlaySectionId', {playSectionId  :item.sectionId});
+			this.$store.commit('setPlayVID', {playVID  :item.recordingUrl});
 			this.playNoteVideo(item);
 		}
 		
@@ -581,7 +582,7 @@ export default {
 										{
 											name: '讲义'
 										},
-										{
+										{  
 											name: '笔记'
 										},
 										{
@@ -605,7 +606,9 @@ export default {
 											name: '答疑'
 										}
 									];
-									this.current = 0;
+									if(this.current == 4) {
+										this.current = 0;
+									}
 								}
 							})