From 0504592f7ded2ed1c846ee323171c2ded64f5697 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 8 Jul 2021 09:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/promotion/coupon/coupon.vue |  2 +-
 .../views/goods/goods-seller/addGoods.scss    | 25 ++-----------------
 .../goods/goods-seller/goodsOperation.vue     | 22 +++++-----------
 .../goods/goods-seller/goodsOperationSec.vue  |  3 +++
 seller/src/views/promotion/coupon/coupon.vue  |  2 +-
 5 files changed, 13 insertions(+), 41 deletions(-)

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 @@
 <template>
   <div class="goods-operation">
     <div class="step-list">
-      <steps :current="activestep" simple style="height:60px;margin-top: 10px" process-status="process">
-        <div class="step-view">
-          <step title="选择商品品类"/>
-        </div>
-        <div class="step-view">
-          <step title="填写商品详情"/>
-        </div>
-        <div class="step-view">
-          <step title="商品发布成功"/>
-        </div>
+      <steps :current="activestep" style="height:60px;margin-top: 10px">
+        <step title="选择商品品类"/>
+        <step title="填写商品详情"/>
+        <step title="商品发布成功"/>
       </steps>
     </div>
     <!-- 第一步 选择分类 -->
-    <first-step ref='first' v-if="activestep === 0"></first-step>
+    <first-step ref='first' v-show="activestep === 0"></first-step>
     <!-- 第二步 商品详细信息 -->
     <second-step ref='second' v-if="activestep === 1"></second-step>
     <!-- 第三步 发布完成 -->
@@ -23,11 +17,7 @@
     
   </div>
 </template>
-
 <script>
-
-
-
 import firstStep from  './goodsOperationFirst'
 import secondStep from  './goodsOperationSec'
 import thirdStep from  './goodsOperationThird'
@@ -42,7 +32,7 @@ export default {
   data() {
     return {
       /** 当前激活步骤*/
-      activestep: '',
+      activestep: 0,
     };
   },
 
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index b11d95df..72f77bfd 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -545,6 +545,9 @@ export default {
       this.selectedSku = row;
       this.showSkuPicture = true;
     },
+    pre () { // 上一步
+      this.$parent.activestep--;
+    },
     // 预览图片
     handleView (url) {
       this.previewPicture = url;
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index a26b98c5..2fc09243 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -108,7 +108,7 @@ export default {
           render: (h, params) => {
             return h(
               "div",
-              params.row.receivedNum + "/" + (params.row.publishNum === 0 ? '无限制' : params.row.publishNum)
+              params.row.receivedNum + "/" + (params.row.publishNum === 0 ? '不限制' : params.row.publishNum)
             );
           },
         },