diff --git a/manager/src/config/index.js b/manager/src/config/index.js index ce41e786..c296c0c7 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -21,10 +21,7 @@ export default { buyer: "https://buyer-api.pickmall.cn", seller: "https://store-api.pickmall.cn", manager: "https://admin-api.pickmall.cn" - // common: 'http://192.168.0.101:8890', - // buyer: 'http://192.168.0.101:8888', - // seller: 'http://192.168.0.101:8889', - // manager: 'http://192.168.0.101:8887' + }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/order/after-order/afterSaleOrder.vue b/manager/src/views/order/after-order/afterSaleOrder.vue index a38ea838..b3896336 100644 --- a/manager/src/views/order/after-order/afterSaleOrder.vue +++ b/manager/src/views/order/after-order/afterSaleOrder.vue @@ -228,7 +228,7 @@ { title: "售后状态", key: "serviceStatus", - width: 110, + width: 200, render: (h, params) => { if (params.row.serviceStatus == "APPLY") { return h('div', [h('tag', {props: {color: "blue"}}, '申请中'),]); diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue index e53f3ac9..5ae41ffe 100644 --- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue +++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue @@ -88,15 +88,15 @@
-
申请退款金额
-
{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}
-
-
-
实际退款金额
-
- -
-
+
申请退款金额
+
{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}
+ +
+
实际退款金额
+
+ +
+
备注信息
@@ -174,12 +174,47 @@ {{afterSaleInfo.orderSn}}
+
+
银行开户行
+
+ {{afterSaleInfo.bankDepositName}} +
+
+
+
银行开户名
+
+ {{afterSaleInfo.bankAccountName}} +
+
+
+
银行卡号
+
+ {{afterSaleInfo.bankAccountNumber}} +
+

平台退款

- +
+
银行开户行
+
+ {{afterSaleInfo.bankDepositName}} +
+
+
+
银行开户名
+
+ {{afterSaleInfo.bankAccountName}} +
+
+
+
银行卡号
+
+ {{afterSaleInfo.bankAccountNumber}} +
+
备注信息
@@ -200,15 +235,15 @@

物流信息

- 收货人 + 收货商家
- {{afterSaleInfo.sconsigneeName}} + {{afterSaleInfo.storeName}}
- 收货人手机 + 收货商家手机
{{afterSaleInfo.sconsigneeMobile}} @@ -227,7 +262,7 @@ 物流公司
- {{afterSaleInfo.slogisticsNo}} + {{afterSaleInfo.mlogisticsName}}
@@ -235,7 +270,7 @@ 物流单号
- {{afterSaleInfo.slogisticsCode}} + {{afterSaleInfo.mlogisticsNo}}
@@ -447,9 +482,14 @@ export default { this.afterSaleImage = (res.result.afterSaleImage || "").split(","); //退货地址去掉逗号 if (this.afterSaleInfo.mconsigneeAddressPath) - this.afterSaleInfo.mconsigneeAddressPath = this.afterSaleInfo.mconsigneeAddressPath.replaceAll(","," "); + this.afterSaleInfo.mconsigneeAddressPath = + this.afterSaleInfo.mconsigneeAddressPath.replaceAll(",", " "); - this.$set(this.params,'actualRefundPrice', this.afterSaleInfo.applyRefundPrice) + this.$set( + this.params, + "actualRefundPrice", + this.afterSaleInfo.applyRefundPrice + ); } }); }, @@ -601,10 +641,10 @@ export default { margin: 0; border-bottom: dotted 1px #e6e6e6; overflow: hidden; + display: flex; dt { - display: inline-block; - width: 13%; + flex: 2; vertical-align: top; text-align: right; padding: 15px 1% 15px 0; @@ -613,8 +653,7 @@ export default { } dd { - display: inline-block; - width: 84%; + flex: 10; padding: 15px 0 15px 1%; margin: 0; border-left: 1px solid #f0f0f0; @@ -727,10 +766,10 @@ dl dt { margin: 0; border-bottom: dotted 1px #e6e6e6; overflow: hidden; - + display: flex; dt { display: inline-block; - width: 13%; + flex: 2; vertical-align: top; text-align: right; padding: 15px 1% 15px 0; @@ -740,7 +779,7 @@ dl dt { dd { display: inline-block; - width: 84%; + flex: 10; padding: 15px 0 15px 1%; margin: 0; border-left: 1px solid #f0f0f0; diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue index dc041aae..4532e0e1 100644 --- a/manager/src/views/order/order/orderDetail.vue +++ b/manager/src/views/order/order/orderDetail.vue @@ -2,174 +2,147 @@
-
- -
- - - - - +
+ +
+ + + + + + + + + +
+ + +
+
+
订单号：
+
{{ orderInfo.order.sn }}
- - -
-
-
订单号：
-
{{ orderInfo.order.sn }}
-
-
-
订单来源：
-
- {{ orderInfo.order.clientType | clientTypeWay}} -
-
- -
-
订单状态：
-
- {{ orderInfo.orderStatusValue }} -
-
- -
-
下单时间：
-
- {{ orderInfo.order.createTime }} -
+
+
订单来源：
+
+ {{ orderInfo.order.clientType | clientTypeWay}}
-
-
-
发票信息：
-
暂无发票信息
-
-
-
发票抬头：
-
{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}
-
- -
-
发票税号：
-
{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}
-
- -
-
发票内容：
-
{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}
-
- -
-
发票金额：
-
{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}
-
- -
-
是否开票：
-
{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}
+
+
订单状态：
+
+ {{ orderInfo.orderStatusValue }}
-
-
-
收货信息：
-
- {{ orderInfo.order.consigneeName }} - {{ orderInfo.order.consigneeMobile }} - {{ orderInfo.order.consigneeAddressPath }} - {{ orderInfo.order.consigneeDetail }} -
-
-
-
支付方式：
-
- {{ orderInfo.paymentMethodValue }} -
-
-
-
买家留言：
-
{{ orderInfo.order.remark }}
-
- -
-
发票信息：
-
暂无发票信息
-
- -
-
发票抬头：
-
{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}
-
- -
-
发票税号：
-
{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}
-
- -
-
发票内容：
-
{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}
-
- -
-
发票金额：
-
{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}
-
- -
-
是否开票：
-
{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}
-
- -
-
配送方式：
-
- {{ orderInfo.deliveryMethodValue }} -
+
+
下单时间：
+
+ {{ orderInfo.order.createTime }}
- -
+
+
+
+
发票信息：
+
暂无发票信息
+
+ +
+
发票抬头：
+
{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}
+
+ +
+
发票税号：
+
{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}
+
+ +
+
发票内容：
+
{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}
+
+ +
+
发票金额：
+
{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}
+
+ +
+
是否开票：
+
{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}
+
+
+
+
+
收货信息：
+
+ {{ orderInfo.order.consigneeName }} + {{ orderInfo.order.consigneeMobile }} + {{ orderInfo.order.consigneeAddressPath }} + {{ orderInfo.order.consigneeDetail }} +
+
+
+
支付方式：
+
+ {{ orderInfo.paymentMethodValue }} +
+
+ +
+
买家留言：
+
{{ orderInfo.order.remark }}
+
+ +
+
发票信息：
+
暂无发票信息
+
+ +
+
发票抬头：
+
{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}
+
+ +
+
发票税号：
+
{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}
+
+ +
+
发票内容：
+
{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}
+
+ +
+
发票金额：
+
{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}
+
+ +
+
是否开票：
+
{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}
+
+ +
+
配送方式：
+
+ {{ orderInfo.deliveryMethodValue }} +
+
+
+ +
- +