fix order

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">

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: {}

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;

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">

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 || {})

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,
                     })
                 }
             })

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){