From 4f22beced75c25f4ee185c6b569736ffad4e0fe3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 18 Nov 2021 15:05:48 +0800
Subject: [PATCH] add retail order

---
 src/components/order_list/retail/retail.vue        |  87 +++++++++++++
 src/js/api.js                                      |   3 +-
 src/pages.json                                     |   6 +
 src/pages/order_list/order_list.vue                |   8 ++
 src/subpackage/order/js/api.js                     |   1 +
 .../order/pages/order_manage/order_manage.vue      |   3 +-
 .../order/pages/retail/detail/detail.vue           | 140 +++++++++++++++++++++
 .../order/static/images/order_manage/order_18.png  | Bin 0 -> 537 bytes
 8 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 src/components/order_list/retail/retail.vue
 create mode 100644 src/subpackage/order/pages/retail/detail/detail.vue
 create mode 100644 src/subpackage/order/static/images/order_manage/order_18.png

diff --git a/src/components/order_list/retail/retail.vue b/src/components/order_list/retail/retail.vue
new file mode 100644
index 0000000..c007d6f
--- /dev/null
+++ b/src/components/order_list/retail/retail.vue
@@ -0,0 +1,87 @@
+<template>
+    <view class="retail-order" @click="toInfo">
+        <a-header :source="orderInfo.source || '-'" :status="getStatus(orderInfo.pay_status)"></a-header>
+        <!--  商品名称: 操作人： 购买时间: -->
+        <view class="ro-info">
+            <a-line :value="orderInfo.order_no || '-'">
+                <block slot="name">订单编号：</block> 
+            </a-line>
+            <a-line :value="getGoodsName || '-'">
+                <block slot="name">商品名称：</block> 
+            </a-line>
+            <a-line :value="orderInfo.sys_optuname || '-'">
+                <block slot="name">操作人：</block> 
+            </a-line>
+            <a-line :value="orderInfo.pay_time || '-'">
+                <block slot="name">购买时间：</block> 
+            </a-line>
+        </view>
+        <view class="ro-total"><text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}</view>
+    </view>
+</template>
+
+<script>
+import util from '../../../utils/util';
+import a_header from '../a_header/a_header.vue';
+import a_line from '../a_line/a_line.vue';
+export default {
+    computed: {
+        getGoodsName(){
+            let { orderInfo } = this;
+            let _ls = orderInfo&&orderInfo.retail_order_goods || [];
+            let _str = _ls.map(e=>e.name).join('；');
+            if(_ls.length)_str += '；'
+            return _str
+        }
+    },
+    components: {
+        'a-header': a_header,
+        'a-line': a_line,
+    },
+    props: {
+        orderInfo: {
+            default: {},
+            type: Object
+        }
+    },
+    methods: {
+        getStatus(status){
+            let _obj = {
+                1: '交易成功'
+            }
+            return _obj[status] || '-'
+        },
+        toInfo(){
+            let { orderInfo } = this;
+            util.routeTo(`/subpackage/order/pages/retail/detail/detail?order_no=${orderInfo.order_no}`, 'nT');
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .retail-order{
+        background-color: #fff;
+        padding: 0 20upx 20upx;
+        border-radius: 10upx;
+    }
+    .ro-info{
+        
+    }
+    .ro-total{
+        line-height: 96upx;
+        font-size: 28upx;
+        color: #1a1a1a;
+        font-weight: 500;
+        text-align: right;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        >text{
+            color: #9a9a9d;
+            font-weight: 400;
+        }
+
+    }
+</style>
\ No newline at end of file
diff --git a/src/js/api.js b/src/js/api.js
index eec907d..b3c3b31 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -42,7 +42,8 @@ export const API = {
   // hardwareOrderList: `${ORIGIN}/admin/stadium/hardware/order/list`,  // 硬件管理-订单列表_copy
   hardwareOrderList: `${ORIGIN}/admin/assistant/hardware/order/list`,  // 硬件管理-订单列表_copy
   appointmentOrderList: `${ORIGIN}/admin/gameAppointment/orderList`,  // 赛事订单列表_copy
-  shop2OrderList: `${ORIGIN}/admin/shop2/orderList`,  // 商城订单 - 列表_copy
+  shop2OrderList: `${ORIGIN}/admin/shop2/orderList`,  // 商城订单 - 列表_copy交易成功
+  retailOrderList: `${ORIGIN}/admin/erp/retailOrder/list`,  // 订单管理-零售订单列表
 
   // 营业额统计
   turnoverBrand: `${ORIGIN}/admin/assistant/turnover/brand/calc`,  // 营业额记录-品牌
diff --git a/src/pages.json b/src/pages.json
index 72a67ad..c927fae 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -390,6 +390,12 @@
 			"root": "subpackage/order",
 			"pages": [
 				{
+					"path": "pages/retail/detail/detail",
+					"style" : {
+						"navigationBarTitleText": "零售订单详情" 
+					}
+				},
+				{
 					"path": "pages/mall/refund_list/refund_list",
 					"style" : {
 						"navigationBarTitleText": "退款" 
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 4f20478..8fff80c 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -62,6 +62,7 @@
                 <competition :order-info="e" v-if="orderType == 14"></competition>
                 <mall v-if="orderType == 2" :order-info="e"></mall>
                 <rent-and-sale v-if="orderType == 8" :order-info="e"></rent-and-sale>
+                <retail v-if="orderType == 19" :order-info="e"></retail>
             </view>
             <!-- <view class="ool-item">
                 <mall></mall>
@@ -136,6 +137,7 @@
 	import mall from '../../components/order_list/mall/mall.vue'; 
 	import device from '../../components/order_list/device/device.vue';  // 售货柜/浴室/咖啡
 	import competition from '../../components/order_list/competition/competition.vue';  // 赛事
+	import retail from '../../components/order_list/retail/retail.vue';  // 零售
 
     import util from '../../utils/util';
     import { servers } from '../../js/server';
@@ -160,6 +162,7 @@
             'mall': mall,
             'device': device,
             'competition': competition,
+            'retail': retail,
         },
         computed:{
             isStoreInfo(){
@@ -419,6 +422,7 @@
 				if(this.isDevice())return API.hardwareOrderList; // 硬件管理
 				if(type == 14)return API.appointmentOrderList; // 高光时刻
 				if(type == 2)return API.shop2OrderList; // 商城订单
+				if(type == 19)return API.retailOrderList; // 零售订单
             },
             // 是否为设备，统一接口
             isDevice(){
@@ -539,6 +543,8 @@
                 return '商城订单列表';
             case 8:
                 return '租售柜订单列表';
+            case 19:
+                return '零售订单';
             default: 
                 return '订单'
         }
@@ -578,6 +584,8 @@
                 return [ {id: 'assistant_all', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 'after_sale', 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: '已购买'}];
+            case 19:  // 订单管理 筛选的 status  status = 1  交易成功
+                return [ {id: 1, name: '交易成功'} ];
             default:  
                 return []
         }
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index 6665d7c..69dc042 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -23,6 +23,7 @@ export const ORDER_API = {
 	orderGoodsRefund:`${ORIGIN}/admin/shop2/orderGoodsRefund`,  // 商城-商品退款_copy
 	rentballOrderEnd:`${ORIGIN}/admin/assistant/rentball/order/end`,  // 租球机-结束计费
 	leaseOrderEnd:`${ORIGIN}/admin/stadium/leaseOrder/endBill`,  // 租售柜-结束计费
+	retailOrderInfo:`${ORIGIN}/admin/erp/retailOrder/info`,  // 订单管理-零售订单详情
 
 }
 
diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue
index 7ddd02a..c82f3a9 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, 11, 12 ];
+            let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12, 18 ];
             return _endKeyArr.includes(key);
         }
     }
@@ -64,6 +64,7 @@ function getTabList(){
             { id: 7, name: '约玩订单', key: 7, iconName: 'order_15', orderType: 10 },
             { id: 8, name: '商城订单', key: 8, iconName: 'order_4', orderType: 2 },
             { id: 9, name: '积分兑换订单', key: 9, iconName: 'order_5', orderType: 5 },
+            { id: 9, name: '零售订单', key: 18, iconName: 'order_18', orderType: 19 },
         ]
     }
 
diff --git a/src/subpackage/order/pages/retail/detail/detail.vue b/src/subpackage/order/pages/retail/detail/detail.vue
new file mode 100644
index 0000000..76e76f9
--- /dev/null
+++ b/src/subpackage/order/pages/retail/detail/detail.vue
@@ -0,0 +1,140 @@
+<template>
+    <view class="retail-container">
+        <view class="rc-header">
+            <a-header :source="orderInfo.source || '-'" :status="getStatus(orderInfo.pay_status)"></a-header>
+            <view class="rh-name">
+                <a-line :value="orderInfo.sys_optuname || '-'">
+                    <block slot="name">操作人：</block> 
+                </a-line>
+            </view>
+        </view>
+        <view class="rc-goods-info" v-if="orderInfo.retail_order_goods&&orderInfo.retail_order_goods.length">
+            <view class="rgi-tit">商品详情</view>
+            <view class="rgi-goods-ls">
+                <view class="rgl-item" v-for="(e, i) in orderInfo.retail_order_goods" :key="i">
+                    <!-- 商品名称 ：咖啡（小） 数量：1 价格：￥3 -->
+                    <a-line :value="e.name || '-'">
+                        <block slot="name">商品名称：</block> 
+                    </a-line>
+                    <a-line :value="e.nums || '0'">
+                        <block slot="name">数量：</block> 
+                    </a-line>
+                    <a-line :value="'￥' + (e.price || '0')">
+                        <block slot="name">价格：</block> 
+                    </a-line>
+                </view>
+            </view>
+            <view class="rgi-total"><text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}</view>
+        </view>
+        <view class="rc-pay-info">
+            <!-- 订单编号   -->
+            <view class="rpi-tit">支付详情</view>
+            <p-line :keyname="'订单编号'" :value="orderInfo.order_no || '-'" isbtn></p-line>
+            <p-line :keyname="'支付方式'" :value="payTypeTxt(orderInfo.pay_type)"></p-line>
+            <p-line :keyname="'支付时间'" :value="orderInfo.pay_time || '-'"></p-line>
+        </view>
+    </view>
+</template>
+
+<script>
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import util from '../../../../../utils/util';
+import a_header from '../../../../../components/order_list/a_header/a_header.vue';
+import a_line from '../../../../../components/order_list/a_line/a_line.vue';
+import s_line from '../../../components/s_line/s_line.vue';
+import p_line from '../../../components/p_line/p_line.vue';
+export default {
+    components: {
+        'a-line': a_line,
+        'a-header': a_header,
+        's-line': s_line,
+        'p-line': p_line,
+    },
+    data(){
+        return {
+            orderInfo: {}
+        }
+    },
+    onLoad(options){
+        this.getOrderInfo(options.order_no);
+    },
+    methods: {
+        payTypeTxt: util.order_pay_type_txt,
+        getStatus(status){
+            let _obj = {
+                1: '交易成功'
+            }
+            return _obj[status] || '-'
+        },
+        getOrderInfo(order_no){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.retailOrderInfo,
+                data: { order_no },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                util.hideLoad();
+                this.orderInfo = res || {};
+            })
+        },
+
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .retail-container{
+
+    }
+    .rc-header{
+        margin-bottom: 26upx;
+        padding: 0 24upx;
+        background-color: #fff;
+        .rh-name{
+            padding: 30upx 0;
+        }
+    }
+    .rc-goods-info{
+        margin-bottom: 24upx;
+        padding: 0 24upx;
+        background-color: #fff;
+        .rgi-tit{
+            padding-top: 20upx;
+            font-size: 32upx;
+            color: #1a1a1a;
+        }
+        .rgi-goods-ls{
+            .rgl-item{
+                padding: 30upx 0;
+                border-bottom: 2upx solid #D8D8D8;
+            }
+        }
+        .rgi-total{
+            text-align: right;
+            line-height: 106upx;
+            font-weight: 500;
+            font-size: 28upx;
+            color: #1a1a1a;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            >text{
+                color: #9a9a9d;
+                font-weight: 400;
+            }
+        }
+    }
+    .rc-pay-info{
+        padding: 30upx;
+        background-color: #fff;
+        .rpi-tit{
+            margin-bottom: 16upx;
+            line-height: 44upx;
+            font-size: 32upx;
+            color: #333;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/order/static/images/order_manage/order_18.png b/src/subpackage/order/static/images/order_manage/order_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8bafe4d4be634e9f0ed82eb3c4b0821c8bc87ae
GIT binary patch
literal 537
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2Ju0X`wFKzjQ0=`&``m^pLi?Afz{
z3?P7rK)66QPznejQa~~)+gS^!O|T@$FPP!)!3XjS>=RxKdv_J;Y`#=~dG?2e3=E7d
zo-U3d9>?EKi|#wDz{9{>#`H|E=>KIs4%cN(L5rrAMX&tKI)(9gfcl50^A+Z=nU%P;
z^4YGea~DlY%D1-2or+p3$d(r{bMnFsPnX%u{qo|3@0-|THv1TTQWc_a9q!fLJLw?*
z{HW;*9xjzReJyW7mh|#XCEFaYu<M*y_vVmNobaJ8o*T<`o-VBQ{3cYsTTb`ny7Svl
z9hl@35qvwquOa?q(TZyEvOW5zJEAA^&%E{I!u|V^MIBfC?05W~|NHoEj|+!Z&T-K3
zHJTkN$>X|QCV2OUzU#3$9Ho8Nw&_OB-ghfQ>8S0MeZu~q4A|F~*2eR0E1UOS$g$|t
z<Q<Qd(!RcwXz*LZdj82d%~kgv&Xh@->``>=V(6vPLm^K#YO`Ck&HP#$Sy4UHC}yX&
zdkFu6=;^<2x0yeAYi=alk)dt+hTn44{>e{kO%HE-KXspw>bxC}d~21XG-oOIOyX~l
zi|<ZrVSLlKtm_<?U|B?{;pC)+S7n%u{j38^TP#KRWM-Xwzkw;3{qXeuXYA)Qc|JPu
Svz-7&7K5j&pUXO@geCyyB=u?l

literal 0
HcmV?d00001