Merge branch 'master' of http://192.168.1.222:10010/zhongzheng-edu/zz--front

common/request.js

@@ -1,8 +1,7 @@
 
 //const BASE_URL = 'http://192.168.1.222:8088'
- const BASE_URL = 'https://api.xyyxt.net' 
 // const BASE_URL = 'http://127.0.0.1:8088' 
-// const BASE_URL = 'https://api.xyyxt.net'  //
+const BASE_URL = 'https://api.xyyxt.net' 
 import store from '@/store/index.js'
 import api from './api.js'
 var num = 1

pages2/bank/detail.vue

@@ -194,10 +194,10 @@
 					<image :src="collecStatus ? '/static/star.png' : '/static/sc.png'" class="sc"></image>
 					<view class="sc_t">收藏</view>
 				</view>
-				<view class="buy" v-if="payStatus === 1" @click="buyTK">
+				<view class="buy" v-if="payStatus === 0" @click="buyTK">
 					立即购买
 				</view>
-				<view class="buy" v-if="payStatus === 0" @click="jumpExam">模拟考试</view>
+				<view class="buy" v-if="payStatus === 1" @click="jumpExam">模拟考试</view>
 			</view>
 		</view>
 		<u-popup v-model="showBox" mode="bottom" border-radius="14">

pages2/plan/create.vue

@@ -166,6 +166,14 @@ export default {
 				});
 				return;
 			}
+			// if (this.form.week == '请选择') {
+			// 	uni.showModal({
+			// 		title: '提示',
+			// 		content: '请选择学习频率',
+			// 		showCancel: false
+			// 	});
+			// 	return;
+			// }
 			let courseId = [];
 			for (let i = 0; i < this.list.length; i++) {
 				courseId.push(this.list[i].courseId);