From 48c0dcb69bc94ad0aff3cb255ae5d9c9cd92b5c7 Mon Sep 17 00:00:00 2001 From: mabo Date: Thu, 8 Jul 2021 14:36:05 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/footer/Footer.vue | 5 +- buyer/src/components/verify/index.vue | 16 +- buyer/src/pages/forgetPassword.vue | 3 +- .../src/pages/home/orderCenter/AfterSale.vue | 4 +- manager/src/router/router.js | 20 -- manager/src/views/main-components/footer.vue | 9 +- .../src/views/my-components/verify/index.vue | 13 +- manager/src/views/promotion/coupon/coupon.vue | 220 +++++---------- .../views/promotion/coupon/couponPublish.vue | 4 +- .../views/promotion/coupon/couponSpecify.vue | 172 ------------ .../promotion/coupon/memberReceiveCoupon.vue | 250 ------------------ .../couponActivity/couponPublish.vue | 4 +- .../promotion/pointsGoods/addPointsGoods.vue | 4 +- seller/src/views/main-components/footer.vue | 9 +- .../src/views/my-components/verify/index.vue | 13 +- seller/src/views/promotion/coupon/coupon.vue | 2 +- 16 files changed, 104 insertions(+), 644 deletions(-) delete mode 100644 manager/src/views/promotion/coupon/couponSpecify.vue delete mode 100644 manager/src/views/promotion/coupon/memberReceiveCoupon.vue diff --git a/buyer/src/components/footer/Footer.vue b/buyer/src/components/footer/Footer.vue index 12116fa1..ff1459bb 100644 --- a/buyer/src/components/footer/Footer.vue +++ b/buyer/src/components/footer/Footer.vue @@ -40,7 +40,7 @@
-

Copyright © LILI

+

Copyright © {{year}} LILI

@@ -58,7 +58,8 @@ export default { [ '支付方式', '货到付款', '在线支付', '分期付款', '邮局汇款', '公司转账' ], [ '售后服务', '售后政策', '价格保护', '退款说明', '返修/退换货', '取消订单' ] ], - moreLink: ['关于我们', '联系我们', '联系客服', '商家帮助', '隐私政策'] // 更多链接 + moreLink: ['关于我们', '联系我们', '联系客服', '商家帮助', '隐私政策'], // 更多链接 + year: new Date().getFullYear() // 当前年份 }; }, methods: { diff --git a/buyer/src/components/verify/index.vue b/buyer/src/components/verify/index.vue index eb6cc5ef..2cbb8824 100644 --- a/buyer/src/components/verify/index.vue +++ b/buyer/src/components/verify/index.vue @@ -3,7 +3,7 @@
- +
@@ -82,26 +82,24 @@ export default { this.verifyText = '解锁失败'; let that = this; setTimeout(() => { - that.refresh(); + that.init(); }, 1000); this.$emit('change', { status: false, distance: this.distance }); } } else { - this.refresh() + this.init() } - }).catch(() => { - this.refresh() + + }).catch(()=>{ + this.init() }); }, - refresh () { // 刷新滑块 + init () { // 初始化数据 this.flag = false; this.downX = 0; this.distance = 0; this.bgColor = '#04ad11'; this.verifyText = '拖动滑块解锁'; - this.init(); - }, - init () { // 初始化数据 getVerifyImg(this.type).then(res => { if (res.result) { this.data = res.result; diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue index 88dced4e..469d329f 100644 --- a/buyer/src/pages/forgetPassword.vue +++ b/buyer/src/pages/forgetPassword.vue @@ -97,7 +97,7 @@ 条款 - Copyright © 2020 - Present + Copyright © {{year}} - Present lili-shop @@ -130,6 +130,7 @@ export default { password: '', oncePasd: '' }, + year: new Date().getFullYear(), // 当前年份 step: 0, // 步骤 ruleInline: { // 验证规则 diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue index c5f896db..271fcc29 100644 --- a/buyer/src/pages/home/orderCenter/AfterSale.vue +++ b/buyer/src/pages/home/orderCenter/AfterSale.vue @@ -84,7 +84,9 @@ export default { params: { // 请求参数 pageNumber: 1, pageSize: 10, - keywords: '' + keywords: '', + sort: 'createTime', + order: 'desc' }, // 状态数组 afterSaleStatusList, diff --git a/manager/src/router/router.js b/manager/src/router/router.js index d60e240f..ca19e81f 100644 --- a/manager/src/router/router.js +++ b/manager/src/router/router.js @@ -230,13 +230,6 @@ export const otherRouter = { name: "edit-platform-coupon", component: () => import("@/views/promotion/coupon/couponPublish.vue") }, - { - path: "promotion/member-receive-coupon", - title: "领取详情", - name: "member-receive-coupon", - component: () => - import("@/views/promotion/coupon/memberReceiveCoupon.vue") - }, { path: "promotion/platform-coupon-info", title: "详情", @@ -261,25 +254,12 @@ export const otherRouter = { name: "coupon-activity-info", component: () => import("@/views/promotion/couponActivity/couponInfo.vue") }, - { - path: "promotion/member-receive-coupon", - title: "领取详情", - name: "member-coupon-activity", - component: () => - import("@/views/promotion/coupon/memberReceiveCoupon.vue") - }, { path: "promotion/platform-coupon-info", title: "详情", name: "platform-coupon-activity", component: () => import("@/views/promotion/coupon/couponInfo.vue") }, - { - path: "promotion/add-coupon-specify", - title: "精准发劵", - name: "add-coupon-specify", - component: () => import("@/views/promotion/coupon/couponSpecify.vue") - }, { path: "promotion/manager-pintuan", title: "平台拼团", diff --git a/manager/src/views/main-components/footer.vue b/manager/src/views/main-components/footer.vue index e471877c..31d1d5f6 100644 --- a/manager/src/views/main-components/footer.vue +++ b/manager/src/views/main-components/footer.vue @@ -6,7 +6,7 @@ {{ $t('terms') }} - Copyright © 2020 - Present + Copyright © {{year}} - Present export default { - name: "footer" + name: "footer", + data() { + return { + year: new Date().getFullYear() + } + }, }; diff --git a/manager/src/views/my-components/verify/index.vue b/manager/src/views/my-components/verify/index.vue index 5f13fee8..2cbb8824 100644 --- a/manager/src/views/my-components/verify/index.vue +++ b/manager/src/views/my-components/verify/index.vue @@ -3,7 +3,7 @@
- +
@@ -82,27 +82,24 @@ export default { this.verifyText = '解锁失败'; let that = this; setTimeout(() => { - that.refresh(); + that.init(); }, 1000); this.$emit('change', { status: false, distance: this.distance }); } } else { - this.refresh() + this.init() } }).catch(()=>{ - this.refresh() + this.init() }); }, - refresh () { // 刷新滑块 + init () { // 初始化数据 this.flag = false; this.downX = 0; this.distance = 0; this.bgColor = '#04ad11'; this.verifyText = '拖动滑块解锁'; - this.init(); - }, - init () { // 初始化数据 getVerifyImg(this.type).then(res => { if (res.result) { this.data = res.result; diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index 5027b6e7..b91528b1 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -1,35 +1,32 @@