From b07f61006cc4439307634c3b5988b7f35ef2a36a Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Thu, 25 Feb 2021 08:57:16 +0800
Subject: [PATCH] fixbug

---
 pages/home/index.js       |   1 +
 pages/scanCode/index.js   |   6 +-
 pages/scanCode/index.wxml |   8 +--
 project.config.json       | 122 +++++++++++++++++++-------------------
 4 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/pages/home/index.js b/pages/home/index.js
index 2d7fd9a..a998b2d 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -224,6 +224,7 @@ Page({
         //   duration: 5000
         // })qr
         scanVenue = res.result;
+        console.log(res.result);
         wx.navigateTo({
           url: '/pages/scanCode/index?venueId=' + scanVenue,
       })
diff --git a/pages/scanCode/index.js b/pages/scanCode/index.js
index 475e937..48e1482 100644
--- a/pages/scanCode/index.js
+++ b/pages/scanCode/index.js
@@ -31,8 +31,10 @@ Page({
         setTimeout(function() {
           that.setData({canOpen : false});
         },60000);
-      }else if (res.InitError){
-        venue: res.InitError
+      }else if (res.InitError!=undefined){
+        this.setData({
+          venue: res
+        });
       }
     });
   },
diff --git a/pages/scanCode/index.wxml b/pages/scanCode/index.wxml
index a2dddac..53e6fb4 100644
--- a/pages/scanCode/index.wxml
+++ b/pages/scanCode/index.wxml
@@ -1,12 +1,10 @@
 <!--pages/scanCode/index.wxml-->
 <header isGoHome="{{isGoHome}}"></header>
-<view class='container' wx:if="{{venue.name}}">
+<view class='container' wx:if="{{venue}}">
+  <rich-text wx:if="{{!venue.venueInit}}" class='info' nodes="{{venue.InitError}}"></rich-text>
   <image class='logo' src='{{venue.listImage}}' mode='widthFix'></image>
-  <rich-text class='info' nodes="[{{venue.name}}] 欢迎您!请在60秒内操作开门！"></rich-text>
+  <rich-text wx:if="{{venue.name}}" class='info' nodes="[{{venue.name}}] 欢迎您!请在60秒内操作开门！"></rich-text>
   <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.venueInit}}">
-  <rich-text class='info' nodes="{{venue.InitError}}"></rich-text>
-</view>
 <confirm-dialog title="{{'提示'}}" message="{{'确认开门'}}" bindcancelselect="cancelDialog" bindconfirmselect="confirmEnterDialog" wx:if="{{showDeleteDialog}}"></confirm-dialog>
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 44b08e1..09afedf 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,62 +1,64 @@
 {
-	"description": "项目配置文件。",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"enhance": false,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"nodeModules": false,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"uglifyFileName": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"useIsolateContext": true,
-		"useCompilerModule": true,
-		"userConfirmedUseCompilerModuleSwitch": false
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.10.2",
-	"appid": "wx73eb8a9ed10a029d",
-	"projectname": "%E6%99%BA%E6%85%A7%E4%BA%91%E9%A6%86",
-	"isGameTourist": false,
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"currentL": -1,
-			"list": []
-		},
-		"gamePlugin": {
-			"current": -1,
-			"list": []
-		}
-	}
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "enhance": false,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": false,
+    "useApiHook": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "useIsolateContext": true,
+    "useCompilerModule": false,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.10.2",
+  "appid": "wx73eb8a9ed10a029d",
+  "projectname": "%E6%99%BA%E6%85%A7%E4%BA%91%E9%A6%86",
+  "isGameTourist": false,
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "search": {
+      "list": []
+    },
+    "conversation": {
+      "list": []
+    },
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "currentL": -1,
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    }
+  }
 }
\ No newline at end of file