From 0635dd38a2dcd599334dbef3e66e1c227a99afa1 Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 22 Apr 2022 16:48:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=93=E7=AE=97=E9=A1=B5?= =?UTF-8?q?=E4=B8=AD=E6=9C=89=E6=97=A0=E6=95=88=E5=95=86=E5=93=81=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=B4=AD=E7=89=A9=E8=BD=A6=E9=A1=B5=E3=80=82=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E7=83=AD?= =?UTF-8?q?=E8=AF=8D=E5=85=A8=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/Cart.vue | 71 +++++--- buyer/src/pages/payment/Pay.vue | 163 ++++++++++++------ .../views/page/article-manage/hotWords.vue | 13 +- 3 files changed, 172 insertions(+), 75 deletions(-) diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index ff6cfb63..0b5a6415 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -34,7 +34,9 @@
- 全选
@@ -77,7 +79,9 @@ v-for="(item, index) in shop.couponList" :key="index" > - ￥{{ item.price }} + ￥{{ item.price }} {{ item.couponDiscount }}折 @@ -100,12 +104,16 @@
+ - @@ -179,13 +202,19 @@
- 全选
-
删除选中商品
+
+ 删除选中商品 +
-
清空购物车
+
+ 清空购物车 +
@@ -193,7 +222,9 @@ >件商品
- 已节省{{ priceDetailDTO.discountPrice | unitPrice("￥") }} + 已节省{{ + priceDetailDTO.discountPrice | unitPrice("￥") + }}
总价（不含运费）: diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index f2f6192d..a736e4bf 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -43,13 +43,20 @@
{{ item.name }} 默认 - {{ item.alias }} + {{ item.alias }} +
{{ item.mobile }}
-
{{ item.consigneeAddressPath | unitAddress }} {{ item.detail }}
+
+ {{ item.consigneeAddressPath | unitAddress }} {{ item.detail }} +
修改 - 删除
@@ -80,45 +87,59 @@ 商品信息 返回购物车
-
-
- - {{ - shop.storeName - }}   - -
-
-
- - - {{ goods.goodsSku.goodsName }} +
+
+
+ + {{ + shop.storeName + }}   - {{ goods.purchasePrice | unitPrice("￥") }} - x{{ goods.num }} - {{ goods.goodsSku.quantity > 0 ? "有货" : "无货" }} - {{ goods.subTotal | unitPrice("￥") }}
-
-
- - 提示：请勿填写有关支付、收货、发票方面的信息 +
+
+ + + {{ + goods.goodsSku.goodsName + }} + + {{ + goods.purchasePrice | unitPrice("￥") + }} + x{{ goods.num }} + {{ goods.goodsSku.quantity > 0 ? "有货" : "无货" }} + {{ + goods.subTotal | unitPrice("￥") + }} +
+
+
+ + 提示：请勿填写有关支付、收货、发票方面的信息 +
@@ -146,11 +167,19 @@
无可用优惠券
    -
  • +
  • - ￥{{ item.price | unitPrice }}￥{{ + item.price | unitPrice + }} {{ item.discount }}折 - 满{{ item.consumeThreshold }}元可用 + 满{{ item.consumeThreshold }}元可用

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

    有效期：{{ item.endTime }}

    @@ -225,9 +256,17 @@
    - + - +
@@ -303,6 +342,15 @@ export default { .then((res) => { this.$Spin.hide(); if (res.success) { + if ( + !res.result.checkedSkuList || + res.result.checkedSkuList.length === 0 + ) { + this.$router.push({ + path: "/cart", + replace: true, + }); + } this.goodsList = res.result.cartList; this.priceDetailDTO = res.result.priceDetailDTO; this.skuList = res.result.skuList; @@ -313,11 +361,19 @@ export default { let notSupArea = res.result.notSupportFreight; this.selectedCoupon = {}; if (res.result.platformCoupon) - this.selectedCoupon[res.result.platformCoupon.memberCoupon.id] = res.result.platformCoupon; - if (res.result.storeCoupons && Object.keys(res.result.storeCoupons)[0]) { - let storeMemberCouponsId = Object.keys(res.result.storeCoupons)[0]; - let storeCouponId = res.result.storeCoupons[storeMemberCouponsId].memberCoupon.id; - this.selectedCoupon[storeCouponId] = res.result.storeCoupons[storeMemberCouponsId]; + this.selectedCoupon[res.result.platformCoupon.memberCoupon.id] = + res.result.platformCoupon; + if ( + res.result.storeCoupons && + Object.keys(res.result.storeCoupons)[0] + ) { + let storeMemberCouponsId = Object.keys( + res.result.storeCoupons + )[0]; + let storeCouponId = + res.result.storeCoupons[storeMemberCouponsId].memberCoupon.id; + this.selectedCoupon[storeCouponId] = + res.result.storeCoupons[storeMemberCouponsId]; } if (notSupArea) { let content = []; @@ -344,7 +400,10 @@ export default { const couponKeys = Object.keys(this.selectedCoupon); if (couponKeys.length) { this.couponList.forEach((e) => { - if (this.selectedCoupon[e.id] && e.id === this.selectedCoupon[e.id].memberCoupon.id) { + if ( + this.selectedCoupon[e.id] && + e.id === this.selectedCoupon[e.id].memberCoupon.id + ) { this.usedCouponId.push(e.id); } }); diff --git a/manager/src/views/page/article-manage/hotWords.vue b/manager/src/views/page/article-manage/hotWords.vue index 69f750ba..d5f717d0 100644 --- a/manager/src/views/page/article-manage/hotWords.vue +++ b/manager/src/views/page/article-manage/hotWords.vue @@ -3,6 +3,7 @@ +

@@ -112,10 +113,16 @@ export default { this.modalVisible = true; }, deleteWords(words) { + let title = "是否确定删除热词"; + let content = "

您确定要删除此热词吗？

"; + if (words === '') { + title = "是否确定清空热词"; + content = "

您确定要清空热词吗？

"; + } this.$Modal.confirm({ - title: "是否确定删除热词", - content: "

您确定要删除此热词吗？

", - okText: "确实", + title: title, + content: content, + okText: "确定", cancelText: "取消", onOk: () => { deleteHotWords(words).then((res) => {