From 87980277bf9d34f9b8afa2bedb982ab5f97ec7ba Mon Sep 17 00:00:00 2001 From: mabo Date: Mon, 26 Jul 2021 18:12:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?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 --- manager/src/router/router.js | 12 - manager/src/views/member/list/index.vue | 35 +- .../views/page/article-manage/articleList.vue | 6 +- manager/src/views/page/focus/mobileFocus.vue | 509 ------------------ manager/src/views/page/focus/pcFocus.vue | 509 ------------------ .../page/navigation/mobileNavigation.vue | 474 ---------------- .../views/page/navigation/pcNavigation.vue | 439 --------------- .../personal-center/personal-center.scss | 65 --- .../views/personal-center/personal-center.vue | 99 +++- manager/src/views/promotion/coupon/coupon.vue | 24 +- .../src/views/promotion/coupon/couponInfo.vue | 240 --------- .../views/promotion/coupon/couponPublish.scss | 257 --------- .../views/promotion/coupon/couponPublish.vue | 14 +- .../views/promotion/couponActivity/coupon.vue | 36 +- .../promotion/couponActivity/couponInfo.vue | 62 ++- .../couponActivity/couponPublish.scss | 253 --------- .../couponActivity/couponPublish.vue | 15 +- .../src/views/promotion/fullCut/full-cut.vue | 17 +- manager/src/views/promotion/live/live.vue | 3 +- .../src/views/promotion/live/liveDetail.vue | 1 - .../src/views/promotion/pintuan/pintuan.vue | 153 +++--- .../views/promotion/pintuan/pintuanGoods.vue | 70 +-- .../promotion/pointsGoods/addPointsGoods.vue | 15 +- .../promotion/pointsGoods/editPointsGoods.vue | 10 +- .../promotion/pointsGoods/pointsGoods.vue | 23 +- .../pointsGoodsCategory.vue | 66 ++- .../views/promotion/seckill/addSeckill.scss | 264 --------- .../views/promotion/seckill/addSeckill.vue | 21 +- .../src/views/promotion/seckill/seckill.vue | 15 +- .../views/promotion/seckill/seckillGoods.vue | 17 +- .../views/promotion/seckill/setupSeckill.vue | 5 +- manager/src/views/region/index.vue | 18 +- .../src/views/seller/shop/shopAuditList.vue | 55 +- manager/src/views/seller/shop/shopDetail.scss | 3 - manager/src/views/seller/shop/shopDetail.vue | 50 +- manager/src/views/seller/shop/shopList.vue | 61 +-- .../src/views/seller/shop/shopOperation.vue | 19 +- manager/src/views/sensitiveWords/index.vue | 33 +- 38 files changed, 418 insertions(+), 3550 deletions(-) delete mode 100644 manager/src/views/page/focus/mobileFocus.vue delete mode 100644 manager/src/views/page/focus/pcFocus.vue delete mode 100644 manager/src/views/page/navigation/mobileNavigation.vue delete mode 100644 manager/src/views/page/navigation/pcNavigation.vue delete mode 100644 manager/src/views/personal-center/personal-center.scss delete mode 100644 manager/src/views/promotion/coupon/couponInfo.vue delete mode 100644 manager/src/views/promotion/coupon/couponPublish.scss delete mode 100644 manager/src/views/promotion/couponActivity/couponPublish.scss delete mode 100644 manager/src/views/promotion/seckill/addSeckill.scss diff --git a/manager/src/router/router.js b/manager/src/router/router.js index 0f938097..3284d3b7 100644 --- a/manager/src/router/router.js +++ b/manager/src/router/router.js @@ -192,12 +192,6 @@ export const otherRouter = { name: "edit-platform-coupon", component: () => import("@/views/promotion/coupon/couponPublish.vue") }, - { - path: "promotion/platform-coupon-info", - title: "详情", - name: "platform-coupon-info", - component: () => import("@/views/promotion/coupon/couponInfo.vue") - }, { path: "coupon-activity/add", title: "添加优惠券活动", @@ -216,12 +210,6 @@ export const otherRouter = { name: "coupon-activity-info", component: () => import("@/views/promotion/couponActivity/couponInfo.vue") }, - { - path: "promotion/platform-coupon-info", - title: "详情", - name: "platform-coupon-activity", - component: () => import("@/views/promotion/coupon/couponInfo.vue") - }, { path: "promotion/manager-pintuan", title: "平台拼团", diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue index 09945e30..894a7184 100644 --- a/manager/src/views/member/list/index.vue +++ b/manager/src/views/member/list/index.vue @@ -17,12 +17,11 @@ - + - -
+
@@ -43,29 +42,20 @@ -
- - + +
-
- + }">修改 @@ -93,12 +83,9 @@
- + }">修改
@@ -121,8 +108,7 @@ import * as RegExp from "@/libs/RegExp.js"; export default { name: "member", components: { - region, - ossManage + region, ossManage }, data() { return { @@ -372,9 +358,6 @@ export default { // 分页 改变页码 changePage(v) { this.searchForm.pageNumber = v; - // 此处如果是父子级传值的时候需要做一下处理 - //selectedMember - this.getData(); }, // 分页 改变页数 diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue index 79e9242b..4892cad6 100644 --- a/manager/src/views/page/article-manage/articleList.vue +++ b/manager/src/views/page/article-manage/articleList.vue @@ -2,9 +2,9 @@
- + diff --git a/manager/src/views/page/focus/mobileFocus.vue b/manager/src/views/page/focus/mobileFocus.vue deleted file mode 100644 index a672e43a..00000000 --- a/manager/src/views/page/focus/mobileFocus.vue +++ /dev/null @@ -1,509 +0,0 @@ - - - - diff --git a/manager/src/views/page/focus/pcFocus.vue b/manager/src/views/page/focus/pcFocus.vue deleted file mode 100644 index 284c1da3..00000000 --- a/manager/src/views/page/focus/pcFocus.vue +++ /dev/null @@ -1,509 +0,0 @@ - - - - diff --git a/manager/src/views/page/navigation/mobileNavigation.vue b/manager/src/views/page/navigation/mobileNavigation.vue deleted file mode 100644 index 3822d8ed..00000000 --- a/manager/src/views/page/navigation/mobileNavigation.vue +++ /dev/null @@ -1,474 +0,0 @@ - - - diff --git a/manager/src/views/page/navigation/pcNavigation.vue b/manager/src/views/page/navigation/pcNavigation.vue deleted file mode 100644 index 927ee2e3..00000000 --- a/manager/src/views/page/navigation/pcNavigation.vue +++ /dev/null @@ -1,439 +0,0 @@ - - - diff --git a/manager/src/views/personal-center/personal-center.scss b/manager/src/views/personal-center/personal-center.scss deleted file mode 100644 index f4a29cb9..00000000 --- a/manager/src/views/personal-center/personal-center.scss +++ /dev/null @@ -1,65 +0,0 @@ -.own-space { - .own-space-new { - .ivu-card-body { - padding: 16px 16px 16px 0px; - } - } - - .own-wrap { - display: flex; - - .title { - font-size: 20px; - color: rgba(0, 0, 0, .85); - line-height: 28px; - font-weight: 500; - margin-bottom: 12px; - } - - .safe { - width: 100%; - - .item { - width: 100%; - display: flex; - align-items: center; - justify-content: space-between; - padding-top: 14px; - padding-bottom: 14px; - border-bottom: 1px solid #e8e8e8; - - .title { - color: rgba(0, 0, 0, .65); - margin-bottom: 4px; - font-size: 14px; - line-height: 22px; - } - - .desc { - color: rgba(0, 0, 0, .45); - font-size: 14px; - line-height: 22px; - - .red { - color: #ed3f14; - } - - .middle { - color: #faad14; - } - - .green { - color: #52c41a; - } - } - } - } - } -} - -/deep/ .upload-list { - img { - width: 100%; - height: 100%; - } -} diff --git a/manager/src/views/personal-center/personal-center.vue b/manager/src/views/personal-center/personal-center.vue index 94f4b62f..ad838f3d 100644 --- a/manager/src/views/personal-center/personal-center.vue +++ b/manager/src/views/personal-center/personal-center.vue @@ -1,7 +1,3 @@ - -