From f703781e4fd88ace8c4a02d0f6dd14035674c6cf Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 20 Oct 2021 17:09:33 +0800
Subject: [PATCH] add mall order

---
 src/components/order_list/mall/mall.vue            |   1 -
 src/subpackage/order/js/api.js                     |   1 +
 .../pages/mall/check_logistic/check_logistic.vue   |  56 ++++++--
 src/subpackage/order/pages/mall/detail/detail.vue  |  50 +++++--
 .../pages/mall/refund_operate/refund_operate.vue   | 141 ++++++++++++++++---
 .../order/pages/mall/send_out/send_out.vue         | 150 +++++++++++----------
 .../order/pages/order_manage/order_manage.vue      |   2 +-
 .../order/static/images/package_icon.png           | Bin 0 -> 14144 bytes
 8 files changed, 289 insertions(+), 112 deletions(-)
 create mode 100644 src/subpackage/order/static/images/package_icon.png

diff --git a/src/components/order_list/mall/mall.vue b/src/components/order_list/mall/mall.vue
index 1b126b5..783bd75 100644
--- a/src/components/order_list/mall/mall.vue
+++ b/src/components/order_list/mall/mall.vue
@@ -87,7 +87,6 @@ export default {
                     width: 152upx;
                     height: 152upx;
                     border-radius: 10upx;
-                    background-color: skyblue;
 
                 }
                 .ri-view{
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index b6e128e..696b42c 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -20,6 +20,7 @@ export const ORDER_API = {
 	erpshList:`${ORIGIN}/stadium/erpsh/newList`,  // 商城订单管理-统一的仓库列表
 	shop2OrderLogistics:`${ORIGIN}/admin/shop2/orderLogistics`,  // 商城订单管理 - 发货_
 	logisticsCompanyLs:`${ORIGIN}/shop2/logisticsCompany/List`,  // 商城订单管理 - 快递公司列表
+	orderGoodsRefund:`${ORIGIN}/admin/shop2/orderGoodsRefund`,  // 商城-商品退款_copy
 
 }
 
diff --git a/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue b/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue
index 33dc2bf..51806b9 100644
--- a/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue
+++ b/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue
@@ -1,24 +1,64 @@
 <template>
     <view class="check-logistic">
         <view class="package-list">
-            <view class="pl-item" v-for="i in 2" :key="i">
-                <view class="pi-tit">包裹1</view>
-                <view class="pi-express"><view>快递：顺丰速递    SF1090317923085</view><view>复制</view></view>
+            <view class="pl-item" v-for="(e, i) in logisticsInfo" :key="i">
+                <view class="pi-tit">包裹{{ i+1 }}</view>
+                <view class="pi-express">
+                    <view>快递：快递：{{ e.logistics_info.logistics_name || '-' }}    {{ e.logistics_info.logistics_no || '-' }}</view>
+                    <view @click="copyNo(e.logistics_info.logistics_no || '-')">复制</view>
+                </view>
                 <view class="pi-goods">
-                    <view class="pg-item" v-for="i in 4" :key="i">
-                        <image></image>
-                        <view>克洛羽毛球…</view>
+                    <view class="pg-item" v-for="(k, j) in e.logistics_product_lite_list" :key="j">
+                        <image mode="aspectFill" :src="k.product_imgs"></image>
+                        <view>{{ k.product_name || '-' }}</view>
                     </view>
                 </view>
-                <view class="pi-total">共10件商品</view>
+                <view class="pi-total">共{{ e.logistics_product_lite_list.length || 0 }}件商品</view>
             </view>
         </view>
     </view>
 </template>
 
 <script>
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import util from '../../../../../utils/util';
 export default {
-
+    computed: {
+        logisticsInfo(){
+            let { orderInfo } = this;
+            if(orderInfo.product_order_logistics_data&&orderInfo.product_order_logistics_data.length){
+                return orderInfo.product_order_logistics_data
+            }
+            return []
+        },
+    },
+    onLoad(options){
+        this.getInfo(options.order_no);
+    },
+    data(){
+        return {
+            orderInfo: {},
+        }
+    },
+    methods: {
+        copyNo(num){
+            uni.setClipboardData({ data: num });
+        },
+        getInfo(order_no){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.shop2OrderInfo,
+                data: { order_no },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                util.hideLoad();
+                let _order = res.order || {};
+                this.orderInfo = _order;
+            })
+        },
+    }
 }
 </script>
 
diff --git a/src/subpackage/order/pages/mall/detail/detail.vue b/src/subpackage/order/pages/mall/detail/detail.vue
index 0111c8f..b3d420a 100644
--- a/src/subpackage/order/pages/mall/detail/detail.vue
+++ b/src/subpackage/order/pages/mall/detail/detail.vue
@@ -2,12 +2,12 @@
     <view class="mall-detail">
         <view class="md-send">
             <view class="ms-status-bar">{{ orderInfo.status_text || '-' }}</view>
-            <view class="ms-send-info">
+            <view class="ms-send-info" v-if="logisticsInfo" @click="toLogisticInfo">
                 <view class="msi-txt">
-                    <view>快递：顺丰速递  SF1090317923085</view>
-                    <view>复制</view>
+                    <view>快递：{{ logisticsInfo.logistics_info.logistics_name || '-' }}  {{ logisticsInfo.logistics_info.logistics_no || '-' }}</view>
+                    <view @click.stop="copyLogisticNum(logisticsInfo.logistics_info.logistics_no || '-')">复制</view>
                 </view>
-                <image></image>
+                <image mode="aspectFit" src="/subpackage/order/static/images/arrow.png"></image>
             </view>
             <view class="ms-main">
                 <view class="md-box ms-consignee">
@@ -19,7 +19,6 @@
                         <view class="mc-code">取货码：{{ orderInfo.product_order_self_pickup_info.gcode || '-' }}</view>
                         <view class="mc-time">取货时间： {{ orderInfo.product_order_self_pickup_info.gtime || '-' }}</view>
                     </block>
-                    
                 </view>
                 <view class="md-box ms-goods-info">
                     <view class="md-tit">商品信息</view>
@@ -41,7 +40,8 @@
                                 </view>
                                 <view class="mi-amount">
                                     <view>实付：¥<text>{{ e.product_price_pay || 0 }}</text></view>
-                                    <view>已退款</view>
+                                    
+                                    <!-- <view>已退款</view> -->
                                 </view>
                             </view>
                         </view>
@@ -80,9 +80,9 @@
             </view>
             <view class="ms-fixed-bar">
                 <view class="mfb-btns">
-                    <view>查看退款</view>
-                    <view class="red">主动退款</view>
-                    <view class="green" @click="toSendOut">发货</view>
+                    <!-- <view>查看退款</view> -->
+                    <view v-if="orderInfo.status == 1" class="red" @click="toRefund">主动退款</view>
+                    <view v-if="orderInfo.status == 1" class="green" @click="toSendOut">发货</view>
                 </view>
             </view>
         </view>
@@ -91,6 +91,7 @@
 </template>
 
 <script>
+// 0 待付款 / 1 待发货 / 2 待收货 / 3 待评价 / 4 交易完成 / 5 订单关闭 / 6 退款中 / 7 退款完成 / 8 退款失败 / 9 已删除
 import p_line from '../../../components/p_line/p_line.vue';
 import { ORDER_API } from '../../../js/api';
 import server from '../../../js/server';
@@ -101,6 +102,13 @@ export default {
             let { orderInfo } = this;
             if(orderInfo&&orderInfo.product_order_custom)return (orderInfo.product_order_custom || {})
             return {};
+        },
+        logisticsInfo(){
+            let { orderInfo } = this;
+            if(orderInfo.product_order_logistics_data&&orderInfo.product_order_logistics_data.length){
+                return orderInfo.product_order_logistics_data[orderInfo.product_order_logistics_data.length - 1]; // 最后为最新
+            }
+            return null
         }
     },
     components: {
@@ -115,6 +123,29 @@ export default {
         this.getInfo(options.order_no);
     },
     methods: {
+        // 主动退款
+        toRefund(){
+            let { orderInfo } = this;
+            // let _ls = this.sendAndNotRefundList() || [];
+            // if(!_ls.length)return;
+            // if(_ls.length == 1)
+            return util.routeTo(`/subpackage/order/pages/mall/refund_operate/refund_operate?order_no=${orderInfo.order_no}&brand_id=${orderInfo.brand_id}`, 'nT');
+            // util.routeTo(`/subpackage/order/pages/mall/refund_list/refund_list?order_no=${orderInfo.order_no}&brand_id=${orderInfo.brand_id}`, 'nT');
+        },
+        // 已发货为退款列表
+        // sendAndNotRefundList(){
+        //     let { orderInfo } = this;
+        //     let _goodsLs = orderInfo.product_order_goods || [];
+        //     return _goodsLs.filter(ele=>ele.product_logistics_end == 1&&ele.product_refund_utype == 0);
+        // },
+        // 快递详情
+        toLogisticInfo(){
+            let { orderInfo } = this;
+            util.routeTo(`/subpackage/order/pages/mall/check_logistic/check_logistic?order_no=${orderInfo.order_no}&brand_id=${orderInfo.brand_id}`, 'nT');
+        },
+        copyLogisticNum(_data){
+            uni.setClipboardData({ data: _data });
+        },
         toSendOut(){
             let { orderInfo } = this;
             util.routeTo(`/subpackage/order/pages/mall/send_out/send_out?order_no=${orderInfo.order_no}&brand_id=${orderInfo.brand_id}`, 'nT');
@@ -178,7 +209,6 @@ export default {
                 flex-shrink: 0;
                 width: 32upx;
                 height: 32upx;
-                background-color: skyblue;
             }
 
         }
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 af50b4f..4153d5c 100644
--- a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
+++ b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
@@ -1,40 +1,147 @@
 <template>
     <view class="refund-operate">
-        <view class="ro-num">订单编号     sc20 0822 0815 6894</view>
+        <view class="ro-num">订单编号    {{ orderInfo.order_no || '-' }}</view>
         <view class="ro-box ro-goods-info">
-            <view class="rgi-list" v-if="false">
-                <view class="rl-item" v-for="i in 3" :key="i">
-                    <image></image>
-                    <view>克洛羽毛球…</view>
+            <view class="rgi-single" v-if="refundLs.length == 1">
+                <image mode="aspectFill" :src="refundLs[0].product_imgs"></image>
+                <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>
             </view>
-            <view class="rgi-single">
-                <image></image>
-                <view>克洛斯威羽毛球拍2支装C8正品碳素成人进攻型羽毛球比赛用</view>
+            
+            <view class="rgi-total">
+                <text>共{{ refundLs.length || 0 }}件</text>
+                <!-- <image v-if="refundLs.length > 1" mode="aspectFit" src="/subpackage/order/static/images/arrow.png"></image> -->
             </view>
-            <view class="rgi-total"><text>共3件</text><image></image></view>
         </view>
         <view class="ro-box ro-refund-info">
-            <view class="rri-txt">最大可退金额 <text>￥179.7</text>（含运费￥0）</view>
-            <view class="rri-txt">可退积分：100积分</view>
-            <view class="rri-line">
+            <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-line">
                 <view class="rl-name"><text>*</text>退款金额</view>
-                <view class="rl-frame"><input /></view>
+                <view class="rl-frame"><input v-model="refundAmount" /></view>
             </view>
             <view class="rri-line">
                 <view class="rl-name"><text>*</text>回退积分</view>
-                <view class="rl-frame"><input /></view>
+                <view class="rl-frame"><input v-model="refundIntegral" /></view>
             </view>
-        </view>
+        </view> -->
         <view class="ro-bar">
-            <view>确定</view>
+            <view @click="confirmRefund">确定</view>
         </view>
     </view>
 </template>
 
 <script>
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import util from '../../../../../utils/util';
+import { servers } from '../../../../../js/server';
 export default {
+    computed: {
+        maxAmount(){
+            let { refundLs } = this;
+            let _amount = 0;
+            refundLs.forEach(ele=>_amount+=(+ele.refundable_amount || 0));
+            return _amount.toFixed(2);
+        },
+        maxIntegral(){
+            let { refundLs } = this;
+            let _integral = 0;
+            refundLs.forEach(ele=>_integral+=(+ele.refundable_integral || 0));
+            return _integral.toFixed(0);
+        },
+        refundLs(){
+            let { orderInfo, selectedLs } = this;
+            let _selectedArr = selectedLs.split(',');
+            let _goodsArr = orderInfo.product_order_goods || [];
+            return _goodsArr;
+            // 只支持全部退款
+            // return _goodsArr.filter(ele=>{
+            //     return _selectedArr.includes((ele.product_id + ''));
+            // })
+        },
+    },
+    data(){
+        return {
+            orderInfo: {},
+            selectedLs: '',
+            refundAmount: '',
+            refundIntegral: '',
+        }
+    },
+    onLoad(options){
+        this.getInfo(options.order_no);
+    },
+    methods: {
+        confirmRefund: util.debounce(function(){
+            util.showModal({
+                title: '提示',
+                content: '确认对该订单进行退款操作吗？',
+                showCancel: true,
+                confirmText: '确认',
+                success: res => {
+                    let { orderInfo } = this;
+                    if(res.confirm)this.refundReq({
+                        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,
+                    })
+                }
+            })
+        }, 300, true),
+        refundReq({
+            brand_id,
+            order_no,
+            product_cart_id,
+            integral,
+            amount,
+        }){
+            util.showLoad();
+            servers.post({
+                url: ORDER_API.orderGoodsRefund,
+                data: {
+                    brand_id,
+                    order_no: order_no,
+                    product_cart_id: product_cart_id,
+                    integral: integral,
+                    amount: amount,
+                },
+                isDefaultGet: false
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                    setInterval(util.routeTo, 1200);
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }
+            })
+            .catch(util.hideLoad)
+        },
+        getInfo(order_no){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.shop2OrderInfo,
+                data: { order_no },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                util.hideLoad();
+                let _order = res.order || {};
+                this.orderInfo = _order;
+            })
+        },
 
+    }
 }
 </script>
 
@@ -71,7 +178,6 @@ export default {
                 vertical-align: middle;
                 width: 30upx;
                 height: 30upx;
-                background-color: skyblue;
             }
         }
         .rgi-list{
@@ -83,7 +189,6 @@ export default {
                     width: 152upx;
                     height: 152upx;
                     border-radius: 10upx;
-                    background-color: skyblue;
 
                 }
                 >view{
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 4c50b07..e1b3c4c 100644
--- a/src/subpackage/order/pages/mall/send_out/send_out.vue
+++ b/src/subpackage/order/pages/mall/send_out/send_out.vue
@@ -25,105 +25,108 @@
             <view class="os-wait" v-if="curTab == 0">
                 <!-- 没数据 -->
                 <view class="os-null" v-if="!waitdeliverLs.length">
-                    <image></image>
-                    <view>无已发货</view>
+                    <image src="/subpackage/order/static/images/package_icon.png"></image>
+                    <view>无待发货</view>
                 </view>
-                <view class="oh-box ow-goods" v-else>
-                    <view class="og-header">
-                        <view class="oh-tit"><text>*</text>请选择商品发货</view>
-                        <view class="oh-select">
-                            <view @click="sendOutSelectAll">全选</view>
-                            <view>
-                                <image v-if="isSelectedAllSendOut" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image>
+                <block v-else>
+                    <view class="oh-box ow-goods">
+                        <view class="og-header">
+                            <view class="oh-tit"><text>*</text>请选择商品发货</view>
+                            <view class="oh-select">
+                                <view @click="sendOutSelectAll">全选</view>
+                                <view>
+                                    <image v-if="isSelectedAllSendOut" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image>
+                                </view>
                             </view>
                         </view>
-                    </view>
-                    <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>
-                            </view>
-                            <image mode="aspecfFill" :src="e.product_imgs"></image>
-                            <view class="oi-info">
-                                <view class="oi-tit">{{ e.product_name || '-' }}</view>
-                                <view class="oi-spec" v-if="e.product_spec_multi_info&&e.product_spec_multi_info.spec_info&&e.product_spec_multi_info.spec_info.length">
-                                    <block v-for="(k, j) in e.product_spec_multi_info.spec_info" :key="j">
-                                       {{ k + '；' }}
-                                    </block>
+                        <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>
+                                </view>
+                                <image mode="aspecfFill" :src="e.product_imgs"></image>
+                                <view class="oi-info">
+                                    <view class="oi-tit">{{ e.product_name || '-' }}</view>
+                                    <view class="oi-spec" v-if="e.product_spec_multi_info&&e.product_spec_multi_info.spec_info&&e.product_spec_multi_info.spec_info.length">
+                                        <block v-for="(k, j) in e.product_spec_multi_info.spec_info" :key="j">
+                                        {{ k + '；' }}
+                                        </block>
+                                    </view>
                                 </view>
                             </view>
                         </view>
                     </view>
-                </view>
 
-                <view class="oh-box ow-warehouse" >
-                    <view class="oh-tit"><text>*</text>发货仓库</view>
-                    <picker :range="warehouseList" range-key="erp_name" @change="warehouseChange">
-                        <view class="ow-picker">
-                            <input disabled placeholder="请选择发货仓库" :value="selectedWarehouse.erp_name" />
-                            <image mode="aspectFit" src="/subpackage/order/static/images/down_arrow.png"></image>
-                        </view>
-                    </picker>
-                    <view class="ow-tip">商品如果不在同一仓库，请分开发货</view>
-                </view>
-
-                <view class="oh-box ow-logistics">
-                    <view class="oh-tit">发货物流</view>
-                    <view class="ol-line">
-                        <view class="ol-name"><text>* </text>发货方式</view>
-                        <view class="ol-mode">
-                            <view class="om-item">
-                                <view :class="[ sendOutMethod == 0 ? 'active' : '' ]"  @click="sendOutMethod = 0"></view>
-                                <view @click="sendOutMethod = 0">快递</view>
+                    <view class="oh-box ow-warehouse" >
+                        <view class="oh-tit"><text>*</text>发货仓库</view>
+                        <picker :range="warehouseList" range-key="erp_name" @change="warehouseChange">
+                            <view class="ow-picker">
+                                <input disabled placeholder="请选择发货仓库" :value="selectedWarehouse.erp_name" />
+                                <image mode="aspectFit" src="/subpackage/order/static/images/down_arrow.png"></image>
                             </view>
-                            <view class="om-item">
-                                <view :class="[ sendOutMethod == 1 ? 'active' : '' ]"  @click="sendOutMethod = 1"></view>
-                                <view  @click="sendOutMethod = 1">无需快递</view>
-                            </view>
-                        </view>
+                        </picker>
+                        <view class="ow-tip">商品如果不在同一仓库，请分开发货</view>
                     </view>
-                    <block v-if="sendOutMethod == 0">
+
+                    <view class="oh-box ow-logistics">
+                        <view class="oh-tit">发货物流</view>
                         <view class="ol-line">
-                            <view class="ol-name"><text>* </text>物流公司</view>
-                            <view class="ol-company">
-                                <picker :range="logisticsCompanyLs" @change="logisticsChange">
+                            <view class="ol-name"><text>* </text>发货方式</view>
+                            <view class="ol-mode">
+                                <view class="om-item">
+                                    <view :class="[ sendOutMethod == 0 ? 'active' : '' ]"  @click="sendOutMethod = 0"></view>
+                                    <view @click="sendOutMethod = 0">快递</view>
+                                </view>
+                                <view class="om-item">
+                                    <view :class="[ sendOutMethod == 1 ? 'active' : '' ]"  @click="sendOutMethod = 1"></view>
+                                    <view  @click="sendOutMethod = 1">无需快递</view>
+                                </view>
+                            </view>
+                        </view>
+                        <block v-if="sendOutMethod == 0">
+                            <view class="ol-line">
+                                <view class="ol-name"><text>* </text>物流公司</view>
+                                <view class="ol-company">
+                                    <picker :range="logisticsCompanyLs" @change="logisticsChange">
+                                        <view class="oc-ipt-frame">
+                                            <input disabled placeholder="请选择物流公司" :value="curlogisticsName" />
+                                            <image mode="aspectFit" src="/subpackage/order/static/images/down_arrow.png"></image>
+                                        </view>
+                                    </picker>
+                                </view>
+                            </view>
+                            <view class="ol-line">
+                                <view class="ol-name"><text>* </text>物流单号</view>
+                                <view class="ol-company">
                                     <view class="oc-ipt-frame">
-                                        <input disabled placeholder="请选择物流公司" :value="curlogisticsName" />
-                                        <image mode="aspectFit" src="/subpackage/order/static/images/down_arrow.png"></image>
+                                        <input placeholder="请输入物流单号" v-model="logisticsOrderNum" />
                                     </view>
-                                </picker>
+                                </view>
                             </view>
-                        </view>
-                        <view class="ol-line">
-                            <view class="ol-name"><text>* </text>物流单号</view>
+                        </block>
+                        
+
+                        <view class="ol-line" v-if="sendOutMethod == 1">
+                            <view class="ol-name"><text>* </text>备注</view>
                             <view class="ol-company">
                                 <view class="oc-ipt-frame">
-                                    <input placeholder="请输入物流单号" v-model="logisticsOrderNum" />
+                                    <input placeholder="备注" v-model="sendOutRemark" />
                                 </view>
                             </view>
                         </view>
-                    </block>
-                    
-
-                    <view class="ol-line" v-if="sendOutMethod == 1">
-                        <view class="ol-name"><text>* </text>备注</view>
-                        <view class="ol-company">
-                            <view class="oc-ipt-frame">
-                                <input placeholder="备注" v-model="sendOutRemark" />
-                            </view>
-                        </view>
                     </view>
-                </view>
-                <cover-view class="ow-btn">
-                    <cover-view class="ob-btn" @click="confirmSendOutBtn">确认发货</cover-view>
-                </cover-view>
+                    <cover-view class="ow-btn">
+                        <cover-view class="ob-btn" @click="confirmSendOutBtn">确认发货</cover-view>
+                    </cover-view>
+                </block>
+                
 
             </view>
             <!-- 已发货 -->
             <view class="os-yet" v-if="curTab == 1">
                 <!-- 没数据 -->
                 <view class="os-null"  v-if="!shippedLs.length">
-                    <image></image>
+                    <image mode="aspectFit" src="/subpackage/order/static/images/package_icon.png"></image>
                     <view>无已发货</view>
                 </view>
                 <view class="package-list" v-else>
@@ -720,7 +723,6 @@ export default {
                 margin: 0 auto 68upx;
                 width: 260upx;
                 height: 260upx;
-                background-color: skyblue;
             }
             >view{
                 line-height: 44upx;
diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue
index e303e77..d7f178b 100644
--- a/src/subpackage/order/pages/order_manage/order_manage.vue
+++ b/src/subpackage/order/pages/order_manage/order_manage.vue
@@ -38,7 +38,7 @@ export default {
             util.routeTo(getTabRoutePath() + `?order_type=${ele.orderType}`,'nT');
         },
         isFinish(key){
-            let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8 ];
+            let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11 ];
             return _endKeyArr.includes(key);
         }
     }
diff --git a/src/subpackage/order/static/images/package_icon.png b/src/subpackage/order/static/images/package_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a93fe586be2468fcef17048a011573b090d3fd00
GIT binary patch
literal 14144
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
J@34;e{{?M!ipl^0

literal 0
HcmV?d00001