diff --git a/public/index.html b/public/index.html index 223fef8..e0d1029 100644 --- a/public/index.html +++ b/public/index.html @@ -1,21 +1,27 @@ - - - - - - - <%= webpackConfig.name %> - - - -
- - + + + + + + + + + + <%= webpackConfig.name %> + + + + + +
+ + + + \ No newline at end of file diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue index ed78c30..3751ea6 100644 --- a/src/views/order/list/index.vue +++ b/src/views/order/list/index.vue @@ -401,7 +401,13 @@ :key="i" class="tabBox acea-row row-middle" > - {{ val.product.is_customize ? "是" : "否" }} + {{ + val.cart_info && + val.cart_info.product && + val.cart_info.product.is_customize + ? "是" + : "否" + }} diff --git a/src/views/order/refund/refundDetail.vue b/src/views/order/refund/refundDetail.vue index caf43f4..cc21da4 100644 --- a/src/views/order/refund/refundDetail.vue +++ b/src/views/order/refund/refundDetail.vue @@ -9,54 +9,118 @@
用户信息
-
用户昵称：{{ orderDatalist.user.nickname }}
-
退货人：{{ orderDatalist.order.real_name }}
-
联系电话：{{ orderDatalist.order.user_phone }}
-
退货地址：{{ orderDatalist.order.user_address }}
+
+ 用户昵称：{{ orderDatalist.user.nickname }} +
+
+ 退货人：{{ orderDatalist.order.real_name }} +
+
+ 联系电话：{{ orderDatalist.order.user_phone }} +
+
+ 退货地址：{{ orderDatalist.order.user_address }} +
备注：{{ orderDatalist.mark }}
-
{{orderDatalist.refund_type == 1 ? '退款信息' : '退回商品信息'}}
+
+ {{ orderDatalist.refund_type == 1 ? "退款信息" : "退回商品信息" }} +
-
订单编号：{{ orderDatalist.order.order_sn }}
-
订单状态：{{ orderDatalist.status | orderRefundFilter }}
-
退款单号：{{ orderDatalist.refund_order_sn }}
-
退款商品名称： -
-
- {{item.product.cart_info.product.store_name}} -
-
+
+ 订单编号：{{ orderDatalist.order.order_sn }}
-
退款发起方：{{ orderDatalist.create_user }}
-
退款商品件数：{{ orderDatalist.refund_num }}件
-
退款总金额：{{ orderDatalist.refund_price }}元
-
退货快递单号：{{ orderDatalist.delivery_id }}
-
创建时间：{{ orderDatalist.create_time }}
-
退货金额：{{ orderDatalist.refund_price-orderDatalist.refund_postage }}
-
退折扣：{{ orderDatalist.amount }}
-
退运费金额：{{ orderDatalist.refund_postage }}
-
商家备注：{{ orderDatalist.mer_mark }}
-
退款凭证： -
-
- + 订单状态：{{ orderDatalist.status | orderRefundFilter }} +
+
+ 退款单号：{{ orderDatalist.refund_order_sn }} +
+
+ 退款商品名称： +
+
+ > + {{ item.product.cart_info.product.store_name }} +
+
+
+
+ 退款发起方：{{ orderDatalist.create_user }} +
+
+ 退款商品件数：{{ orderDatalist.refund_num }}件 +
+
+ 退款总金额：{{ orderDatalist.refund_price }}元 +
+
+ 退货快递单号：{{ orderDatalist.delivery_id }} +
+
+ 创建时间：{{ orderDatalist.create_time }} +
+
+ 退货金额：{{ orderDatalist.refund_good_price }} +
+
退折扣：{{ orderDatalist.amount }}
+
+ 退运费金额：{{ orderDatalist.refund_postage }} +
+
+ 商家备注：{{ orderDatalist.mer_mark }} +
+
+ 退款凭证： +
+
+ +
-
订单记录
- - - - + + + +
-
+
退货物流信息
快递公司：{{ orderDatalist.delivery_type }} - 物流查询 + 物流查询 +
+
+ 快递单号：{{ orderDatalist.delivery_id }}
-
快递单号：{{ orderDatalist.delivery_id }}
-
diff --git a/src/views/product/productExamine/editAttr.vue b/src/views/product/productExamine/editAttr.vue index c5cdba8..a220342 100644 --- a/src/views/product/productExamine/editAttr.vue +++ b/src/views/product/productExamine/editAttr.vue @@ -3,10 +3,10 @@ + > --> - + - + - + - + - - + + - + - - - - - - - + - + + + + + + + + + + + + + + + + + + + - + - 提交 + 提交
@@ -225,26 +452,25 @@ diff --git a/src/views/product/productExamine/proDetails.vue b/src/views/product/productExamine/proDetails.vue index 5a1644c..c0209c6 100644 --- a/src/views/product/productExamine/proDetails.vue +++ b/src/views/product/productExamine/proDetails.vue @@ -1216,9 +1216,11 @@ const defaultObj = { ot_price: null, proportion: 0.6, coupon: "", + third_agreement_price: "", stock: 0, // growth: 0, bar_code: "", + third_product_item_id: "", gist_url: null, weight: null, volume: null, @@ -1249,6 +1251,9 @@ const objTitle = { coupon: { title: "折扣", }, + third_agreement_price: { + title: "协议价", + }, stock: { title: "库存", }, @@ -1258,6 +1263,9 @@ const objTitle = { bar_code: { title: "商品编号", }, + third_product_item_id: { + title: "编号", + }, weight: { title: "重量（KG）", },