From ba42c5676695c2e0a3b08f7f2c10ad002ed29e52 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 26 Jul 2024 18:19:58 +0800
Subject: [PATCH] add tid1553 logic

---
 .../order/components/order_list/filter_modal.vue   |  6 ++-
 .../timekeeping/modules/order_list/deposit.vue     | 22 ++++++---
 .../pages/timekeeping/modules/order_list/site.vue  |  8 ++--
 .../order/pages/timekeeping/order_list.vue         | 53 ++++++++++++++++------
 4 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/src/subpackage/order/components/order_list/filter_modal.vue b/src/subpackage/order/components/order_list/filter_modal.vue
index ec6f28c..08b9d3d 100644
--- a/src/subpackage/order/components/order_list/filter_modal.vue
+++ b/src/subpackage/order/components/order_list/filter_modal.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="filter-modal" v-show="visibled" @click="hide">
-        <view class="fm-container" @click.stop="_=>false">
+        <scroll-view class="fm-container"  scroll-y @click.stop="_=>false">
             <view class="fc-title">{{ title }}</view>
             <view class="fc-list">
                 <view 
@@ -11,7 +11,7 @@
                     @click="itemClick(e)"
                 >{{ e.label }}</view>
             </view>
-        </view>
+        </scroll-view>
     </view>
 </template>
 
@@ -65,10 +65,12 @@ export default {
         top: 0;
         bottom: 0;
         width: 500upx;
+        height: 100%;
         padding-left: 42upx;
         background-color: #fff;
         padding-top: 26upx;
         padding-left: 42upx;
+        padding-bottom: 40upx;
         .fc-title{
             margin-bottom: 58upx;
             padding: 50upx 0;
diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue
index 3282e1c..6f064f5 100644
--- a/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue
+++ b/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue
@@ -1,15 +1,20 @@
 <template>
-    <list-item-temp>
+    <list-item-temp
+        :stadium="order.stadium_name || ''"
+        :status="order.status_text || ''"
+        :price="order.pay_amount || ''"
+        :price-show="true"
+    >
         <template v-slot:default>
             <view class="lc-info">
                 <kv-line label="订单编号：">
-                    <template v-slot:default>qp20200150150245569</template>
+                    <template v-slot:default>{{ order.order_no || '-' }}</template>
                     <template v-slot:right>
-                        <image class="li-icon"></image>
+                        <image class="li-icon" src="../../../../static/images/arrow.png"></image>
                     </template>
                 </kv-line>
-                <kv-line label="项目类型：">押金</kv-line>
-                <kv-line label="创建时间：">2019-08-17 18:02:58</kv-line>
+                <kv-line label="项目类型：">{{ order.project_type_name || '-' }}</kv-line>
+                <kv-line label="创建时间：">{{ order.created_at || '-' }}</kv-line>
             </view>
         </template>
     </list-item-temp>
@@ -19,6 +24,12 @@
 import kvLine from "../../../../components/kv_line.vue";
 import listItemTemp from "./item_temp.vue";
 export default {
+    props: {
+        order: {
+            type: Object,
+            default: () => ({})
+        }
+    },
     components: {
         'kv-line': kvLine,
         'list-item-temp': listItemTemp
@@ -34,7 +45,6 @@ export default {
             flex-shrink: 0;
             width: 32upx;
             height: 32upx;
-            background: skyblue;
         }
     }
 </style>
\ No newline at end of file
diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
index 4541ed9..0443607 100644
--- a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
+++ b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
@@ -3,6 +3,8 @@
         :stadium="order.stadium_name || ''"
         :status="order.status_text || ''"
         :price="order.pay_amount || ''"
+        :status-active="['待支付', '计费中','待使用', '使用中'].includes(order.status_text)"
+        :price-show="['待支付', '待使用', '使用中', '已完成', '已失效', '已退款'].includes(order.status_text)"
     >
         <template v-slot:default>
             <view class="lc-info">
@@ -15,7 +17,7 @@
                 <kv-line label="开始时间：">{{ order.start_time || '-' }}</kv-line>
                 <kv-line label="结束时间：">{{ order.end_time || '-' }}</kv-line>
                 <kv-line label="时长合计：">
-                    <text style="color: #009874;">{{ (order.extension&&order.extension.duration) || '' }}</text>
+                    <text :style="order.status_text === '计费中' ? 'color: #009874;' : ''">{{ (order.extension&&order.extension.duration) || '' }}</text>
                 </kv-line>
                 <kv-line label="创建时间：">{{ order.created_at || '-' }}</kv-line>
                 
@@ -23,8 +25,8 @@
         </template>
         <template v-slot:bottom>
             <view class="lc-btns">
-                <view class="lb-item">取消预约</view>
-                <view class="lb-item">结束计费</view>
+                <view class="lb-item" v-if="order.status_text === '待使用'">取消预约</view>
+                <view class="lb-item" v-if="order.status_text === '计费中'">结束计费</view>
             </view>
         </template>
     </list-item-temp>
diff --git a/src/subpackage/order/pages/timekeeping/order_list.vue b/src/subpackage/order/pages/timekeeping/order_list.vue
index 9a92621..a5a2d01 100644
--- a/src/subpackage/order/pages/timekeeping/order_list.vue
+++ b/src/subpackage/order/pages/timekeeping/order_list.vue
@@ -22,12 +22,12 @@
             </block>
             <block v-else-if="order_type === '1'">
                 <block v-for="(e, i) in orderList" :key="i">
-                    <view class="tl-item">
+                    <view class="tl-item" v-if="e.order_type === 1">
                         <site-list-item :order="e"></site-list-item>
                     </view>
-                    <!-- <view class="tl-item">
-                        <deposit-list-item></deposit-list-item>
-                    </view> -->
+                    <view class="tl-item" v-if="e.order_type === 3">
+                        <deposit-list-item :order="e"></deposit-list-item>
+                    </view>
                 </block>
                 
             </block>
@@ -55,6 +55,10 @@ import endBillingModal from "./modules/order_detail/end_billing_modal.vue";
 import { ORDER_API } from '../../js/api';
 import server from '../../js/server';
 import { showLoad, hideLoad, formatDate, showNone } from '@/utils/util';
+const enumOrderType = {
+    site: '1', // 场时
+    person: '2' // 人时
+}
 export default {
     components: {
         'order-list-header': orderListHeader,
@@ -104,8 +108,8 @@ export default {
     async onLoad(options){
         let _bID = options?.brand_id || '';
         let _order_type = options?.order_type || '';
-        let { start, end } = this.initDefaultDate(_order_type);
-        let { value } = this.initDefaultStatus();
+        let { start, end } = this.initDefaultDate();
+        let { value } = this.initDefaultStatus(_order_type);
         this.getOrderList({
             brand_id: _bID,
             start: start,
@@ -131,7 +135,7 @@ export default {
         showFilterModal(){
             this.$refs.filterModal.init({
                 title: '订单状态',
-                list: this.getFilterList(),
+                list: this.getFilterList(this.order_type),
                 curValue: this.condition.status_text,
                 success: item =>{
                     console.log(item);
@@ -140,22 +144,38 @@ export default {
             });
         },
         // 初始化默认状态
-        initDefaultStatus(){
-            let _ls = this.getFilterList();
+        initDefaultStatus(order_type){
+            let _ls = this.getFilterList(order_type);
             let _defaultItem = _ls?.[0] || {}
             this.condition.status_text = _defaultItem?.value;
             return _defaultItem;
         },
         // 获取筛选列表
-        getFilterList(){
-            let _ls = [
+        getFilterList(order_type){
+            let _obj = {
+                [enumOrderType.site]: [
                     { label: '全部', value: '' },
+                    { label: '已关闭', value: '已关闭' },
                     { label: '计费中', value: '计费中' },
                     { label: '待支付', value: '待支付' },
+                    { label: '待使用', value: '待使用' },
+                    { label: '使用中', value: '使用中' },
+                    { label: '已失效', value: '已失效' },
                     { label: '已完成', value: '已完成' },
+                    { label: '已抵扣', value: '已抵扣' },
                     { label: '已退款', value: '已退款' },
-                ];
-            return _ls;
+                    { label: '已取消预约', value: '已取消预约' },
+                    { label: '已退款', value: '已退款' },
+                ],
+                [enumOrderType.person]: [
+                    { label: '全部', value: '' },
+                    { label: '计费中', value: '计费中' },
+                    { label: '待支付', value: '待支付' },
+                    { label: '已完成', value: '已完成' },
+                    { label: '已退款', value: '已退款' },
+                ]
+            }
+            return _obj?.[order_type] ?? {};
         },
         // 店铺选择
         changeStadium(e){
@@ -208,7 +228,7 @@ export default {
                 url: ORDER_API.billingOrderList,
                 data: { 
                     brand_id, stadium_id, status, 
-                    start, end, order_type, page, page_size,
+                    start, end, order_type: this.getReqOrderType(order_type), page, page_size,
                     status_text
                 },
                 failMsg: '加载失败！'
@@ -227,6 +247,11 @@ export default {
                 this.page = page;
                 
             })
+        },
+        // 获取请求订单类型
+        getReqOrderType(type){
+            if(type === enumOrderType.site)return '1,3'; // 场时需要同时加载押金订单
+            return type;
         }
     }
 }