From 2aa2b646f2d86f24e6bf137d832f9a715ebee595 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 19 Jun 2023 17:56:44 +0800
Subject: [PATCH] add md230614

---
 src/components/site/order_modal/order_modal.vue    | 11 +++++++++++
 src/pages/site/confirm/confirm.vue                 | 22 +++++++++++++++++-----
 src/pages/site/manage/manage.vue                   | 14 ++++++++++++--
 .../retail/pages/confirm_order/confirm_order.vue   |  6 +++---
 4 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue
index aca5f50..6967c9f 100644
--- a/src/components/site/order_modal/order_modal.vue
+++ b/src/components/site/order_modal/order_modal.vue
@@ -124,6 +124,12 @@
 				<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 class="om-btns" v-if="false">
+				<view class="ob-view" @click="toShare">分享给朋友</view>
+				<view class="ob-view red" @click="cancelOccupy">取消占用</view>
+				<view class="ob-view red2">收款</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -471,6 +477,11 @@ export default {
 					border-color: #EA5061;
 					color: #EA5061;
 				}
+				&.red2{
+					background-color: #EA5061;
+					border-color: #EA5061;
+					color: #fff;
+				}
 			}
 		}
     }
diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue
index d842700..b770ad4 100644
--- a/src/pages/site/confirm/confirm.vue
+++ b/src/pages/site/confirm/confirm.vue
@@ -46,10 +46,17 @@
                     <view class="su-line">
                         <view class="si-tit"><text>* </text>占用用途</view>
                         <view class="su-ls">
-                            <view :class="[ocUsage == 1 ? 'active' : '']" @click="ocUsage = 1">
+                            <block v-for="(e, i) in usageLs" :key="i">
+                                <view :class="[e.type == ocUsage ? 'active' : '']" @click="ocUsage = e.type">
+                                    <text>{{ e.name || "-" }}</text>
+                                    <image v-if="e.type == ocUsage" mode="aspectFit" src='/static/images/icon/selected_tag.png'></image>
+                                </view>
+                            </block>
+                            <!-- <view :class="[ocUsage == 1 ? 'active' : '']" @click="ocUsage = 1">
                                 <text>客户订场</text>
                                 <image v-if="ocUsage == 1" mode="aspectFit" src='/static/images/icon/selected_tag.png'></image>
                             </view>
+
                             <view :class="[ocUsage == 2 ? 'active' : '']" @click="ocUsage = 2">
                                 <text>散客</text>
                                 <image v-if="ocUsage == 2" mode="aspectFit" src='/static/images/icon/selected_tag.png'></image>
@@ -57,7 +64,7 @@
                             <view :class="[ocUsage == 3 ? 'active' : '']" @click="ocUsage = 3">
                                 <text>锁场</text>
                                 <image v-if="ocUsage == 3" mode="aspectFit" src='/static/images/icon/selected_tag.png'></image>
-                            </view>
+                            </view> -->
                         </view>
                     </view>
                     <view class="su-tip">注：占用用途如选择“散客”，用户端次卡列表将会显示该占用场次为散客时间</view>
@@ -85,8 +92,12 @@ export default {
         return {
             ocPrice: '',
             ocReaon: '',
-            ocUsage: 1, // 1 -> 客户订场， 2-> 散客， 3-> 锁场
+            ocUsage: 1, // 1 -> 客户订场， 2-> 散客， 3-> 锁场, 4 -> 挂账
             light_up: false,
+            usageLs: [
+                { name: '客户订场', type: 1 }, { name: '散客', type: 2 },
+                { name: '锁场', type: 3 }, { name: '挂账', type: 4 },
+            ]
         }
     },
     computed: {
@@ -310,12 +321,13 @@ export default {
             .si-usage{
                 padding: 24upx 0;
                 .su-line{
-                    @include centerFlex(flex-start);
+                    display: flex;
                     .su-ls{
+                        flex-wrap: wrap;
                         margin-bottom: 20upx;
                         @include centerFlex(flex-start);
                         >view{
-                            
+                            margin-bottom: 20upx;
                             padding: 0 10upx;
                             width: 152upx;
                             height: 72upx;
diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue
index deee003..2be72cf 100644
--- a/src/pages/site/manage/manage.vue
+++ b/src/pages/site/manage/manage.vue
@@ -133,7 +133,7 @@
         <view class="sm-fixed-tip" v-if="occupyTip!==''">
             <text>{{occupyTip || '-'}}</text>
         </view>
-        <order-modal @close="boardInfo=null" @refresh='refreshVenues'  v-if="boardInfo!=null" :query-info="boardInfo"></order-modal>
+        <order-modal @close="boardInfo=null" @refresh='refreshVenues'  v-if="boardInfo!==null" :query-info="boardInfo"></order-modal>
     </view>
 </template>
 
@@ -166,6 +166,7 @@ export default {
                 { n: '课程预定', c: 'pistac' },
                 { n: '固定场锁定', c: 'blue' },
                 { n: '已占用', c: 'black' },
+                { n: '挂账', c: 'red' },
             ],
             // 订场看板信息
             boardInfo: null, // { brand_id，stadium_id, venue_id, date, duration }
@@ -957,6 +958,11 @@ export default {
                                         border-color: #9A9A9D;
                                         color: #9A9A9D;
                                     }
+                                    &.red{
+                                        color: #fff;
+                                        background-color: #EA5061;
+                                        border-color: #EA5061;
+                                    }
                                 }
                             }
                         }
@@ -1055,7 +1061,7 @@ export default {
                         &:nth-child(2){
                             line-height: 34upx;
                             text-align: center;
-                            font-size: 28upx;
+                            font-size: 24upx;
                             color: #9a9a9d;
                         }
                         &.green{
@@ -1073,6 +1079,10 @@ export default {
                             background-color: #333333;
                             border-color: #333333;
                         }
+                        &.red{
+                            background-color: #EA5061;
+                            border-color: #EA5061;
+                        }
                         
                     }
                 }
diff --git a/src/subpackage/retail/pages/confirm_order/confirm_order.vue b/src/subpackage/retail/pages/confirm_order/confirm_order.vue
index d350b06..cf16f53 100644
--- a/src/subpackage/retail/pages/confirm_order/confirm_order.vue
+++ b/src/subpackage/retail/pages/confirm_order/confirm_order.vue
@@ -288,9 +288,9 @@
 		flex-direction: column;
 		width: 100vw;
 		height: 100vh;
-		padding-bottom: 0rpx;
-		padding-bottom: calc( 0rpx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
-		padding-bottom: calc( 0rpx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+		padding-bottom: 112rpx;
+		padding-bottom: calc( 112rpx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+		padding-bottom: calc( 112rpx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
 		
 		.final-cart-list {
 			display: flex;