Merge branch 'xqy_h5' of http://120.79.166.78:19005/zhongzheng-edu/saas_miniprogram into xqy_h5

App.vue

@@ -24,8 +24,8 @@ export default {
       console.log('开发环境')
       const consoleObj = new vconsole()
     } else {
-      console.log('生产环境')
-      const consoleObj = new vconsole()
+      // console.log('生产环境')
+      // const consoleObj = new vconsole()
     }
     // #endif
   },

common/request.js

@@ -5,24 +5,26 @@ import method from '@/common/methodTool.js'
 import api from './api.js'
 var num = 1
 //接口api   
-// export const BASE_URL = 'https://api.xyyxt.net'   //release
+export const BASE_URL = 'https://api.xyyxt.net'   //release
+// export const BASE_URL = 'https://h.gdzzkj.net'
 // 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.7:5055'    //后端本地
 
  //图片上传api
-// export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
-export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
+export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
+// 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://cm.xyyxt.net/'  //release-祥粤学堂
 // export const WEBVIEW_URL = 'https://zstcm.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://live.gdzzkj.net/'  //release-中正学堂
+// export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
+// export const WEBVIEW_URL = 'http://120.79.166.78:18001/' // 测试环境-祥粤云学堂
 // export const WEBVIEW_URL = 'http://120.79.166.78:18011/' // 测试环境-祥粤学堂  
 // export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布(弃用了)
 
@@ -38,7 +40,7 @@ hF6WiNlWfQTVoF1rhwIDAQAB
 -----END PUBLIC KEY-----`;
 
 export const version = '1.5.12' 
-export const tenantId = '867735392558919680'  // 祥粤云学堂：867735392558919680，祥粤学堂：667735392758919630, 中建云学堂-567735392758918520
+export const tenantId = '141250585240548145'  // 祥粤云学堂：867735392558919680，祥粤学堂：667735392758919630, 中建云学堂-567735392758918520,中正学堂-141250585240548145
 export const myRequest = (options) => {
 	if (store.state.allowLoading && !options.noLoading) {
 		uni.showLoading({

manifest.json

@@ -73,9 +73,9 @@
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 */
+    /* 小程序特有相关 中正学堂-wx5872ef563d13dabf， */
     "mp-weixin" : {
-        "appid" : "wxd3c8ae80cf43a305", // 祥粤云学堂：wxd3c8ae80cf43a305, 祥粤学堂-wx871153afc95f55f4
+        "appid" : "wx5872ef563d13dabf", // 祥粤云学堂：wxd3c8ae80cf43a305, 祥粤学堂-wx871153afc95f55f4
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

pages/index/index.vue

@@ -457,11 +457,12 @@ export default {
       this.OfficialLogin();
     } else {
       console.log("没有code");
-      // 没有code,就重定向到地址https://www.xyyxt.net?ask_type=h.xyyxt.net 去获取code，授权后就会把code带上然后访问域名，就拿到code了
-      // if (!uni.getStorageSync('h5_code')) {
-      // 	location.replace('https://www.xyyxt.net/?ask_type=h.xyyxt.net')
-      // 	return
-      // }
+      // 没有code,就重定向到地址https://www.xyyxt.net?ask_type=h.xyyxt.net 去获取code，授权后就会把code带上然后访问域名
+      // h.gdzzkj.net
+      if (!uni.getStorageSync('h5_code')) {
+      	location.replace('https://www.xyyxt.net/?ask_type=h.gdzzkj.net')
+      	return
+      }
     }
     // #endif
     this.getInfo(); // 判断有没有关注公众号

pages2/class/questionBank.vue

@@ -775,7 +775,7 @@
     </u-popup>
     <!-- 节卷不需要拍照 -->
     <!-- :show="examType != 2 && photoPopup" -->
-    <u-popup v-model="photoPopup" mode="bottom" border-radius="40" >
+    <u-popup v-model="photoPopup" mode="bottom" border-radius="40" :mask-close-able="false">
       <!-- 播放前拍照start -->
       <!-- :mask-close-able="false" -->
         <!-- style="bottom: 0; position: fixed; width: 100%; z-index: 999" -->

pages3/live/detail.vue

@@ -492,7 +492,7 @@
       </view>
     </u-popup>
 
-    <u-popup v-model="photoPopup" mode="bottom" border-radius="40">
+    <u-popup v-model="photoPopup" mode="bottom" border-radius="40" :mask-close-able="false">
       <!-- 播放前拍照start -->
        <!-- :mask-close-able="false" -->
       <!-- style="bottom: 0; position: fixed; width: 100%; z-index: 999" -->

pages3/polyv/detail.vue

@@ -542,7 +542,7 @@
         </view>
       </view>
     </u-popup>
-    <u-popup v-model="photoPopup" mode="bottom" border-radius="40">
+    <u-popup v-model="photoPopup" mode="bottom" border-radius="40" :mask-close-able="false">
       <!-- 播放前拍照start -->
       <!-- :mask-close-able="false" -->
       <!-- style="bottom: 0; position: fixed; width: 100%; z-index: 999" -->