From bd75573fea9a98ec3eb17ca72b2e0feb915b01d3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 27 Oct 2021 16:44:43 +0800
Subject: [PATCH] fix order

---
 .../order_list/club_rental/club_rental.vue         | 11 +++++---
 src/components/order_list/device/device.vue        |  2 +-
 src/components/order_list/locker/locker.vue        |  4 +--
 .../spectacular_monent/spectacular_monent.vue      |  2 +-
 src/pages/order_list/order_list.vue                | 33 +++++++++++++---------
 src/pages/order_search/order_search.vue            | 25 +++++++++-------
 src/subpackage/order/js/api.js                     |  2 +-
 .../order/pages/club_rental/detail/detail.vue      | 12 +++++++-
 .../order/pages/devices/detail/detail.vue          |  6 ++--
 .../pages/mall/refund_operate/refund_operate.vue   |  2 +-
 .../order/pages/rent_and_sale/detail/detail.vue    |  6 ++--
 .../pages/spectacular_monent/detail/detail.vue     |  2 +-
 12 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/src/components/order_list/club_rental/club_rental.vue b/src/components/order_list/club_rental/club_rental.vue
index c2ece31..a5565d2 100644
--- a/src/components/order_list/club_rental/club_rental.vue
+++ b/src/components/order_list/club_rental/club_rental.vue
@@ -1,6 +1,7 @@
 <template>
+    <!-- 租球机 -->
     <view class="club-rental-container" @click="toInfo">
-        <a-header :source="orderInfo.source || '-'" :status="getStatusTxt(orderInfo.pay_status)">
+        <a-header :source="orderInfo.source || '-'" :status="orderInfo.extension.status_text || '-'">
             <view slot="line" class="crc-line">
                 <image class="cl-img" mode="aspectFit" src="/static/images/icon/location.png"></image>
                 <view class="cl-view">{{ orderInfo.hardware_name || '-' }}</view>
@@ -47,7 +48,9 @@ export default {
     },
     props: {
         orderInfo: {
-            default: {},
+            default: {
+                extension: {}
+            },
             type: Object
         }
     },
@@ -58,9 +61,9 @@ export default {
             let { orderInfo } = this;
             util.routeTo(`/subpackage/order/pages/club_rental/detail/detail?order_no=${orderInfo.order_no}`, 'nT');
         },
-        getStatusTxt(status = 0){
+        getStatusTxt(status = -1){
             let _obj = {
-                1: '寄存中',
+                0: '租用中',
                 2: '已完成',
                 4: '已退款',
             }
diff --git a/src/components/order_list/device/device.vue b/src/components/order_list/device/device.vue
index 91ff181..dae5b1a 100644
--- a/src/components/order_list/device/device.vue
+++ b/src/components/order_list/device/device.vue
@@ -1,5 +1,5 @@
 <template>
- <!-- 售货柜/浴室/咖啡/储物柜订单 -->
+ <!-- 售货柜/浴室/咖啡/ -->
     <view class="device-container" @click="toInfo">
         <a-header :source="orderInfo.stadium_name" :status="status_txt(orderInfo.pay_status)">
             <view slot="line" class="dc-line">
diff --git a/src/components/order_list/locker/locker.vue b/src/components/order_list/locker/locker.vue
index 78adfeb..2a2ed37 100644
--- a/src/components/order_list/locker/locker.vue
+++ b/src/components/order_list/locker/locker.vue
@@ -1,9 +1,9 @@
 <template>
     <view class="locker-container" @click="toInfo">
-        <a-header :source="orderInfo.source" :status="status_txt(orderInfo.pay_status)">
+        <a-header :source="orderInfo.stadium_name" :status="status_txt(orderInfo.pay_status)">
             <view slot="line" class="lc-line">
                 <image class="ll-img" mode="aspectFit" src="/static/images/icon/location.png"></image>
-                <view class="ll-view">{{ orderInfo.extension.hardware_name || '-' }}</view>
+                <view class="ll-view">{{ orderInfo.hardware_name || '-' }}</view>
             </view> 
         </a-header>
         <view class="lc-info">
diff --git a/src/components/order_list/spectacular_monent/spectacular_monent.vue b/src/components/order_list/spectacular_monent/spectacular_monent.vue
index 27699ca..cd6498a 100644
--- a/src/components/order_list/spectacular_monent/spectacular_monent.vue
+++ b/src/components/order_list/spectacular_monent/spectacular_monent.vue
@@ -11,7 +11,7 @@
             <a-line :value="orderInfo.price_type_text || '-'">
                 <block slot="name">类型：</block> 
             </a-line>
-            <block v-if="orderInfo.order_type == 0">
+            <block v-if="orderInfo.order_type == 0 || orderInfo.order_type == 2">
                 <a-line :value="orderInfo.venue_name || '-'">
                     <block slot="name">场地：</block> 
                 </a-line>
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 33323b1..cbdf843 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -99,7 +99,7 @@
                   <view class="op-time">
                       <text>开始时间</text>
                       <view>
-                          <input placeholder="选择时间" disabled :value="tempTimer.start" />
+                          <input placeholder="选择时间" disabled :value="tempTimer.start || periodInfo.start" />
                           <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
                       </view>
                   </view>
@@ -108,7 +108,7 @@
                   <view class="op-time">
                       <text>截止时间</text>
                       <view>
-                          <input placeholder="选择时间" disabled :value="tempTimer.end" />
+                          <input placeholder="选择时间" disabled :value="tempTimer.end || periodInfo.end" />
                           <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
                       </view>
                   </view>
@@ -310,8 +310,8 @@
                 let _obj = { start: '', end: '' };
 
                 if(type == 3 ){
-                    _obj['start']=util.formatDate({});
-                    _obj['end'] = util.formatDate({date: _afterSeven});
+                    _obj['start']=util.formatDate({date: _beforeSeven});
+                    _obj['end'] = util.formatDate({});
                 }
 
                 if(type == 4 || type == 1){
@@ -344,13 +344,20 @@
             },
             confirmPeriod(){
                 let { start, end } = this.tempTimer;
+                let { tempTimer, periodInfo } = this;
+                let _start = tempTimer.start || periodInfo.start || '';
+                let _end = tempTimer.end || periodInfo.end || '';
+                this.periodInfo = { 
+                    start: _start,
+                    end: _end,
+                 };
 
                 if(
-                    !start || !end || 
-                    new Date(start.replace(/\-/g,'/')).getTime()>=new Date(end.replace(/\-/g,'/')).getTime()
+                    // !start || !end || 
+                    new Date(start.replace(/\-/g,'/')).getTime()> new Date(end.replace(/\-/g,'/')).getTime()
                 )return util.showNone('请选择合理时间！');
 
-                this.periodInfo = { ...this.tempTimer };
+                
                 this.hidePeriodModal();
                 this.$nextTick(this.refreshList);
             },
@@ -563,14 +570,14 @@
             case 11:  // 浴室 筛选 status  ：  全部 1,4    交易成功 1  退款完成 4
             case 9:  // 咖啡机 筛选 status  ：  全部 1,4    交易成功 1  退款完成 4
                 return [ {id: '1,4', name: '全部'}, {id: 1, name: '交易成功'}, {id: 4, name: '退款完成 '}];
-            case 7:  // 储物柜 筛选  status ：  全部 1,2,4    寄存中 1  已完成 2   退款完成 4
-                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '寄存中'}, {id: 2, name: '已完成'}, {id: 4, name: '退款完成 '}];
+            case 7:  // 储物柜 筛选  status ：  全部 1,2,4    寄存中 1  已完成 2   退款完成 4   
+                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '寄存中'}, {id: 2, name: '已完成'}, {id: 4, name: '退款完成'}];
             case 14:  // 赛事订单列表 订单状态  全部1,2,4   1=进行中   4=已退款     2=已完成 
-                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款 '}];
-            case 2:  // 商城订单  0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6
-                return [ {id: '1,2,3,6', name: '全部'}, {id: 0, name: '待支付'}, {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '已完成 '}, {id: 4, name: '已关闭 '}, {id: 5, name: '退款中 '}, {id: 6, name: '已退款 '}];
+                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'}];
+            case 2:  // 商城订单  0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6  // 测试： 不显示全部分组
+                return [ {id: '0,1,2,3,4,5,6', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 5, name: '申请售后中'}, {id: 6, name: '退款完成'}];
             case 8:  // 租售柜 筛选的 status   全部 1,2,4    租用中 1   已完成 2    已退款4    已购买5
-                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成 '}, {id: 4, name: '已退款 '},{id: 5, name: '已购买 '}];
+                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}];
             default:  
                 return []
         }
diff --git a/src/pages/order_search/order_search.vue b/src/pages/order_search/order_search.vue
index 274ca4b..348a502 100644
--- a/src/pages/order_search/order_search.vue
+++ b/src/pages/order_search/order_search.vue
@@ -156,18 +156,20 @@ export default {
         }){
             let { brandInfo } = this;
             util.showLoad();
+            let _data = {
+                key,
+                begin: '',
+                end: '',
+                status: '',
+                brand_id: brandInfo.brand.id,
+                stadium_id: '',
+                page,
+                page_size,
+            }
+            if(orderType in deviceTypeObj())_data['type'] = deviceTypeObj()[orderType];
             servers.get({
                 url: this.getApiUrl(orderType),
-                data: {
-                    key,
-                    begin: '',
-                    end: '',
-                    status: '',
-                    brand_id: brandInfo.brand.id,
-                    stadium_id: '',
-                    page,
-                    page_size,
-                },
+                data: _data,
                 failMsg: '加载失败！'
             })
             .then(res=>{
@@ -184,6 +186,9 @@ export default {
             })
             .catch(util.hideLoad)
         },
+        getReqQuery(){
+
+        }
     }
 }
 
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index 1f67d9c..6665d7c 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -9,7 +9,7 @@ export const ORDER_API = {
 	userValueCardRecharge:`${ORIGIN}/admin/userValueCard/recharge`,  // 用户储值卡-充值_copy
 	momentOrderInfo:`${ORIGIN}/admin/perfect/moment/order/get`,  // 后台-高光时刻订单详情_copy
 	hardwareOrderInfo:`${ORIGIN}/admin/assistant/hardware/order/get`,  // 硬件管理-订单详情_copy
-	rentballRefundDeposit:`${ORIGIN}/admin/stadium/rentball/order/refundDeposit`,  // 退押金-后台
+	rentballRefundDeposit:`${ORIGIN}/admin/assistant/rentball/refundDeposit`,  // 退押金-后台
 	hardwareOrderGet:`${ORIGIN}/admin/assistant/hardware/order/get`,  // 硬件订单详情 储物柜/售货柜/水阀/咖啡机/租售柜
 	lockEndBill:`${ORIGIN}/admin/stadium/locker/endBill`,  // 储物柜-结束计费
 	currentUser:`${ORIGIN}/admin/assistant/currentUser`,  // 获取当前用户信息
diff --git a/src/subpackage/order/pages/club_rental/detail/detail.vue b/src/subpackage/order/pages/club_rental/detail/detail.vue
index 264c0d7..413ce8f 100644
--- a/src/subpackage/order/pages/club_rental/detail/detail.vue
+++ b/src/subpackage/order/pages/club_rental/detail/detail.vue
@@ -196,6 +196,16 @@ export default {
             })
         },
         depositRefundBtn: util.debounce(function(){
+            util.showModal({
+                title: '提示',
+                content: '是否确认退回押金',
+                success: mRes=>{
+                    if(mRes.confirm)this.refundReq();
+                }
+            })
+            
+        }, 300, true),
+        refundReq(){
             util.showLoad();
             let { orderInfo } = this;
             server.post({
@@ -215,7 +225,7 @@ export default {
                 }   
             })
             .catch(util.hideLoad)
-        }, 300, true)
+        }
     },
 }
 </script>
diff --git a/src/subpackage/order/pages/devices/detail/detail.vue b/src/subpackage/order/pages/devices/detail/detail.vue
index 79003b9..813a72b 100644
--- a/src/subpackage/order/pages/devices/detail/detail.vue
+++ b/src/subpackage/order/pages/devices/detail/detail.vue
@@ -27,9 +27,9 @@
             </a-line>
             <view class="ri-line"></view>
             <view class="ri-price">
-                <s-line :keyname="'积分抵扣'" :value="orderInfo.deduction_amount || '0'"></s-line>
-                <s-line :keyname="'折扣金额'" :value="orderInfo.discount_amount || '0'"></s-line>
-                <s-line :keyname="'优惠券优惠'" :value="orderInfo.coupons_amount || '0'"></s-line>
+                <s-line :keyname="'积分抵扣'" :value="'￥' + (orderInfo.deduction_amount || '0')"></s-line>
+                <s-line :keyname="'折扣金额'" :value="'￥' + (orderInfo.discount_amount || '0')"></s-line>
+                <s-line :keyname="'优惠券优惠'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
                 <view class="rp-total"><text>合计支付：</text>￥{{orderInfo.pay_amount || '0'}}</view>
             </view>
         </view>
diff --git a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
index 4f95bab..3b34291 100644
--- a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
+++ b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
@@ -125,7 +125,7 @@ export default {
                 util.hideLoad();
                 if(res.data.code == 0){
                     util.showNone(res.data.message || '操作成功！');
-                    setInterval(util.routeTo, 1200);
+                    setTimeout(util.routeTo, 1200);
                 }else{
                     util.showNone(res.data.message || '操作失败！');
                 }
diff --git a/src/subpackage/order/pages/rent_and_sale/detail/detail.vue b/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
index 9e7da77..2d85e03 100644
--- a/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
+++ b/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
@@ -42,9 +42,9 @@
                     <block slot="name">产生费用：</block> 
                 </a-line>
                 <block v-if="orderInfo.pay_status == 2">
-                    <s-line :keyname="'积分抵扣'" :value="'￥' + (orderInfo.deduction_amount || '0')"></s-line>
-                    <s-line :keyname="'折扣金额'" :value="'￥' + (orderInfo.discount_amount || '0')"></s-line>
-                    <s-line :keyname="'优惠券优惠'" :value="'￥'+ (orderInfo.coupons_amount || '0')"></s-line>
+                    <s-line :keyname="'积分抵扣'" :value="'-￥' + (orderInfo.deduction_amount || '0')"></s-line>
+                    <s-line :keyname="'折扣金额'" :value="'-￥' + (orderInfo.discount_amount || '0')"></s-line>
+                    <s-line :keyname="'优惠券优惠'" :value="'-￥'+ (orderInfo.coupons_amount || '0')"></s-line>
                     <view class="rpi-total"><text>合计支付：</text>￥{{ orderInfo.rent_amount || '0' }}</view>
                     <view class="ras-border"></view>
                     <view class="rpi-refund-info">
diff --git a/src/subpackage/order/pages/spectacular_monent/detail/detail.vue b/src/subpackage/order/pages/spectacular_monent/detail/detail.vue
index 031f41d..fc205bf 100644
--- a/src/subpackage/order/pages/spectacular_monent/detail/detail.vue
+++ b/src/subpackage/order/pages/spectacular_monent/detail/detail.vue
@@ -18,7 +18,7 @@
             <a-line :value="orderInfo.price_type_text || '-'">
                 <block slot="name">产品名称：</block> 
             </a-line>
-            <block v-if="orderInfo.order_type == 0">
+            <block v-if="orderInfo.order_type == 0 || orderInfo.order_type == 2">
                 <a-line :value="orderInfo.venue_name || '-'">
                     <block slot="name">场地：</block> 
                 </a-line>