From 4156d51d78062bdb2b99a66ff2814fc7a443d1a4 Mon Sep 17 00:00:00 2001 From: paulGao Date: Mon, 18 Apr 2022 09:38:52 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E8=A3=85=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/assets/align-text-center.png | Bin 0 -> 270 bytes manager/src/assets/align-text-left.png | Bin 0 -> 266 bytes manager/src/assets/align-text-right.png | Bin 0 -> 271 bytes manager/src/views/lili-dialog/link-dialog.vue | 30 +- .../views/lili-dialog/template/marketing.vue | 214 +++++++------- .../src/views/lili-dialog/template/other.vue | 56 ++-- .../views/lili-floor-renovation/wap/config.js | 162 ++++++----- .../lili-floor-renovation/wap/decorate.scss | 260 ++++++++++------- .../lili-floor-renovation/wap/decorate.vue | 271 +++++++++++++++--- .../wap/template/index.js | 22 +- .../wap/template/tpl_notice.vue | 61 ++++ .../wap/template/tpl_promotion_detail.vue | 137 +++++++++ .../wap/template/tpl_promotions.vue | 30 ++ .../wap/template/tpl_title.vue | 29 +- 14 files changed, 916 insertions(+), 356 deletions(-) create mode 100644 manager/src/assets/align-text-center.png create mode 100644 manager/src/assets/align-text-left.png create mode 100644 manager/src/assets/align-text-right.png create mode 100644 manager/src/views/lili-floor-renovation/wap/template/tpl_notice.vue create mode 100644 manager/src/views/lili-floor-renovation/wap/template/tpl_promotion_detail.vue create mode 100644 manager/src/views/lili-floor-renovation/wap/template/tpl_promotions.vue diff --git a/manager/src/assets/align-text-center.png b/manager/src/assets/align-text-center.png new file mode 100644 index 0000000000000000000000000000000000000000..a38eb53433e4fb33c970a1ae1eb5133acb61ae61 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-wj^(N7l!{JxM1({$v~0Ao-U3d z8I5meMspo95O7_uba!%TZPeZ6Z_Qqv7jfiBIdaUqnvdtFXM$gwO@a!;4b!Cdc@EET`D{I{pZ&}?=X0}`njxg HN@xNA{j+Q_ literal 0 HcmV?d00001 diff --git a/manager/src/assets/align-text-left.png b/manager/src/assets/align-text-left.png new file mode 100644 index 0000000000000000000000000000000000000000..993028dc4c724d1f004cf5095a15908cab61460e GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-wj^(N7l!{JxM1({$v~0)o-U3d z8I5mmI&vK{5NLh4+~a+U?fkI!nbp0!W#WMTQlDOS`_gXBYo)m{9;PgX#ol%IU)_n>#J%h8 z#4q!+o|;%Y37ET=tkrtH=Cd25*s7$X>K zJdZIYY`AsDt?7{WV`0usHx{L*Ts&I!#`^KLrRl+IR(t9_G2%M3%yx&~>pwPoKK~Hnm=)kkdC$u-`b(>~2)L*WR0}ZVIv{E{^N&t
- - - + + -
+ diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_promotion_detail.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_promotion_detail.vue new file mode 100644 index 00000000..05d4bd6d --- /dev/null +++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_promotion_detail.vue @@ -0,0 +1,137 @@ + + + \ No newline at end of file diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_promotions.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_promotions.vue new file mode 100644 index 00000000..391596eb --- /dev/null +++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_promotions.vue @@ -0,0 +1,30 @@ + + + diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue index 5fce25ff..7286f2ce 100644 --- a/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue +++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue @@ -1,9 +1,26 @@ @@ -11,13 +28,14 @@ From 744567e8de21afd045b859682a41ed9e94f13e91 Mon Sep 17 00:00:00 2001 From: paulGao Date: Mon, 18 Apr 2022 09:49:09 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E8=A3=85=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/lili-floor-renovation/wap/index.vue | 110 +++++++++++++----- 1 file changed, 81 insertions(+), 29 deletions(-) diff --git a/manager/src/views/lili-floor-renovation/wap/index.vue b/manager/src/views/lili-floor-renovation/wap/index.vue index b0f82171..36fd57e5 100644 --- a/manager/src/views/lili-floor-renovation/wap/index.vue +++ b/manager/src/views/lili-floor-renovation/wap/index.vue @@ -15,7 +15,7 @@ >
  • @@ -77,7 +77,8 @@ import templates from "./template/index"; import Draggable from "vuedraggable"; import { modelData } from "./config"; import decorate from "./decorate"; -import * as API_Other from '@/api/other' +import * as API_Other from "@/api/other"; +import * as API_Promotions from "@/api/promotion"; export default { components: { Draggable, @@ -89,10 +90,12 @@ export default { modelData, // 装修模型 qrcode: "", // 二维码 selected: 0, // 已选下标 - contentData: { // 总数据 + contentData: { + // 总数据 list: [], }, decorateData: "", // 装修数据 + decoratePromotionsData: "", // 装修数据 }; }, watch: { @@ -108,21 +111,14 @@ export default { }, methods: { - - enableBindGoodsShow(){ - - }, - - // 初始化数据 init() { if (!this.$route.query.id) return false; - API_Other.getHomeData(this.$route.query.id).then(res=>{ - this.contentData = JSON.parse(res.result.pageData) + API_Other.getHomeData(this.$route.query.id).then((res) => { + this.contentData = JSON.parse(res.result.pageData); - - this.handleComponent( this.contentData.list[0], 0) - }) + this.handleComponent(this.contentData.list[0], 0); + }); }, // 中间组件拖动，右侧数据绑定不变 @@ -136,7 +132,6 @@ export default { this.$nextTick(() => { this.decorateData = ""; - console.log(this.contentData.list.length); // 如果当前楼层不为一 if (this.contentData.list.length > 1) { // 如果当前最底层 给下一层赋值 @@ -156,29 +151,86 @@ export default { // 点击楼层装修 handleComponent(val, index) { - console.warn(val) this.selected = index; this.$set(this, "decorateData", val); }, // 右侧栏回调 handleDrawer(val) { - let newIndex = this.selected; + if (val.promotionsType) { + if (this.contentData.list[newIndex].options.list.length >= 2) { + this.$Message.error("最多只能展示两个活动"); + return; + } + if (val.promotionsType === "LIVE") { + API_Promotions.getLiveList({ + status: "START", + pageSize: 1, + }).then((res) => { + if (res.success && res.result.size > 0) { + API_Promotions.getLiveInfo(res.result.records[0].id).then( + (res) => { + if (res.success) { + this.contentData.list[newIndex].options.list.push({ + type: val.promotionsType, + title: val.name, + title1: val.subName, + color1: val.subColor, + bk_color: val.subBkColor, + data: res.result.commodityList + ? res.result.commodityList + : [], + }); + } + } + ); + } + }); + } else { + API_Promotions.getAllPromotion().then((res) => { + let exist = this.contentData.list[newIndex].options.list.find( + (i) => i.type === val.promotionsType + ); - this.decorateData = ""; + if (res.success && !exist) { + this.contentData.list[newIndex].options.list.push({ + data: res.result[val.promotionsType] + ? res.result[val.promotionsType] + : [], + type: val.promotionsType, + title1: val.subName, + color1: val.subColor, + bk_color: val.subBkColor, + title: val.name, + }); + } + }); + } + this.$set(this.contentData.list, newIndex, { + ...val, + options: { + ...this.contentData.list[newIndex].options, + }, + // 绑定键值 + model: val.type, + }); + } else { + this.decorateData = ""; - this.$set(this.contentData.list, newIndex, { - ...val, - options: { - ...val.options, - }, + this.$set(this.contentData.list, newIndex, { + ...val, + options: { + ...val.options, + }, - // 绑定键值 - model: val.type, - }); - this.contentData.list = JSON.parse(JSON.stringify(this.contentData.list)); - - this.$set(this, "decorateData", this.contentData.list[newIndex]); + // 绑定键值 + model: val.type, + }); + this.contentData.list = JSON.parse( + JSON.stringify(this.contentData.list) + ); + this.$set(this, "decorateData", this.contentData.list[newIndex]); + } }, // 封装拖拽参数 From c09e25974f468ee54434a819be98cb8fde881838 Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Mon, 18 Apr 2022 19:10:10 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/seller/bill/bill-detail.vue | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue index e8959646..896b3fe8 100644 --- a/manager/src/views/seller/bill/bill-detail.vue +++ b/manager/src/views/seller/bill/bill-detail.vue @@ -47,23 +47,22 @@

    -{{bill.distributionCommission || 0 | unitPrice('￥')}}

    -

    平台优惠券支出

    -

    -{{bill.siteCouponCommission || 0 | unitPrice('￥')}}

    +

    退单平台优惠券返还

    +

    +{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}

    +     + + +

    平台优惠券补贴

    +

    -{{bill.siteCouponCommission || 0 | unitPrice('￥')}}

    退单产生退还佣金金额

    +{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}

     -

    退单分销返现返还

    +{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}

     - - -

    退单平台优惠券返还

    -

    +{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}

    -

    积分结算金额

    +{{bill.pointSettlementPrice || 0 | unitPrice('￥')}}

    From 7312b3ec3f27630328620dd9a428c643075050cb Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Mon, 18 Apr 2022 19:10:46 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/shop/bill/billDetail.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue index 4bd1f266..5c536a1b 100644 --- a/seller/src/views/shop/bill/billDetail.vue +++ b/seller/src/views/shop/bill/billDetail.vue @@ -45,9 +45,15 @@

    分销返现支出

    -{{bill.distributionCommission || 0 | unitPrice('￥')}}

     + + +

    退单平台优惠券返还

    +

    -{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}

    +     + -

    平台优惠券支出

    -

    -{{bill.siteCouponCommission || 0 | unitPrice('￥')}}

    +

    平台优惠券补贴

    +

    +{{bill.siteCouponCommission || 0 | unitPrice('￥')}}

    退单产生退还佣金金额

    @@ -58,11 +64,6 @@

    退单分销返现返还

    +{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}

     - - -

    退单平台优惠券返还

    -

    +{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}

    -

    积分结算金额

    +{{bill.pointSettlementPrice || 0 | unitPrice('￥')}}

    From c4168c9a2bd6f31ef53311618ed0273dd5bd5cc2 Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 21 Apr 2022 14:57:33 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=98=E6=83=A0=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/goodsDetail/ShowGoods.vue | 2 +- buyer/src/pages/home/orderCenter/MyOrder.vue | 2 +- manager/src/api/promotion.js | 2 +- .../views/lili-floor-renovation/wap/config.js | 18 ++++ .../lili-floor-renovation/wap/decorate.scss | 4 +- .../lili-floor-renovation/wap/decorate.vue | 10 ++ .../views/lili-floor-renovation/wap/index.vue | 4 +- .../wap/template/index.js | 1 - .../wap/template/tpl_menu.vue | 57 +++++----- .../full-discount/full-discount-add.vue | 100 +++++++++++++----- 10 files changed, 138 insertions(+), 62 deletions(-) diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index dc85314d..006492f6 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -101,7 +101,7 @@ > 满{{ promotionMap["FULL_DISCOUNT"].fullMoney }}元，立享{{ promotionMap["FULL_DISCOUNT"].fullRate }}折 { return e.status === status }); - return ob[0].name + return ob && ob[0] ? ob[0].name : status } } }; diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js index 50591f28..2628f5d9 100644 --- a/manager/src/api/promotion.js +++ b/manager/src/api/promotion.js @@ -41,7 +41,7 @@ export const getPromotionGoods = (promotionId, params) => { // 获取当前进行中的促销活动 export const getAllPromotion = params => { - return getRequest("/promotion/current", params); + return getRequest("/promotion/promotion/current", params); }; // 获取拼团数据 diff --git a/manager/src/views/lili-floor-renovation/wap/config.js b/manager/src/views/lili-floor-renovation/wap/config.js index cf931eed..cc6808c4 100644 --- a/manager/src/views/lili-floor-renovation/wap/config.js +++ b/manager/src/views/lili-floor-renovation/wap/config.js @@ -519,6 +519,24 @@ export const modelData = [ ] } }, + { + type: "notice", + name: "公告", + img: "md-image", + notAdd: false, + notLink: true, + notImg: true, + options: { + list: [ + { + title: [{context: "这是一条公告"}], + color: "#666", + bk_color: "#FFF", + img: 'http://files.sxcfx.cn/upload/20220318/71e5d27aca82aeedf647052e1e4ceaaa.png' + } + ] + } + }, { type: "promotions", name: "促销活动", diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.scss b/manager/src/views/lili-floor-renovation/wap/decorate.scss index 8c2f85bd..ac7aaaa5 100644 --- a/manager/src/views/lili-floor-renovation/wap/decorate.scss +++ b/manager/src/views/lili-floor-renovation/wap/decorate.scss @@ -148,7 +148,9 @@ display: flex; } -.decorate-notice {} +.decorate-notice { + margin-top: 10px; +} .card {} diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.vue b/manager/src/views/lili-floor-renovation/wap/decorate.vue index ee889144..78d50203 100644 --- a/manager/src/views/lili-floor-renovation/wap/decorate.vue +++ b/manager/src/views/lili-floor-renovation/wap/decorate.vue @@ -274,6 +274,11 @@ class="decorate-notice" > + @@ -503,6 +508,11 @@ export default { this.selectedGoods = item; this.picModelFlag = true; }, + removeNotice(index) { + this.$nextTick(() => { + this.res.options.list[0].title.splice(index, 1); + }); + }, // 关闭 closeDecorate(index) { this.$nextTick(() => { diff --git a/manager/src/views/lili-floor-renovation/wap/index.vue b/manager/src/views/lili-floor-renovation/wap/index.vue index 36fd57e5..e4149dd1 100644 --- a/manager/src/views/lili-floor-renovation/wap/index.vue +++ b/manager/src/views/lili-floor-renovation/wap/index.vue @@ -178,7 +178,7 @@ export default { color1: val.subColor, bk_color: val.subBkColor, data: res.result.commodityList - ? res.result.commodityList + ? res.result.commodityList.splice(0,2) : [], }); } @@ -195,7 +195,7 @@ export default { if (res.success && !exist) { this.contentData.list[newIndex].options.list.push({ data: res.result[val.promotionsType] - ? res.result[val.promotionsType] + ? res.result[val.promotionsType].splice(0,2) : [], type: val.promotionsType, title1: val.subName, diff --git a/manager/src/views/lili-floor-renovation/wap/template/index.js b/manager/src/views/lili-floor-renovation/wap/template/index.js index d1be0999..88e40321 100644 --- a/manager/src/views/lili-floor-renovation/wap/template/index.js +++ b/manager/src/views/lili-floor-renovation/wap/template/index.js @@ -46,5 +46,4 @@ export default { tpl_ad_list, promotions: tpl_promotions, tpl_activity_list, - tpl_adv }; diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue index 7fd1357c..1e942c32 100644 --- a/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue +++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue @@ -1,38 +1,39 @@ diff --git a/seller/src/views/promotion/full-discount/full-discount-add.vue b/seller/src/views/promotion/full-discount/full-discount-add.vue index f1067acf..134ef7d4 100644 --- a/seller/src/views/promotion/full-discount/full-discount-add.vue +++ b/seller/src/views/promotion/full-discount/full-discount-add.vue @@ -53,11 +53,19 @@ 消费达到当前金额可以参与优惠 - - + 减现金 - 打折 @@ -102,7 +110,9 @@ v-model="form.couponFlag" >送优惠券 - 送赠品 - + @@ -140,9 +153,14 @@ :loading="giftLoading" style="width: 280px" > - + @@ -155,17 +173,26 @@ /> - + 全品类 - 指定商品 - +
    - +
    @@ -280,7 +310,10 @@ export default { promotionName: [{ required: true, message: "活动名称不能为空" }], rangeTime: [{ required: true, message: "请选择活动时间" }], description: [{ required: true, message: "请填写活动描述" }], - price: [{ required: true, message: "请输入面额" }, { validator: checkPrice }], + price: [ + { required: true, message: "请输入面额" }, + { validator: checkPrice }, + ], consumptionLimit: [{ required: true, validator: checkWeight }], fullMoney: [{ required: true, validator: checkWeight }], fullMinus: [ @@ -318,7 +351,10 @@ export default { key: "price", minWidth: 40, render: (h, params) => { - return h("div", this.$options.filters.unitPrice(params.row.price, "￥")); + return h( + "div", + this.$options.filters.unitPrice(params.row.price, "￥") + ); }, }, { @@ -343,8 +379,8 @@ export default { if (this.id) { this.getDetail(); } - this.getCouponList(); - this.getGiftList(); + await this.getCouponList(); + await this.getGiftList(); }, methods: { // 关闭当前页面 @@ -390,14 +426,19 @@ export default { this.$refs.form.validate((valid) => { if (valid) { const params = JSON.parse(JSON.stringify(this.form)); - const strat = this.$options.filters.unixToDate(this.form.rangeTime[0] / 1000); - const end = this.$options.filters.unixToDate(this.form.rangeTime[1] / 1000); + const strat = this.$options.filters.unixToDate( + this.form.rangeTime[0] / 1000 + ); + const end = this.$options.filters.unixToDate( + this.form.rangeTime[1] / 1000 + ); params.startTime = strat; params.endTime = end; if ( params.scopeType == "PORTION_GOODS" && - (!params.promotionGoodsList || params.promotionGoodsList.length == 0) + (!params.promotionGoodsList || + params.promotionGoodsList.length == 0) ) { this.$Modal.warning({ title: "提示", content: "请选择指定商品" }); return; @@ -463,9 +504,11 @@ export default { this.selectedGoods.forEach(function (e) { ids.push(e.id); }); - this.form.promotionGoodsList = this.form.promotionGoodsList.filter((item) => { - return !ids.includes(item.id); - }); + this.form.promotionGoodsList = this.form.promotionGoodsList.filter( + (item) => { + return !ids.includes(item.id); + } + ); }, }); }, @@ -511,7 +554,10 @@ export default { let params = { pageSize: 10, pageNumber: 1, - goodsName: query, + id: query === this.form.giftId ? this.form.giftId : null, + goodsName: query === this.form.giftId ? null : query, + marketEnable: "UPPER", + authFlag: "PASS" }; this.giftLoading = true; getGoodsSkuListDataSeller(params).then((res) => { From 7ff51b5e537a9da47688f323adf369560bc46bf3 Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 21 Apr 2022 16:11:11 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E9=A1=B5=E6=98=BE=E7=A4=BA=E5=A4=B1=E6=95=88=E5=95=86=E5=93=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/payment/Pay.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index 9b5d83b7..f2f6192d 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -92,7 +92,7 @@
    Date: Fri, 22 Apr 2022 09:04:20 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/seller/bill/bill-detail.vue | 26 +++--- seller/src/views/shop/bill/billDetail.vue | 82 ++++++++++--------- 2 files changed, 57 insertions(+), 51 deletions(-) diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue index 896b3fe8..f4f641d2 100644 --- a/manager/src/views/seller/bill/bill-detail.vue +++ b/manager/src/views/seller/bill/bill-detail.vue @@ -38,31 +38,35 @@

    退单金额

    -{{bill.refundPrice || 0 | unitPrice('￥')}}

     +

    平台收取佣金

    -{{bill.commissionPrice || 0 | unitPrice('￥')}}

     + +

    退单产生退还佣金金额

    +

    +{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}

    +     +

    分销返现支出

    -{{bill.distributionCommission || 0 | unitPrice('￥')}}

     + +

    退单分销返现返还

    +

    +{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}

    +     + -

    退单平台优惠券返还

    -

    +{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}

    +

    退单平台优惠券补贴返还

    +

    -{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}

    平台优惠券补贴

    -

    -{{bill.siteCouponCommission || 0 | unitPrice('￥')}}

    -     - -

    退单产生退还佣金金额

    -

    +{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}

    -     - -

    退单分销返现返还

    -

    +{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}

    +

    +{{bill.siteCouponCommission || 0 | unitPrice('￥')}}

     +

    积分结算金额

    +{{bill.pointSettlementPrice || 0 | unitPrice('￥')}}

    diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue index 5c536a1b..ab9b016d 100644 --- a/seller/src/views/shop/bill/billDetail.vue +++ b/seller/src/views/shop/bill/billDetail.vue @@ -33,47 +33,49 @@

    结算详细

    - -

    退单金额

    -

    -{{bill.refundPrice || 0 | unitPrice('￥')}}

    -     - -

    平台收取佣金

    -

    -{{bill.commissionPrice || 0 | unitPrice('￥')}}

    -     - -

    分销返现支出

    -

    -{{bill.distributionCommission || 0 | unitPrice('￥')}}

    -     - - -

    退单平台优惠券返还

    -

    -{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}

    -     - - -

    平台优惠券补贴

    -

    +{{bill.siteCouponCommission || 0 | unitPrice('￥')}}

    -     - -

    退单产生退还佣金金额

    -

    +{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}

    -     - - -

    退单分销返现返还

    -

    +{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}

    -     - -

    积分结算金额

    -

    +{{bill.pointSettlementPrice || 0 | unitPrice('￥')}}

    -     - -

    砍价商品结算金额

    -

    +{{bill.kanjiaSettlementPrice || 0 | unitPrice('￥')}}

    -     + +

    退单金额

    +

    -{{bill.refundPrice || 0 | unitPrice('￥')}}

    +     + + +

    平台收取佣金

    +

    -{{bill.commissionPrice || 0 | unitPrice('￥')}}

    +     + +

    退单产生退还佣金金额

    +

    +{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}

    +     + + +

    分销返现支出

    +

    -{{bill.distributionCommission || 0 | unitPrice('￥')}}

    +     + +

    退单分销返现返还

    +

    +{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}

    +     + + +

    退单平台优惠券补贴返还

    +

    -{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}

    +     + + +

    平台优惠券补贴

    +

    +{{bill.siteCouponCommission || 0 | unitPrice('￥')}}

    +     + + +

    积分结算金额

    +

    +{{bill.pointSettlementPrice || 0 | unitPrice('￥')}}

    +     + +

    砍价商品结算金额

    +

    +{{bill.kanjiaSettlementPrice || 0 | unitPrice('￥')}}

    +     +
    -
    From 0635dd38a2dcd599334dbef3e66e1c227a99afa1 Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 22 Apr 2022 16:48:43 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E9=A1=B5=E4=B8=AD=E6=9C=89=E6=97=A0=E6=95=88=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=AD=E7=89=A9=E8=BD=A6=E9=A1=B5=E3=80=82?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=83=AD=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) => {