升级已给南方水泥使用

app.js

@@ -124,7 +124,7 @@ App({
       openid:null
     },
     serverUrl: 'https://cbma.ctc-gz.com/',
-    //serverUrl: 'http://127.0.0.1:8000/',
+    // serverUrl: 'http://127.0.0.1:8000/',
     //serverUrl: 'http://10.21.28.148:8000/',
     //serverUrl: 'http://192.168.0.103:8000/',
     //serverUrl:'http://10.0.11.195:8000/',

pages/main/main.js

@@ -39,7 +39,8 @@ Page({
     // 后边距，可用于露出后一项的一小部分，接受 px 和 rpx 值
     nextMargin: 0,
     msgList: [
-      { title: "欢迎参加安全环保专题网络考评!" },{title:"每晚10-11点不定期更新,请尽量不在此时间使用"}]
+      { title: "欢迎参加安全环保专题网络考评!" },{title:"每晚10-11点不定期更新,请尽量不在此时间使用"}],
+    showAll:true
   },
 
   /**
@@ -59,12 +60,6 @@ Page({
   },
   callback: function () {
     var that = this;
-    if (getApp().globalData.userInfo.companyid == 2681) {
-      this.setData({
-        showAll: true,
-        user__name:getApp().globalData.userInfo.name,
-      })
-    }
     // let openid = getApp().globalData.userInfo.openid;
     // if (openid == null && getApp().globalData.userInfo.companyid != 2681) {
     //   wx.showModal({
@@ -99,14 +94,7 @@ Page({
     if(getApp().globalData.sessionId){
       that.getNew()
     }
-      if (getApp().globalData.userInfo.companyid == 2681) {
+      
-        this.setData({
-          showAll: true,
-          user__name: getApp().globalData.userInfo.name,
-          msgList: [
-            { title: "知识竞赛火热进行中!" },]
-        })
-      }
     
 
 
@@ -416,12 +404,13 @@ Page({
     }
   },
   tapexercise: function () {
-    if (this.data.showAll) { //练习功能
+    // if (this.data.showAll) { //练习功能
-      wx.showModal({
+    //   wx.showModal({
-        content: '本次活动该功能不便访问!',
+    //     content: '本次活动该功能不便访问!',
-        showCancel: false
+    //     showCancel: false
-      })
+    //   })
-    } else if (getApp().globalData.userInfo.perms != undefined) {
+    // } else 
+    if (getApp().globalData.userInfo.perms != undefined) {
       if (getApp().globalData.userInfo.perms.indexOf(25) != -1) {//考试功能
         wx.navigateTo({
           url: '/pages/exercise/index',

pages/main/main.wxss

@@ -26,10 +26,10 @@ text-overflow: ellipsis;
 white-space: nowrap;
 }
 .weui-grids {
-  /* border-top:none; */
+  border-top:none;
 }
 .weui-grid {
   width: 25%;
-  /* border-right:none; */
+  border-right:none;
   border-bottom:none;
 }

project.config.json

@@ -20,23 +20,22 @@
     "compileHotReLoad": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
-    "useApiHostProcess": false,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
     "enableEngineNative": false,
-    "useIsolateContext": true,
+    "useIsolateContext": false,
-    "useCompilerModule": false,
-    "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
-  "libVersion": "2.9.4",
+  "libVersion": "2.20.0",
   "appid": "wx8cc62edbfed029b9",
   "projectname": "aqyj",
   "isGameTourist": false,