From d58e767d6c53c81942723f3174ea52e4883438fb Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 8 Mar 2022 17:58:09 +0800
Subject: [PATCH 1/6] fix ipt&btn

---
 src/pages/site/confirm/confirm.vue               | 12 +++++++-----
 src/pages/site/occupy_success/occupy_success.vue |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue
index b869412..1d41797 100644
--- a/src/pages/site/confirm/confirm.vue
+++ b/src/pages/site/confirm/confirm.vue
@@ -50,9 +50,9 @@
                 </view>
             </view>
         </view>
-        <view class="sc-fixed-bot">
-            <view hover-class="hover-active" @click="confirmOccupy">确定</view>
-        </view>
+        <cover-view class="sc-fixed-bot">
+            <cover-view class="sfb-view" hover-class="hover-active" @click="confirmOccupy">确定</cover-view>
+        </cover-view>
     </view>
 </template>
 
@@ -91,7 +91,7 @@ export default {
         confirmOccupy: util.debounce(function(){
             let { storeInfo, dateInfo, venueList, typeInfo } = this.occupyInfo;
             let { ocPrice, ocReaon, light_up } = this;
-            
+            util.showLoad();
             servers.post({
                 url: API.venue.venueTakeUp,
                 data: {
@@ -113,6 +113,7 @@ export default {
                 isDefaultGet: false
             })
             .then(res=>{
+                util.hideLoad();
                 if(res.data.code == 0){
                     
                     util.showNone(res.data.message || '操作成功！');
@@ -130,6 +131,7 @@ export default {
                     util.showNone(res.data.message || '操作失败！');
                 }
             })
+            .catch(util.hideLoad)
 
         }, 300, true),
     },
@@ -299,7 +301,7 @@ export default {
             padding-bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
             padding-bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
             background-color: #fff;
-            >view{
+            .sfb-view{
                 margin: 0 auto;
                 width: 702upx;
                 height: 88upx;
diff --git a/src/pages/site/occupy_success/occupy_success.vue b/src/pages/site/occupy_success/occupy_success.vue
index 88a473c..e558fcd 100644
--- a/src/pages/site/occupy_success/occupy_success.vue
+++ b/src/pages/site/occupy_success/occupy_success.vue
@@ -37,10 +37,10 @@ export default {
         },
         backBtn(){
             util.routeTo();
-            util.previousPageFunction({ // 刷新占用列表
-                fnName: 'refreshList',
-                query: null
-            })
+            // util.previousPageFunction({ // 刷新占用列表
+            //     fnName: 'refreshList',
+            //     query: null
+            // })
         },
         getPageInfo({
             brand_id,

From ad9246e52fb623d967d849887a2481870eedf634 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 9 Mar 2022 13:24:57 +0800
Subject: [PATCH 2/6] vtest 1.1.18

---
 src/pages/site/confirm/confirm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue
index 1d41797..43095d4 100644
--- a/src/pages/site/confirm/confirm.vue
+++ b/src/pages/site/confirm/confirm.vue
@@ -55,7 +55,6 @@
         </cover-view>
     </view>
 </template>
-
 <script>
 import { mapState } from 'vuex';
 import { API } from '../../../js/api';

From d632fee778f8d70078ebee5dddbe81fe14b7fa5f Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 9 Mar 2022 16:30:34 +0800
Subject: [PATCH 3/6] fix site manage

---
 src/components/site/order_modal/order_modal.vue     |  7 ++++---
 .../reservation_site_detail.vue                     | 21 ++++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue
index 891972d..e1c73eb 100644
--- a/src/components/site/order_modal/order_modal.vue
+++ b/src/components/site/order_modal/order_modal.vue
@@ -66,7 +66,7 @@
 			<view class="om-name-line">
 				<view class="onl-view">预订信息</view>
 			</view>
-			<view class="om-info-line">
+			<view class="om-info-line" v-if="orderInfo.type == 'fixed_venue'">
 				<view class="oil-view">固定场名称：</view>
 				<view class="oil-view">
 					<view class="ov-view">{{ orderInfo.fix_name || '-' }}</view>
@@ -94,7 +94,7 @@
 			</view>
 			<view class="om-total" v-if="isShowTotalAmoutn" >实付款 ￥{{ orderInfo.amount || '0' }}</view>
 			<!-- 管理员占用 -->
-			<view class="om-btns" v-if="orderInfo.type == 'take_up_venue'">
+			<view class="om-btns" v-if="orderInfo.type == 'take_up_venue'&&orderInfo.overdue != true">
 				<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>
@@ -113,7 +113,8 @@
 			<view class="om-btns" v-if="orderInfo.type == 'fixed_venue'">
 				<!-- 测试：固定场地没有详情 -->
 				<view class="ob-view" v-if="orderInfo.pay_status != 0" @click="toOrderInfo">订单详情</view>
-				<view class="ob-view red" @click="fixedCancelOccupy" v-if="orderInfo.pay_status!=2">取消订场</view>
+				<!-- 20220309 测试&PM： 直接不要取消订场是吧 -->
+				<!-- <view class="ob-view red" @click="fixedCancelOccupy" v-if="orderInfo.pay_status!=2&&orderInfo.overdue != true">取消订场</view> -->
 				<!-- <view class="ob-view red">退款</view> -->
 			</view>
 		</view>
diff --git a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
index b5ba273..ec9000b 100644
--- a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
+++ b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
@@ -27,7 +27,7 @@
 				<view :class="['rl-code1', orderInfo.pay_status==2?'rl-code2':'', orderInfo.pay_status==3?'rl-code3':'', orderInfo.pay_status==4?'rl-code4':'']" >{{orderInfo.verify_code || '-'}}<text>({{zh_pay_status(orderInfo.pay_status)}})</text></view>
 			</view>
 			<!-- 已使用 -->
-			<block v-if="orderInfo.pay_status==2">
+			<block v-if="orderInfo.pay_status==2 || orderInfo.pay_status==8">
 				<view class="rb-line">
 					<view class="rl-view">核销方式：</view>
 					<text class="rl-text">{{orderInfo.verify_desc || '-'}}</text>
@@ -36,14 +36,17 @@
 					<view class="rl-view">核销时间：</view>
 					<text class="rl-text">{{orderInfo.verify_time || '-'}}</text>
 				</view>
-				<view class="rb-line">
-					<view class="rl-view">离场方式：</view>
-					<text class="rl-text">{{orderInfo.verify_leave_desc || '-'}}</text>
-				</view>
-				<view class="rb-line">
-					<view class="rl-view">离场时间：</view>
-					<text class="rl-text">{{orderInfo.verify_leave_time || '-'}}</text>
-				</view>
+				<block v-if="orderInfo.pay_status==2">
+					<view class="rb-line">
+						<view class="rl-view">离场方式：</view>
+						<text class="rl-text">{{orderInfo.verify_leave_desc || '-'}}</text>
+					</view>
+					<view class="rb-line">
+						<view class="rl-view">离场时间：</view>
+						<text class="rl-text">{{orderInfo.verify_leave_time || '-'}}</text>
+					</view>
+				</block>
+				
 			</block>
 		</view>
 		<view class="rs-box">

From e80e6d6d68bffe069ea8dac29843e010471cad1a Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 10 Mar 2022 13:57:27 +0800
Subject: [PATCH 4/6] vtest 1.1.19

---
 src/components/site/order_modal/order_modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue
index e1c73eb..f67ae0a 100644
--- a/src/components/site/order_modal/order_modal.vue
+++ b/src/components/site/order_modal/order_modal.vue
@@ -96,7 +96,7 @@
 			<!-- 管理员占用 -->
 			<view class="om-btns" v-if="orderInfo.type == 'take_up_venue'&&orderInfo.overdue != true">
 				<block v-if="orderInfo.pay_status == 0 || orderInfo.pay_status == 1">
-					<view class="ob-view" @click="toShare">分享给朋友</view>
+					<view class="ob-view" @click="toShare" v-if="orderInfo.is_take_up_can_share">分享给朋友</view>
 					<view class="ob-view red" @click="cancelOccupy">取消占用</view>
 				</block>
 			</view>

From f76ac33e3bbb9cf8d153e4aa00e0a4a446185f8e Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 14 Mar 2022 10:58:11 +0800
Subject: [PATCH 5/6] v 1.1.19 formal

---
 src/js/api.js     | 4 ++--
 src/manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/api.js b/src/js/api.js
index 9e91b77..eea9f31 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,5 +1,5 @@
-export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
-// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
+// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
+export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
 // export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 
 
 
diff --git a/src/manifest.json b/src/manifest.json
index 98b6d1a..a5b378a 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -55,7 +55,7 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 微信小程序特有相关 */
-        "appid" : "wx7106e84614cf0060",
+        "appid" : "wxf1294b279ad1b845",
         "setting" : {
             "urlCheck" : false
         },

From 8f2b50958b679c030e24139ae0fd1d5128b51020 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 14 Mar 2022 17:59:59 +0800
Subject: [PATCH 6/6] fix cancel btn

---
 src/components/site/order_modal/order_modal.vue | 3 +--
 src/js/api.js                                   | 4 ++--
 src/manifest.json                               | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue
index f67ae0a..107c569 100644
--- a/src/components/site/order_modal/order_modal.vue
+++ b/src/components/site/order_modal/order_modal.vue
@@ -113,8 +113,7 @@
 			<view class="om-btns" v-if="orderInfo.type == 'fixed_venue'">
 				<!-- 测试：固定场地没有详情 -->
 				<view class="ob-view" v-if="orderInfo.pay_status != 0" @click="toOrderInfo">订单详情</view>
-				<!-- 20220309 测试&PM： 直接不要取消订场是吧 -->
-				<!-- <view class="ob-view red" @click="fixedCancelOccupy" v-if="orderInfo.pay_status!=2&&orderInfo.overdue != true">取消订场</view> -->
+				<view class="ob-view red" @click="fixedCancelOccupy" v-if="orderInfo.pay_status==0&&orderInfo.overdue != true">取消订场</view>
 				<!-- <view class="ob-view red">退款</view> -->
 			</view>
 		</view>
diff --git a/src/js/api.js b/src/js/api.js
index eea9f31..9e91b77 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,5 +1,5 @@
-// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
-export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
+export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
+// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
 // export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 
 
 
diff --git a/src/manifest.json b/src/manifest.json
index a5b378a..98b6d1a 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -55,7 +55,7 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 微信小程序特有相关 */
-        "appid" : "wxf1294b279ad1b845",
+        "appid" : "wx7106e84614cf0060",
         "setting" : {
             "urlCheck" : false
         },