From d67c8e2d5864247d8da7152149428e0ba7e5ad52 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 9 Jul 2021 15:06:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json               |  2 +-
 pages/openDoor/openDoor.vue | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 067421b..0c5f264 100755
--- a/manifest.json
+++ b/manifest.json
@@ -89,6 +89,6 @@
         },
         "domain" : "owner.demo.winqi.cn",
         "publicPath" : "./",
-        "title" : "HC智慧家园"
+        "title" : "业主版"
     }
 }
diff --git a/pages/openDoor/openDoor.vue b/pages/openDoor/openDoor.vue
index 837d8e4..65267a7 100755
--- a/pages/openDoor/openDoor.vue
+++ b/pages/openDoor/openDoor.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view>
-			<image src="../../static/images/openDoorTop.png" class="heard-location-icon"></image>
+			<image src="/static/images/openDoorTop.png" class="heard-location-icon"></image>
 		</view>
 		<view class="cu-list grid" :class="'col-2'">
 			<view class="cu-item" @click="showOpenDoor(item);"
@@ -20,7 +20,7 @@
 					</view>
 				</view>
 				<view class="padding-xl">
-					您确认{{curMachine.machineName}}开门? 请勿频繁操作！
+					您确认{{curMachine.machineName}}开门? 开门次数有限,请勿频繁操作！
 				</view>
 				<view class="cu-bar bg-white justify-end">
 					<view class="action margin-0 flex-sub  solid-left" @tap="_cancleOpenDoor()">取消</view>
@@ -90,18 +90,22 @@
 			},
 			_doOpenDoor:function(){
 				let _that = this;
+				wx.showLoading({
+					title: '请求中'
+				});
 				openDoor({
 					communityId:this.communityId,
 					userRole:'owner',
 					machineCode:_that.curMachine.machineCode,
 					userId:this.memberId
 				}).then((res)=>{
+					wx.hideLoading();
 					let data = res.data;
 					let msg = '';
 					if(data.code == 0){
 						msg = '请求发送至门禁'
 					}else{
-						msg = '开门失败'
+						msg = data.msg;
 					}
 					wx.showToast({
 						title: msg,
@@ -110,6 +114,7 @@
 					});
 					_that._cancleOpenDoor();
 				},(err)=>{
+					wx.hideLoading();
 					wx.showToast({
 						title: '开门失败',
 						icon: 'none',