Merge branch 'master' of https://gitee.com/he2802/saas_applet

# Conflicts:
#	pages2/appointment/index.vue

common/request.js

@@ -4,7 +4,7 @@ import store from '@/store/index.js'
 import api from './api.js'
 var num = 1
 
-export const BASE_URL = 'http://192.168.1.222:5055' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
+export const BASE_URL = 'http://42.192.164.187:19005' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
 
 
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/' //图片上传api  'https://file.xyyxt.net/

pages2/class/detail.vue

@@ -347,6 +347,12 @@ export default {
 				}
 			}
 		});
+		console.log(this.gradeId,7512)
+		if(this.gradeId>0){
+			//提交完资料返回判断是否已开班
+			
+			this.getGradeInfo()
+		}
 	},
 	onUnload() {
 		if (this.playSectionId > 0) {
@@ -531,10 +537,11 @@ export default {
 		},
 		getGradeInfo() {
 			let self = this;
-			
+			this.$store.state.allowLoading = false;
 			this.$api.goodsGradeInfo(this.gradeId).then(res => {
 				if (res.data.code == 200) {
 					self.gradeDetail = res.data.data;
+					console.log(self.needProfileModal,61189)
 					if(self.gradeDetail.learningStatus==2){
 						uni.showModal({
 							showCancel:false,
@@ -557,6 +564,7 @@ export default {
 					}
 				}
 			});
+			this.$store.state.allowLoading = true;
 		},
 		getNoteList() {
 			let self = this;
@@ -833,7 +841,12 @@ export default {
 				console.log(self.gradeId, 698);
 				self.getMenuList();
 				self.getReMenuList(); //获取重修目录
-				self.getGradeInfo()
+				setTimeout(function(){
+					if(!self.needProfileModal){
+						self.getGradeInfo()
+					}
+				},500)
+				
 				//获取节笔记
 				this.getNoteList();
 				if (self.goodsData.goodsPlayConfig) {

pages2/exam/index.vue

@@ -24,9 +24,9 @@ export default {
 		};
 	},
 	onLoad(){
-		this.getInfo()
 	},
 	onShow() {
+		this.getInfo()
 	},
 	methods: {
 		getInfo(){