From 4d11ab9c7913ad1810db17d36435dd0ced936997 Mon Sep 17 00:00:00 2001
From: limqhz <l>
Date: Sun, 30 Aug 2020 18:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E6=97=B6=E6=95=88fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/scanCode/index.js   | 26 ++++++++++++++------------
 pages/scanCode/index.wxml |  4 ++--
 utils/api.js              |  1 -
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pages/scanCode/index.js b/pages/scanCode/index.js
index 3b20f7e..ad9bca6 100644
--- a/pages/scanCode/index.js
+++ b/pages/scanCode/index.js
@@ -7,12 +7,12 @@ Page({
    */
   data: {
     venueId: undefined,
+    canOpen: true,
     venue: {
 
     },
     isGoHome: false,
-    showDeleteDialog: false,
-    canOpen: true
+    showDeleteDialog: false
   },
 
   /**
@@ -23,11 +23,14 @@ Page({
     app.$api.scanCodeInitVenue({
       deviceId : this.data.venueId
     }).then(res => {
+      var that = this;
       if (res.venueInit){
         this.setData({
           venue: res.venueInit
-        })
-        setTimeout(canOpenDoor,60000);
+        }),
+        setTimeout(function() {
+          that.setData({canOpen : false});
+        },60000);
       }
     });
   },
@@ -90,6 +93,12 @@ Page({
     })
   },
 
+  backClick : function(){
+    wx.redirectTo({
+        url: '/pages/home/index',
+    })
+  },
+
   // 取消弹框
   cancelDialog() {
     this.setData({
@@ -97,13 +106,6 @@ Page({
     })
   },
 
-  // 取消开门
-  canOpenDoor() {
-    this.setData({
-      canOpen: false
-    })
-  },
-
   confirmEnterDialog(){
     this.setData({
       showDeleteDialog: false
@@ -119,11 +121,11 @@ Page({
           title: '请入场！'
         });
       }else {
-        canOpenDoor();
         wx.showToast({
           title: res.err_msg
         });
       }
+      this.setData({canOpen : false});
     });
   }
 
diff --git a/pages/scanCode/index.wxml b/pages/scanCode/index.wxml
index c4f0fa0..feec67f 100644
--- a/pages/scanCode/index.wxml
+++ b/pages/scanCode/index.wxml
@@ -3,8 +3,8 @@
 <view class='container' wx:if="{{venue.name}}">
   <image class='logo' src='{{venue.listImage}}' mode='widthFix'></image>
   <rich-text class='info' nodes="[{{venue.name}}] 欢迎您!请在60秒内操作开门！"></rich-text>
-  <view wx:if="{{canOpen}}" class='footer-btn' bindtap='enterClick'>开门</view>
-  <view wx:if="{{!canOpen}}" class='footer-btn' bindtap='enterClick'>返回</view>
+  <view wx:if="{{canOpen==true}}" class='footer-btn' bindtap='enterClick'>开门</view>
+  <view wx:if="{{canOpen==false}}" class='footer-btn' bindtap='backClick'>返回</view>
 </view>
 <view class='container' wx:if="{{!venue.name}}">
   <rich-text class='info' nodes="门禁设备连接异常，请联系管理员！"></rich-text>
diff --git a/utils/api.js b/utils/api.js
index 653a659..45de406 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -1,6 +1,5 @@
 //testURL
 const BASE_URL = 'https://lmqhznn.goho.co';
-// const BASE_URL = 'http://120.27.209.4:8093';
 //prodURL
 // const BASE_URL = 'https://api.hongyutiyu.top';
 // const platformId = 1;