修复bug

App.vue

@@ -30,4 +30,11 @@
 	/*每个页面公共css */
 	@import "/iconfont/iconfont.css";
 	@import "uview-ui/index.scss";
+	
+	button {
+		padding:0;
+		margin:0;
+		background: none;
+		overflow: auto;
+	}
 </style>

common/request.js

@@ -5,17 +5,17 @@ import api from './api.js'
 var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
-export const BASE_URL = 'http://api.xyyxt.net:19009'   //预发布
+// export const BASE_URL = 'http://api.xyyxt.net:19009'   //预发布
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test
-// export const BASE_URL = 'http://192.168.1.222:5055'    //dev
+export const BASE_URL = 'http://192.168.1.222:5055'    //dev
 
  //图片上传api
 // export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 
-// export const WEBVIEW_URL = 'http://192.168.1.38:8082/'  //test
-export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布
+export const WEBVIEW_URL = 'http://192.168.1.38:8082/'  //test
+// export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布
 // export const WEBVIEW_URL = 'https://m.xyyxt.net/'  //release
 
 // export const socket_url = 'ws://42.192.164.187:19005/webSocket/'  //test

pages/wd/index.vue

@@ -150,6 +150,8 @@ export default {
 		getCount() {
 			this.$api.mockSubscribeListSubscribe({
 				mockStatus:0,
+				pageNum:1,
+				pageSize:1,
 			}).then(res => {
 				this.total1 = res.data.total
 			})

pages2/bank/free_question.vue

@@ -73,7 +73,7 @@
 			studyIn(item,index){
 				this.itemIndex = index;
 				let sysTime = this.$method.timest()
-				if (item.serviceStartTime && item.item.serviceEndTime && (sysTime <= item.serviceStartTime || this.sysTime >= item.serviceEndTime)) {
+				if (item.serviceStartTime && item.serviceEndTime && (sysTime <= item.serviceStartTime || this.sysTime >= item.serviceEndTime)) {
 					uni.showToast({
 						icon: 'none',
 						title: '不在学习服务期，不能进入学习'

pages2/bank/my_question.vue

@@ -71,6 +71,7 @@
 				})
 			},
 			studyIn(item,index){
+				console.log(item)
 				this.itemIndex = index;
 				let sysTime = this.$method.timest()
 				if (item.serviceStartTime && item.serviceEndTime && (sysTime <= item.serviceStartTime || this.sysTime >= item.serviceEndTime)) {

pages2/wd/class.vue

@@ -329,7 +329,6 @@
 				confirmCount:10,
 				confirmChecked:false,
 				showUserConfirmInfo:false,
-				markContent: 'http://admin.zhujianpeixun.com/',
 				showMark: false,
 				list: [1, 2, 3],
 				goodsList: [],
@@ -550,8 +549,10 @@
 				if (item.interfaceAccountId > 0) { //学习账号已开通
 
 					if (item.learnStatus == 1) { //跳转第三方h5
-						this.showMark = true;
-
+						// this.showMark = true;
+						uni.navigateTo({
+							url: `/pages3/polyv/detail?goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&isOther=1`
+						})
 						return;
 						// uni.navigateTo({
 						// 	url:'/pages/webview/index?url='+item.officialLearningUrl

pages3/course/detail.vue

@@ -4,14 +4,14 @@
 		<view class="videoBox" >
 			<view >
 				<view class="video_box" v-if="!startStatus">
-					<image :src="$method.splitImgHost(detail.coverUrl)" style="width: 100%;height: 460rpx;"></image>
+					<image :src="$method.splitImgHost(detail.coverUrl)" style="width: 100%;height: 421rpx;"></image>
 					<image v-if="false" class="video_play" src="/static/play.png" @click="startVideo"></image>
 				</view>
-				<view v-else class="video_box" style="width: 100%;height: 460rpx;">
+				<view v-else class="video_box" style="width: 100%;height: 421rpx;">
 					<polyv-player
 						id="playerVideo"
 						playerId="playerVideo"
-						height="460rpx"
+						height="421rpx"
 						:vid="vid"
 						:showSettingBtn="true"
 						:enablePlayGesture="true"

pages3/live/detail.vue

@@ -9,7 +9,7 @@
         <image
           :src="$method.splitImgHost(detail.coverUrl)"
           mode="widthFix"
-          style="width: 100%; height: 460rpx"
+          style="width: 100%; height: 421rpx"
         ></image>
         <image
           v-if="false"
@@ -21,13 +21,13 @@
       <view v-else>
         <view
           class="video_box"
-          style="width: 100%; height: 460rpx"
+          style="width: 100%; height: 421rpx"
           v-if="playVID"
         >
           <polyv-player
             id="playerVideo"
             playerId="playerVideo"
-            height="460rpx"
+            height="421rpx"
             :vid="vid"
             :showSettingBtn="true"
             :enablePlayGesture="true"
@@ -63,7 +63,7 @@
         </view>
         <view
           class="video_box"
-          style="width: 100%; height: 460rpx"
+          style="width: 100%; height: 421rpx"
           v-if="playChannelId > 0"
         >
           <player

pages3/polyv/detail.vue

@@ -9,7 +9,7 @@
         <image
           :src="$method.splitImgHost(detail.coverUrl)"
           mode="widthFix"
-          style="width: 100%; height: 460rpx"
+          style="width: 100%; height: 421rpx"
         ></image>
         <image
           v-if="false"
@@ -21,13 +21,13 @@
       <view v-else>
         <view
           class="video_box"
-          style="width: 100%; height: 460rpx"
+          style="width: 100%; height: 421rpx"
           v-if="playVID"
         >
           <polyv-player
             id="playerVideo"
             playerId="playerVideo"
-            height="460rpx"
+            height="421rpx"
             :vid="vid"
             :showSettingBtn="true"
             :enablePlayGesture="true"
@@ -63,7 +63,7 @@
         </view>
         <view
           class="video_box"
-          style="width: 100%; height: 460rpx"
+          style="width: 100%; height: 421rpx"
           v-if="playChannelId > 0"
         >
           <player
@@ -507,6 +507,19 @@
       </div>
     </u-popup>
 		
+		<u-modal v-model="showMark" title="提示" @confirm="markConfirm" @cancel="markCancel" confirm-text="复制学习网址" :show-cancel-button="true"
+			cancel-text="关闭">
+			<view class="slot-content">
+				<view>您的学习账号已经开通，请按照步骤操作，进行学习。</view>
+				<view>1.复制学习地址:{{markContent}}</view>
+				<view>2.在【浏览器中】打开复制的学习网址</view>
+				<view>3.打开学习网址后，选择【个人用户】进行登录</view>
+				<view>(1)账号：您个人的身份证号码</view>
+				<view>(2)密码：身份证号码，再加111111</view>
+			</view>
+		
+		</u-modal>
+		
 		
   </view>
 </template>
@@ -527,6 +540,8 @@ export default {
   },
   data() {
     return {
+			markContent: 'http://admin.zhujianpeixun.com/',
+			showMark: false,
 			hasStart:false,
 			channelItem:null,
       lockTimer: null,
@@ -616,6 +631,7 @@ export default {
 			clearTimer:null,
 			livingItem:'',
 			option:null,
+			isOther:''
     };
   },
   computed: {
@@ -625,6 +641,7 @@ export default {
     this.courseId = Number(option.id);
     this.goodsId = Number(option.goodsId);
     this.orderGoodsId = Number(option.orderGoodsId) || '';
+		this.isOther = option.isOther
 		this.option = option
   //   this.courseDetail();
   //   this.getGoodsDetail();
@@ -662,6 +679,10 @@ export default {
 			
 		// })
 		
+		if(this.isOther) {
+			this.showMark = true;
+			return;
+		}
 		this.getbaseprofiletplists().then(res => {
 			this.courseDetail();
 			this.getGoodsDetail();
@@ -779,6 +800,25 @@ export default {
   },
   methods: {
     ...mapMutations(["updateChapterOpen","updateLiveLast"]),
+		markCancel() {
+			uni.navigateBack({
+				delta:1
+			})
+		},
+		markConfirm() {
+			uni.setClipboardData({
+		 	data: this.markContent,
+		  success: function() {
+					console.log('success');
+					setTimeout(() => {
+						uni.navigateBack({
+							delta:1
+						})
+					},1000)
+					
+				}
+			});
+		},
 		closeNotice() {
 			this.$api.baseHandoutTip({
 				orderGoodsId:this.orderGoodsId
@@ -3074,6 +3114,10 @@ page {
   transform: rotate(90deg);
 }
 
+.slot-content {
+		padding: 0 20rpx;
+	}
+
 .notice_modal {
   .content {
     width: 100%;

pages5/examBank/index.vue

@@ -852,7 +852,11 @@
 </template>
 
 <script>
+	import {mapGetters,mapActions} from 'vuex'
 export default {
+	computed:{
+		...mapGetters(['sysTime']),
+	},
   data() {
     return {
 			subscribeId:0,
@@ -886,14 +890,20 @@ export default {
 			normal:'',
 			isAutoSubmit:false,
       cgType: 0, //对应设计稿弹窗编码
+			examStartTime:0,
+			examEndTime:0,
     };
   },
   async onLoad(option) {
 		console.log(option)
+		
+		this.examStartTime = option.examStartTime;
+		this.examEndTime = option.examEndTime;
 		this.subscribeId = option.subscribeId || ''
     this.current = +option.current || 0;
 		this.eachExamId = option.eachExamId
     this.examId = option.examId;
+		this.allTimes = this.examEndTime - this.examStartTime || "";
     let isBack = option.isback;
 
     let showDialog = uni.getStorageSync("showDialog");
@@ -914,7 +924,7 @@ export default {
         this[k] = globalData.bankData[k];
       }
       this.showArrow = true;
-
+		
       this.timer = setInterval(() => {
         if (this.lastTime <= 0) {
           clearInterval(this.timer);
@@ -935,6 +945,7 @@ export default {
     } else {
       //进入页面
       // await this.bankExam();
+			await this.setSystemTime()
       this.goodsQuestionList();
     }
   },
@@ -956,7 +967,9 @@ export default {
           this.eachExamId +
           "&isback=true"+
 					"&subscribeId="+
-					this.subscribeId
+					this.subscribeId+
+					'&examStartTime='+this.examStartTime+
+					'&examEndTime='+this.examEndTime
       });
     } else {
       //点击返回按钮确认允许退出，记录答题记录
@@ -966,6 +979,7 @@ export default {
     }
   },
   methods: {
+		...mapActions(['setSystemTime']),
     /**
      * 是否有上传图片
      */
@@ -1511,28 +1525,32 @@ export default {
             });
             return;
           }
-          this.allTimes = res.data.data[0].answerTime * 60;
-          this.lastTime =
-            res.data.data[0].answerTime && res.data.data[0].answerTime * 60;
-          //考试时间到了自动交卷
-          if (this.lastTime) {
-            this.timer = setInterval(() => {
-              if (this.lastTime <= 0) {
-                clearInterval(this.timer);
-                uni.showToast({
-                  icon: "none",
-                  mask: true,
-                  title: "考试时间已到，系统将自动交卷",
-                  duration: 10000,
-                });
-
-                this.submit();
-                return;
-              }
-              this.lastTime--;
-            }, 1000);
-          } else {
-          }
+					
+					 if (this.subscribeId) {
+							this.lastTime = this.examEndTime - this.sysTime;
+							//考试时间到了自动交卷
+							if (this.lastTime) {
+							  this.timer = setInterval(() => {
+							    if (this.lastTime <= 0) {
+							      clearInterval(this.timer);
+							      uni.showToast({
+							        icon: "none",
+							        mask: true,
+							        title: "考试时间已到，系统将自动交卷",
+							        duration: 5000,
+							      });
+										
+										this.isAutoSubmit = true;
+							
+							      this.submit();
+							      return;
+							    }
+							    this.lastTime--;
+							  }, 1000);
+							} else {
+							}
+					 }
+          
           res.data.data.forEach((item, index) => {
             // if (typeof item.jsonStr == 'string') {
             item.jsonStr = JSON.parse(item.jsonStr);

pages5/examCount/index.vue

@@ -32,9 +32,11 @@ export default {
 			subscribeId:0,
 			end:0,
 			percent:0,
+			examEndTime:0,
 		};
 	},
 	onLoad(option){
+		this.examEndTime = option.examEndTime;
 		this.mockName = option.mockName || ''
 		this.subscribeId = option.subscribeId
 		this.eachExamId = option.eachExamId
@@ -75,7 +77,7 @@ export default {
 		examBank() {
 			if(((this.nowTime > this.start) && (this.nowTime < this.end ))) {
 				uni.redirectTo({
-					url:'../examBank/index?examId='+this.examId+'&eachExamId='+this.eachExamId+'&subscribeId='+this.subscribeId
+					url:'../examBank/index?examId='+this.examId+'&eachExamId='+this.eachExamId+'&subscribeId='+this.subscribeId+'&examEndTime='+this.examEndTime+'&examStartTime='+this.start
 				})
 			} else {
 				uni.showToast({

pages5/examList/index.vue

@@ -334,7 +334,7 @@ export default {
 			
 			this.itemIndex = index;
 			uni.navigateTo({
-				url:'../examCount/index?start='+this.$method.TimeTotimestamp(this.$method.timestampToTime(item.applySiteExamTime) + ' ' + item.applySiteStartTime)+'&limit='+item.timeLimit+'&examId='+item.examId+'&eachExamId='+item.eachExamId+'&subscribeId='+item.subscribeId+'&mockName='+item.applyName
+				url:'../examCount/index?start='+this.$method.TimeTotimestamp(this.$method.timestampToTime(item.applySiteExamTime) + ' ' + item.applySiteStartTime)+'&limit='+item.timeLimit+'&examId='+item.examId+'&eachExamId='+item.eachExamId+'&subscribeId='+item.subscribeId+'&mockName='+item.applyName +'&examEndTime='+this.$method.TimeTotimestamp(this.$method.timestampToTime(item.applySiteExamTime) + ' ' + item.applySiteEndTime)
 			})
 		},
 		

pages5/examReport/index.vue

@@ -44,14 +44,15 @@
 			</view>
 			<view class="dis_fst">
 				<navigator
-					 v-if="wrongRecordWrongNum != 0"
+				 hover-class="none" 
 					:url="
 						'/pages5/examReport/questionBankWrongExplain?recordId=' + reportdata.recordId+'&id='+examData.examId+'&eachExamId='+eachExamId
 					"
 				>
-					<view class="btnACs">错题解析</view>
+					<button  hover-class="none"  class="btnACs">错题解析</button>
 				</navigator>
 				<navigator
+				 hover-class="none" 
 					:url="
 						'/pages5/examReport/questionBankAllExplain?id=' +
 							reportdata.examId +
@@ -59,7 +60,17 @@
 							'&eachExamId='+eachExamId
 					"
 				>
-					<view class="btnACs">全部解析</view>
+					<button  hover-class="none" disabled class="btnACs">全部解析</button>
+				</navigator>
+				<navigator
+				 hover-class="none" 
+					:url="
+						'/pages5/examBank/index?examId=' +
+							reportdata.examId +
+							'&eachExamId='+eachExamId
+					"
+				>
+					<button  hover-class="none"  class="btnACs">去做题</button>
 				</navigator>
 			</view>
 		</view>

pages5/liveList/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<nav-bar title="模考预约" class="nav"></nav-bar>
+		<nav-bar title="模考讲解直播" class="nav"></nav-bar>
 		<view class="tabs">
 			<view class="tab" :class="{ active: index == 2 }" data-index="2">
 				<view class="dateRange">