diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index 5027b6e7..bfa68824 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -121,7 +121,7 @@ export default { render: (h, params) => { return h( "div", - params.row.receivedNum + "/" + params.row.publishNum + params.row.receivedNum + "/" + (params.row.publishNum === 0 ? '不限制' : params.row.publishNum) ); }, diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss index a1b9d609..44de5fac 100644 --- a/seller/src/views/goods/goods-seller/addGoods.scss +++ b/seller/src/views/goods/goods-seller/addGoods.scss @@ -280,34 +280,13 @@ div.base-info-item { word-break: break-all; } -/deep/ .ivu-steps { - width: 100% !important; - display: flex; -} .step-list { height: 60px; + padding: 10px 30px; + background-color: #fff; margin-bottom: 20px; border-radius: 0.8em; box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); - // box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04) -} -.step-view { - flex: 1; - height: 60px; - font-size: 19px; - text-align: center; - display: flex; - background-color: #fff; - justify-content: center; - align-items: center; -} -.step-view:nth-of-type(1) { - border-top-left-radius: 0.4em; - border-bottom-left-radius: 0.4em; -} -.step-view:nth-last-child(1) { - border-top-right-radius: 0.4em; - border-bottom-right-radius: 0.4em; } .add-sku-btn { diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index 5d3a9a41..824bff12 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -1,20 +1,14 @@ -