From 647ed90eace0e2c92e3a7fe62398c3c77eb8e500 Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 3 Sep 2021 09:40:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96=EF=BC=8C=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/Cart.vue | 4 +- buyer/src/pages/payment/Pay.vue | 158 +++++++++++++----- .../views/promotion/pintuan/pintuanGoods.vue | 7 - 3 files changed, 117 insertions(+), 52 deletions(-) diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index f46df18b..857a82b8 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -90,14 +90,14 @@
- {{ goods.goodsSku.price | unitPrice("¥") }} + {{ goods.purchasePrice | unitPrice("¥") }}
{{goods.goodsSku.quantity > 0 ? '有货' : '无货'}}
- {{ goods.num * goods.goodsSku.price | unitPrice("¥") }} + {{ goods.subTotal | unitPrice("¥") }}
删除 diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index 812806f6..231b45d2 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -5,7 +5,7 @@
- +
@@ -46,8 +46,9 @@ {{ item.name }} 默认 {{ - item.alias - }} + item.alias + }} +
{{ item.mobile }}
@@ -59,16 +60,16 @@ class="ml_10" v-if="!item.isDefault" @click.stop="delAddress(item)" - >删除删除
- +
- +
添加新地址
@@ -79,8 +80,8 @@ v-if="addressList.length > 3" > {{ moreAddr ? "收起地址" : "更多地址" }} - - + + @@ -97,8 +98,8 @@
{{ - shop.storeName - }}  
@@ -114,19 +115,19 @@ goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId) " > - + {{ - goods.goodsSku.goodsName - }} + goods.goodsSku.goodsName + }} {{ - goods.goodsSku.price | unitPrice("¥") - }} + goods.purchasePrice | unitPrice("¥") + }} x{{ goods.num }} {{ goods.goodsSku.quantity > 0 ? "有货" : "无货" }} {{ - (goods.goodsSku.price * goods.num) | unitPrice("¥") - }} + goods.subTotal | unitPrice("¥") + }}
@@ -138,7 +139,7 @@ placeholder="订单备注" /> 提示:请勿填写有关支付、收货、发票方面的信息提示:请勿填写有关支付、收货、发票方面的信息
@@ -147,7 +148,7 @@
发票信息 + >发票信息 开企业抬头发票须填写纳税人识别号,以免影响报销 @@ -177,18 +178,18 @@ {{ + >¥{{ item.price | unitPrice }} {{ item.discount }}{{ item.discount }} 满{{ item.consumeThreshold }}元可用满{{ item.consumeThreshold }}元可用

使用范围:{{ useScope(item.scopeType) }}

@@ -206,7 +207,7 @@ class="c-right" v-if="usedCouponId.includes(item.id)" @click="useCoupon(item.id, false)" - >放弃优惠放弃优惠 @@ -219,21 +220,27 @@ {{ totalNum }}件商品,总商品金额:{{ priceDetailDTO.goodsPrice | unitPrice("¥") }}
-
+
运费:{{ priceDetailDTO.freightPrice | unitPrice("¥") }}
-
+
优惠金额:-{{ - (priceDetailDTO.discountPrice + - priceDetailDTO.couponPrice + - priceDetailDTO.updatePrice) - | unitPrice("¥") - }} + >-{{ + priceDetailDTO.discountPrice | unitPrice("¥") + }}
+
+ 优惠券金额:-{{ + priceDetailDTO.couponPrice | unitPrice("¥") + }} +
+
应付积分:{{ @@ -277,7 +284,7 @@ diff --git a/seller/src/views/main-components/footer.vue b/seller/src/views/main-components/footer.vue index 16001782..41985922 100644 --- a/seller/src/views/main-components/footer.vue +++ b/seller/src/views/main-components/footer.vue @@ -1,22 +1,24 @@