From 1c0b463c243214c5a67fa9d621ff524a3714f834 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Thu, 10 Dec 2020 07:25:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=9C=BA=E4=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                   |  2 +-
 pages/bind/binduser.js   | 46 ++++++++++++++++++++++++++++++++++++++++
 pages/bind/binduser.wxml |  1 +
 pages/examtest/note.js   |  8 +++++--
 pages/examtest/note.wxml |  1 +
 project.config.json      | 14 ++++++------
 6 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 45ce375..d24175a 100644
--- a/app.js
+++ b/app.js
@@ -98,7 +98,7 @@ App({
       openid:null
     },
     serverUrl: 'https://safeyun.ctcshe.com/',
-    //serverUrl: 'http://127.0.0.1:8002/',
+    //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/',
diff --git a/pages/bind/binduser.js b/pages/bind/binduser.js
index dae467c..245c0dc 100644
--- a/pages/bind/binduser.js
+++ b/pages/bind/binduser.js
@@ -56,6 +56,46 @@ Page({
       }
     });
   },
+  denglu2: function(){
+    var data = this.data
+    data.username = 'test4'
+    data.password = 'q4'
+    wx.request({
+      url: getApp().globalData.serverUrl + 'bindmp',
+      header: {
+        'content-type': 'application/json', // 
+      },
+      method: 'POST',
+      data:data,
+      success: res => {
+        if (res.statusCode === 200) {
+          if (res.data.code == 1) {
+            wx.showToast({})
+            getApp().globalData.userInfo = {
+              userid: 0,
+              username: '',
+              name: '',
+              isaqy: 0,
+              mpopenid: '',
+              companyid: '',
+              perms: [],
+              openid:null
+            } //重置globaldata和session
+            getApp().mplogin()
+            wx.switchTab({
+              url: '/pages/main/main',
+            })
+          }else{
+            wx.showModal({
+              content: '账户或密码不正确！',
+              showCancel: false,
+              confirmText: "确定"
+            })
+          }
+        }
+      }
+    });
+  },
   getUserbasic:function(){
     var that = this
     wx.request({
@@ -86,6 +126,12 @@ Page({
     })
     this.denglu()
   },
+  onGetInfo2:function(e){
+    this.setData({
+      userInfo:e.detail.userInfo
+    })
+    this.denglu2()
+  },
   /**
    * 生命周期函数--监听页面加载
    */
diff --git a/pages/bind/binduser.wxml b/pages/bind/binduser.wxml
index fb1decb..c910680 100644
--- a/pages/bind/binduser.wxml
+++ b/pages/bind/binduser.wxml
@@ -30,6 +30,7 @@
   </view>
   <button class="weui-btn" type="primary" open-type="getUserInfo" bindgetuserinfo="onGetInfo">授权并绑定登陆</button>
   <view style="text-align:center;color:gray" bindtap="showPw">账号错误或忘记密码?</view>
+  <button class="weui-btn"  open-type="getUserInfo" bindgetuserinfo="onGetInfo2">测试账户登录</button>
 </view>
 <view class="weui-footer weui-footer_fixed-bottom">
             <!-- <view class="weui-footer__links">
diff --git a/pages/examtest/note.js b/pages/examtest/note.js
index 538c311..b0d4562 100644
--- a/pages/examtest/note.js
+++ b/pages/examtest/note.js
@@ -7,7 +7,8 @@ Page({
    */
   data: {
     testdisable:true,
-    fromWx:false
+    fromWx:false,
+    remainnum:0
   },
 
   /**
@@ -58,10 +59,13 @@ Page({
             ksdata['testdisable'] = true
             ksdata['msg'] = '不在考试期限范围内!'
           }
-          if (ksdata.ison == 1) {
+          if (ksdata.testnum == 0) {
+            ksdata['testdisable'] = false
+          }else{
             ksdata['testdisable'] = true
             ksdata['msg'] = '您已考过!'
           }
+          ksdata['remainnum'] = res.data.remainnum
           this.setData(ksdata)
           wx.hideLoading()
 
diff --git a/pages/examtest/note.wxml b/pages/examtest/note.wxml
index 8b327f4..6a8601b 100644
--- a/pages/examtest/note.wxml
+++ b/pages/examtest/note.wxml
@@ -29,4 +29,5 @@
 <view style="position:fixed;bottom:0;left:0;width:100%;">
   <view style="color:red;text-align:center">{{msg}}</view>
   <button class="weui-btn" type="primary" bindtap="start" disabled="{{testdisable}}">开始考试</button>
+  <button class="weui-btn" bindtap="start" wx:if="{{remainnum>0}}">重考({{remainnum}})</button>
 </view>
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index df17f0e..5e8956e 100644
--- a/project.config.json
+++ b/project.config.json
@@ -3,7 +3,9 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
+    "enhance": false,
     "postcss": true,
+    "preloadBackgroundData": false,
     "minified": true,
     "newFeature": true,
     "coverView": true,
@@ -11,23 +13,21 @@
     "autoAudits": false,
     "showShadowRootInWxmlPanel": true,
     "scopeDataCheck": false,
+    "uglifyFileName": false,
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": false,
+    "useApiHook": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
     "useIsolateContext": true,
-    "useCompilerModule": false,
+    "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": false,
-    "enhance": false,
-    "preloadBackgroundData": false,
-    "uglifyFileName": false,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": false,
-    "useApiHook": true,
     "packNpmManually": false,
     "packNpmRelationList": []
   },