From b543ff827881e47565545f3bfa51a4aa8ac0acfe Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Tue, 8 Jun 2021 11:33:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/promotion/coupon/coupon.vue | 11 +++++++----
 seller/src/views/promotion/coupon/coupon.vue  | 18 +++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
index 5ea885b3..5efe3010 100644
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -138,13 +138,13 @@ export default {
         {
           title: "活动名称",
           key: "promotionName",
-          minWidth: 120,
+          width: 120,
           fixed: "left",
         },
         {
           title: "优惠券名称",
           key: "couponName",
-          minWidth: 120,
+          width: 120,
           tooltip: true
         }, {
           title: "面额/折扣",
@@ -168,7 +168,8 @@ export default {
           render: (h, params) => {
             return h(
               "div", params.row.receivedNum + "/" + params.row.publishNum)
-          }
+          },
+          minWidth:130,
         },
         {
           title: "优惠券类型",
@@ -210,6 +211,7 @@ export default {
                 {innerHTML: params.row.startTime + "<br/>" + params.row.endTime}
             });
           },
+          minWidth:150,
         },
         {
           title: "状态",
@@ -243,13 +245,14 @@ export default {
               ),
             ]);
           },
+          minWidth:70,
         },
         {
           title: "操作",
           slot: "action",
           align: "center",
           fixed: "right",
-          width: 80
+          minWidth: 140
         },
       ],
       data: [], // 表单数据
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 5bdde01e..9cd259de 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -143,13 +143,13 @@ export default {
         {
           title: "活动名称",
           key: "promotionName",
-          minWidth: 120,
+          width: 120,
           fixed: "left",
         },
         {
           title: "优惠券名称",
           key: "couponName",
-          minWidth: 120,
+          width: 120,
           tooltip: true
         }, {
           title: "面额/折扣",
@@ -170,11 +170,11 @@ export default {
         {
           title: "领取数量/总数量",
           key: "publishNum",
-          width: 100,
           render: (h, params) => {
             return h(
               "div", params.row.receivedNum + "/" + params.row.publishNum)
-          }
+          },
+          minWidth:130,
         },
         {
           title: "优惠券类型",
@@ -210,18 +210,17 @@ export default {
         },
         {
           title: "活动时间",
-          minWidth: 120,
           render: (h, params) => {
             return h("div", {
               domProps:
                 {innerHTML: params.row.startTime + "<br/>" + params.row.endTime}
             });
           },
+          minWidth:150,
         },
         {
           title: "状态",
           key: "promotionStatus",
-          width: 100,
           fixed: "right",
           render: (h, params) => {
             let text = "未知",
@@ -248,16 +247,17 @@ export default {
                   },
                 },
                 text
-              )
+              ),
             ]);
-          }
+          },
+          minWidth:70,
         },
         {
           title: "操作",
           slot: "action",
           align: "center",
           fixed: "right",
-          minWidth: 80,
+          minWidth: 140
         },
       ],
       data: [], // 表单数据

From 99f4634ef700bc94b17c5d066c88adb446fbdf89 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Tue, 8 Jun 2021 14:45:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/goods/goods-seller/goodsOperation.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index bb794f9b..ea90ac09 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -522,7 +522,7 @@
                 <span slot="append">kg</span>
               </Input>
             </FormItem>
-            <!-- <FormItem class="form-item-view-el" label="运费" prop="skuList">
+            <FormItem class="form-item-view-el" label="运费" prop="skuList">
               <RadioGroup type="button" button-style="solid"
                 @on-change="logisticsTemplateChange"
                 v-model="baseInfoForm.freightPayer"
@@ -534,7 +534,7 @@
                   <span>使用物流规则</span>
                 </Radio>
               </RadioGroup>
-            </FormItem> -->
+            </FormItem>
             <FormItem
               class="form-item-view-el"
               label="物流模板"

From b7a2a681c2f796f02095ebf07b9074fa2cd2a024 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 9 Jun 2021 09:32:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/goods/goods-seller/goods.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index 75f8123d..7751b2b9 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -226,7 +226,7 @@ export default {
         {
           title: "商品编号",
           key: "sn",
-          width: 200,
+          width: 100,
           tooltip: true,
         },
         {
@@ -338,6 +338,7 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
+          fixed: "right",
           width: 200,
           render: (h, params) => {
             let enableOrDisable = "";