From 7825186853bc46772c6c87c92909df46809b595d Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Sun, 19 May 2024 11:52:06 +0800 Subject: [PATCH] edit --- src/components/templatesFrom/index.vue | 3 +++ src/filters/commFilter.js | 2 +- src/views/order/index.vue | 6 +++--- src/views/order/orderDetails.vue | 14 +++++++------- src/views/order/orderRefund/index.vue | 6 +++--- src/views/product/addProduct/index.vue | 2 +- src/views/systemForm/setSystem/modifyStoreInfo.vue | 6 +++--- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/components/templatesFrom/index.vue b/src/components/templatesFrom/index.vue index 06aa48b..6832c89 100644 --- a/src/components/templatesFrom/index.vue +++ b/src/components/templatesFrom/index.vue @@ -6,6 +6,9 @@ + + 运费说明会显示在商品名称下方，请仔细填写 + diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js index d7d7825..9fd72c2 100644 --- a/src/filters/commFilter.js +++ b/src/filters/commFilter.js @@ -96,7 +96,7 @@ export function cancelOrderStatusFilter(status) { export function orderPayType(type) { const typeMap = { - '0': '抵扣券支付', + '0': '银联支付', '1': '微信支付', '2': '小程序', '3': '微信支付', diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 6853052..083810d 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -79,10 +79,10 @@ class="selWidth" @change="getList(1),getCardList()" > - - + + - + diff --git a/src/views/order/orderDetails.vue b/src/views/order/orderDetails.vue index 7a566cd..f5f3fa4 100644 --- a/src/views/order/orderDetails.vue +++ b/src/views/order/orderDetails.vue @@ -32,13 +32,13 @@ @click="send" >发送货 - 小票打印 + > --> @@ -139,22 +139,22 @@ 尾款¥{{orderDetailList.finalOrder.pay_price}} -
  • +
  • -
    积分抵扣：
    +
    铸源星抵扣：
    使用了{{ orderDetailList.integral }}个积分，抵扣了{{ orderDetailList.integral_price }}元
  • 商品总价：
    {{ orderDetailList.total_price ? orderDetailList.total_price : '-' }}
    • -
  • +
  • 支付运费：
    {{ orderDetailList.pay_postage }}
    diff --git a/src/views/order/orderRefund/index.vue b/src/views/order/orderRefund/index.vue index 62bf6da..79ddfb6 100644 --- a/src/views/order/orderRefund/index.vue +++ b/src/views/order/orderRefund/index.vue @@ -113,10 +113,10 @@ class="selWidth" @change="getList(1)" > - - + + - + diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue index 84c916b..eb43602 100644 --- a/src/views/product/addProduct/index.vue +++ b/src/views/product/addProduct/index.vue @@ -2169,7 +2169,7 @@ const objTitle = { title: '占比' }, coupon:{ - title:'抵扣' + title:'抵扣券' }, stock: { title: '库存' diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue index a1dd337..436998e 100644 --- a/src/views/systemForm/setSystem/modifyStoreInfo.vue +++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue @@ -44,9 +44,9 @@
    是否开启商户： - - - + + + 请先支付店铺费用!