diff --git a/template/admin/src/pages/order/orderList/components/tableList.vue b/template/admin/src/pages/order/orderList/components/tableList.vue index 0bdd191e4..fb2da383a 100644 --- a/template/admin/src/pages/order/orderList/components/tableList.vue +++ b/template/admin/src/pages/order/orderList/components/tableList.vue @@ -653,11 +653,11 @@ export default { // 发送货 sendOrder(row) { this.$refs.send.total_num = row.total_num; + this.virtual_type = row.virtual_type; this.$refs.send.modals = true; this.orderId = row.id; this.status = row._status; this.pay_type = row.pay_type; - this.virtual_type = row.virtual_type; this.$refs.send.getList(); this.$refs.send.getDeliveryList(); this.$nextTick((e) => { diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue index 29cbda58d..ecfeb5ccf 100644 --- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue +++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue @@ -235,6 +235,21 @@ {{ orderDatalist.orderInfo.mark }} +
+ +
售后信息
+ + 备注:{{ orderDatalist.orderInfo.refund_reason }} + + + +
+
+ +
+
+
diff --git a/template/admin/src/pages/order/orderList/handle/orderSend.vue b/template/admin/src/pages/order/orderList/handle/orderSend.vue index 2eb526724..cfcd26a50 100644 --- a/template/admin/src/pages/order/orderList/handle/orderSend.vue +++ b/template/admin/src/pages/order/orderList/handle/orderSend.vue @@ -157,10 +157,11 @@ - - - + + {{ sendPrice }} + 立即计算 +
@@ -197,11 +198,6 @@ export default { pay_type: String, virtual_type: Number, }, - watch: { - orderId(val) { - if (this.virtual_type == 3) this.formItem.type = '3'; - }, - }, data() { return { orderStatus: 0, @@ -291,6 +287,7 @@ export default { ], selectData: [], serviceTypeList: [], + sendPrice: 0, }; }, watch: { @@ -298,6 +295,9 @@ export default { if (newVal) { } }, + virtual_type(val) { + if (this.virtual_type == 3) this.formItem.type = '3'; + }, }, mounted() { this.kuaidiComsList(1); @@ -322,9 +322,14 @@ export default { cart_num: v.num || v.surplus_num, }); }); - orderPrice(data).then((res) => { - console.log(res); - }); + orderPrice(data) + .then((res) => { + console.log(res); + this.sendPrice = res.data.price; + }) + .catch((err) => { + this.$Message.error(err.msg); + }); }, selectOne(data) { this.selectData = data; @@ -343,6 +348,9 @@ export default { this.manyFormValidate.push(res.data[key]); }); }); + } else { + this.formItem.cart_ids = []; + this.selectData = []; } }, changeRadio(o) { diff --git a/template/admin/src/pages/order/refund/index.vue b/template/admin/src/pages/order/refund/index.vue index 66c4dc34e..917882d3e 100644 --- a/template/admin/src/pages/order/refund/index.vue +++ b/template/admin/src/pages/order/refund/index.vue @@ -568,13 +568,13 @@ export default { getDataInfoNew(id) .then(async (res) => { this.orderDatalist = res.data; - if (this.orderDatalist.orderInfo.refund_img.length) { - try { - this.orderDatalist.orderInfo.refund_img = JSON.parse(this.orderDatalist.orderInfo.refund_img); - } catch (e) { - this.orderDatalist.orderInfo.refund_img = []; - } - } + // if (this.orderDatalist.orderInfo.refund_img.length) { + // try { + // this.orderDatalist.orderInfo.refund_img = this.orderDatalist.orderInfo.refund_img; + // } catch (e) { + // this.orderDatalist.orderInfo.refund_img = []; + // } + // } this.$nextTick((e) => { this.$refs.detailss.modals = true; });