From 9f3fe2dbf8cb416f19c0df004c44436bb7481e88 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 26 Oct 2021 18:01:19 +0800
Subject: [PATCH] fix order

---
 src/components/order_list/device/device.vue        |   4 +--
 src/components/order_list/mall/mall.vue            |  10 +++++-
 src/pages/order_list/order_list.vue                |  40 ++++++++++++++++-----
 src/static/images/order_null.png                   | Bin 0 -> 8736 bytes
 .../order/pages/devices/detail/detail.vue          |   4 +--
 src/subpackage/order/pages/mall/detail/detail.vue  |   6 +++-
 .../pages/mall/refund_operate/refund_operate.vue   |  23 +++++++-----
 .../order/pages/mall/send_out/send_out.vue         |  12 +++----
 8 files changed, 70 insertions(+), 29 deletions(-)
 create mode 100644 src/static/images/order_null.png

diff --git a/src/components/order_list/device/device.vue b/src/components/order_list/device/device.vue
index 07073b8..91ff181 100644
--- a/src/components/order_list/device/device.vue
+++ b/src/components/order_list/device/device.vue
@@ -1,10 +1,10 @@
 <template>
  <!-- 售货柜/浴室/咖啡/储物柜订单 -->
     <view class="device-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="dc-line">
                 <image class="dl-img" mode="aspectFit" src="/static/images/icon/location.png"></image>
-                <view class="dl-view">{{ orderInfo.extension.hardware_name || '-' }}</view>
+                <view class="dl-view">{{ orderInfo.hardware_name || '-' }}</view>
             </view> 
         </a-header>
         <view class="dc-info">
diff --git a/src/components/order_list/mall/mall.vue b/src/components/order_list/mall/mall.vue
index 59f0c93..58bebb9 100644
--- a/src/components/order_list/mall/mall.vue
+++ b/src/components/order_list/mall/mall.vue
@@ -23,15 +23,23 @@
         <view class="mo-total"><text class="mt-txt">商品金额合计：</text>¥{{ orderInfo.pay_amount || 0 }}</view>
         <view class="mo-bot">
             <view class="mb-express">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
-            <view class="mb-btn" @click.stop="toSendOut">发货</view>
+            <view class="mb-btn" v-if="orderInfo.status == 1" @click.stop="toSendOut">发货</view>
         </view>
     </view>
 </template>
 
 <script>
+// 订单状态，0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6
 import util from '../../../utils/util';
 export default {
+    computed: {
+        isShowSendMethods(){
+            let { orderInfo } = this;
+            return orderInfo.status == 2 || orderInfo.status == 3 || orderInfo.status == 5 || orderInfo.status == 6
+        },         
+    },
     props: {
+        
         orderInfo: {
             default: {
                 extension: {}
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index cc6bf85..33323b1 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -45,7 +45,7 @@
               </view>
           </view>
       </view>
-      <view class="ol-order-list">
+      <view class="ol-order-list" v-if="orderList&&orderList.length">
             <view class="ool-item" v-for="(e,i) in orderList" :key="i" >
                 <reservation-order :order-info="e" v-if="orderType == 3"></reservation-order>
                 <membership-order :order-info="e" v-if="orderType == 4"></membership-order>
@@ -71,6 +71,10 @@
             </view> -->
             
       </view>
+      <view class="ol-order-null" v-else>
+          <image mode="aspectFit" src="/static/images/order_null.png"></image>
+          <view>暂无内容</view>
+      </view>
       <!-- 分类tab -->
       <view class="ox-dark-mask" v-if="isShowClassify" @click="hideClassify">
           <view class="ol-classify" @click.stop="()=>false">
@@ -161,12 +165,14 @@
             isStoreInfo(){
                 let { orderType } = this;
                 return (
-                    orderType == 3 || orderType == 4 || 
-                    orderType == 1 || orderType == 10 ||
+                    orderType == 3  || orderType == 4  || 
+                    orderType == 1  || orderType == 10 ||
                     orderType == 18 || orderType == 12 ||
                     orderType == 18 || orderType == 12 ||
                     orderType == 15 || orderType == 16 ||
-                    orderType == 8
+                    orderType == 8  || orderType == 7  ||
+                    orderType == 11 || orderType == 6  || 
+                    orderType == 9
                 )
             },
             // 分类列表
@@ -426,9 +432,10 @@
 
                 let { brandInfo, curTabID, periodInfo, orderType, curSelectedStore, appointOrderType, selectedOrderType } = this;
                 let _curSelectedStore = curSelectedStore || {};
+                let _startTime = periodInfo.start ? periodInfo.start + ' ' + '00:00:00' : '', _endTime = periodInfo.end ? periodInfo.end + ' ' + '23:59:59' : ''; // 20211026 后端接口需要整形
                 let _obj = {
-                    begin: periodInfo.start || '',
-                    end: periodInfo.end || '',
+                    begin: _startTime,
+                    end: _endTime,
                     status: curTabID, 
                     brand_id: brandInfo.brand.id,
                     stadium_id: _curSelectedStore.id || ''
@@ -444,8 +451,8 @@
                 // 助手约玩订单修改, 按后端荣升0430重写接口重新定制字段.后续后端家兴0507重新接手该接口的修改(涉及约玩订单列表及订单详情)
                 if(orderType == "10"){ 
 					_obj['type'] = selectedOrderType;
-					_obj['filter_start_time'] = periodInfo.start;
-					_obj['filter_end_time'] = periodInfo.end;
+					_obj['filter_start_time'] = _startTime;
+					_obj['filter_end_time'] = _endTime;
 					_obj['pay_status'] = curTabID;
 				};
 
@@ -665,6 +672,23 @@
             margin-bottom: 24upx;
         }
     }
+    .ol-order-null{
+        padding-top: 114upx;
+        >image{
+            margin: 0 auto 70upx;
+            display: block;
+            width: 380upx;
+            height: 380upx;
+        }
+        >view{
+            text-align: center;
+            line-height: 44upx;
+            font-size: 32upx;
+            color: #9A9A9D;
+
+        }        
+
+    }
     .ol-classify{
         position: absolute;
         right: 0;
diff --git a/src/static/images/order_null.png b/src/static/images/order_null.png
new file mode 100644
index 0000000000000000000000000000000000000000..51835332f4c5b64fc75fe8816190f4e4e2203988
GIT binary patch
literal 8736
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
H|BL!Rgr_n;

literal 0
HcmV?d00001

diff --git a/src/subpackage/order/pages/devices/detail/detail.vue b/src/subpackage/order/pages/devices/detail/detail.vue
index a31d26a..79003b9 100644
--- a/src/subpackage/order/pages/devices/detail/detail.vue
+++ b/src/subpackage/order/pages/devices/detail/detail.vue
@@ -4,8 +4,8 @@
         <o-header
             :logo='orderInfo.stadium_logo'
             :source='orderInfo.stadium_name'
-            :phone='orderInfo.phone'
-            :name='orderInfo.name'
+            :phone='orderInfo.mobile'
+            :name='orderInfo.nickname'
             :status='pay_txt(orderInfo.pay_status)'
         ></o-header>
         <view class="rent-info dcd-box">
diff --git a/src/subpackage/order/pages/mall/detail/detail.vue b/src/subpackage/order/pages/mall/detail/detail.vue
index 2eb4869..fa67c1f 100644
--- a/src/subpackage/order/pages/mall/detail/detail.vue
+++ b/src/subpackage/order/pages/mall/detail/detail.vue
@@ -81,7 +81,7 @@
             <view class="ms-fixed-bar">
                 <view class="mfb-btns">
                     <!-- <view>查看退款</view> -->
-                    <view v-if="orderInfo.status == 1" class="red" @click="toRefund">主动退款</view>
+                    <view v-if="isRufundBtn" class="red" @click="toRefund">主动退款</view>
                     <view v-if="orderInfo.status == 1" class="green" @click="toSendOut">发货</view>
                 </view>
             </view>
@@ -98,6 +98,10 @@ import server from '../../../js/server';
 import util from '../../../../../utils/util';
 export default {
     computed: {
+        isRufundBtn(){
+            let { orderInfo } = this;
+            return (orderInfo.status!=6 || orderInfo.status != 7)
+        },
         order_custom(){
             let { orderInfo } = this;
             if(orderInfo&&orderInfo.product_order_custom)return (orderInfo.product_order_custom || {})
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 3303e04..4f95bab 100644
--- a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
+++ b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
@@ -7,10 +7,13 @@
                 <view>{{ refundLs[0].product_name || '-' }}</view>
             </view>
             <view class="rgi-list" v-else>
-                <view class="rl-item" v-for="(e, i) in refundLs" :key="i">
-                    <image mode="aspectFill" :src="e.product_imgs"></image>
-                    <view>{{ e.product_name || '-' }}</view>
-                </view>
+                <block v-for="(e, i) in refundLs" :key="i">
+                    <view class="rl-item" v-if="i<=2">
+                        <image mode="aspectFill" :src="e.product_imgs"></image>
+                        <view>{{ e.product_name || '-' }}</view>
+                    </view>
+                </block>
+                
             </view>
             
             <view class="rgi-total">
@@ -19,8 +22,8 @@
             </view>
         </view>
         <view class="ro-box ro-refund-info">
-            <view class="rri-txt">最大可退金额 <text>￥{{ orderInfo.pay_amount || 0 }}</text>（含运费￥{{ orderInfo.product_logistics_price || 0 }}）</view>
-            <view class="rri-txt">可退积分：{{ orderInfo.deduction_integral || 0 }} 积分</view>
+            <view class="rri-txt">最大可退金额 <text>￥{{ orderInfo.extension.refundable_amount || 0 }}</text>（含运费￥{{ orderInfo.product_logistics_price || 0 }}）</view>
+            <view class="rri-txt">可退积分：{{ orderInfo.extension.refundable_integral || 0 }} 积分</view>
             <!-- 不支持部分退款 -->
             <!-- <view class="rri-line">
                 <view class="rl-name"><text>*</text>退款金额</view>
@@ -69,7 +72,9 @@ export default {
     },
     data(){
         return {
-            orderInfo: {},
+            orderInfo: {
+                extension: {}
+            },
             selectedLs: '',
             refundAmount: '',
             refundIntegral: '',
@@ -91,8 +96,8 @@ export default {
                         brand_id: orderInfo.brand_id,
                         order_no: orderInfo.order_no,
                         product_cart_id: orderInfo.product_order_goods.map(ele=>ele.product_cart_id).join(','),
-                        integral: orderInfo.integral,
-                        amount: orderInfo.amount,
+                        integral: orderInfo.extension.refundable_integral || 0,
+                        amount: orderInfo.extension.refundable_amount || 0,
                     })
                 }
             })
diff --git a/src/subpackage/order/pages/mall/send_out/send_out.vue b/src/subpackage/order/pages/mall/send_out/send_out.vue
index 5c45aaa..df81259 100644
--- a/src/subpackage/order/pages/mall/send_out/send_out.vue
+++ b/src/subpackage/order/pages/mall/send_out/send_out.vue
@@ -42,7 +42,7 @@
                         <view class="og-list">
                             <view class="ol-item" v-for="(e, i) in waitdeliverLs" :key="i" @click="goodsItemClick(e)">
                                 <view class="oi-select">
-                                    <image v-if="selectedSendOutIds.includes(e.product_id)" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image>
+                                    <image v-if="selectedSendOutIds.includes(e.product_cart_id)" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image>
                                 </view>
                                 <image mode="aspecfFill" :src="e.product_imgs"></image>
                                 <view class="oi-info">
@@ -177,14 +177,14 @@ export default {
         // 选中发货 id列表
         selectedSendOutIds(){
             let { selectedSendOutLs } = this;
-            return selectedSendOutLs.map(e=>e.product_id);
+            return selectedSendOutLs.map(e=>e.product_cart_id);
         },  
         // 待发货列表全选
         isSelectedAllSendOut(){
             let { selectedSendOutIds, waitdeliverLs } = this;
             let _unLs = []; // 未被选中列表
             if(!waitdeliverLs.length)return false;
-            _unLs = waitdeliverLs.filter(ele => !selectedSendOutIds.includes(ele.product_id));
+            _unLs = waitdeliverLs.filter(ele => !selectedSendOutIds.includes(ele.product_cart_id));
             return _unLs.length == 0;
         }
     },
@@ -230,10 +230,10 @@ export default {
             this.getInfo(order_no);
         },
         confirmSendOutBtn: util.debounce(function(){
-            let { order_no, selectedSendOutLs, selectedWarehouse, sendOutMethod, curlogisticsName, logisticsOrderNum, sendOutRemark } = this;
+            let { order_no,  selectedSendOutLs, selectedSendOutIds, selectedWarehouse, sendOutMethod, curlogisticsName, logisticsOrderNum, sendOutRemark } = this;
             let _query = {
                 order_no,
-                ids: selectedSendOutLs.map(ele=>ele.product_cart_id),
+                ids: selectedSendOutIds,
                 esh_type: selectedWarehouse.erp_type,
                 esh_id: selectedWarehouse.erp_id,
                 logistics_type: sendOutMethod,
@@ -285,7 +285,7 @@ export default {
         },
         goodsItemClick(e){
             let { selectedSendOutIds, selectedSendOutLs } = this;
-            if(selectedSendOutIds.includes(e.product_id))return this.selectedSendOutLs = selectedSendOutLs.filter(ele=>ele.product_id !=e.product_id);
+            if(selectedSendOutIds.includes(e.product_cart_id))return this.selectedSendOutLs = selectedSendOutLs.filter(ele=>ele.product_cart_id !=e.product_cart_id);
             this.selectedSendOutLs = [ ...selectedSendOutLs, e];
         },
         tabChange(idx){