diff --git a/src/components/order_list/device/device.vue b/src/components/order_list/device/device.vue
new file mode 100644
index 0000000..07073b8
--- /dev/null
+++ b/src/components/order_list/device/device.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+ {{ orderInfo.extension.hardware_name || '-' }}
+
+
+
+
+ 订单编号：
+
+
+ 商品名称：
+
+
+ 时长：
+
+
+ 购买时间：
+
+
+ 合计支付：¥{{orderInfo.pay_amount || 0}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/order_list/locker/locker.vue b/src/components/order_list/locker/locker.vue
index 8dd24bb..640b3e8 100644
--- a/src/components/order_list/locker/locker.vue
+++ b/src/components/order_list/locker/locker.vue
@@ -1,20 +1,19 @@
-
+
- 储物柜-B柜
+ {{ orderInfo.extension.hardware_name || '-' }}
-
-
+
订单编号：
-
+
寄存时长：
- 合计支付：¥6
+ 合计支付：¥{{orderInfo.pay_amount || 0}}
@@ -29,6 +28,34 @@ export default {
'a-header': a_header,
'a-line': a_line,
},
+ props: {
+ orderInfo: {
+ default: {
+ extension: {}
+ },
+ type: Object,
+ },
+ },
+ computed: {
+ isTotalAmount(){
+ let { orderInfo } = this;
+ return orderInfo.pay_status == 4 || orderInfo.pay_status == 2;
+ },
+ },
+ methods: {
+ status_txt(status){
+ let _obj2 = {
+ 1: '寄存中',
+ 2: '已完成',
+ 4: '退款完成'
+ }
+ return _obj2[status] || '-'
+ },
+ toInfo(){
+ let { orderInfo } = this;
+ util.routeTo(`/subpackage/order/pages/locker/detail/detail?order_no=${orderInfo.order_no}`, 'nT');
+ }
+ }
}
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index fc0cf8f..31a63ce 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -57,10 +57,11 @@
-
+
+
-
+
-
+
商品详情
-
+
产品名称：
-
+
规格：
-
+
+ 时长：
+
+
数量：
-
+
价格：
-
-
-
- 合计支付：￥5
+
+
+
+ 合计支付：￥{{orderInfo.pay_amount || '0'}}
支付详情
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -51,6 +63,54 @@ export default {
's-line': s_line,
'p-line': p_line,
},
+ computed: {
+ showname(){
+ let { orderInfo, optionsQuery } = this;
+ if(optionsQuery.type == 6)return orderInfo.goods_name || '-'
+ if(optionsQuery.type == 11)return orderInfo.water_valve_name || '-'
+ if(optionsQuery.type == 9&&orderInfo.coffee_drink)return orderInfo.coffee_drink.name || '-'
+ }
+ },
+ data(){
+ return {
+ orderInfo: {},
+ optionsQuery: {
+ type: -1, // 订单类型 // 售货柜-> 6 / 浴室 -> 11 / 咖啡 -> 9
+ order_no: ''
+ }
+ }
+ },
+ onLoad(options){
+ this.optionsQuery = options || {};
+ if(options.order_no)this.getInfo(options.order_no);
+ },
+ methods: {
+ pay_txt(status){
+ let _obj = {
+ 1: '交易成功',
+ 4: '退款完成'
+ };
+ return _obj[status] || '-'
+ },
+ status_txt(status){
+ let _obj = {
+ 0: '微信支付',
+ 1: '支付宝支付',
+ 2: '会员卡支付',
+ };
+ return _obj[status] || '-'
+ },
+ getInfo(order_no){
+ server.get({
+ url: ORDER_API.hardwareOrderGet,
+ data: { order_no },
+ failMsg: '加载失败！'
+ })
+ .then(res=>{
+ this.orderInfo = res || {};
+ })
+ },
+ }
}
diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue
index ce40bb9..ca2321b 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, 11, ]
+ let _endKeyArr = [1, 2, 3, 4, 5, 7, 9, 10, 11, 14, 16, 15, 13 ]
return _endKeyArr.includes(key);
}
}