修复bug

common/methodTool.js

@@ -61,18 +61,30 @@ export default {
 	 * @param timestamp
 	 * @returns {*}
 	 */
-	timestampToTime(timestamp, isDay = true) {
+	timestampToTime(timestamp, isDay = true,hasChinese) {
 		var date = new Date(timestamp * 1000); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
-		var Y = date.getFullYear() + '';
-		var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '';
-		var D = date.getDate() < 10 ? '0' + date.getDate() + '' : date.getDate() + '';
+		var Y = date.getFullYear() + (hasChinese ? '' : '-');
+		var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + (hasChinese ? '' : '-');
+		var D = date.getDate() < 10 ? '0' + date.getDate() + (hasChinese ? '' : ' ') : date.getDate() + (hasChinese ? '' :' ');
 		var h = date.getHours() < 10 ? '0' + date.getHours() + ':' : date.getHours() + ':';
 		var m = date.getMinutes() < 10 ? '0' + date.getMinutes() + ':' : date.getMinutes() + ':';
 		var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
 		if (isDay) {
-			return Y +'年'+ M +'月'+ D +'日';
+			
+			if(hasChinese) {
+				return Y +'年'+ M +'月'+ D + '日';
+			} else {
+				return Y + M + D;
+			}
+			
+		}
+		
+		if(hasChinese) {
+			return Y +'年'+ M +'月'+ D + '日' + h + m + s;
+		} else {
+			return Y + M + D + h + m + s;
 		}
-		return Y + M + D + h + m + s;
+		
 	},
 	//当前时间距离目标时间还有多久
 	GetRTime(EndTime, isDay = true) {

common/request.js

@@ -5,8 +5,8 @@ import api from './api.js'
 var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
-export const BASE_URL = 'http://120.79.166.78:19009'   //预发布
-// export const BASE_URL = 'http://42.192.164.187:19005'    //test
+// export const BASE_URL = 'http://120.79.166.78:19009'   //预发布
+export const BASE_URL = 'http://42.192.164.187:19005'    //test
 // export const BASE_URL = 'http://192.168.1.222:5055'    //dev
 
  //图片上传api

components/course/courseChapter.vue

@@ -462,6 +462,7 @@ export default {
 		justify-content: space-between;
 	}
 	.exam{
+		font-size: 30rpx;
 		display: flex;
 		align-items: center;
 		margin: 20rpx 0;

components/course/courseSection.vue

@@ -455,6 +455,7 @@ export default {
 		color: #007AFF;
 	}
 	.t_content{
+		font-size: 30rpx;
 		margin-left: 10rpx;
 		color: #666666;
 		flex:1;

pages2/appointment/order.vue

@@ -148,7 +148,10 @@ export default {
 			this.activeList = arrays.filter((item,index) => {
 				console.log(item)
 				const newTime = parseInt(new Date().getTime() / 1000)
+				console.log(item.dataTime.replace(/-/g,'/') + '' + item.startTime + ':00')
 				const liTime = parseInt(new Date(item.dataTime.replace(/-/g,'/') + '' + item.startTime + ':00').getTime() / 1000)
+				console.log(liTime,'liTime')
+				console.log(newTime,'newTime')
 				if(liTime > newTime){
 					return item
 				}

pages2/bank/my_question.vue

@@ -9,7 +9,7 @@
 				</view>
 				<view class=".content_box">
 					<image src="/static/icon/wk_icon2.png" class="wk_icon"></image>
-					学习有效期:<text class="content"> {{$method.timestampToTime(item.studyStartTime)}}-{{$method.timestampToTime(item.studyEndTime)}} </text>
+					学习有效期:<text class="content"> {{$method.timestampToTime(item.studyStartTime,true,true)}}-{{$method.timestampToTime(item.studyEndTime,true,true)}} </text>
 				</view>
 				
 			</view>

pages2/bank/question_detail.vue

@@ -536,7 +536,7 @@ page {
 			}
 
 			.section {
-				font-size: 28rpx;
+				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #666;
@@ -553,7 +553,7 @@ page {
 				display: flex;
 				align-items: center;
 
-				font-size: 28rpx;
+				font-size: 30rpx;
 				color: #666666;
 				border-bottom: 1rpx solid #eeeeee;
 				display: flex;

pages2/order/index.vue

@@ -71,9 +71,9 @@
 			</template>
 			
 
-			<template v-if="current == 1 && order.length">
+			<!-- <template v-if="current == 1 && order.length">
 				<view class="apply-invoice" @click="goInvoice">发票申请</view>
-			</template>
+			</template> -->
 			
 		</view>
 	</view>

pages2/wd/class.vue

@@ -20,7 +20,7 @@
 							<view class="content_box" v-if="item.studyStartTime && item.studyEndTime">
 								<image src="/static/icon/wk_icon2.png" class="wk_icon"></image>
 								学习服务期：
-								<text class="content">{{ $method.timestampToTime(item.studyStartTime) }} - {{ $method.timestampToTime(item.studyEndTime) }}</text>
+								<text class="content">{{ $method.timestampToTime(item.studyStartTime,true,true) }} - {{ $method.timestampToTime(item.studyEndTime,true,true) }}</text>
 							</view>
 						</view>
 						
@@ -41,7 +41,7 @@
 								<view class="class-warm">
 									<u-icon class="class-warm__icon" size="30" color="#FF3B30" name="error-circle-fill"></u-icon>
 									<view class="class-warm__text">
-										<view class="date">班级有效期：{{$method.timestampToTime(item.classStartTime)}} - {{$method.timestampToTime(item.classEndTime)}}</view>
+										<view class="date">班级有效期：{{$method.timestampToTime(item.classStartTime,true,true)}} - {{$method.timestampToTime(item.classEndTime,true,true)}}</view>
 										<view class="state">班级状态：已过期，有疑问请联系 <text @click="call">020-87085982</text></view>
 									</view>
 								</view>
@@ -52,7 +52,7 @@
 								<view class="class-warm">
 									<u-icon class="class-warm__icon" size="30" color="#FF3B30" name="error-circle-fill"></u-icon>
 									<view class="class-warm__text">
-										<view class="date">班级有效期：{{$method.timestampToTime(item.classStartTime)}} - {{$method.timestampToTime(item.classEndTime)}}</view>
+										<view class="date">班级有效期：{{$method.timestampToTime(item.classStartTime,true,true)}} - {{$method.timestampToTime(item.classEndTime,true,true)}}</view>
 										<view class="state">班级状态：未到学习时间，有疑问请联系 <text @click="call">020-87085982</text></view>
 									</view>
 								</view>
@@ -70,7 +70,7 @@
 										</view>
 										<view class="state" v-if="item.classStatus == 0">教务处正在为您开通班级，请耐心等待</view>
 										<view class="state" v-if="item.classStatus == 1 && item.classStartTime && item.classEndTime">
-											班级有效期：{{$method.timestampToTime(item.classStartTime)}}-{{$method.timestampToTime(item.classEndTime)}}
+											班级有效期：{{$method.timestampToTime(item.classStartTime,true,true)}}-{{$method.timestampToTime(item.classEndTime,true,true)}}
 										</view>
 									</view>
 								</view>
@@ -127,7 +127,7 @@
 											<view class="date">
 												<view v-if="item.subExamStatus === null">待预约考试</view>
 												<view v-else-if="item.subExamStatus === 0 &&  sysTime < item.subApplySiteStartTime">
-													待考试，考试时间：{{$method.timestampToTime(item.subApplySiteStartTime)}} - {{$method.timestampToTime(item.subaApplySiteEndTime)}}
+													待考试，考试时间：{{$method.timestampToTime(item.subApplySiteStartTime,true,true)}} - {{$method.timestampToTime(item.subaApplySiteEndTime,true,true)}}
 												</view>
 												<view v-else-if="item.subExamStatus === 0">待出考试结果</view>
 												<view v-else-if="item.subExamStatus === 1">
@@ -215,7 +215,7 @@
 												<view :class="item.checked?'white-box blue-box':'white-box'" >
 													<view>
 														<view class="blackTxt">{{item.className}}</view>
-														<view class="redTxt" v-if="item.classEndTime">有效期至：{{$method.timestampToTime(item.classEndTime)}}</view>
+														<view class="redTxt" v-if="item.classEndTime">有效期至：{{$method.timestampToTime(item.classEndTime,true,true)}}</view>
 														<view class="redTxt" v-if="item.classEndTime">本班还剩{{$method.GetRTime(item.classEndTime)}}天将结束学习</view>
 													</view>
 												</view>

pages3/polyv/detail.vue

@@ -548,17 +548,17 @@ export default {
 							if(res.data.rows.length) {
 								// res.data.rows[index].name = res.data.rows[index].menuName;
 								// this.$set(this.reMenuList,index,res.data.rows[index])
-								for (let i = 0; i < res.data.rows.length; i++) {
-									let item = res.data.rows[i];
-									item.down = true;
-									item.id = item.menuId;
-									item.name = item.menuName;
-								}
-								this.reMenuList = []
-								this.$nextTick(() => {
-									this.reMenuList = res.data.rows;
-									console.log(this.reMenuList,'this.reMenuList1')
-								})
+								// for (let i = 0; i < res.data.rows.length; i++) {
+								// 	let item = res.data.rows[i];
+								// 	item.down = true;
+								// 	item.id = item.menuId;
+								// 	item.name = item.menuName;
+								// }
+								// this.reMenuList = []
+								// this.$nextTick(() => {
+								// 	this.reMenuList = res.data.rows;
+								// 	console.log(this.reMenuList,'this.reMenuList1')
+								// })
 								
 							} else {
 								this.reMenuList = []
@@ -639,15 +639,22 @@ export default {
 					this.$api.reMenuList({ courseId: this.courseId, rebuild: 1, gradeId: this.gradeId }).then(res => {
 						console.log('Rebuild2')
 						if (res.data.code == 200) {
-							for (let i = 0; i < res.data.rows.length; i++) {
-								let item = res.data.rows[i];
-								item.down = true;
-								item.id = item.menuId;
-								item.name = item.menuName;
+							if(res.data.rows.length) {
+								for (let i = 0; i < res.data.rows.length; i++) {
+									let item = res.data.rows[i];
+									item.down = true;
+									item.id = item.menuId;
+									item.name = item.menuName;
+								}
+								
+								
+								this.reMenuList = res.data.rows;
+							} else {
+								this.reMenuList = []
 							}
-							this.reMenuList = []
+							
+							
 							this.$nextTick(() => {
-								this.reMenuList = res.data.rows;
 								if(this.reMenuList.length>0){
 									this.list = [