From 75ef173c6494b048140234623480bf4af36e7f4b Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 13 Jul 2022 20:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpc=E7=AB=AF=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E8=A3=85=E4=BF=AE=E5=A4=96=E9=83=A8=E9=93=BE=E6=8E=A5=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/plugins/request.js | 2 +- .../views/lili-dialog/template/marketing.vue | 2 + .../views/lili-floor-renovation/modelForm.vue | 790 ++++++++++-------- .../lili-floor-renovation/modelFormItem.vue | 21 +- .../modelList/carousel.vue | 84 +- .../modelList/carousel1.vue | 64 +- .../modelList/carousel2.vue | 122 ++- .../modelList/firstPageAdvert.vue | 326 ++++---- .../modelList/newGoodsSort.vue | 741 +++++++++------- .../modelList/recommend.vue | 28 +- .../full-discount/full-discount-detail.vue | 71 +- 11 files changed, 1276 insertions(+), 975 deletions(-) diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js index b9e8a6cf..20503d87 100644 --- a/buyer/src/plugins/request.js +++ b/buyer/src/plugins/request.js @@ -142,7 +142,7 @@ service.interceptors.response.use( const errorResponse = error.response || {}; const errorData = errorResponse.data || {}; - if (errorResponse.status === 403 || error.response.data.code === 20004) { + if (errorResponse.status === 401 || errorResponse.status === 403 || error.response.data.code === 20004) { isRefreshToken++; if (isRefreshToken === 1) { diff --git a/manager/src/views/lili-dialog/template/marketing.vue b/manager/src/views/lili-dialog/template/marketing.vue index 119bf4d9..c81f56fa 100644 --- a/manager/src/views/lili-dialog/template/marketing.vue +++ b/manager/src/views/lili-dialog/template/marketing.vue @@ -341,6 +341,7 @@ export default { title: "优惠券", methodsed: () => { this.showPromotionList = []; + this.activeColumns = this.pintuanColumns; this.sortGoods("COUPON"); }, }; @@ -349,6 +350,7 @@ export default { title: "积分商品", methodsed: () => { this.showPromotionList = []; + this.activeColumns = this.pintuanColumns; this.sortGoods("POINTS_GOODS"); }, }; diff --git a/manager/src/views/lili-floor-renovation/modelForm.vue b/manager/src/views/lili-floor-renovation/modelForm.vue index f2c65e68..acfaefce 100644 --- a/manager/src/views/lili-floor-renovation/modelForm.vue +++ b/manager/src/views/lili-floor-renovation/modelForm.vue @@ -1,385 +1,449 @@ diff --git a/manager/src/views/lili-floor-renovation/modelFormItem.vue b/manager/src/views/lili-floor-renovation/modelFormItem.vue index b87d747f..1df2a076 100644 --- a/manager/src/views/lili-floor-renovation/modelFormItem.vue +++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue @@ -198,7 +198,12 @@ 建议尺寸：{{ selected.size }}
- 图片链接：{{ selected.url }} + 图片链接： @@ -211,11 +216,7 @@
- + import ModelCarousel from "./modelList/carousel.vue"; -import ModelCarousel1 from './modelList/carousel1.vue'; -import ModelCarousel2 from './modelList/carousel2.vue'; +import ModelCarousel1 from "./modelList/carousel1.vue"; +import ModelCarousel2 from "./modelList/carousel2.vue"; import FirstPageAdvert from "./modelList/firstPageAdvert.vue"; import NewGoodsSort from "./modelList/newGoodsSort.vue"; import Recommend from "./modelList/recommend.vue"; @@ -284,8 +285,10 @@ export default { // 确定选择链接 selectedLink(val) { this.selected.url = this.$options.filters.formatLinkType(val); + this.selected.type = + val.___type === "other" && val.url === "" ? "link" : "other"; }, - + handleSelectImg() { // 选择图片 this.$refs.ossManage.selectImage = true; diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel.vue b/manager/src/views/lili-floor-renovation/modelList/carousel.vue index cede534d..60f7fe15 100644 --- a/manager/src/views/lili-floor-renovation/modelList/carousel.vue +++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue @@ -22,7 +22,9 @@
-
Hi，{{ userInfo.nickName || "欢迎来到管理后台" | secrecyMobile }}
+
+ Hi，{{ userInfo.nickName || "欢迎来到管理后台" | secrecyMobile }} +
@@ -34,8 +36,13 @@
常见问题
    -
  • - {{article.title}} +
  • + {{ article.title }}
@@ -49,8 +56,6 @@ width="800" :z-index="100" :mask-closable="false" - - >
@@ -78,19 +83,22 @@ alt="" /> - + + +   -   +  
@@ -125,39 +133,40 @@ export default { name: "modelCarousel", props: ["data"], components: { - ossManage + ossManage, }, data() { return { showModal: false, // modal显隐 selected: null, // 已选数据 picModelFlag: false, // 选择图片modal - userInfo:{}, - articleList:[ - {title:'促销计算规则'}, - {title:'商家申请开店'}, - {title:'商家账号注册'}, - {title:'促销计算规则'} - ] + userInfo: {}, + articleList: [ + { title: "促销计算规则" }, + { title: "商家申请开店" }, + { title: "商家账号注册" }, + { title: "促销计算规则" }, + ], }; }, methods: { - handleSelectModel () { + handleSelectModel() { // 编辑模块 this.showModal = true; }, // 添加轮播图 - handleAdd () { - this.data.options.list.push({ img: "", url: "" }); + handleAdd() { + this.data.options.list.push({ img: "", url: "", type: "" }); this.$forceUpdate(); }, - handleSelectLink (item) { + handleSelectLink(item) { // 选择链接 - this.$refs.liliDialog.open('link') + this.$refs.liliDialog.open("link"); this.selected = item; }, - callbackSelected (item) { // 选择图片回调 + callbackSelected(item) { + // 选择图片回调 this.picModelFlag = false; this.selected.img = item.url; }, @@ -165,10 +174,11 @@ export default { // 删除图片 this.data.options.list.splice(index, 1); }, - selectedLink(val) { // 选择链接回调 - console.log(val); + selectedLink(val) { + // 选择链接回调 this.selected.url = this.$options.filters.formatLinkType(val); - console.log(this.selected.url); + this.selected.type = + val.___type === "other" && val.url === "" ? "link" : "other"; }, // 选择图片 handleSelectImg(item) { diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel1.vue b/manager/src/views/lili-floor-renovation/modelList/carousel1.vue index 3ee291f5..aa3c6bb8 100644 --- a/manager/src/views/lili-floor-renovation/modelList/carousel1.vue +++ b/manager/src/views/lili-floor-renovation/modelList/carousel1.vue @@ -1,12 +1,12 @@ @@ -242,11 +252,13 @@ export default { }, handleSelectGoods(item) { // 调起选择商品 - this.$refs.liliDialog.open('goods', 'single') + this.$refs.liliDialog.open("goods", "single"); }, // 选择链接回调 selectedLink(val) { this.selected.url = this.$options.filters.formatLinkType(val); + this.selected.type = + val.___type === "other" && val.url === "" ? "link" : "other"; }, // 选择商品回调 selectedGoodsData(val) { diff --git a/manager/src/views/promotions/full-discount/full-discount-detail.vue b/manager/src/views/promotions/full-discount/full-discount-detail.vue index 67073a33..ede6b069 100644 --- a/manager/src/views/promotions/full-discount/full-discount-detail.vue +++ b/manager/src/views/promotions/full-discount/full-discount-detail.vue @@ -52,8 +52,12 @@ /> 消费达到当前金额可以参与优惠 - - + + 减现金 打折 @@ -88,24 +92,29 @@ 优惠折扣为0-10之间数字，可有一位小数 - 免邮费  - 送优惠券  + 免邮费  + 送优惠券  送赠品  送积分 @@ -118,22 +127,37 @@ :loading="giftLoading" style="width: 260px" > - + - + - + 全品类 指定商品 - +