From 43349a51d1532703ea8e751fdd456d26efdd9717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 3 Sep 2021 14:58:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=88=86=E7=A6=BBseller=E7=AB=AFconfig?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E9=85=8D=E7=BD=AE=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=86=97=E4=BD=99=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B2=A1=E7=94=A8=E7=9A=84=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/styles/common.scss | 1 + manager/src/styles/table-common.scss | 72 ++--- manager/src/views/promotion/coupon/coupon.vue | 12 +- .../views/promotion/coupon/couponPublish.vue | 49 ++-- seller/public/config.js | 29 +++ seller/public/index.html | 3 +- seller/src/assets/background.svg | 1 - seller/src/assets/dashboard/console.png | Bin 2370 -> 0 bytes seller/src/assets/dashboard/department.png | Bin 6531 -> 0 bytes seller/src/assets/dashboard/fee.png | Bin 6391 -> 0 bytes seller/src/assets/dashboard/user.png | Bin 6259 -> 0 bytes seller/src/assets/decorate/delete.png | Bin 5657 -> 0 bytes seller/src/assets/decorate/edit.png | Bin 3887 -> 0 bytes seller/src/assets/decorate/phone.png | Bin 41877 -> 0 bytes seller/src/assets/decorate/poplarGoods.png | Bin 1401 -> 0 bytes seller/src/assets/festival_icon.png | Bin 1169 -> 0 bytes seller/src/assets/iPhoneX_model.png | Bin 17276 -> 0 bytes seller/src/assets/loading.gif | Bin 72109 -> 0 bytes seller/src/assets/loading3.gif | Bin 81765 -> 0 bytes seller/src/assets/logo.png | Bin 398960 -> 11570 bytes seller/src/assets/play.png | Bin 9279 -> 0 bytes seller/src/assets/seckillBg.png | Bin 17182 -> 0 bytes seller/src/assets/vaptcha-loading.gif | Bin 1479 -> 0 bytes seller/src/config/index.js | 27 -- seller/src/libs/axios.js | 9 +- seller/src/libs/util.js | 2 +- seller/src/main.js | 9 +- seller/src/styles/common.scss | 246 +++++++----------- seller/src/styles/table-common.scss | 65 ++--- seller/src/styles/tree-common.scss | 14 - .../src/views/goods/goods-manage/category.vue | 18 -- seller/src/views/main-components/footer.vue | 10 +- seller/src/views/main-components/header.vue | 2 +- seller/src/views/main.scss | 21 -- seller/src/views/order/order/orderList.vue | 2 +- seller/src/views/promotion/coupon/coupon.vue | 12 +- .../views/promotion/coupon/couponPublish.vue | 43 +-- seller/vue.config.js | 7 + 38 files changed, 256 insertions(+), 398 deletions(-) create mode 100644 seller/public/config.js delete mode 100644 seller/src/assets/background.svg delete mode 100644 seller/src/assets/dashboard/console.png delete mode 100644 seller/src/assets/dashboard/department.png delete mode 100644 seller/src/assets/dashboard/fee.png delete mode 100644 seller/src/assets/dashboard/user.png delete mode 100644 seller/src/assets/decorate/delete.png delete mode 100644 seller/src/assets/decorate/edit.png delete mode 100644 seller/src/assets/decorate/phone.png delete mode 100644 seller/src/assets/decorate/poplarGoods.png delete mode 100644 seller/src/assets/festival_icon.png delete mode 100644 seller/src/assets/iPhoneX_model.png delete mode 100644 seller/src/assets/loading.gif delete mode 100644 seller/src/assets/loading3.gif delete mode 100644 seller/src/assets/play.png delete mode 100644 seller/src/assets/seckillBg.png delete mode 100644 seller/src/assets/vaptcha-loading.gif diff --git a/manager/src/styles/common.scss b/manager/src/styles/common.scss index a170a37d..c2816e89 100644 --- a/manager/src/styles/common.scss +++ b/manager/src/styles/common.scss @@ -67,6 +67,7 @@ $theme_color: #804ed1; .mb_10{margin-bottom: 10px;} .mt_10{margin-top: 10px;} .ml_10{margin-left: 10px;} +.ml_5{margin-left: 10px;} .mr_10{margin-right: 10px;} .pb_20{padding-bottom: 20px;} diff --git a/manager/src/styles/table-common.scss b/manager/src/styles/table-common.scss index 19a17f47..ccce9a12 100644 --- a/manager/src/styles/table-common.scss +++ b/manager/src/styles/table-common.scss @@ -1,79 +1,47 @@ .search { - .operation { - margin-bottom: 2vh; - } + .operation { + margin-bottom: 2vh; + } - .select-count { - font-weight: 600; - color: #40a9ff; - } + .select-count { + font-weight: 600; + color: #40a9ff; + } - .select-clear { - margin-left: 10px; - } - - .page { - margin-top: 2vh; - } - - .drop-down { - margin-left: 5px; - } + .select-clear { + margin-left: 10px; + } } -.tree-list { - position: relative; - min-height: 80px; -} - -.drawer-footer { - z-index: 10; - width: 100%; - position: absolute; - bottom: 0; - left: 0; - border-top: 1px solid #e8e8e8; - padding: 10px 16px; - text-align: right; - background: #fff; -} - -.block-tool .ivu-tooltip, -.block-tool .ivu-tooltip-rel { - display: block; -} - -.block-pop .ivu-poptip, -.block-pop .ivu-poptip-rel { - display: block; +.search-input { + width: 270px; + margin-right: 20px; } .search-form { width: 100% !important; display: flex; align-items: center; - background-color: #F0F0F0; + background-color: #f0f0f0; + border-radius: 0.4em; padding: 10px; margin: 0; flex-wrap: wrap; - .ivu-form-item{ - margin:8px 10px !important; + > .ivu-form-item { + margin: 8px 10px !important; } - } -.padding-row{ +.padding-row { margin-top: 15px; margin-bottom: 15px; } -.search-btn{ +.search-btn { margin-left: 20px; } -.div-zoom{ +.div-zoom { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 4; overflow: hidden; } - - diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index 9818d4b5..731eb3ff 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -24,9 +24,11 @@ @@ -313,8 +315,10 @@ export default { this.loading = false; }, - edit(v) { // 跳转编辑页面 - this.$router.push({ name: "edit-platform-coupon", query: { id: v.id } }); + see(v,only) { // 跳转编辑页面 + let data + only ? data = { onlyView : true,id: v.id } : data = { id: v.id } + this.$router.push({ name: "edit-platform-coupon", query:data }); }, remove(v) { // 下架优惠券 this.$Modal.confirm({ diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue index 5cb6cddd..24efe2a9 100644 --- a/manager/src/views/promotion/coupon/couponPublish.vue +++ b/manager/src/views/promotion/coupon/couponPublish.vue @@ -6,68 +6,68 @@

基本信息

- + - + - - + 请输入0-10之间数字,可以输入一位小数 - + - - + % 店铺承担比例,输入0-100之间数值 - +
如果发放数量为0时,则代表不限制发放数量
- +
如果领取数量为0时,则代表不限制领取数量
-

使用限制

- +
- + 起止时间 - 固定时间 + 固定时间
-
@@ -80,16 +80,16 @@ - 全品类 - 指定商品 - 部分商品分类 + 全品类 + 指定商品 + 部分商品分类
- - + +