diff --git a/src/components/order_list/retail/retail.vue b/src/components/order_list/retail/retail.vue
index c007d6f..e5ccafe 100644
--- a/src/components/order_list/retail/retail.vue
+++ b/src/components/order_list/retail/retail.vue
@@ -9,8 +9,8 @@
商品名称：
-
- 操作人：
+
+ 操作途径：
购买时间：
@@ -29,7 +29,7 @@ export default {
getGoodsName(){
let { orderInfo } = this;
let _ls = orderInfo&&orderInfo.retail_order_goods || [];
- let _str = _ls.map(e=>e.name).join('；');
+ let _str = _ls.map(e=>`${e.name}【${e.spec}】x${e.nums}`).join('；');
if(_ls.length)_str += '；'
return _str
}
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index a39bdaa..b33dd38 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -587,7 +587,7 @@
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: '交易成功'} ];
+ return [ {id: 1, name: '交易成功'}, {id: 4, name: '已退款'} ];
case 20: // 年月卡 筛选的 status 全部 0,1,2,3 待激活 0 使用中 1 已失效 2 已退卡 3
return [ {id: '', name: '全部'}, {id: 0, name: '待激活'}, {id: 1, name: '使用中'}, {id: 2, name: '已失效'},{id: 3, name: '已退卡'}];
default:
diff --git a/src/subpackage/order/pages/retail/detail/detail.vue b/src/subpackage/order/pages/retail/detail/detail.vue
index 76e76f9..90e4f44 100644
--- a/src/subpackage/order/pages/retail/detail/detail.vue
+++ b/src/subpackage/order/pages/retail/detail/detail.vue
@@ -1,38 +1,91 @@
@@ -40,14 +93,10 @@
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,
},
@@ -60,10 +109,21 @@ export default {
this.getOrderInfo(options.order_no);
},
methods: {
- payTypeTxt: util.order_pay_type_txt,
+ // payTypeTxt: util.order_pay_type_txt,
+ payTypeTxt(payType, cardNo) {
+ let _obj = {
+ 0: '微信支付',
+ 1: '支付宝支付',
+ 2: `储值卡支付 ${cardNo ? '(' + cardNo + ')' : ''}`,
+ 3: '现金支付',
+ 4: '其他'
+ };
+ return _obj[payType] || '-'
+ },
getStatus(status){
let _obj = {
- 1: '交易成功'
+ 1: '交易成功',
+ 4: '已退款'
}
return _obj[status] || '-'
},
@@ -77,6 +137,10 @@ export default {
.then(res=>{
util.hideLoad();
this.orderInfo = res || {};
+ // this.orderInfo.refunds = [
+ // { refund_amount: this.orderInfo.refund_amount, refund_no: this.orderInfo.refund_no, refund_time: this.orderInfo.refund_time, refund_reason: this.orderInfo.refund_reason },
+ // { refund_amount: this.orderInfo.refund_amount, refund_no: this.orderInfo.refund_no, refund_time: this.orderInfo.refund_time, refund_reason: this.orderInfo.refund_reason }
+ // ];
})
},
@@ -93,40 +157,133 @@ export default {
margin-bottom: 26upx;
padding: 0 24upx;
background-color: #fff;
+ .ra-header {
+ position: relative;
+ padding-top: 30upx;
+ padding-bottom: 30upx;
+ @include centerFlex(flex-start);
+ >image {
+ width: 32upx;
+ height: 30upx;
+ margin-right: 14upx;
+ }
+ >text {
+ font-size: 28upx;
+ font-weight: 500;
+ color: #1A1A1A;
+ }
+ >view {
+ position: absolute;
+ bottom: 0%;
+ width: 100%;
+ height: 2upx;
+ background-color: #D8D8D8;
+ }
+ }
.rh-name{
- padding: 30upx 0;
+ padding-top: 18upx;
+ padding-bottom: 18upx;
+ .rh-name-line {
+ @include centerFlex(space-between);
+ font-size: 28upx;
+ font-weight: 400;
+ margin-bottom: 10upx;
+
+ >view {
+ &:first-child {
+ color: #9C9C9F;
+ @include centerFlex(flex-start);
+ flex-grow: 1;
+
+ >view {
+ width: 152upx;
+ flex-shrink: 0;
+ }
+ >text {
+ color: #333333;
+ @include textHide(1);
+ }
+ }
+
+ &:nth-child(2) {
+ flex-shrink: 0;
+ }
+ }
+ }
}
}
.rc-goods-info{
margin-bottom: 24upx;
- padding: 0 24upx;
+ padding: 30upx 24upx 46upx 24upx;
background-color: #fff;
+ font-weight: 500;
.rgi-tit{
- padding-top: 20upx;
font-size: 32upx;
+ font-weight: 500;
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;
+ padding-top: 30upx;
+ // border-bottom: 2upx solid #D8D8D8;
+ color: #9C9C9F;
+ font-size: 28upx;
+
+ .rgl-item-desc {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20upx;
+ color: #333;
+ }
+ .rgl-item-sku {
+ margin-bottom: 10upx;
+ }
+ .rgl-item-type-spec {
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-end;
+ >text {
+ color: #333;
+ }
+ }
+ .rgl-item-bottom-line {
+ width: 100%;
+ height: 2upx;
+ background-color: #D8D8D8;
+ margin-top: 18upx;
+ }
}
}
}
+ .rc-total-amount-info{
+ margin-bottom: 24upx;
+ padding: 0 24upx;
+ padding-top: 1upx;
+ background-color: #fff;
+ font-size: 28upx;
+
+ .rc-total-amount-line {
+ margin-top: 26upx;
+ @include centerFlex(space-between);
+ >text {
+ font-size: 24upx;
+ }
+ }
+ .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;
@@ -137,4 +294,15 @@ export default {
color: #333;
}
}
+ .rc-refund-info{
+ padding: 30upx;
+ margin-top: 24upx;
+ background-color: #fff;
+ .rpi-tit{
+ margin-bottom: 16upx;
+ line-height: 44upx;
+ font-size: 28upx;
+ color: #9C9C9F;
+ }
+ }
\ No newline at end of file