公众号跳转

common/request.js

@@ -6,10 +6,10 @@ var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
 // export const BASE_URL = 'https://test.xyyxt.net'   //预发布
-// export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
+export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test(后端本地)
 // export const BASE_URL = 'http://192.168.1.222:5055'    //后端本地更新到222
-export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
+// export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
 // export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
 
  //图片上传api
@@ -18,8 +18,8 @@ export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 // web_view的
 // export const WEBVIEW_URL = 'https://m.xyyxt.net/'  //release
-// export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
-export const WEBVIEW_URL = 'http://120.79.166.78:18001/' // 测试环境
+export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
+// export const WEBVIEW_URL = 'http://120.79.166.78:18001/' // 测试环境
 // export const WEBVIEW_URL = 'http://192.168.1.38:8082/'  //test
 // export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布(弃用了)
 

pages/learn/index.scss

@@ -189,7 +189,8 @@
 			.exam_btns {
 				width: 64%;
 				display: flex;
-				justify-content: space-between;
+				justify-content: flex-end;
+				align-items: center;
 			}
 		}
 		.box_appoint {

pages/learn/index.vue

@@ -115,19 +115,25 @@
 								v-if="item.gradeStatus == 1 && item.status == 1 && (item.serviceEndTime > sysTime) && (item.serviceStartTime < sysTime) &&  (item.classEndTime && (item.classEndTime < sysTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0">
 							</template>
 							<view v-else class="exam_btns">
-								<view class="box_appoint" v-if="item.applyStatus === 1 && !( sysTime <= item.serviceStartTime || sysTime >= item.serviceEndTime || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart))">
+								<view class="box_appoint" v-if="item.applyStatus === 1 && !( sysTime <= item.serviceStartTime || sysTime >= item.serviceEndTime
+									 || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || 
+									 item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart))"
+									 @click="appointment(item,appoint)">
 									<image class="img" src="/static/learn/icon_apoint.png"></image>
-									<text class="exam_word" @click="appointment(item,appoint)">预约考试</text>
+									<text class="exam_word">预约考试</text>
 								</view>
-								<view class="box_appoint" v-if="item.beforeStatus === 1 && !( sysTime <= item.serviceStartTime || sysTime >= item.serviceEndTime || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart))">
+								<view class="box_appoint" v-if="item.beforeStatus === 1 && !( sysTime <= item.serviceStartTime || sysTime >= item.serviceEndTime
+									 || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || 
+									 item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart))"
+									 @click="appBeforeAddress(item.goodsId,item)">
 									<image class="img" src="/static/learn/icon_study.png"></image>
-									<text class="exam_word"  @click="appBeforeAddress(item.goodsId,item)">进入刷题</text>
+									<text class="exam_word">进入刷题</text>
 								</view>
 								
 							</view>
-							<view class="box_appoint">
+							<view class="box_appoint" @click="studyIn(item.goodsId,item.gradeId,item,index)">
 								<image class="img" src="/static/learn/icon_learn.png"></image>
-								<text class="exam_word" @click="studyIn(item.goodsId,item.gradeId,item,index)">进入学习</text>
+								<text class="exam_word">进入学习</text>
 							</view> 
 						</view>
 

pages2/appointment/appointment_success.vue

@@ -82,6 +82,9 @@ export default {
 		};
 	},
 	onLoad(option) {
+		if (this.$method.isGoLogin()) { // 从公众号消息进来的没登录需要跳到登录页，登录后返回
+			return;
+		}
 		this.subscribeId = Number(option.subscribeId);
 		this.getInfo();
 	},

pages2/exam/exam_appointment.vue

@@ -167,6 +167,14 @@ export default {
 	},
 	onPullDownRefresh() {},
 	onLoad(option) {
+		if (this.$method.isGoLogin()) { // 从公众号消息进来的没登录需要跳到登录页，登录后返回
+			return;
+		}
+		if (String(option.current)) {
+			this.current = +option.current
+			this.change(+option.current)
+			return
+		}
 		this.setSystemTime()
 		this.$api.getApplylist({ subscribeStatus: 1, exceedExamExpend: 2 }).then(res => {
 			if (res.data.code === 200) {
@@ -265,9 +273,9 @@ export default {
 				});
 		},
 		change(index) {
-			if (this.current === index) {
-				return;
-			}
+			// if (this.current === index) {
+			// 	return;
+			// }
 			this.current = index;
 			var data = {};
 			if (index === 0) {

pages2/exam/exam_result.vue

@@ -158,6 +158,14 @@ export default {
 	},
 	onPullDownRefresh() {},
 	onLoad(option) {
+		if (this.$method.isGoLogin()) { // 从公众号消息进来的没登录需要跳到登录页，登录后返回
+			return;
+		}
+		if (String(option.current)) {
+			this.current = +option.current
+			this.change(+option.current)
+			return
+		}
 		this.$api.getApplylist().then(res => {
 			if (res.data.code === 200) {
 				var a = [];
@@ -203,9 +211,9 @@ export default {
 			this.details_show = false;
 		},
 		change(index) {
-			if (this.current === index) {
-				return;
-			}
+			// if (this.current === index) {
+			// 	return;
+			// }
 			this.current = index;
 			var data = {};
 			if (index === 0) {

pages2/learn/details.vue

@@ -51,6 +51,9 @@ export default {
     };
   },
   onLoad(option) {
+    if (this.$method.isGoLogin()) { // 从公众号消息进来的没登录需要跳到登录页，登录后返回
+      return;
+    }
     this.orderGoodsId = option.orderGoodsId || "";
     this.goodsId = Number(option.goodsId);
     this.gradeId = Number(option.gradeId);

pages2/verify/input.vue

@@ -228,7 +228,7 @@
                   top: 20rpx;
                   left: 130rpx;
                 "
-                >竖向证件照 文件大小≤2M</text
+                >竖向白底证件照 文件大小≤2M</text
               >
               <text
                 v-if="