From e0331b5d6657a7623a2c44181e4d59436cc08821 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 9 Aug 2021 15:24:20 +0800
Subject: [PATCH] fix all && vtest 1.1.5

---
 src/components/site/order_modal/order_modal.vue             | 9 ++++++---
 src/subpackage/device/pages/switch_manage/switch_manage.vue | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue
index e2fb1b4..b1f53b8 100644
--- a/src/components/site/order_modal/order_modal.vue
+++ b/src/components/site/order_modal/order_modal.vue
@@ -89,8 +89,10 @@
 			<view class="om-total" v-if="isShowTotalAmoutn" >实付款 ￥{{ orderInfo.amount || '0' }}</view>
 			<!-- 管理员占用 -->
 			<view class="om-btns" v-if="orderInfo.type == 'take_up_venue'">
-				<view class="ob-view" @click="toShare">分享给朋友</view>
-				<view class="ob-view red" @click="cancelOccupy">取消占用</view>
+				<block v-if="orderInfo.pay_status == 0 || orderInfo.pay_status == 1">
+					<view class="ob-view" @click="toShare">分享给朋友</view>
+					<view class="ob-view red" @click="cancelOccupy">取消占用</view>
+				</block>
 			</view>
 			<!-- 小程序预定 -->
 			<view class="om-btns" v-if="orderInfo.type == 'mini_program'">
@@ -227,7 +229,8 @@ export default {
                     return '已失效'
                 case 8:
                     return '使用中'
-                default: return '-'
+                default: 
+					return '-'
             }
 		},
 		getTitle(type){
diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue
index 3f691e4..24b75ce 100644
--- a/src/subpackage/device/pages/switch_manage/switch_manage.vue
+++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue
@@ -63,7 +63,7 @@ const showArr = {
         id: 1, name: '照明管理', isOpen: true, isClose: true, isLongOpen:true, isTiming:true,
         openIcon: '/subpackage/device/static/images/open.png',closeIcon: '/subpackage/device/static/images/close.png',
         longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
-        openName: '开', closeName: '关', longOpenName: '长按', timingName: '定时', hardware_type: 'Light',iconNum:4
+        openName: '开', closeName: '关', longOpenName: '长开', timingName: '定时', hardware_type: 'Light',iconNum:4
     },
     's2': {
         id: 2, name: '空调管理', isOpen: true, isClose: true,
@@ -76,7 +76,7 @@ const showArr = {
         openIcon: '/subpackage/device/static/images/open.png',
         closeIcon: '/subpackage/device/static/images/close.png',
 		 longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
-        openName: '开', closeName: '关', hardware_type: 'Fan',longOpenName: '长按', timingName: '定时',iconNum:4,
+        openName: '开', closeName: '关', hardware_type: 'Fan',longOpenName: '长开', timingName: '定时',iconNum:4,
     },
     's4': {
         id: 4, name: '门禁管理', isOpen: true, isClose: false,
@@ -101,7 +101,7 @@ const showArr = {
         openIcon: '/subpackage/device/static/images/open.png',
         closeIcon: '/subpackage/device/static/images/close.png',
        longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
-       openName: '开', closeName: '关', hardware_type: 'WaterValve',longOpenName: '长按', timingName: '定时',iconNum:4,
+       openName: '开', closeName: '关', hardware_type: 'WaterValve',longOpenName: '长开', timingName: '定时',iconNum:4,
     },
     's12': {
         id: 12, name: '互动设备管理', isOpen: true, isClose: true,