From c15c223bdc1233dcfae39ae4e95a80ad284ca199 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 15 Jun 2023 11:35:48 +0800
Subject: [PATCH] change class & order_source_text

---
 .../reservation_people_detail.vue                  |  14 +--
 .../reservation_site_detail.vue                    |  14 +--
 .../order/pages/value_card/detail/detail.vue       | 140 +++++++++++----------
 3 files changed, 88 insertions(+), 80 deletions(-)

diff --git a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
index 033e067..283a16f 100644
--- a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
+++ b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
@@ -16,14 +16,12 @@
 			<view class="rh-line">
 				<view>用户昵称：<text>{{orderInfo.nickname || '-'}}</text></view>
 			</view>
-			<block v-if="getMarkTxt">
-				<view class="rh-line">
-					<view>订单来源：<text>{{ orderInfo.extension&&orderInfo.extension.source || '-' }}</text></view>
-				</view>
-				<view class="rh-line">
-					<view>订单备注：<text>{{ getMarkTxt || '-' }}</text></view>
-				</view>
-			</block>
+			<view class="rh-line">
+				<view>订单来源：<text>{{ orderInfo.order_source_text || '-' }}</text></view>
+			</view>
+			<view class="rh-line">
+				<view>订单备注：<text>{{ getMarkTxt || '-' }}</text></view>
+			</view>
 			
 			<!-- 门店是否开启ic卡 -->
 			<block v-if="orderInfo.stadium_has_iccard && orderInfo.pay_status==1">
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 92699c1..2e04b30 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
@@ -19,14 +19,12 @@
 			<view class="rh-line">
 				<view>用户昵称：<text>{{orderInfo.nickname || '-'}}</text></view>
 			</view>
-			<block v-if="getMarkTxt">
-				<view class="rh-line">
-					<view>订单来源：<text>{{ orderInfo.extension&&orderInfo.extension.source || '-' }}</text></view>
-				</view>
-				<view class="rh-line">
-					<view>订单备注：<text>{{ getMarkTxt || '-' }}</text></view>
-				</view>
-			</block>
+			<view class="rh-line">
+				<view>订单来源：<text>{{ orderInfo.order_source_text || '-' }}</text></view>
+			</view>
+			<view class="rh-line">
+				<view>订单备注：<text>{{ getMarkTxt || '-' }}</text></view>
+			</view>
 		</view>
 		<view class="rs-box">
 			<view class="rb-title">验证信息</view>
diff --git a/src/subpackage/order/pages/value_card/detail/detail.vue b/src/subpackage/order/pages/value_card/detail/detail.vue
index 654b221..2f1b358 100644
--- a/src/subpackage/order/pages/value_card/detail/detail.vue
+++ b/src/subpackage/order/pages/value_card/detail/detail.vue
@@ -12,8 +12,8 @@
             <view class="vh-btns">
                 <view @click="toRecord">消费记录</view>
 
-                <view v-if="orderInfo.status == 0 || orderInfo.status == 1" class="red" @click="isDeductModal = true">扣费</view>
-                <view v-if="orderInfo.status == 1" class="orange" @click="isRechargeModal = true">充值</view>
+                <view v-if="orderInfo.status == 0 || orderInfo.status == 1" class="red" @click="deductButton(true)">扣费</view>
+                <view v-if="orderInfo.status == 1" class="orange" @click="rechargeBtn(!isRechargeModal)">充值</view>
                 
             </view>
             <!-- 0: '待激活',
@@ -86,10 +86,62 @@
                 <block slot="name">途径：</block> 
             </a-line> -->
         </view>
+        <view class="modal-mask" v-if="isDeductModal" @click="deductButton(false)">
+            <view class="vc-recharge vc-deductions" @click.stop="_=>false" >
+                <image 
+                    class="vr-close" 
+                    mode="apsectFit" 
+                    @click="deductButton(false)"
+                    src="/subpackage/order/static/images/value_card/close.png"
+                ></image>
+                <view class="vr-tit">扣费</view>
+                
+                <view class="vr-info">
+                    <view><text>储值卡号：</text>{{ orderInfo.card_no || '-' }}</view>
+                    <view><text>手机号码：</text>{{ orderInfo.mobile || '-' }}</view>
+                    <view><text>余额：</text>￥{{ orderInfo.balance || '0' }}</view>
+                </view>
 
-        <view class="vc-mask" v-if="isRechargeModal" @click="isRechargeModal = false">
+                <view class="vr-edit">
+                    <view class="ve-line">
+                        <view class="vl-name"><text>*</text>消费金额</view>
+                        <view class="vl-ipt">
+                            <view class="vi-box">
+                                <view class="vb-btn" @click="deductAmount--"></view>
+                                <view class="vb-ipt">
+                                    <input v-model="deductAmount" type="number" />
+                                </view>
+                                <view class="vb-btn" @click="deductAmount++"></view>
+                            </view>
+                            <view class="vi-unit">元</view>
+                        </view>
+                    </view>
+                    <view class="ve-line" style="margin-bottom: 20rpx;">
+                        <view class="vl-name"><text>*</text>消费场景(单选)</view>
+                    </view>
+                    
+                    <view class="vd-ipt">
+                        <picker mode="selector" :range="consumeTypeList" range-key="consume_type_name" @change="consumeTypePickerChange">
+                            <view class="vi-box">
+                                <input placeholder="请选择消费场景" disabled :value="curConsumeType.consume_type_name" />
+                                <image mode="aspectFit" src="/subpackage/order/static/images/value_card/arrow.png"></image>
+                            </view>
+                        </picker>
+                        <view class="vi-box vi-remark">
+                            <input placeholder="备注(选填)" v-model="deductRemark" />
+                        </view>
+                    </view>
+                </view>
+
+                <view class="vr-btns">
+                    <view @click="deductConfirmBtn">确认</view>
+                </view>
+                
+            </view>
+        </view>
+        <view class="modal-mask" v-if="isRechargeModal" @click="rechargeBtn(false)">
             <view class="vc-recharge" @click.stop="_=>false">
-                <image class="vr-close" @click="isRechargeModal = false"></image>
+                <image class="vr-close" @click="rechargeBtn(false)"></image>
                 <view class="vr-tit">充值</view>
                 
                 <view class="vr-info">
@@ -154,68 +206,13 @@
                 </view>
 
                 <view class="vr-btns">
-                    <view class="white" @click="isRechargeModal = false">取消</view>
+                    <view class="white" @click="rechargeBtn(false)">取消</view>
                     <view @click="rechargeConfirm">确认</view>
                 </view>
                 
             </view>
         </view>
-        
-        <view class="vc-mask" v-if="isDeductModal" @click="isDeductModal = false">
-            <view class="vc-recharge vc-deductions" @click.stop="_=>false" >
-                <image 
-                    class="vr-close" 
-                    mode="apsectFit" 
-                    @click="isDeductModal = false"
-                    src="/subpackage/order/static/images/value_card/close.png"
-                ></image>
-                <view class="vr-tit">扣费</view>
-                
-                <view class="vr-info">
-                    <view><text>储值卡号：</text>{{ orderInfo.card_no || '-' }}</view>
-                    <view><text>手机号码：</text>{{ orderInfo.mobile || '-' }}</view>
-                    <view><text>余额：</text>￥{{ orderInfo.balance || '0' }}</view>
-                </view>
-
-                <view class="vr-edit">
-                    <view class="ve-line">
-                        <view class="vl-name"><text>*</text>消费金额</view>
-                        <view class="vl-ipt">
-                            <view class="vi-box">
-                                <view class="vb-btn" @click="deductAmount--"></view>
-                                <view class="vb-ipt">
-                                    <input v-model="deductAmount" type="number" />
-                                </view>
-                                <view class="vb-btn" @click="deductAmount++"></view>
-                            </view>
-                            <view class="vi-unit">元</view>
-                        </view>
-                    </view>
-                    <view class="ve-line" style="margin-bottom: 20rpx;">
-                        <view class="vl-name"><text>*</text>消费场景(单选)</view>
-                    </view>
-                    
-                    <view class="vd-ipt">
-                        <picker mode="selector" :range="consumeTypeList" range-key="consume_type_name" @change="consumeTypePickerChange">
-                            <view class="vi-box">
-                                <input placeholder="请选择消费场景" disabled :value="curConsumeType.consume_type_name" />
-                                <image mode="aspectFit" src="/subpackage/order/static/images/value_card/arrow.png"></image>
-                            </view>
-                        </picker>
-                        <view class="vi-box vi-remark">
-                            <input placeholder="备注(选填)" v-model="deductRemark" />
-                        </view>
-                    </view>
-                </view>
-
-                <view class="vr-btns">
-                    <view @click="deductConfirmBtn">确认</view>
-                </view>
-                
-            </view>
-        </view>
-
-        <view class="vc-mask" v-if="operateInfo" @click="operateInfo = null">
+        <view class="modal-mask" v-if="operateInfo" @click="operateInfo = null">
             <view class="tip-modal" @click="_=> false">
                 <image class="tm-close"  @click="operateInfo = null" mode="aspectFit" src="/subpackage/order/static/images/value_card/close.png"></image>
                 <image class="tm-icon" mode="aspectFit" src="/subpackage/order/static/images/value_card/success_c098.png"></image>
@@ -232,6 +229,7 @@
                 </view>
             </view>
         </view>
+        
     </view>
 </template>
 <script>
@@ -273,6 +271,13 @@ export default {
         this.getConsumeTypeList();
     },
     methods: {
+        rechargeBtn: util.debounce(function(bol){
+            console.warn(12345)
+            this.isRechargeModal = bol
+        }, 300, true),
+        deductButton: util.debounce(function(bol){
+            this.isDeductModal = bol;
+        }, 300, true),
         cardType(type){
             if(type == 1)return '个人卡';
             if(type == 2 || type == 3)return '团体卡';
@@ -314,12 +319,11 @@ export default {
 
         }, 300, true),
         refreshThis(){
-            this.isDeductModal = false;
+            this.deductButton(false);
             this.deductAmount = 1;
             this.deductRemark = '';
             this.curConsumeType = {};
-
-            this.isRechargeModal = false;
+            this.rechargeBtn(false);
             this.rechargeInfo['amount'] = 0;
             this.rechargeInfo['giveAmount'] = 0;
             this.rechargeInfo['giveDate'] = 0;
@@ -403,6 +407,14 @@ export default {
 
 <style lang="scss">
     @import '~style/public.scss';
+    .modal-mask{
+        position: fixed;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba($color: #000000, $alpha: .5);
+    }
     .value-card-order-info{
         padding: 24upx;
         padding-bottom: calc( 24upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */