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 @@ - 全品类 - 指定商品 - 部分商品分类 + 全品类 + 指定商品 + 部分商品分类
- - + +