From 9fbc61f7426f9284eb69667746fe910407f972d1 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 29 Jun 2021 11:50:37 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods-seller/goodsOperationFirst.vue      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 seller/src/views/goods/goods-seller/goodsOperationFirst.vue

diff --git a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
new file mode 100644
index 00000000..5eaee9b6
--- /dev/null
+++ b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
@@ -0,0 +1,20 @@
+<template>
+  <div>
+    
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      
+    }
+  },
+  methods: {
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+  @import "./addGoods.scss";
+</style>
\ No newline at end of file

From e493f26442337a341f17023a52dc2cd0ced190c0 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 29 Jun 2021 17:53:50 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/verify/index.vue         |   2 +-
 .../goods/goods-seller/goodsOperation.vue     | 331 ++++--------------
 .../goods-seller/goodsOperationFirst.vue      | 190 +++++++++-
 .../goods/goods-seller/goodsOperationSec.vue  |  20 ++
 .../goods-seller/goodsOperationThird.vue      |  20 ++
 5 files changed, 288 insertions(+), 275 deletions(-)
 create mode 100644 seller/src/views/goods/goods-seller/goodsOperationSec.vue
 create mode 100644 seller/src/views/goods/goods-seller/goodsOperationThird.vue

diff --git a/buyer/src/components/verify/index.vue b/buyer/src/components/verify/index.vue
index 39ecee85..eb6b7705 100644
--- a/buyer/src/components/verify/index.vue
+++ b/buyer/src/components/verify/index.vue
@@ -112,7 +112,7 @@ export default {
       handler: function (v) {
         this.type = v;
       }
-    },
+    }
   }
 };
 </script>
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index f88e7c76..a1f874b5 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -1,32 +1,5 @@
 <template>
   <div class="goods-operation">
-    <!-- 选择商品类型 -->
-    <Modal v-model="selectGoodsType" width="550" :closable="false">
-      <div class="goods-type-list" v-if="!showGoodsTemplates">
-        <div class="goods-type-item" :class="{'active-goods-type':item.check}" @click="handleClickGoodsType(item)"
-             v-for="(item,index) in goodsTypeWay" :key="index">
-          <img :src="item.img"/>
-          <div>
-            <h2>{{ item.title }}</h2>
-            <p>{{ item.desc }}</p>
-          </div>
-        </div>
-      </div>
-      <div v-else class="goods-type-list">
-        <h2 @click="showGoodsTemplates = !showGoodsTemplates">返回</h2>
-        <div class="goods-type-item template-item" @click="handleClickGoodsTemplate(item)"
-             v-for="(item,index) in goodsTemplates" :key="index">
-          <img :src="item.thumbnail"/>
-          <div>
-            <h2>{{ item.goodsName }}</h2>
-            <p>{{ item.sellingPoint || '' }}</p>
-          </div>
-        </div>
-
-      </div>
-
-    </Modal>
-
     <div class="step-list">
       <steps :current="activestep" simple style="height:60px;margin-top: 10px" process-status="process">
         <div class="step-view">
@@ -40,39 +13,12 @@
         </div>
       </steps>
     </div>
-    <div class="content-goods-publish" v-show="activestep === 0">
-      <div class="goods-category">
-        <ul v-if="categoryListLevel1 && categoryListLevel1.length > 0">
-          <li v-for="(item, index) in categoryListLevel1" :class="{ activeClass: index == activeCategoryIndex1 }"
-              @click="handleSelectCategory(item, index, 1)" :key="index">
-            <span>{{ item.name }}</span>
-            <span>&gt;</span>
-          </li>
-        </ul>
-        <ul v-if="categoryListLevel2 && categoryListLevel2.length > 0">
-          <li v-for="(item, index) in categoryListLevel2" :class="{ activeClass: index == activeCategoryIndex2 }"
-              @click="handleSelectCategory(item, index, 2)" :key="index">
-            <span>{{ item.name }}</span>
-            <span>&gt;</span>
-          </li>
-        </ul>
-        <ul v-if="categoryListLevel3 && categoryListLevel3.length > 0">
-          <li v-for="(item, index) in categoryListLevel3" :class="{ activeClass: index == activeCategoryIndex3 }"
-              @click="handleSelectCategory(item, index, 3)" :key="index">
-            <span>{{ item.name }}</span>
-          </li>
-        </ul>
-      </div>
-      <p class="current-goods-category">
-        您当前选择的商品类别是：
-        <span>{{ activeCategoryName1 }}</span>
-        <span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
-        <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
-      </p>
-      <template v-if="!$route.query.id && draftId">
-        <Divider>已选商品模版:{{checkedTemplate()}}</Divider>
-      </template>
-    </div>
+    <!-- 第一步 选择分类 -->
+    <first-step ref='first' v-show="activestep === 0"></first-step>
+    <!-- 第二步 商品详细信息 -->
+    <second-step v-show="activestep === 1"></second-step>
+    <!-- 第三步 发布完成 -->
+    <third-step v-show="activestep === 2"></third-step>
 
     <div class="content-goods-publish" v-show="activestep === 1">
       <Form ref="baseInfoForm" :model="baseInfoForm" :label-width="120" :rules="baseInfoFormRule">
@@ -151,12 +97,6 @@
                         <Icon type="ios-eye-outline" size="30" @click.native="handleViewGoodsPicture(item.url)"></Icon>
                         <Icon type="ios-trash-outline" size="30" @click.native="handleRemoveGoodsPicture(item)"></Icon>
                       </div>
-                      <!-- <div>
-                        <Icon type="ios-arrow-dropleft" @click.native="
-                          handleGoodsPicRemoteUp(baseInfoForm.goodsGalleryFiles,__index)"/>
-                        <Icon type="ios-arrow-dropright" @click.native="
-                          handleGoodsPicRemoteDown(baseInfoForm.goodsGalleryFiles,__index)"/>
-                      </div> -->
                     </div>
                   </template>
                   <template v-else>
@@ -307,7 +247,7 @@
                   show-checkbox
                   @on-select-change="selectTree"
                   @on-check-change="changeSelect"
-                  :check-strictly="!strict"
+                  :check-strictly="false"
                 ></Tree>
               </FormItem>
             </div>
@@ -417,7 +357,7 @@
       <ButtonGroup>
         <Button type="primary" @click="pre" v-if="activestep === 1 && isPublish">上一步
         </Button>
-        <Button type="primary" @click="selectGoodsType=!selectGoodsType" v-if="activestep === 0">商品类型
+        <Button type="primary" @click="$refs.first.selectGoodsType = true" v-if="activestep === 0">商品类型
         </Button>
         <Button type="primary" @click="next" v-if="activestep === 0">下一步
         </Button>
@@ -428,8 +368,8 @@
           保存为模版
         </Button>
       </ButtonGroup>
-
     </div>
+    
   </div>
 </template>
 
@@ -441,43 +381,49 @@ import * as API_Shop from "@/api/shops";
 
 import cloneObj from "@/utils/index";
 import vuedraggable from "vuedraggable";
+import firstStep from  './goodsOperationFirst'
+import secondStep from  './goodsOperationSec'
+import thirdStep from  './goodsOperationThird'
 export default {
   name: "addGoods",
   components: {
     editor,
-    vuedraggable
+    vuedraggable,
+    firstStep,
+    secondStep,
+    thirdStep
   },
   watch: {
-    selectGoodsType: {
-      handler(val) {
-        if (val && this.baseInfoForm.goodsType) {
-          this.goodsTypeWay.forEach((item) => {
-            item.check = false;
-            if (item.type == this.baseInfoForm.goodsType) {
-              item.check = true;
-            }
-            if (!item.type) {
-              this.defaultBaseInfo();
-            }
-          });
-        }
-      },
-    },
-    $route(to, from) {
-      if (to.query.draftId) {
-        this.draftId = to.query.draftId;
-        this.activestep = 1;
-        this.isOperationGoods = false;
-        this.GET_GoodData();
-      } else if (to.query.id) {
-        this.activestep = 1;
-        this.goodsId = this.$route.query.id;
-        this.GET_GoodData();
-      } else {
-        this.selectGoodsType = true;
-        this.defaultBaseInfo();
-      }
-    },
+    // selectGoodsType: {
+    //   handler(val) {
+    //     if (val && this.baseInfoForm.goodsType) {
+    //       this.goodsTypeWay.forEach((item) => {
+    //         item.check = false;
+    //         if (item.type == this.baseInfoForm.goodsType) {
+    //           item.check = true;
+    //         }
+    //         if (!item.type) {
+    //           this.defaultBaseInfo();
+    //         }
+    //       });
+    //     }
+    //   },
+    // },
+    // $route(to, from) {
+    //   if (to.query.draftId) {
+    //     this.draftId = to.query.draftId;
+    //     this.activestep = 1;
+    //     this.isOperationGoods = false;
+    //     this.GET_GoodData();
+    //   } else if (to.query.id) {
+    //     this.activestep = 1;
+    //     this.goodsId = this.$route.query.id;
+    //     this.GET_GoodData();
+    //   } else {
+    //     this.selectGoodsType = true;
+    //     this.defaultBaseInfo();
+    //   }
+    // },
   },
   data() {
     // 表单验证项，商品价格
@@ -519,35 +465,12 @@ export default {
     };
 
     return {
-      selectGoodsType: false, //是否选择商品类型
-      showGoodsTemplates: false, //是否显示选择商品模板
-      goodsTypeWay: [
-        {
-          title: "实物商品",
-          img: require("@/assets/goodsType1.png"),
-          desc: "零售批发，物流配送",
-          type: "PHYSICAL_GOODS",
-          check: false,
-        },
-        {
-          title: "虚拟商品",
-          img: require("@/assets/goodsType2.png"),
-          desc: "虚拟核验，无需物流",
-          type: "VIRTUAL_GOODS",
-          check: false,
-        },
-        {
-          title: "商品模板导入",
-          img: require("@/assets/goodsTypeTpl.png"),
-          desc: "商品模板，一键导入",
-          check: false,
-        },
-      ],
+      
       //提交状态
       submitLoading: false,
       //上传图片路径
       uploadFileUrl: API_GOODS.uploadFile,
-      // 预览图片
+      // 预览图片路径
       previewPicture: "",
       //商品图片
       previewGoodsPicture: "",
@@ -559,9 +482,7 @@ export default {
       showSkuPicture: false,
       //选择的sku
       selectedSku: {},
-      //选择店铺分类
-      strict: true,
-      //模版 / 草稿 id
+      //模版 id
       draftId: undefined,
       /** 当前激活步骤*/
       activestep: 0,
@@ -569,30 +490,7 @@ export default {
       isOperationGoods: true,
       //是否在发布商品
       isPublish: false,
-      /** 当前点击的1级分类索引*/
-      activeCategoryIndex1: -1,
-
-      /** 当前点击的2级分类索引*/
-      activeCategoryIndex2: -1,
-
-      /** 当前点击的3级分类索引*/
-      activeCategoryIndex3: -1,
-      /** 当前商品分类名称1*/
-      activeCategoryName1: "",
-
-      /** 当前商品分类名称2*/
-      activeCategoryName2: "",
-
-      /** 当前商品分类名称3*/
-      activeCategoryName3: "",
-      /** 1级分类列表*/
-      categoryListLevel1: [],
-
-      /** 2级分类列表*/
-      categoryListLevel2: [],
-
-      /** 3级分类列表*/
-      categoryListLevel3: [],
+      
 
       /** 请求的商品参数组列表 */
       goodsParams: [],
@@ -688,7 +586,7 @@ export default {
           {validator: checkPrice},
         ],
         weight: [
-          {required: true, message: "请输入物流参数"},
+          {required: true, message: "请输入商品重量"},
           {validator: checkWeight},
         ],
         templateId: [{required: true, message: '请选择物流模板'}],
@@ -702,7 +600,6 @@ export default {
       shopCategory: [],
       /** 商品单位列表 */
       goodsUnitList: {},
-      goodsTemplates: [],
       ignoreColumn: [
         "_index",
         "_rowKey",
@@ -734,8 +631,6 @@ export default {
       this.activestep = 1;
       this.goodsId = this.$route.query.id;
       this.GET_GoodData();
-      this.selectGoodsType = false;
-
     }
     // 编辑模板
     else if (this.$route.query.draftId) {
@@ -743,11 +638,10 @@ export default {
       this.activestep = 1;
       this.isOperationGoods = false;
       this.GET_GoodData();
-      this.selectGoodsType = false;
     }
     //新增商品
     else {
-      this.selectGoodsType = true;
+      this.$refs.first.selectGoodsType = true;
       this.defaultBaseInfo();
     }
   },
@@ -775,66 +669,10 @@ export default {
       };
       this.activestep = 0;
       this.isPublish = true;
-      this.GET_GoodsTemplate();
-      this.GET_NextLevelCategory();
-    },
-     // 获取已选模板
-    checkedTemplate () {
-      if(this.goodsTemplates.length) {
-        return this.goodsTemplates.find(item=>{return item.id == this.draftId}).goodsName
-      } else {
-        return ""
-      }
-    },
-    // 选择商品模板
-    handleClickGoodsTemplate(val) {
-      this.draftId = val.id;
-      this.selectGoodsType = false;
-    },
-    // 点击商品类型
-    handleClickGoodsType(val) {
-      this.goodsTypeWay.map((item) => {
-        return (item.check = false);
-      });
-
-      val.check = !val.check;
-      if (!val.type) {
-        this.showGoodsTemplates = true;
-      } else {
-        this.baseInfoForm.goodsType = val.type;
-        this.draftId = "";
-      }
+      this.$refs.first.GET_NextLevelCategory();
     },
 
-    // 移动商品图片位置
-    handleGoodsPicRemoteUp(fieldData, index) {
-      if (index != 0) {
-        fieldData[index] = fieldData.splice(index - 1, 1, fieldData[index])[0];
-      } else {
-        fieldData.push(fieldData.shift());
-      }
-    },
-    // 移动商品图片位置
-    handleGoodsPicRemoteDown(fieldData, index) {
-      if (index != fieldData.length - 1) {
-        fieldData[index] = fieldData.splice(index + 1, 1, fieldData[index])[0];
-      } else {
-        fieldData.unshift(fieldData.splice(index, 1)[0]);
-      }
-    },
-    // 获取商品模板
-    GET_GoodsTemplate() {
-      let searchParams = {
-        saveType: "TEMPLATE",
-        sort: "create_time",
-        order: "desc",
-      };
-      API_GOODS.getDraftGoodsListData(searchParams).then((res) => {
-        if (res.success) {
-          this.goodsTemplates = res.result.records;
-        }
-      });
-    },
+  
     /**
      * 选择参数
      * @paramsGroup 参数分组
@@ -1433,17 +1271,10 @@ export default {
     /** 上一步*/
     pre() {
       window.scrollTo(0, 0);
-      this.loading = true;
       if (this.activestep === 1) {
-        this.toPreCount > 0
-          ? this.GET_NextLevelCategory()
-          : this.GET_NextLevelCategory(null, 0, true);
         if (this.activestep-- < 0) this.activestep = 0;
-        this.toPreCount++;
-        this.loading = false;
       } else {
         this.activestep--;
-        this.loading = false;
       }
     },
     /** 下一步*/
@@ -1454,16 +1285,13 @@ export default {
         this.GET_GoodData();
         return;
       }
-      this.GET_GoodsParams();
+      
       /** 1级校验 */
-      this.loading = true;
-      if (this.activestep === 0 && !this.activeCategoryName1) {
+      if (this.activestep === 0 && !this.activeCategoryName1) { 
         this.$Message.error("请选择商品分类");
-        this.loading = false;
         return;
       } else if (this.activestep === 0 && this.activeCategoryIndex3 === -1) {
         this.$Message.error("必须选择到三级分类");
-        this.loading = false;
         return;
       } else if (
         this.activestep === 0 &&
@@ -1471,6 +1299,7 @@ export default {
         this.currentStatus === 0
       ) {
         /** 获取该商城分类下 商品参数信息 */
+        this.GET_GoodsParams();
         /** 查询品牌列表 */
         this.getGoodsBrandList();
         /** 查询分类绑定的规格信息 */
@@ -1487,13 +1316,10 @@ export default {
           if (valid) {
             /** 规格校验 */
             if (!this.skuFormVali()) {
-              this.loading = false;
               return;
             }
-            this.loading = false;
             if (this.activestep++ > 2) return;
           } else {
-            this.loading = false;
             this.$message.error(
               "表单中存在未填写或者填写有误的地方,已有错误标示，请检查并正确填写"
             );
@@ -1502,7 +1328,6 @@ export default {
         return;
       }
       /** 下一步 */
-      this.loading = false;
       if (this.activestep++ > 2) return;
     },
     // 店内分类选择
@@ -1653,46 +1478,8 @@ export default {
         }
       });
     },
-    /** 选择商城商品分类 */
-    handleSelectCategory(row, index, level) {
-      if (level === 1) {
-        this.baseInfoForm.categoryPath = row.id;
-        this.activeCategoryName1 = row.name;
-        this.activeCategoryName2 = this.activeCategoryName3 = "";
-        this.activeCategoryIndex1 = index;
-        this.activeCategoryIndex2 = -1;
-        this.activeCategoryIndex3 = -1;
-        this.categoryListLevel2 = this.categoryListLevel1[index].children;
-        this.categoryListLevel3 = [];
-      } else if (level === 2) {
-        this.baseInfoForm.categoryPath =
-          this.baseInfoForm.categoryPath + "," + row.id;
-        this.activeCategoryName2 = row.name;
-        this.activeCategoryName3 = "";
-        this.activeCategoryIndex2 = index;
-        this.activeCategoryIndex3 = -1;
-        this.categoryListLevel3 = this.categoryListLevel2[index].children;
-      } else {
-        this.baseInfoForm.categoryPath =
-          this.baseInfoForm.categoryPath + "," + row.id;
-        this.activeCategoryName3 = row.name;
-        this.activeCategoryIndex3 = index;
-      }
-      // 设置当前商城分类ID
-      this.baseInfoForm.categoryId = row.id;
-      this.categoryId = row.id;
-      this.baseInfoForm.categoryName = row.name;
-    },
-    /** 查询下一级 商城商品分类*/
-    GET_NextLevelCategory(row, level, not_click = false) {
-      this.loading = true;
-      const _id = row && row.id !== 0 ? row.id : 0;
-      API_GOODS.getGoodsCategoryAll().then((res) => {
-        if (res.success && res.result) {
-          this.categoryListLevel1 = res.result;
-        }
-      });
-    },
+    
+    
   },
 };
 </script>
diff --git a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
index 5eaee9b6..b7015b0f 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
@@ -1,17 +1,203 @@
 <template>
   <div>
-    
+    <!-- 选择商品类型 -->
+    <Modal v-model="selectGoodsType" width="550" :closable="false">
+      <div class="goods-type-list" v-if="!showGoodsTemplates">
+        <div class="goods-type-item" :class="{'active-goods-type':item.check}" @click="handleClickGoodsType(item)"
+          v-for="(item,index) in goodsTypeWay" :key="index">
+          <img :src="item.img"/>
+          <div>
+            <h2>{{ item.title }}</h2>
+            <p>{{ item.desc }}</p>
+          </div>
+        </div>
+      </div>
+      <div v-else class="goods-type-list">
+        <h2 @click="showGoodsTemplates = !showGoodsTemplates">返回</h2>
+        <div class="goods-type-item template-item" @click="handleClickGoodsTemplate(item)"
+             v-for="(item,index) in goodsTemplates" :key="index">
+          <img :src="item.thumbnail"/>
+          <div>
+            <h2>{{ item.goodsName }}</h2>
+            <p>{{ item.sellingPoint || '' }}</p>
+          </div>
+        </div>
+      </div>
+    </Modal>
+    <!-- 商品分类 -->
+    <div class="content-goods-publish">
+      <div class="goods-category">
+        <ul v-if="categoryListLevel1 && categoryListLevel1.length > 0">
+          <li v-for="(item, index) in categoryListLevel1" :class="{ activeClass: index == activeCategoryIndex1 }"
+              @click="handleSelectCategory(item, index, 1)" :key="index">
+            <span>{{ item.name }}</span>
+            <span>&gt;</span>
+          </li>
+        </ul>
+        <ul v-if="categoryListLevel2 && categoryListLevel2.length > 0">
+          <li v-for="(item, index) in categoryListLevel2" :class="{ activeClass: index == activeCategoryIndex2 }"
+              @click="handleSelectCategory(item, index, 2)" :key="index">
+            <span>{{ item.name }}</span>
+            <span>&gt;</span>
+          </li>
+        </ul>
+        <ul v-if="categoryListLevel3 && categoryListLevel3.length > 0">
+          <li v-for="(item, index) in categoryListLevel3" :class="{ activeClass: index == activeCategoryIndex3 }"
+              @click="handleSelectCategory(item, index, 3)" :key="index">
+            <span>{{ item.name }}</span>
+          </li>
+        </ul>
+      </div>
+      <p class="current-goods-category">
+        您当前选择的商品类别是：
+        <span>{{ activeCategoryName1 }}</span>
+        <span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
+        <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
+      </p>
+      <template v-if="!$route.query.id && draftId">
+        <Divider>已选商品模版:{{checkedTemplate()}}</Divider>
+      </template>
+    </div>
   </div>
 </template>
 <script>
+import * as API_GOODS from "@/api/goods";
 export default {
   data() {
     return {
-      
+      selectGoodsType: false, // 展示选择商品分类modal
+      goodsTemplates: [], // 商品模板列表
+      showGoodsTemplates: false, //是否显示选择商品模板
+      goodsTypeWay: [
+        {
+          title: "实物商品",
+          img: require("@/assets/goodsType1.png"),
+          desc: "零售批发，物流配送",
+          type: "PHYSICAL_GOODS",
+          check: false,
+        },
+        {
+          title: "虚拟商品",
+          img: require("@/assets/goodsType2.png"),
+          desc: "虚拟核验，无需物流",
+          type: "VIRTUAL_GOODS",
+          check: false,
+        },
+        {
+          title: "商品模板导入",
+          img: require("@/assets/goodsTypeTpl.png"),
+          desc: "商品模板，一键导入",
+          check: false,
+        },
+      ],
+      /** 当前点击的1级分类索引*/
+      activeCategoryIndex1: -1,
+
+      /** 当前点击的2级分类索引*/
+      activeCategoryIndex2: -1,
+
+      /** 当前点击的3级分类索引*/
+      activeCategoryIndex3: -1,
+      /** 当前商品分类名称1*/
+      activeCategoryName1: "",
+
+      /** 当前商品分类名称2*/
+      activeCategoryName2: "",
+
+      /** 当前商品分类名称3*/
+      activeCategoryName3: "",
+      /** 1级分类列表*/
+      categoryListLevel1: [],
+
+      /** 2级分类列表*/
+      categoryListLevel2: [],
+
+      /** 3级分类列表*/
+      categoryListLevel3: [],
     }
   },
   methods: {
+      // 获取已选模板
+    checkedTemplate () {
+      if(this.goodsTemplates.length) {
+        return this.goodsTemplates.find(item=>{return item.id == this.draftId}).goodsName
+      } else {
+        return ""
+      }
+    },
+    // 点击商品类型
+    handleClickGoodsType(val) {
+      this.goodsTypeWay.map((item) => {
+        return (item.check = false);
+      });
 
+      val.check = !val.check;
+      if (!val.type) {
+        this.showGoodsTemplates = true;
+      } else {
+        // this.baseInfoForm.goodsType = val.type;
+        // this.draftId = "";
+      }
+    },
+    // 获取商品模板
+    GET_GoodsTemplate() {
+      let searchParams = {
+        saveType: "TEMPLATE",
+        sort: "create_time",
+        order: "desc",
+      };
+      API_GOODS.getDraftGoodsListData(searchParams).then((res) => {
+        if (res.success) {
+          this.goodsTemplates = res.result.records;
+        }
+      });
+    },
+    // 选择商品模板
+    handleClickGoodsTemplate(val) {
+      // this.draftId = val.id;
+      this.selectGoodsType = false;
+    },
+    /** 选择商城商品分类 */
+    handleSelectCategory(row, index, level) {
+      if (level === 1) {
+        // this.baseInfoForm.categoryPath = row.id;
+        this.activeCategoryName1 = row.name;
+        this.activeCategoryName2 = this.activeCategoryName3 = "";
+        this.activeCategoryIndex1 = index;
+        this.activeCategoryIndex2 = -1;
+        this.activeCategoryIndex3 = -1;
+        this.categoryListLevel2 = this.categoryListLevel1[index].children;
+        this.categoryListLevel3 = [];
+      } else if (level === 2) {
+        // this.baseInfoForm.categoryPath =
+        //   this.baseInfoForm.categoryPath + "," + row.id;
+        this.activeCategoryName2 = row.name;
+        this.activeCategoryName3 = "";
+        this.activeCategoryIndex2 = index;
+        this.activeCategoryIndex3 = -1;
+        this.categoryListLevel3 = this.categoryListLevel2[index].children;
+      } else {
+        // this.baseInfoForm.categoryPath =
+        //   this.baseInfoForm.categoryPath + "," + row.id;
+        this.activeCategoryName3 = row.name;
+        this.activeCategoryIndex3 = index;
+      }
+      // 设置当前商城分类ID
+      // this.baseInfoForm.categoryId = row.id;
+      // this.categoryId = row.id;
+      // this.baseInfoForm.categoryName = row.name;
+    },
+    /** 查询下一级 商城商品分类*/
+    GET_NextLevelCategory(row) {
+      const _id = row && row.id !== 0 ? row.id : 0;
+      API_GOODS.getGoodsCategoryAll().then((res) => {
+        if (res.success && res.result) {
+          this.categoryListLevel1 = res.result;
+        }
+      });
+    },
+  },
+  mounted () {
   }
 }
 </script>
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
new file mode 100644
index 00000000..5eaee9b6
--- /dev/null
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -0,0 +1,20 @@
+<template>
+  <div>
+    
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      
+    }
+  },
+  methods: {
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+  @import "./addGoods.scss";
+</style>
\ No newline at end of file
diff --git a/seller/src/views/goods/goods-seller/goodsOperationThird.vue b/seller/src/views/goods/goods-seller/goodsOperationThird.vue
new file mode 100644
index 00000000..5eaee9b6
--- /dev/null
+++ b/seller/src/views/goods/goods-seller/goodsOperationThird.vue
@@ -0,0 +1,20 @@
+<template>
+  <div>
+    
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      
+    }
+  },
+  methods: {
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+  @import "./addGoods.scss";
+</style>
\ No newline at end of file

From c403fce7860caeae1122e2acbab8c69a1f286d5f Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 2 Jul 2021 18:04:17 +0800
Subject: [PATCH 03/12] no message

---
 .../views/goods/goods-seller/draftGoods.vue   | 79 ++-----------------
 1 file changed, 5 insertions(+), 74 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue
index fdd63905..401e5d10 100644
--- a/seller/src/views/goods/goods-seller/draftGoods.vue
+++ b/seller/src/views/goods/goods-seller/draftGoods.vue
@@ -59,8 +59,6 @@
         :data="data"
         ref="table"
         sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
       ></Table>
       <Row type="flex" justify="end" class="page">
         <Page
@@ -77,29 +75,6 @@
         ></Page>
       </Row>
     </Card>
-    <Modal
-      :title="modalTitle"
-      v-model="modalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
-      <Form
-        ref="underForm"
-        :model="underForm"
-        :label-width="100"
-        :rules="formValidate"
-      >
-        <FormItem label="下架原因" prop="reason">
-          <Input v-model="underForm.reason" clearable style="width: 100%" />
-        </FormItem>
-      </Form>
-      <div slot="footer">
-        <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="lower(form.id)"
-          >提交</Button
-        >
-      </div>
-    </Modal>
   </div>
 </template>
 
@@ -110,11 +85,7 @@ export default {
   components: {},
   data() {
     return {
-      id: "", //要操作的id
-      openSearch: true, // 显示搜索
       loading: true, // 表单加载状态
-      modalVisible: false, // 添加或编辑显示
-      modalTitle: "", // 添加或编辑标题
       drop: false,
       dropDownContent: "展开",
       dropDownIcon: "ios-arrow-down",
@@ -124,24 +95,8 @@ export default {
         pageSize: 10, // 页面大小
         sort: "create_time", // 默认排序字段
         order: "desc", // 默认排序方式
+        saveType: "TEMPLATE"
       },
-      underForm: { // 下架表单
-        reason: "",
-      },
-      form: {
-        // 添加或编辑表单对象初始化数据
-        goodsName: "",
-        sn: "",
-        marketEnable: "",
-        price: "",
-        sellerName: "",
-      },
-      // 表单验证规则
-
-      formValidate: {},
-      submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [ // 表头
         {
           title: "ID",
@@ -202,7 +157,7 @@ export default {
                 "Button",
                 {
                   props: {
-                    type: "primary",
+                    type: "success",
                     size: "small",
                   },
                   style: {
@@ -244,22 +199,14 @@ export default {
   },
   methods: {
     init() {
-      let here = this.$route.matched.find((v) => v.name === this.$route.name);
-      this.pageType = here.props.default ? here.props.default.type : "";
-      if (this.pageType === "TEMPLATE") {
-        this.searchForm.saveType = "TEMPLATE";
-      } else {
-        this.searchForm.saveType = "DRAFT";
-      }
       this.getDataList();
     },
+    // 编辑模板
     editGoods(v) {
-      this.searchForm.saveType === "TEMPLATE" ?
-        this.$router.push({ name: "goods-template-operation-edit", query: { draftId: v.id } }):
-        this.$router.push({ name: "goods-draft-operation-edit", query: { draftId: v.id } });
+        this.$router.push({ name: "goods-template-operation-edit", query: { draftId: v.id } })
     },
     removeDraft (id) {
-      let showType = this.searchForm.saveType === "TEMPLATE" ? "模版" : "草稿";
+      let showType = "模版";
       this.$Modal.confirm({
         title: "确认审核",
         content: "您确认要删除id为 " + id + " 的" + showType + "吗?",
@@ -278,7 +225,6 @@ export default {
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
-      this.clearSelectAll();
     },
     changePageSize(v) {
       this.searchForm.pageSize = v;
@@ -296,21 +242,6 @@ export default {
       // 重新加载数据
       this.getDataList();
     },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
     dropDown() {
       if (this.drop) {
         this.dropDownContent = "展开";

From 9b9295ea94d71106cf3c93f663b19d21ea89ec78 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Mon, 5 Jul 2021 16:08:12 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goodsDetail/ShowGoodsDetail.vue           |    7 +-
 buyer/src/config/index.js                     |   16 +-
 .../src/pages/home/memberCenter/Favorites.vue |    7 +-
 seller/src/libs/eventBus.js                   |    3 +
 .../goods/goods-seller/goodsOperation.vue     | 1417 +----------------
 .../goods-seller/goodsOperationFirst.vue      |  117 +-
 .../goods/goods-seller/goodsOperationSec.vue  | 1216 +++++++++++++-
 .../goods-seller/goodsOperationThird.vue      |   33 +-
 8 files changed, 1342 insertions(+), 1474 deletions(-)
 create mode 100644 seller/src/libs/eventBus.js

diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index ab2ca565..3ec0b9af 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -90,7 +90,7 @@
               <template v-if="detail.goodsParamsDTOList && detail.goodsParamsDTOList.length">
                 <div class="goods-params" v-for="item in detail.goodsParamsDTOList" :key="item.groupId">
                   <span class="ml_10">{{item.groupName}}</span>
-                  <table class="mb_10" cellpadding='0' border="1" cellspacing="0" >
+                  <table class="mb_10" cellpadding='0' cellspacing="0" >
                     <tr v-for="param in item.goodsParamsItemDTOList" :key="param.paramId">
                       <td style="text-align:right">{{param.paramName}}</td><td>{{param.paramValue}}</td>
                     </tr>
@@ -491,12 +491,13 @@ export default {
 table{
   border-color:#efefef;
   color: #999;
-  min-width: 30%;
+  width: 40%;
   margin-left: 10px;
+  margin-bottom: 10px;
   font-size: 12px;
   tr{
     td:nth-child(1){
-      min-width: 70px;
+      width: 70px;
     }
     td:nth-child(2){
       padding-left: 10px;
diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index e3011596..ded4aee2 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -17,15 +17,15 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.100:8887'
+    common: 'http://192.168.0.105:8890',
+    buyer: 'http://192.168.0.105:8888',
+    seller: 'http://192.168.0.105:8889',
+    manager: 'http://192.168.0.105:8887'
 
-    common: 'https://common-api.pickmall.cn',
-    buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn'
+    // common: 'https://common-api.pickmall.cn',
+    // buyer: 'https://buyer-api.pickmall.cn',
+    // seller: 'https://store-api.pickmall.cn',
+    // manager: 'https://admin-api.pickmall.cn'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',
diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue
index d63fcd2b..f57a6b94 100644
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -5,11 +5,8 @@
     <div v-if="list.length">
       <template v-for="(item) in list">
         <div class="goodsItem" :key="item.skuId">
-          <div class="goodsImg hover-pointer">
-            <img
-              :src="params.type === 'GOODS'? item.image : item.logo"
-              alt=""
-            />
+          <div class="goodsImg hover-pointer" v-if="params.type === 'GOODS'">
+            <img :src="item.image" />
           </div>
           <div class="goodsTitle hover-pointer">
             {{params.type === 'GOODS'? item.goodsName : item.storeName}}
diff --git a/seller/src/libs/eventBus.js b/seller/src/libs/eventBus.js
new file mode 100644
index 00000000..5fc63790
--- /dev/null
+++ b/seller/src/libs/eventBus.js
@@ -0,0 +1,3 @@
+import Vue from "vue";
+
+export default new Vue;
\ No newline at end of file
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index ec9717fd..b128af30 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -14,1441 +14,50 @@
       </steps>
     </div>
     <!-- 第一步 选择分类 -->
-    <first-step ref='first' v-show="activestep === 0"></first-step>
+    <first-step ref='first' v-if="activestep === 0"></first-step>
     <!-- 第二步 商品详细信息 -->
-    <second-step v-show="activestep === 1"></second-step>
+    <second-step ref='second' v-if="activestep === 1"></second-step>
     <!-- 第三步 发布完成 -->
-    <third-step v-show="activestep === 2"></third-step>
-
-    <div class="content-goods-publish" v-show="activestep === 1">
-      <Form ref="baseInfoForm" :model="baseInfoForm" :label-width="120" :rules="baseInfoFormRule">
-        <div class="base-info-item">
-          <h4>基本信息</h4>
-          <div class="form-item-view">
-            <FormItem label="商品分类">
-              <span class="goods-category-name">{{ activeCategoryName1 }}</span>
-              <span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
-              <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
-              <span v-if="!activeCategoryName1" v-html="baseInfoForm.category_name"></span>
-            </FormItem>
-            <FormItem label="商品名称" prop="goodsName">
-              <Input type="text" v-model="baseInfoForm.goodsName" placeholder="商品名称" clearable style="width: 260px"/>
-            </FormItem>
-
-            <FormItem label="商品卖点" prop="sellingPoint">
-              <Input v-model="baseInfoForm.sellingPoint" type="textarea" :rows="4" style="width: 260px"/>
-            </FormItem>
-            <FormItem label="商品品牌" prop="brandId">
-              <Select v-model="baseInfoForm.brandId" style="width: 200px">
-                <Option v-for="item in brandList" :value="item.id" :key="item.id" :label="item.name"></Option>
-              </Select>
-            </FormItem>
-          </div>
-          <h4>商品交易信息</h4>
-          <div class="form-item-view">
-            <FormItem class="form-item-view-el" label="计量单位" prop="goodsUnit">
-              <Select v-model="baseInfoForm.goodsUnit" style="width: 100px">
-                <Option v-for="unit in goodsUnitList" :key="unit" :value="unit">{{ unit }}
-                </Option>
-              </Select>
-            </FormItem>
-            <FormItem class="form-item-view-el" label="销售模式" prop="salesModel">
-              <RadioGroup type="button" v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'" button-style="solid"
-                          v-model="baseInfoForm.salesModel">
-                <Radio title="零售型" label="RETAIL">
-                  <span>零售型</span>
-                </Radio>
-                <Radio title="批发型" label="WHOLESALE">
-                  <span>批发型</span>
-                </Radio>
-              </RadioGroup>
-              <RadioGroup type="button" v-else button-style="solid" v-model="baseInfoForm.salesModel">
-                <Radio title="零售型" label="RETAIL">
-                  <span>虚拟型</span>
-                </Radio>
-
-              </RadioGroup>
-
-            </FormItem>
-          </div>
-          <h4>商品规格及图片</h4>
-          <div class="form-item-view">
-            <FormItem label="商品编号" prop="sn">
-              <Input type="text" v-model="baseInfoForm.sn" placeholder="商品编号" clearable style="width: 260px"/>
-            </FormItem>
-            <FormItem label="商品价格" prop="price">
-              <Input type="text" v-model="baseInfoForm.price" placeholder="商品价格" clearable style="width: 260px"/>
-            </FormItem>
-            <FormItem label="市场价格" prop="cost">
-              <Input type="text" v-model="baseInfoForm.cost" placeholder="市场价格" clearable style="width: 260px"/>
-            </FormItem>
-            <FormItem class="form-item-view-el required" label="商品图片" prop="goodsGalleryFiles">
-              <vuedraggable
-                :list="baseInfoForm.goodsGalleryFiles"
-                :animation="200"
-                style="display:inline-block;"
-                ghost-class="thumb-ghost"
-              >
-                <div class="demo-upload-list" v-for="(item, __index) in baseInfoForm.goodsGalleryFiles" :key="__index">
-                  <template v-if="item.status === 'finished'">
-                    <img :src="item.url"/>
-                    <div class="demo-upload-list-cover">
-                      <div>
-                        <Icon type="ios-eye-outline" size="30" @click.native="handleViewGoodsPicture(item.url)"></Icon>
-                        <Icon type="ios-trash-outline" size="30" @click.native="handleRemoveGoodsPicture(item)"></Icon>
-                      </div>
-                    </div>
-                  </template>
-                  <template v-else>
-                    <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
-                  </template>
-                </div>
-              </vuedraggable>
-              <Upload ref="upload" :show-upload-list="false" :default-file-list="baseInfoForm.goodsGalleryFiles"
-                      :on-success="handleSuccessGoodsPicture" :format="['jpg', 'jpeg', 'png']"
-                      :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
-                      :before-upload="handleBeforeUploadGoodsPicture" multiple type="drag" :action="uploadFileUrl"
-                      :headers="accessToken" style="display: inline-block;margin-left:10px;">
-                <div style="width: 80px; height: 80px; line-height: 80px">
-                  <Icon type="ios-camera" size="20"></Icon>
-                </div>
-              </Upload>
-              <!-- <upload-pic-thumb v-model="baseInfoForm.goodsGalleryFiles" :multiple="true"></upload-pic-thumb> -->
-
-              <Modal title="View Image" v-model="goodsPictureVisible">
-                <img :src="previewGoodsPicture" v-if="goodsPictureVisible" style="width: 100%"/>
-              </Modal>
-            </FormItem>
-
-            <div class="layout" style="width: 100%">
-              <Collapse v-model="open_panel">
-                <Panel name="1">
-                  规格名称
-                  <div slot="content" class="sku-item-content">
-                    <Form :model="skuForm" @submit.native.prevent>
-                      <div class="sku-item" v-for="(item, $index) in skuInfo" :key="$index">
-                        <Card :bordered="true">
-                          <FormItem label="规格名：" class="sku-item-content-name">
-                            <AutoComplete style="width: 150px" v-model="item.name" :maxlength="30"
-                                          placeholder="请输入规格项名称"
-                                          :filter-method="filterMethod" :data="skuData"
-                                          @on-change="editSkuItem">
-                            </AutoComplete>
-                            <Button type="error" style="margin-left: 10px" @click="handleCloseSkuItem($index)">删除
-                            </Button>
-                          </FormItem>
-
-                          <FormItem label="规格值：" prop="sku">
-                            <!--规格值文本列表-->
-                            <div v-for="(val, index) in item.spec_values" :key="index"
-                                 style="padding: 0px 20px 10px 0px; float: left">
-                              <div>
-                                <AutoComplete style="width: 150px; float: left" v-model="val.value"
-                                  :maxlength="30" placeholder="请输入规格值名称"
-                                  :filter-method="filterMethod" :data="skuVal"
-                                  @on-focus="changeSkuVals(item.name)"
-                                  @on-change="skuValueChange(val.value, $index, item)">
-                                </AutoComplete>
-                                <Button type="error" style="margin-left: 10px" @click="handleCloseSkuValue(item, index)">
-                                  删除
-                                </Button>
-                              </div>
-                            </div>
-                            <div style="float: left">
-                              <Button type="primary" @click="addSpec($index, item)">添加规格值</Button>
-                            </div>
-                          </FormItem>
-                        </Card>
-                      </div>
-                    </Form>
-                    <Button class="add-sku-btn" type="primary" size="mini" @click="addSkuItem">添加规格项目</Button>
-                  </div>
-                </Panel>
-                <Panel name="2">
-                  规格详细
-                  <div slot="content">
-                    <div slot="content">
-                      <Table :columns="skuTableColumn" :data="skuTableData" style="
-                          width: 100%;
-                          .ivu-table-overflowX {
-                            overflow-x: hidden;
-                          }
-                        " :span-method="handleSpan">
-                        <template slot-scope="{ row }" slot="sn">
-                          <Input v-model="row.sn" placeholder="请输入货号" @on-change="updateSkuTable(row, 'sn')"/>
-                        </template>
-
-                        <template slot-scope="{ row }" slot="weight" v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'">
-                          <Input v-model="row.weight" placeholder="请输入重量" @on-change="updateSkuTable(row, 'weight')"/>
-                        </template>
-
-                        <template slot-scope="{ row }" slot="quantity">
-                          <Input v-model="row.quantity" placeholder="请输入库存"
-                                 @on-change="updateSkuTable(row, 'quantity')"/>
-                        </template>
-
-                        <template slot-scope="{ row }" slot="cost">
-                          <Input v-model="row.cost" placeholder="请输入成本价" @on-change="updateSkuTable(row, 'cost')"/>
-                        </template>
-
-                        <template slot-scope="{ row }" slot="price">
-                          <Input v-model="row.price" placeholder="请输入价格" @on-change="updateSkuTable(row, 'price')"/>
-                        </template>
-                        <template slot-scope="{ row }" slot="images">
-                          <Button @click="editSkuPicture(row)">编辑图片</Button>
-                          <Modal v-model="showSkuPicture" :styles="{ top: '30px' }" class-name="sku-preview-modal"
-                                 title="编辑图片" ok-text="结束编辑" @on-ok="updateSkuPicture()" cancel-text="取消">
-                            <div class="preview-picture">
-                              <img v-if="previewPicture !== ''" :src="previewPicture"/>
-                            </div>
-                            <Divider/>
-                            <div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
-                              <template v-if="img.status === 'finished'">
-                                <img :src="img.url"/>
-                                <div class="sku-upload-list-cover">
-                                  <Icon type="ios-eye-outline" @click="handleView(img.url)"></Icon>
-                                  <Icon type="ios-trash-outline" @click="handleRemove(img, __index)"></Icon>
-                                </div>
-                              </template>
-                              <template v-else>
-                                <Progress v-if="img.showProgress" :percent="img.percentage" hide-info></Progress>
-                              </template>
-                            </div>
-                            <Upload ref="uploadSku" :show-upload-list="false" :default-file-list="row.images"
-                                    :on-success="handleSuccess" :format="['jpg', 'jpeg', 'png']"
-                                    :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
-                                    :before-upload="handleBeforeUpload" multiple type="drag" :action="uploadFileUrl"
-                                    :headers="accessToken" style="display: inline-block; width: 58px">
-                              <div>
-                                <Icon type="ios-camera" size="55"></Icon>
-                              </div>
-                            </Upload>
-                          </Modal>
-                        </template>
-                      </Table>
-
-                    </div>
-                  </div>
-                </Panel>
-              </Collapse>
-            </div>
-          </div>
-          <h4>商品详情描述</h4>
-          <div class="form-item-view">
-            <div class="tree-bar">
-              <FormItem
-                class="form-item-view-el"
-                label="店内分类"
-                prop="shopCategory"
-              >
-                <Tree
-                  ref="tree"
-                  :data="shopCategory"
-                  show-checkbox
-                  @on-select-change="selectTree"
-                  @on-check-change="changeSelect"
-                  :check-strictly="false"
-                ></Tree>
-              </FormItem>
-            </div>
-            <FormItem class="form-item-view-el" label="商品描述" prop="intro">
-              <editor id="intro" v-model="baseInfoForm.intro"></editor>
-            </FormItem>
-            <FormItem class="form-item-view-el" label="移动端描述" prop="skuList">
-              <editor id="mobileIntr" v-model="baseInfoForm.mobileIntro"></editor>
-            </FormItem>
-          </div>
-          <div v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'">
-            <h4>商品物流信息</h4>
-            <div class="form-item-view">
-              <FormItem class="form-item-view-el" label="商品重量" prop="weight">
-                <Input v-model="baseInfoForm.weight">
-                  <span slot="append">kg</span>
-                </Input>
-              </FormItem>
-
-              <FormItem
-                class="form-item-view-el"
-                label="物流模板"
-                prop="templateId"
-              >
-                <Select v-model="baseInfoForm.templateId" style="width: 200px">
-                  <Option
-                    v-for="item in logisticsTemplate"
-                    :value="item.id"
-                    :key="item.id"
-                  >{{ item.name }}
-                  </Option>
-                </Select>
-              </FormItem>
-            </div>
-            <h4>其他信息</h4>
-            <div class="form-item-view">
-              <FormItem class="form-item-view-el" label="商品发布" prop="release">
-                <RadioGroup type="button" button-style="solid" v-model="baseInfoForm.release">
-                  <Radio title="立即发布" label="true">
-                    <span>立即发布</span>
-                  </Radio>
-                  <Radio title="放入仓库" label="false">
-                    <span>放入仓库</span>
-                  </Radio>
-                </RadioGroup>
-              </FormItem>
-              <FormItem class="form-item-view-el" label="商品推荐" prop="skuList">
-                <RadioGroup type="button" button-style="solid" v-model="baseInfoForm.recommend">
-                  <Radio title="推荐" label="true">
-                    <span>推荐</span>
-                  </Radio>
-                  <Radio title="不推荐" label="false">
-                    <span>不推荐</span>
-                  </Radio>
-                </RadioGroup>
-              </FormItem>
-            </div>
-            <div class="form-item-view-bottom">
-              <Collapse v-model="params_panel" v-for="(paramsGroup,groupIndex) in goodsParams"
-                        :title="paramsGroup.groupName"
-                        class="mb_10"
-                        style="text-align: left" :key="paramsGroup.groupName">
-                <Panel :name="paramsGroup.groupName">
-                  {{paramsGroup.groupName}}
-                  <p slot="content">
-                    <FormItem v-for="( params, paramsIndex) in paramsGroup.params" :key="paramsIndex"
-                              :label="`${params.paramName}：`">
-                      <Select v-model="params.paramValue" placeholder="请选择" style="width: 200px" clearable
-                              @on-change="selectParams(paramsGroup,groupIndex,params,paramsIndex,params.paramValue)">
-                        <Option v-for="option in params.options.split(',')" :label="option"
-                                :value="option" :key="option"></Option>
-                      </Select>
-                    </FormItem>
-                  </p>
-                </Panel>
-              </Collapse>
-            </div>
-
-          </div>
-        </div>
-      </Form>
-    </div>
-    <div class="content-goods-publish" v-show="activestep === 2">
-      <template>
-
-        <div class="success" style="text-align: left">
-          <h1>恭喜您，商品发布成功!</h1>
-          <div class="goToGoodsList" @click="gotoGoodsList">
-            <a>去店铺查看商品列表>></a>
-          </div>
-          <div class="operation">
-            <h3>您还可以：</h3>
-            <div>
-              1、继续
-              <a @click="gotoBack">发布商品</a>
-            </div>
-            <div>
-              2、进入卖家中心，管理
-              <a @click="gotoGoodsList">商品列表</a>
-            </div>
-          </div>
-        </div>
-
-      </template>
-    </div>
-    <div class="footer">
-      <ButtonGroup>
-        <Button type="primary" @click="pre" v-if="activestep === 1 && isPublish">上一步
-        </Button>
-        <Button type="primary" @click="$refs.first.selectGoodsType = true" v-if="activestep === 0">商品类型
-        </Button>
-        <Button type="primary" @click="next" v-if="activestep === 0">下一步
-        </Button>
-        <Button type="primary" @click="save" :loading="submitLoading" v-if="activestep === 1">
-          {{ this.goodsId ? "保存" : "保存商品" }}
-        </Button>
-        <Button type="primary" @click="saveToDraft" v-if="activestep === 1">
-          保存为模版
-        </Button>
-      </ButtonGroup>
-    </div>
+    <third-step ref='third' v-if="activestep === 2"></third-step>
+    
     
   </div>
 </template>
 
 <script>
-import {regular} from "@/utils";
-import editor from "@/views/my-components/lili/editor";
-import * as API_GOODS from "@/api/goods";
-import * as API_Shop from "@/api/shops";
 
-import cloneObj from "@/utils/index";
-import vuedraggable from "vuedraggable";
+import * as API_GOODS from "@/api/goods";
+
 import firstStep from  './goodsOperationFirst'
 import secondStep from  './goodsOperationSec'
 import thirdStep from  './goodsOperationThird'
 export default {
   name: "addGoods",
   components: {
-    editor,
-    vuedraggable,
     firstStep,
     secondStep,
     thirdStep
   },
 
   data() {
-    // 表单验证项，商品价格
-    const checkPrice = (rule, value, callback) => {
-      if (!value && value !== 0) {
-        return callback(new Error("商品价格不能为空"));
-      }
-      setTimeout(() => {
-        if (!regular.money.test(value)) {
-          callback(new Error("请输入正整数或者两位小数"));
-        } else if (parseFloat(value) > 99999999) {
-          callback(new Error("商品价格设置超过上限值"));
-        } else {
-          callback();
-        }
-      }, 1000);
-    };
-    // 表单验证项，商品编号
-    const checkSn = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error("商品编号不能为空"));
-      } else if (!/^[a-zA-Z0-9_\\-]+$/g.test(value)) {
-        callback(new Error("请输入数字、字母、下划线或者中划线"));
-      } else {
-        callback();
-      }
-    };
-    // 表单验证项，商品重量
-    const checkWeight = (rule, value, callback) => {
-      if (!value && typeof value !== "number") {
-        callback(new Error("重量不能为空"));
-      } else if (!regular.money.test(value)) {
-        callback(new Error("请输入正整数或者两位小数"));
-      } else if (parseFloat(value) > 99999999) {
-        callback(new Error("商品重量设置超过上限值"));
-      } else {
-        callback();
-      }
-    };
-
     return {
-      
-      //提交状态
-      submitLoading: false,
-      //上传图片路径
-      uploadFileUrl: API_GOODS.uploadFile,
-      // 预览图片路径
-      previewPicture: "",
-      //商品图片
-      previewGoodsPicture: "",
-      //展示图片层
-      visible: false,
-      //展示商品图片
-      goodsPictureVisible: false,
-      //展示sku图片
-      showSkuPicture: false,
-      //选择的sku
-      selectedSku: {},
       /** 当前激活步骤*/
-      activestep: 0,
-      //是否在编辑商品
-      isOperationGoods: true,
-      //是否在发布商品
-      isPublish: false,
-      
-
-      /** 请求的商品参数组列表 */
-      goodsParams: [],
-      /** 当前状态/模式 默认发布商品0 编辑商品1 编辑草稿箱商品2 */
-      currentStatus: 0,
-
-      baseInfoForm: {
-        salesModel: "RETAIL",
-        /** 商品重量 */
-        weight: "",
-        /** 商品相册列表 */
-        goodsGalleryFiles: [],
-        /** 是否立即发布 0 立即发布 1放入仓库 */
-        release: "true",
-        /** 是否为推荐商品 */
-        recommend: "true",
-        /** 店铺分类 */
-        storeCategoryPath: "",
-        brandId: 0,
-        /** 计量单位 **/
-        goodsUnit: "",
-        /** 商品类型 **/
-        goodsType: "",
-        /** 分类路径 **/
-        categoryPath: "",
-        /** 商品卖点 **/
-        sellingPoint: "",
-        /** 商品详情 **/
-        intro: "",
-        mobileIntro: "",
-        updateSku: true,
-        /** 是否重新生成sku */
-        regeneratorSkuFlag: false,
-        /** 物流模板id **/
-        templateId: '',
-        /** 参数组*/
-        goodsParamsDTOList: [],
-      },
-      /** 表单数据*/
-      skuForm: {},
-      /** 表格头 */
-      skuTableColumn: [],
-      /** 表格数据 */
-      skuTableData: [],
-
-      /** 默认的规格参数 */
-      skuData: [],
-
-      /** 默认的规格值 */
-      skuVals: [],
-      // 某一规格名下的规格值
-      skuVal: [],
-      open_panel: [1, 2],
-
-      /** 要提交的规格数据*/
-      skuInfo: [],
-
-      /** 规格图片 */
-      images: [],
-
-      /** 物流模板 **/
-      logisticsTemplate: [],
-
-      /** 固定列校验提示内容 */
-      validatatxt: "请输入0~99999999之间的数字值",
-      //参数panel展示
-      params_panel: [],
-      /** 存储未通过校验的单元格位置  */
-      validateError: [],
-      baseInfoFormRule: {
-        goodsName: [
-          {required: true, message: "请输入商品名称"},
-          {
-            whitespace: true,
-            message: "商品名称不可为纯空格",
-          },
-          {
-            min: 3,
-            max: 60,
-            message: "长度在 3 到 60 个字符",
-          },
-        ],
-        sn: [
-          {required: true, message: "请输入商品编号"},
-          {validator: checkSn},
-        ],
-        price: [
-          {required: true, message: "请输入商品价格"},
-          {validator: checkPrice},
-        ],
-        cost: [
-          {required: true, message: "请输入市场价格"},
-          {validator: checkPrice},
-        ],
-        weight: [
-          {required: true, message: "请输入商品重量"},
-          {validator: checkWeight},
-        ],
-        templateId: [{required: true, message: '请选择物流模板'}],
-        sellingPoint: [{required: true, message: "请输入商品卖点"}],
-        goodsUnit: [{required: true, message: "请选择计量单位"}],
-      },
-      /** 品牌列表 */
-      brandList: [],
-      collapseVal: [],
-      /** 店铺分类列表 */
-      shopCategory: [],
-      /** 商品单位列表 */
-      goodsUnitList: {},
-      ignoreColumn: [
-        "_index",
-        "_rowKey",
-        "sn",
-        "cost",
-        "price",
-        "weight",
-        "quantity",
-        "specId",
-        "specValueId",
-      ],
-      skuValVisible: true,
+      activestep: '',
     };
   },
 
   mounted() {
-    this.accessToken = {
-      accessToken: this.getStore("accessToken"),
-    };
-    // 获取物流模板
-    API_Shop.getShipTemplate().then((res) => {
-      if (res.success) {
-        this.logisticsTemplate = res.result;
-      }
-    })
-
-    // 编辑商品
-    if (this.$route.query.id) {
+    // 编辑商品、模板
+    if (this.$route.query.id || this.$route.query.draftId) {
       this.activestep = 1;
-      this.goodsId = this.$route.query.id;
-      this.GET_GoodData();
-    }
-    // 编辑模板
-    else if (this.$route.query.draftId) {
-      this.activestep = 1;
-      this.isOperationGoods = false;
-      this.GET_GoodData();
-    }
-    //新增商品
-    else {
-      this.$refs.first.selectGoodsType = true;
-      this.defaultBaseInfo();
+    } else {
+      this.activestep = 0
     }
+    
   },
   methods: {
-    // 默认还原数据
-    defaultBaseInfo() {
-      this.baseInfoForm = {
-        salesModel: "RETAIL",
-        weight: "",
-        goodsGalleryFiles: [],
-        release: "true",
-        recommend: "true",
-        storeCategoryPath: "",
-        brandId: 0,
-        goodsUnit: "",
-        goodsType: "",
-        categoryPath: "",
-        sellingPoint: "",
-        intro: "",
-        mobileIntro: "",
-        updateSku: true,
-        regeneratorSkuFlag: false,
-        templateId: '',
-        goodsParamsDTOList: [],
-      };
-      this.activestep = 0;
-      this.isPublish = true;
-      this.$refs.first.GET_NextLevelCategory();
-    },
-    /**
-     * 选择参数
-     * @paramsGroup 参数分组
-     * @groupIndex 参数分组下标
-     * @params 参数选项
-     * @paramIndex 参数下标值
-     * @value 参数选项值
-     */
-    selectParams(paramsGroup, groupIndex, params, paramsIndex, value) {
-      if (!this.baseInfoForm.goodsParamsDTOList[groupIndex]) {
-        this.baseInfoForm.goodsParamsDTOList[groupIndex] = {
-          groupId:'',
-          groupName:'',
-          goodsParamsItemDTOList:[]
-        }
-      }
-      //赋予分组id
-      this.baseInfoForm.goodsParamsDTOList[groupIndex].groupId = paramsGroup.groupId
-      //赋予分组名称
-      this.baseInfoForm.goodsParamsDTOList[groupIndex].groupName = paramsGroup.groupName
-      //参数详细为空，则赋予
-      if (!this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[paramsIndex]) {
-        this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[paramsIndex]={
-          paramName: '',
-          paramValue: '',
-          isIndex: '',
-          required: '',
-          paramId: ''
-        }
-      }
-      this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[paramsIndex]={
-        paramName: params.paramName,
-        paramValue: value,
-        isIndex: params.isIndex,
-        required: params.required,
-        paramId: params.id
-      }
-
-    },
-
-    // 编辑sku图片
-    editSkuPicture(row) {
-      if (row.images && row.images.length > 0) {
-        this.previewPicture = row.images[0].url;
-      }
-      this.selectedSku = row;
-      this.showSkuPicture = true;
-    },
-    handleView (url) {
-      this.previewPicture = url;
-      this.visible = true;
-    },
-    handleRemove(item, index) {
-      this.selectedSku.images = this.selectedSku.images.filter(
-        (i) => i.url !== item.url
-      );
-      if (this.selectedSku.images.length > 0 && index === 0) {
-        this.previewPicture = this.selectedSku.images[0].url;
-      } else if (this.selectedSku.images.length < 0) {
-        this.previewPicture = "";
-      }
-    },
-    handleViewGoodsPicture(url) {
-      this.previewGoodsPicture = url;
-      this.goodsPictureVisible = true;
-    },
-    handleRemoveGoodsPicture(file) {
-      this.baseInfoForm.goodsGalleryFiles =
-        this.baseInfoForm.goodsGalleryFiles.filter((i) => i.url !== file.url);
-    },
-    updateSkuPicture() {
-      let _index = this.selectedSku._index;
-      this.skuTableData[_index] = this.selectedSku;
-    },
-    handleSuccess(res, file) {
-      if (file.response) {
-        file.url = file.response.result;
-        if (this.selectedSku.images) {
-          this.selectedSku.images.push(file);
-        } else {
-          this.selectedSku.images = [file];
-        }
-        this.previewPicture = file.url;
-      }
-    },
-    handleSuccessGoodsPicture(res, file) {
-      if (file.response) {
-        file.url = file.response.result;
-        this.baseInfoForm.goodsGalleryFiles.push(file);
-      }
-    },
-    handleFormatError(file) {
-      this.$Notice.warning({
-        title: "文件格式不正确",
-        desc:
-          "File format of " +
-          file.name +
-          " is incorrect, please select jpg or png.",
-      });
-    },
-    handleMaxSize(file) {
-      this.$Notice.warning({
-        title: "超过文件大小限制",
-        desc: "图片  " + file.name + " 不能超过2mb",
-      });
-    },
-    handleBeforeUploadGoodsPicture() {
-      const check = this.baseInfoForm.goodsGalleryFiles.length < 5;
-      if (!check) {
-        this.$Notice.warning({
-          title: "Up to five pictures can be uploaded.",
-        });
-      }
-      return check;
-    },
-    handleBeforeUpload() {
-      const check =
-        this.selectedSku.images !== undefined &&
-        this.selectedSku.images.length > 5;
-      if (check) {
-        this.$Notice.warning({
-          title: "Up to five pictures can be uploaded.",
-        });
-      }
-      return !check;
-    },
-    // 跳转商品列表
-    gotoGoodsList() {
-      this.$router.push({name: "goods"});
-    },
-    gotoBack() {
-      this.$router.go();
-    },
-    /** 查询商品品牌列表 */
-    getGoodsBrandList() {
-      API_GOODS.getCategoryBrandListDataSeller(this.categoryId).then(
-        (response) => {
-          this.brandList = response;
-        }
-      );
-    },
-    // 获取商品单位
-    GET_GoodsUnit() {
-      API_GOODS.getGoodsUnitList().then((res) => {
-        if (res.success) {
-          this.goodsUnitList = res.result.records.map((i) => i.name);
-        }
-      });
-    },
-    // 获取当前店铺分类
-    GET_ShopGoodsLabel() {
-      API_GOODS.getShopGoodsLabelListSeller().then((res) => {
-        if (res.success) {
-          let shopCategories = !this.baseInfoForm.storeCategoryPath
-            ? []
-            : this.baseInfoForm.storeCategoryPath.split(",");
-
-          this.shopCategory = res.result.map((i) => {
-            i.title = i.labelName;
-            i.expand = false;
-            i.checked = shopCategories.some((o) => o === i.id);
-            i.children = i.children.map((j) => {
-              j.title = j.labelName;
-              j.expand = false;
-              j.checked = shopCategories.some((o) => o === j.id);
-              return j;
-            });
-            return i;
-          });
-        }
-      });
-    },
-    // 编辑时获取商品信息
-    async GET_GoodData() {
-      let response = {};
-      if (this.$route.query.draftId) {
-        response = await API_GOODS.getDraftGoodsDetail(this.$route.query.draftId);
-      } else {
-        response = await API_GOODS.getGoods(this.$route.query.id);
-        this.goodsId = response.result.id;
-      }
-      this.baseInfoForm = {
-        ...this.baseInfoForm,
-        ...response.result,
-      };
-
-      this.baseInfoForm.release = "true";
-      this.baseInfoForm.recommend = this.baseInfoForm.recommend
-        ? "true"
-        : "false";
-
-      //分类名称展示
-      this.activeCategoryName1 = response.result.categoryName[0];
-      this.activeCategoryName2 = response.result.categoryName[1];
-      this.activeCategoryName3 = response.result.categoryName[2];
-
-      this.baseInfoForm.categoryId = response.result.categoryPath.split(",");
-
-
-      if (
-        response.result.goodsGalleryList &&
-        response.result.goodsGalleryList.length > 0
-      ) {
-        this.baseInfoForm.goodsGalleryFiles =
-          response.result.goodsGalleryList.map((i) => {
-            let files = {url: i};
-            return files;
-          });
-      }
-
-      this.categoryId = this.baseInfoForm.categoryId[2];
-
-      this.Get_SkuInfoByCategory(this.categoryId)
-
-      this.renderGoodsDetailSku(response.result.skuList);
-
-      /** 查询品牌列表 */
-      this.getGoodsBrandList();
-      /** 查询商品参数 */
-      this.GET_GoodsParams();
-      /** 查询店铺商品分类 */
-      this.GET_ShopGoodsLabel();
-      this.GET_GoodsUnit();
-    },
-    // 渲染sku数据
-    renderGoodsDetailSku(skuList) {
-      let skus = [];
-      let skusInfo = [];
-      skuList.map((e) => {
-        let sku = {
-          id: e.id,
-          sn: e.sn,
-          price: e.price,
-          cost: e.cost,
-          quantity: e.quantity,
-          weight: e.weight,
-        };
-        e.specList.forEach((u) => {
-          if (u.specName === "images") {
-            sku.images = u.specImage;
-          } else {
-            sku[u.specName] = u.specValue;
-            if (
-              !skusInfo.some((s) => s.name === u.specName) &&
-              !this.ignoreColumn.includes(u.specName)
-            ) {
-              skusInfo.push({
-                name: u.specName,
-                spec_id: u.specNameId,
-                spec_values: [
-                  {
-                    id: u.specValueId,
-                    name: u.specName,
-                    value: u.specValue,
-                  },
-                ],
-              });
-            } else {
-              skusInfo = skusInfo.map((sk) => {
-                if (
-                  !sk.spec_values.some((s) => s.value === u.specValue) &&
-                  sk.name === u.specName
-                ) {
-                  sk.spec_values.push({
-                    id: u.specValueId,
-                    name: u.specName,
-                    value: u.specValue,
-                  });
-                }
-                if (!sk.spec_id && u.specName === "specId") {
-                  sk.spec_id = u.specValue;
-                }
-                return sk;
-              });
-            }
-          }
-        });
-        skus.push(sku);
-      });
-      this.skuInfo = skusInfo;
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-      this.skuTableData = skus;
-    },
-
-    /** 根据当前分类id查询商品应包含的参数 */
-    GET_GoodsParams() {
-      API_GOODS.getCategoryParamsListDataSeller(this.categoryId).then(
-        (response) => {
-          if (!response || response.length <= 0) {
-            return;
-          }
-          this.goodsParams = response;
-
-          //展开选项卡
-          this.goodsParams.forEach(item => {
-              this.params_panel.push(item.groupName)
-            }
-          )
-          if (this.baseInfoForm.goodsParamsDTOList) {
-            // 已选值集合
-            const paramsArr = []
-            this.baseInfoForm.goodsParamsDTOList.forEach(group =>{
-              group.goodsParamsItemDTOList.forEach(param => {
-                param.groupId = group.groupId
-                paramsArr.push(param)
-              })
-            })
-            // 循环参数分组
-            this.goodsParams.forEach((parmsGroup) => {
-              parmsGroup.params.forEach(param => {
-              
-                paramsArr.forEach(arr=>{
-                  if(param.paramName == arr.paramName){
-                    param.paramValue = arr.paramValue
-                  }
-                })
-              })
-            });
-          } else {
-            this.baseInfoForm.goodsParamsDTOList = []
-          }
-        }
-      );
-    },
-
-    /** 添加规格项 */
-    addSkuItem() {
-      if (this.skuInfo.length >= 5) {
-        this.$Message.error("规格项不能大于5个！");
-        return;
-      }
-      // 写入对象，下标，具体对象
-      this.$set(this.skuInfo, this.skuInfo.length, {
-        spec_values: [],
-      });
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-    // 编辑规格名
-    editSkuItem() {
-      this.renderTableData();
-    },
-    // 编辑规格值
-    async skuValueChange(val, index, item) {
- 
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-    // 获取焦点时，取得规格名对应的规格值
-    changeSkuVals(name) {
-      if (name) {
-        this.skuData.forEach((e, index) => {
-          if (e === name) {
-            if (this.skuVal.length != this.skuVals[index].length) {
-              this.skuVal = this.skuVals[index]
-            }
-          }
-        })
-      }
-    },
-    /** 移除当前规格项 进行数据变化*/
-    handleCloseSkuItem($index) {
-      this.skuInfo.splice($index, 1);
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-    // 添加规格值的验证
-    validateEmpty(params) {
-      let flag = true;
-      params.forEach((item) => {
-        for (var key in item) {
-          if (item[key] != "0" && !item.value) {
-            this.$Message.error("请必填规格项");
-            flag = false;
-            return false; // 终止程序
-          }
-        }
-      });
-
-      return flag;
-    },
-    /** 添加当前规格项的规格值*/
-    addSpec($index, item) {
-
-      if (this.validateEmpty(item.spec_values)) {
-        if (item.spec_values.length >= 10) {
-          this.$Message.error("规格值不能大于10个！");
-          return;
-        }
-        this.$set(
-          item.spec_values,
-          item.spec_values.length,
-          {
-            name: item.name,
-          }
-        );
-        this.baseInfoForm.regeneratorSkuFlag = true;
-        /**
-         * 渲染规格详细表格
-         */
-        this.renderTableData();
-      }
-    },
-
-    /** 移除当前规格值 */
-    handleCloseSkuValue(item, index) {
-      item.spec_values.splice(index, 1);
-
-      this.baseInfoForm.regeneratorSkuFlag = true;
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-
-    /**
-     * 渲染table所需要的column 和 data
-     */
-    renderTableData() {
-      this.skuTableColumn = [];
-      this.skuTableData = [];
-      let pushData = [];
-      //渲染头部
-      this.skuInfo.forEach((sku) => {
-        //列名称
-        let columnName = sku.name;
-        pushData.push({
-          title: columnName,
-          key: columnName,
-        });
-      });
-      
-      this.baseInfoForm.goodsType != "VIRTUAL_GOODS"
-        ? pushData.push({
-          title: "重量",
-          slot: "weight",
-        })
-        : "";
-      pushData.push(
-        {
-          title: "货号",
-          slot: "sn",
-        },
-        {
-          title: "库存",
-          slot: "quantity",
-        },
-        {
-          title: "成本价",
-          slot: "cost",
-        },
-        {
-          title: "价格",
-          slot: "price",
-        },
-        {
-          title: "图片",
-          slot: "images",
-        }
-      );
-
-      this.skuTableColumn = pushData;
-      //克隆所有渲染的数据
-      let cloneTemp = cloneObj(this.skuInfo);
-
-      //数据清空一次
-      this.skuTableData = [];
-      //判定 是否存在规格分组
-      if (cloneTemp[0]) {
-        //存放最终结果
-        let result = [];
-        //循环选中的 sku 数据
-        cloneTemp[0].spec_values.forEach((specItem) => {
-          result.push({
-            [cloneTemp[0].name]: specItem.value,
-            images: this.baseInfoForm.goodsGalleryFiles || [],
-          });
-        });
-        cloneTemp.splice(0, 1);
-        result = this.specIterator(result, cloneTemp);
-        this.skuTableData = result;
-      }
-    },
-     /**
-     * 迭代属性，形成表格
-     * result 渲染的数据
-     * array spec数据
-     */
-    specIterator(result, cloneTemp) {
-      //是否还可以循环
-      if (cloneTemp.length > 0) {
-        let table = [];
-        result.forEach((resItem) => {
-          cloneTemp[0].spec_values.forEach((valItem) => {
-            let obj = cloneObj(resItem);
-            obj[cloneTemp[0].name] = valItem.value;
-            table.push(obj);
-          });
-        });
-        result = [];
-        table.forEach((t) => {
-          result.push(t);
-        });
-        //清除当前循环的分组
-        cloneTemp.splice(0, 1);
-        
-      } else {
-        return result;
-      }
-      return this.specIterator(result, cloneTemp);
-    },
-    /** 根据分类id获取系统设置规格信息*/
-    Get_SkuInfoByCategory(categoryId) {
-      if (categoryId) {
-        API_GOODS.getGoodsSpecInfoSeller(categoryId).then(res => {
-            if (res.length) {
-              res.forEach(e => {
-                this.skuData.push(e.specName)
-                const vals = e.specValue ? e.specValue.split(',') : []
-                this.skuVals.push(Array.from(new Set(vals)))
-              })
-            }
-          }
-        );
-      }
-    },
-    /** 自动完成表单所需方法*/
-    filterMethod(value, option) {
-      return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
-    },
-    // 节流函数
-    throttle (fn,time) {
-      let startTime = new Date();//初始时间
-      return function(){
-        let time_ = (new Date() - startTime) >= time;//判断时间间隔是否大于传入的time值，返回布尔值
-        if(time_){
-          fn.apply(this);
-          startTime = new Date();//函数执行完后更新初始时间的值
-        }
-      }
-    },
-   
-    // 规格表格操作
-    handleSpan({row, column, rowIndex, columnIndex}) {
-    },
-    /** 数据改变之后 抛出数据 */
-    updateSkuTable(row, item) {
-      let index = row._index;
-      // this.skuTableData[index][item] = row[item];
-      /** 进行自定义校验 判断是否是数字（小数也能通过）重量 */
-      if (item === "weight") {
-        if (
-          !/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(row[item]) ||
-          parseInt(row[item]) < 0 ||
-          parseInt(row[item]) > 99999999
-        ) {
-          // 校验未通过 加入错误存储列表中
-          this.validateError.push([index, item]);
-          this.validatatxt = "请输入0~99999999之间的数字值";
-          return;
-        }
-      } else if (item === "quantity") {
-        if (
-          !/^[0-9]\d*$/.test(row[item]) ||
-          parseInt(row[item]) < 0 ||
-          parseInt(row[item]) > 99999999
-        ) {
-          // 库存
-          this.validateError.push([index, item]);
-          this.validatatxt = "请输入0~99999999之间的整数";
-          return;
-        }
-      } else if (item === "cost" || item === "price") {
-        if (
-          !regular.money.test(row[item]) ||
-          parseInt(row[item]) < 0 ||
-          parseInt(row[item]) > 99999999
-        ) {
-          // 成本价 价格
-          this.validateError.push([index, item]);
-          this.validatatxt = "请输入0~99999999之间的价格";
-          return;
-        }
-      }
-      this.skuTableData[index][item] = row[item];
-    },
-    /** 上一步*/
-    pre() {
-      window.scrollTo(0, 0);
-      if (this.activestep === 1) {
-        if (this.activestep-- < 0) this.activestep = 0;
-      } else {
-        this.activestep--;
-      }
-    },
-    /** 下一步*/
-    next() {
-      window.scrollTo(0, 0);
-      if (this.activestep === 0 && this.$route.query.draftId) {
-        this.activestep = 1;
-        this.GET_GoodData();
-        return;
-      }
-      /** 1级校验 */
-      this.loading = true;
-      if (this.activestep === 0 && !this.baseInfoForm.goodsType) {
-        this.$Message.error('请选择商品类型')
-        this.loading = false;
-        return
-      }
-      if (this.activestep === 0 && !this.activeCategoryName1) {
-        this.$Message.error("请选择商品分类");
-        return;
-      } else if (this.activestep === 0 && this.activeCategoryIndex3 === -1) {
-        this.$Message.error("必须选择到三级分类");
-        return;
-      } else if (
-        this.activestep === 0 &&
-        this.activeCategoryName3 &&
-        this.currentStatus === 0
-      ) {
-        /** 获取该商城分类下 商品参数信息 */
-        this.GET_GoodsParams();
-        /** 查询品牌列表 */
-        this.getGoodsBrandList();
-        /** 查询分类绑定的规格信息 */
-        this.Get_SkuInfoByCategory(this.baseInfoForm.categoryId);
-        // 获取商品单位
-        this.GET_GoodsUnit();
-        // 获取当前店铺分类
-        this.GET_ShopGoodsLabel();
-      }
-
-      /** 2级校验 */
-      if (this.activestep === 1) {
-        this.$refs["baseInfoForm"].validate((valid) => {
-          if (valid) {
-            /** 规格校验 */
-            if (!this.skuFormVali()) {
-              return;
-            }
-            if (this.activestep++ > 2) return;
-          } else {
-            this.$message.error(
-              "表单中存在未填写或者填写有误的地方,已有错误标示，请检查并正确填写"
-            );
-          }
-        });
-        return;
-      }
-      
-    },
-    // 店内分类选择
-    selectTree(v) {
-      if (v.length > 0) {
-        // 转换null为""
-        for (let attr in v[0]) {
-          if (v[0][attr] == null) {
-            v[0][attr] = "";
-          }
-        }
-        let str = JSON.stringify(v[0]);
-        let menu = JSON.parse(str);
-        this.form = menu;
-        this.editTitle = menu.title;
-      }
-    },
-    // 店内分类选中
-    changeSelect(v) {
-      this.selectCount = v.length;
-      let ids = "";
-      v.forEach(function (e) {
-        ids += e.id + ",";
-      });
-      ids = ids.substring(0, ids.length - 1);
-      this.baseInfoForm.storeCategoryPath = ids;
-    },
-    /**  添加商品 **/
-    save() {
-      this.submitLoading = true;
-      this.$refs["baseInfoForm"].validate((valid) => {
-        if (valid) {
-          if (
-            this.baseInfoForm.goodsGalleryFiles &&
-            this.baseInfoForm.goodsGalleryFiles.length <= 0
-          ) {
-            this.submitLoading = false;
-            this.$Message.error("请上传商品图片");
-            return;
-          }
-          if (this.baseInfoForm.templateId === '') this.baseInfoForm.templateId = 0;
-          let flag = false;
-          let paramValue = "";
-          // //参数校验
-          // this.baseInfoForm.goodsParamsList.forEach((e) => {
-          //   if (
-          //     (e.required === 1 && e.paramValue === null) ||
-          //     e.paramValue === undefined
-          //   ) {
-          //     flag = true;
-          //     paramValue = e.paramName;
-          //   }
-          // });
-          if (flag) {
-            this.$Message.error(paramValue + " 参数值不能为空");
-            this.submitLoading = false;
-            return;
-          }
-
-          this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
-            delete sku._index;
-            delete sku._rowKey;
-            delete sku.specNameId;
-            delete sku.specValueId;
-            return sku;
-          });
-
-          if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
-            this.baseInfoForm.goodsGalleryList =
-              this.baseInfoForm.goodsGalleryFiles.map((i) => i.url);
-          }
-          /** 参数校验 **/
-          /* Object.keys(this.baseInfoForm.goodsParamsList).forEach((item) => {
-          });*/
-
-          if (this.goodsId) {
-            API_GOODS.editGoods(this.goodsId, this.baseInfoForm).then((res) => {
-              if (res.success) {
-                this.submitLoading = false;
-                this.$router.go(-1);
-              } else {
-                this.submitLoading = false;
-              }
-            });
-          } else {
-            // this.baseInfoForm.goodsType = "NORMAL";
-            API_GOODS.createGoods(this.baseInfoForm).then((res) => {
-              if (res.success) {
-                this.submitLoading = false;
-                this.activestep = 2;
-                window.scrollTo(0, 0);
-              } else {
-                this.submitLoading = false;
-              }
-            });
-          }
-        } else {
-          this.submitLoading = false;
-        }
-      });
-    },
-    /** 保存为模板 */
-    saveToDraft() {
-      this.baseInfoForm.skuList = this.skuTableData;
-      if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
-        this.baseInfoForm.goodsGalleryList =
-          this.baseInfoForm.goodsGalleryFiles.map((i) => i.url);
-      }
-      this.baseInfoForm.categoryName = [];
-      this.baseInfoForm.saveType = 'TEMPLATE';
-
-      if (this.$route.query.draftId) {
-        this.baseInfoForm.id = this.$route.query.draftId;
-        this.$Modal.confirm({
-          title: "当前模板已存在",
-          content: "当前模板已存在，保存为新模板或替换原模板",
-          okText: "保存新模板",
-          cancelText: "替换旧模板",
-          closable: true,
-          onOk: () => {
-            delete this.baseInfoForm.id;
-            this.SAVE_DRAFT_GOODS();
-            return;
-          },
-          onCancel: () => {
-            this.SAVE_DRAFT_GOODS();
-            return;
-          },
-        });
-        return;
-      }
-
-      this.$Modal.confirm({
-        title: "保存模板",
-        content: "是否确定保存",
-        okText: "保存",
-        closable: true,
-        onOk: () => {
-          this.SAVE_DRAFT_GOODS();
-        },
-      });
-    },
-    SAVE_DRAFT_GOODS() { // 保存模板
-      API_GOODS.saveDraftGoods(this.baseInfoForm).then((res) => {
-        if (res.success) {
-          this.$Message.info("保存成功！");
-          this.$router.back();
-        }
-      });
-    },
     
-    
-  },
+  }
 };
 </script>
 
diff --git a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
index b6125b16..0c93a1dd 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
@@ -27,22 +27,22 @@
     <!-- 商品分类 -->
     <div class="content-goods-publish">
       <div class="goods-category">
-        <ul v-if="categoryListLevel1 && categoryListLevel1.length > 0">
-          <li v-for="(item, index) in categoryListLevel1" :class="{ activeClass: index == activeCategoryIndex1 }"
+        <ul v-if="categoryListLevel1.length > 0">
+          <li v-for="(item, index) in categoryListLevel1" :class="{ activeClass: category[0].name }"
               @click="handleSelectCategory(item, index, 1)" :key="index">
             <span>{{ item.name }}</span>
             <span>&gt;</span>
           </li>
         </ul>
-        <ul v-if="categoryListLevel2 && categoryListLevel2.length > 0">
-          <li v-for="(item, index) in categoryListLevel2" :class="{ activeClass: index == activeCategoryIndex2 }"
+        <ul v-if="categoryListLevel2.length > 0">
+          <li v-for="(item, index) in categoryListLevel2" :class="{ activeClass: category[1].name }"
               @click="handleSelectCategory(item, index, 2)" :key="index">
             <span>{{ item.name }}</span>
             <span>&gt;</span>
           </li>
         </ul>
-        <ul v-if="categoryListLevel3 && categoryListLevel3.length > 0">
-          <li v-for="(item, index) in categoryListLevel3" :class="{ activeClass: index == activeCategoryIndex3 }"
+        <ul v-if="categoryListLevel3.length > 0">
+          <li v-for="(item, index) in categoryListLevel3" :class="{ activeClass: category[2].name }"
               @click="handleSelectCategory(item, index, 3)" :key="index">
             <span>{{ item.name }}</span>
           </li>
@@ -50,21 +50,30 @@
       </div>
       <p class="current-goods-category">
         您当前选择的商品类别是：
-        <span>{{ activeCategoryName1 }}</span>
-        <span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
-        <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
+        <span>{{ category[0].name }}</span>
+        <span v-show="category[1].name">> {{ category[1].name }}</span>
+        <span v-show="category[2].name">> {{ category[2].name }}</span>
       </p>
-      <template v-if="!$route.query.id">
+      <template>
         <Divider>已选商品模版:{{checkedTemplate()}}</Divider>
       </template>
     </div>
+    <!-- 底部按钮 -->
+    <div class="footer">
+      <ButtonGroup>
+        <Button type="primary" @click="selectGoodsType = true">商品类型</Button>
+        <Button type="primary" @click="next">下一步</Button>
+      </ButtonGroup>
+    </div>
   </div>
 </template>
 <script>
 import * as API_GOODS from "@/api/goods";
+import bus from '@/libs/eventBus'
 export default {
   data() {
     return {
+      draftId: '',
       selectGoodsType: false, // 展示选择商品分类modal
       goodsTemplates: [], // 商品模板列表
       showGoodsTemplates: false, //是否显示选择商品模板
@@ -90,19 +99,12 @@ export default {
           check: false,
         },
       ],
-      /** 当前点击的1级分类索引*/
-      activeCategoryIndex1: -1,
-
-      /** 当前点击的2级分类索引*/
-      activeCategoryIndex2: -1,
-
-      /** 当前点击的3级分类索引*/
-      activeCategoryIndex3: -1,
-      /** 当前商品分类名称1*/
-      activeCategoryName1: "",
-
-      /** 当前商品分类名称2*/
-      activeCategoryName2: "",
+      // 商品分类选择数组
+      category: [
+        {name: '', id: ''},
+        {name: '', id: ''},
+        {name: '', id: ''}
+      ],
 
       /** 当前商品分类名称3*/
       activeCategoryName3: "",
@@ -120,7 +122,7 @@ export default {
       // 获取已选模板
     checkedTemplate () {
       if(this.goodsTemplates.length) {
-        return this.goodsTemplates.find(item=>{return item.id == this.$parent.draftId}).goodsName
+        return this.goodsTemplates.find(item=>{return item.id == this.draftId}).goodsName
       } else {
         return ""
       }
@@ -137,7 +139,6 @@ export default {
         this.GET_GoodsTemplate()
       } else {
         // this.baseInfoForm.goodsType = val.type;
-        // this.draftId = "";
       }
     },
     // 获取商品模板
@@ -155,35 +156,30 @@ export default {
     },
     // 选择商品模板
     handleClickGoodsTemplate(val) {
-      // this.draftId = val.id;
       this.selectGoodsType = false;
     },
     /** 选择商城商品分类 */
     handleSelectCategory(row, index, level) {
       if (level === 1) {
-        // this.baseInfoForm.categoryPath = row.id;
-        this.activeCategoryName1 = row.name;
-        this.activeCategoryName2 = this.activeCategoryName3 = "";
-        this.activeCategoryIndex1 = index;
-        this.activeCategoryIndex2 = -1;
-        this.activeCategoryIndex3 = -1;
+        this.category.forEach(cate => {
+          cate.name = '',
+          cate.id = ''
+        })
+        this.category[0].name = row.name;
+        this.category[0].id = row.id;
         this.categoryListLevel2 = this.categoryListLevel1[index].children;
         this.categoryListLevel3 = [];
       } else if (level === 2) {
-        // this.baseInfoForm.categoryPath =
-        //   this.baseInfoForm.categoryPath + "," + row.id;
-        this.activeCategoryName2 = row.name;
-        this.activeCategoryName3 = "";
-        this.activeCategoryIndex2 = index;
-        this.activeCategoryIndex3 = -1;
+        this.category[1].name = row.name;
+        this.category[1].id = row.id;
+        this.category[2].name = '';
+        this.category[2].id = '';
         this.categoryListLevel3 = this.categoryListLevel2[index].children;
       } else {
-        // this.baseInfoForm.categoryPath =
-        //   this.baseInfoForm.categoryPath + "," + row.id;
-        this.activeCategoryName3 = row.name;
-        this.activeCategoryIndex3 = index;
+        this.category[2].name = row.name
+        this.category[2].id = row.id
       }
-      // 设置当前商城分类ID
+      // 设置当前商品分类ID
       // this.baseInfoForm.categoryId = row.id;
       // this.categoryId = row.id;
       // this.baseInfoForm.categoryName = row.name;
@@ -197,9 +193,44 @@ export default {
         }
       });
     },
+    // 下一步
+    next() {
+      window.scrollTo(0, 0);
+      if (this.$route.query.draftId) {
+        this.activestep = 1;
+        this.GET_GoodData();
+        return;
+      }
+      /** 1级校验 */
+      this.loading = true;
+      if (!this.baseInfoForm.goodsType) {
+        this.$Message.error('请选择商品类型')
+        this.loading = false;
+        return
+      }
+      if (!this.activeCategoryName1) {
+        this.$Message.error("请选择商品分类");
+        return;
+      } else if (this.activeCategoryIndex3 === -1) {
+        this.$Message.error("必须选择到三级分类");
+        return;
+      } else if (this.activeCategoryName3) {
+        /** 获取该商城分类下 商品参数信息 */
+        this.GET_GoodsParams();
+        /** 查询品牌列表 */
+        this.getGoodsBrandList();
+        /** 查询分类绑定的规格信息 */
+        this.Get_SkuInfoByCategory(this.baseInfoForm.categoryId);
+        // 获取商品单位
+        this.GET_GoodsUnit();
+        // 获取当前店铺分类
+        this.GET_ShopGoodsLabel();
+      }
+    },
   },
   mounted () {
     this.GET_NextLevelCategory()
+    this.selectGoodsType = true;
   }
 }
 </script>
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 5eaee9b6..b437371a 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -1,17 +1,1227 @@
 <template>
   <div>
-    
+    <div class="content-goods-publish">
+      <Form ref="baseInfoForm" :model="baseInfoForm" :label-width="120" :rules="baseInfoFormRule">
+        <div class="base-info-item">
+          <h4>基本信息</h4>
+          <div class="form-item-view">
+            <FormItem label="商品分类">
+              <span class="goods-category-name">{{ activeCategoryName1 }}</span>
+              <span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
+              <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
+              <span v-if="!activeCategoryName1" v-html="baseInfoForm.category_name"></span>
+            </FormItem>
+            <FormItem label="商品名称" prop="goodsName">
+              <Input type="text" v-model="baseInfoForm.goodsName" placeholder="商品名称" clearable style="width: 260px"/>
+            </FormItem>
+
+            <FormItem label="商品卖点" prop="sellingPoint">
+              <Input v-model="baseInfoForm.sellingPoint" type="textarea" :rows="4" style="width: 260px"/>
+            </FormItem>
+            <FormItem label="商品品牌" prop="brandId">
+              <Select v-model="baseInfoForm.brandId" style="width: 200px">
+                <Option v-for="item in brandList" :value="item.id" :key="item.id" :label="item.name"></Option>
+              </Select>
+            </FormItem>
+          </div>
+          <h4>商品交易信息</h4>
+          <div class="form-item-view">
+            <FormItem class="form-item-view-el" label="计量单位" prop="goodsUnit">
+              <Select v-model="baseInfoForm.goodsUnit" style="width: 100px">
+                <Option v-for="unit in goodsUnitList" :key="unit" :value="unit">{{ unit }}
+                </Option>
+              </Select>
+            </FormItem>
+            <FormItem class="form-item-view-el" label="销售模式" prop="salesModel">
+              <RadioGroup type="button" 
+                v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'" 
+                button-style="solid"
+                v-model="baseInfoForm.salesModel">
+                <Radio title="零售型" label="RETAIL">零售型</Radio>
+                <Radio title="批发型" label="WHOLESALE">批发型</Radio>
+              </RadioGroup>
+              <RadioGroup type="button" v-else button-style="solid" v-model="baseInfoForm.salesModel">
+                <Radio title="零售型" label="RETAIL">
+                  <span>虚拟型</span>
+                </Radio>
+              </RadioGroup>
+            </FormItem>
+          </div>
+          <h4>商品规格及图片</h4>
+          <div class="form-item-view">
+            <FormItem label="商品编号" prop="sn">
+              <Input type="text" v-model="baseInfoForm.sn" placeholder="商品编号" clearable style="width: 260px"/>
+            </FormItem>
+            <FormItem label="商品价格" prop="price">
+              <Input type="text" v-model="baseInfoForm.price" placeholder="商品价格" clearable style="width: 260px"/>
+            </FormItem>
+            <FormItem label="市场价格" prop="cost">
+              <Input type="text" v-model="baseInfoForm.cost" placeholder="市场价格" clearable style="width: 260px"/>
+            </FormItem>
+            <FormItem class="form-item-view-el required" label="商品图片" prop="goodsGalleryFiles">
+              <vuedraggable
+                :list="baseInfoForm.goodsGalleryFiles"
+                :animation="200"
+                style="display:inline-block;"
+                ghost-class="thumb-ghost"
+              >
+                <div class="demo-upload-list" v-for="(item, __index) in baseInfoForm.goodsGalleryFiles" :key="__index">
+                  <template v-if="item.status === 'finished'">
+                    <img :src="item.url"/>
+                    <div class="demo-upload-list-cover">
+                      <div>
+                        <Icon type="ios-eye-outline" size="30" @click.native="handleViewGoodsPicture(item.url)"></Icon>
+                        <Icon type="ios-trash-outline" size="30" @click.native="handleRemoveGoodsPicture(item)"></Icon>
+                      </div>
+                    </div>
+                  </template>
+                  <template v-else>
+                    <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
+                  </template>
+                </div>
+              </vuedraggable>
+              <Upload ref="upload" :show-upload-list="false" :default-file-list="baseInfoForm.goodsGalleryFiles"
+                :on-success="handleSuccessGoodsPicture" :format="['jpg', 'jpeg', 'png']"
+                :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
+                :before-upload="handleBeforeUploadGoodsPicture" multiple type="drag" :action="uploadFileUrl"
+                :headers="accessToken" style="display: inline-block;margin-left:10px;">
+                <div style="width: 80px; height: 80px; line-height: 80px">
+                  <Icon type="ios-camera" size="20"></Icon>
+                </div>
+              </Upload>
+              <Modal title="View Image" v-model="goodsPictureVisible">
+                <img :src="previewGoodsPicture" v-if="goodsPictureVisible" style="width: 100%"/>
+              </Modal>
+            </FormItem>
+            <div class="layout" style="width: 100%">
+              <Collapse v-model="open_panel">
+                <Panel name="1">
+                  规格名称
+                  <div slot="content" class="sku-item-content">
+                    <Form :model="skuForm" @submit.native.prevent>
+                      <div class="sku-item" v-for="(item, $index) in skuInfo" :key="$index">
+                        <Card :bordered="true">
+                          <FormItem label="规格名：" class="sku-item-content-name">
+                            <AutoComplete style="width: 150px" v-model="item.name" :maxlength="30"
+                              placeholder="请输入规格项名称"
+                              :filter-method="filterMethod" :data="skuData"
+                              @on-change="editSkuItem">
+                            </AutoComplete>
+                            <Button type="error" style="margin-left: 10px" @click="handleCloseSkuItem($index)">删除
+                            </Button>
+                          </FormItem>
+                          <FormItem label="规格值：" prop="sku">
+                            <!--规格值文本列表-->
+                            <div v-for="(val, index) in item.spec_values" :key="index"
+                                 style="padding: 0px 20px 10px 0px; float: left">
+                              <div>
+                                <AutoComplete style="width: 150px; float: left" v-model="val.value"
+                                  :maxlength="30" placeholder="请输入规格值名称"
+                                  :filter-method="filterMethod" :data="skuVal"
+                                  @on-focus="changeSkuVals(item.name)"
+                                  @on-change="skuValueChange(val.value, $index, item)">
+                                </AutoComplete>
+                                <Button type="error" style="margin-left: 10px" @click="handleCloseSkuValue(item, index)">
+                                  删除
+                                </Button>
+                              </div>
+                            </div>
+                            <div style="float: left">
+                              <Button type="primary" @click="addSpec($index, item)">添加规格值</Button>
+                            </div>
+                          </FormItem>
+                        </Card>
+                      </div>
+                    </Form>
+                    <Button class="add-sku-btn" type="primary" size="mini" @click="addSkuItem">添加规格项目</Button>
+                  </div>
+                </Panel>
+                <Panel name="2">
+                  规格详细
+                  <div slot="content">
+                    <div slot="content">
+                      <Table :columns="skuTableColumn" :data="skuTableData" style="
+                          width: 100%;
+                          .ivu-table-overflowX {
+                            overflow-x: hidden;
+                          }
+                        " :span-method="handleSpan">
+                        <template slot-scope="{ row }" slot="sn">
+                          <Input v-model="row.sn" placeholder="请输入货号" @on-change="updateSkuTable(row, 'sn')"/>
+                        </template>
+                        <template slot-scope="{ row }" slot="weight" v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'">
+                          <Input v-model="row.weight" placeholder="请输入重量" @on-change="updateSkuTable(row, 'weight')"/>
+                        </template>
+                        <template slot-scope="{ row }" slot="quantity">
+                          <Input v-model="row.quantity" placeholder="请输入库存" @on-change="updateSkuTable(row, 'quantity')"/>
+                        </template>
+                        <template slot-scope="{ row }" slot="cost">
+                          <Input v-model="row.cost" placeholder="请输入成本价" @on-change="updateSkuTable(row, 'cost')"/>
+                        </template>
+                        <template slot-scope="{ row }" slot="price">
+                          <Input v-model="row.price" placeholder="请输入价格" @on-change="updateSkuTable(row, 'price')"/>
+                        </template>
+                        <template slot-scope="{ row }" slot="images">
+                          <Button @click="editSkuPicture(row)">编辑图片</Button>
+                          <Modal v-model="showSkuPicture" :styles="{ top: '30px' }" class-name="sku-preview-modal"
+                                 title="编辑图片" ok-text="结束编辑" @on-ok="updateSkuPicture()" cancel-text="取消">
+                            <div class="preview-picture">
+                              <img v-if="previewPicture !== ''" :src="previewPicture"/>
+                            </div>
+                            <Divider/>
+                            <div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
+                              <template v-if="img.status === 'finished'">
+                                <img :src="img.url"/>
+                                <div class="sku-upload-list-cover">
+                                  <Icon type="ios-eye-outline" @click="handleView(img.url)"></Icon>
+                                  <Icon type="ios-trash-outline" @click="handleRemove(img, __index)"></Icon>
+                                </div>
+                              </template>
+                              <template v-else>
+                                <Progress v-if="img.showProgress" :percent="img.percentage" hide-info></Progress>
+                              </template>
+                            </div>
+                            <Upload ref="uploadSku" :show-upload-list="false" :default-file-list="row.images"
+                                :on-success="handleSuccess" :format="['jpg', 'jpeg', 'png']"
+                                :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
+                                :before-upload="handleBeforeUpload" multiple type="drag" :action="uploadFileUrl"
+                                :headers="accessToken" style="display: inline-block; width: 58px">
+                              <div>
+                                <Icon type="ios-camera" size="55"></Icon>
+                              </div>
+                            </Upload>
+                          </Modal>
+                        </template>
+                      </Table>
+
+                    </div>
+                  </div>
+                </Panel>
+              </Collapse>
+            </div>
+          </div>
+          <h4>商品详情描述</h4>
+          <div class="form-item-view">
+            <div class="tree-bar">
+              <FormItem
+                class="form-item-view-el"
+                label="店内分类"
+                prop="shopCategory"
+              >
+                <Tree
+                  ref="tree"
+                  :data="shopCategory"
+                  show-checkbox
+                  @on-select-change="selectTree"
+                  @on-check-change="changeSelect"
+                  :check-strictly="false"
+                ></Tree>
+              </FormItem>
+            </div>
+            <FormItem class="form-item-view-el" label="商品描述" prop="intro">
+              <editor id="intro" v-model="baseInfoForm.intro"></editor>
+            </FormItem>
+            <FormItem class="form-item-view-el" label="移动端描述" prop="skuList">
+              <editor id="mobileIntr" v-model="baseInfoForm.mobileIntro"></editor>
+            </FormItem>
+          </div>
+          <div v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'">
+            <h4>商品物流信息</h4>
+            <div class="form-item-view">
+              <FormItem class="form-item-view-el" label="商品重量" prop="weight">
+                <Input v-model="baseInfoForm.weight">
+                  <span slot="append">kg</span>
+                </Input>
+              </FormItem>
+
+              <FormItem
+                class="form-item-view-el"
+                label="物流模板"
+                prop="templateId"
+              >
+                <Select v-model="baseInfoForm.templateId" style="width: 200px">
+                  <Option
+                    v-for="item in logisticsTemplate"
+                    :value="item.id"
+                    :key="item.id"
+                  >{{ item.name }}
+                  </Option>
+                </Select>
+              </FormItem>
+            </div>
+            <h4>其他信息</h4>
+            <div class="form-item-view">
+              <FormItem class="form-item-view-el" label="商品发布" prop="release">
+                <RadioGroup type="button" button-style="solid" v-model="baseInfoForm.release">
+                  <Radio title="立即发布" label="true">
+                    <span>立即发布</span>
+                  </Radio>
+                  <Radio title="放入仓库" label="false">
+                    <span>放入仓库</span>
+                  </Radio>
+                </RadioGroup>
+              </FormItem>
+              <FormItem class="form-item-view-el" label="商品推荐" prop="skuList">
+                <RadioGroup type="button" button-style="solid" v-model="baseInfoForm.recommend">
+                  <Radio title="推荐" label="true">
+                    <span>推荐</span>
+                  </Radio>
+                  <Radio title="不推荐" label="false">
+                    <span>不推荐</span>
+                  </Radio>
+                </RadioGroup>
+              </FormItem>
+            </div>
+            <div class="form-item-view-bottom">
+              <Collapse v-model="params_panel" v-for="(paramsGroup,groupIndex) in goodsParams"
+                        :title="paramsGroup.groupName"
+                        class="mb_10"
+                        style="text-align: left" :key="paramsGroup.groupName">
+                <Panel :name="paramsGroup.groupName">
+                  {{paramsGroup.groupName}}
+                  <p slot="content">
+                    <FormItem v-for="( params, paramsIndex) in paramsGroup.params" :key="paramsIndex"
+                              :label="`${params.paramName}：`">
+                      <Select v-model="params.paramValue" placeholder="请选择" style="width: 200px" clearable
+                              @on-change="selectParams(paramsGroup,groupIndex,params,paramsIndex,params.paramValue)">
+                        <Option v-for="option in params.options.split(',')" :label="option"
+                                :value="option" :key="option"></Option>
+                      </Select>
+                    </FormItem>
+                  </p>
+                </Panel>
+              </Collapse>
+            </div>
+          </div>
+        </div>
+      </Form>
+    </div>
+    <!-- 底部按钮 -->
+    <div class="footer">
+      <ButtonGroup>
+        <Button type="primary" @click="pre" v-if="!$route.query.id && !$route.query.draftId">上一步
+        </Button>
+        <Button type="primary" @click="save" :loading="submitLoading">
+          {{ this.$route.query.id ? "保存" : "保存商品" }}
+        </Button>
+        <Button type="primary" @click="saveToDraft">保存为模版</Button>
+      </ButtonGroup>
+    </div>
   </div>
 </template>
 <script>
+import * as API_Shop from "@/api/shops";
+import cloneObj from "@/utils/index";
+import bus from '@/libs/eventBus'
+import vuedraggable from "vuedraggable";
+import editor from "@/views/my-components/lili/editor";
+import {regular} from "@/utils";
+
 export default {
-  data() {
+  components:{
+    editor,
+    vuedraggable,
+  },
+  data () {
+    // 表单验证项，商品价格
+    const checkPrice = (rule, value, callback) => {
+      if (!value && value !== 0) {
+        return callback(new Error("商品价格不能为空"));
+      }
+      setTimeout(() => {
+        if (!regular.money.test(value)) {
+          callback(new Error("请输入正整数或者两位小数"));
+        } else if (parseFloat(value) > 99999999) {
+          callback(new Error("商品价格设置超过上限值"));
+        } else {
+          callback();
+        }
+      }, 1000);
+    };
+    // 表单验证项，商品编号
+    const checkSn = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error("商品编号不能为空"));
+      } else if (!/^[a-zA-Z0-9_\\-]+$/g.test(value)) {
+        callback(new Error("请输入数字、字母、下划线或者中划线"));
+      } else {
+        callback();
+      }
+    };
+    // 表单验证项，商品重量
+    const checkWeight = (rule, value, callback) => {
+      if (!value && typeof value !== "number") {
+        callback(new Error("重量不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("商品重量设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
     return {
-      
+      //提交状态
+      submitLoading: false,
+      //上传图片路径
+      uploadFileUrl: API_GOODS.uploadFile,
+      // 预览图片路径
+      previewPicture: "",
+      //商品图片
+      previewGoodsPicture: "",
+      //展示图片层
+      visible: false,
+      //展示商品图片
+      goodsPictureVisible: false,
+      //展示sku图片
+      showSkuPicture: false,
+      //选择的sku
+      selectedSku: {},
+      /** 发布商品基本参数 */
+      baseInfoForm: {
+        salesModel: "RETAIL",
+        /** 商品重量 */
+        weight: "",
+        /** 商品相册列表 */
+        goodsGalleryFiles: [],
+        /** 是否立即发布 true 立即发布 false 放入仓库 */
+        release: "true",
+        /** 是否为推荐商品 */
+        recommend: "true",
+        /** 店铺分类 */
+        storeCategoryPath: "",
+        brandId: 0,
+        /** 计量单位 **/
+        goodsUnit: "",
+        /** 商品类型 **/
+        goodsType: "",
+        /** 分类路径 **/
+        categoryPath: "",
+        /** 商品卖点 **/
+        sellingPoint: "",
+        /** 商品详情 **/
+        intro: "",
+        mobileIntro: "",
+        updateSku: true,
+        /** 是否重新生成sku */
+        regeneratorSkuFlag: false,
+        /** 物流模板id **/
+        templateId: '',
+        /** 参数组*/
+        goodsParamsDTOList: [],
+      },
+      /** 表单数据*/
+      skuForm: {},
+      /** 表格头 */
+      skuTableColumn: [],
+      /** 表格数据 */
+      skuTableData: [],
+
+      /** 默认的规格参数 */
+      skuData: [],
+
+      /** 默认的规格值 */
+      skuVals: [],
+      // 某一规格名下的规格值
+      skuVal: [],
+      open_panel: [1, 2],
+
+      /** 要提交的规格数据*/
+      skuInfo: [],
+
+      /** 规格图片 */
+      images: [],
+
+      /** 物流模板 **/
+      logisticsTemplate: [],
+
+      /** 固定列校验提示内容 */
+      validatatxt: "请输入0~99999999之间的数字值",
+      //参数panel展示
+      params_panel: [],
+      /** 存储未通过校验的单元格位置  */
+      validateError: [],
+      baseInfoFormRule: {
+        goodsName: [
+          {required: true, message: "请输入商品名称"},
+          {
+            whitespace: true,
+            message: "商品名称不可为纯空格",
+          },
+          {
+            min: 3,
+            max: 60,
+            message: "长度在 3 到 60 个字符",
+          },
+        ],
+        sn: [
+          {required: true, message: "请输入商品编号"},
+          {validator: checkSn},
+        ],
+        price: [
+          {required: true, message: "请输入商品价格"},
+          {validator: checkPrice},
+        ],
+        cost: [
+          {required: true, message: "请输入市场价格"},
+          {validator: checkPrice},
+        ],
+        weight: [
+          {required: true, message: "请输入商品重量"},
+          {validator: checkWeight},
+        ],
+        templateId: [{required: true, message: '请选择物流模板'}],
+        sellingPoint: [{required: true, message: "请输入商品卖点"}],
+        goodsUnit: [{required: true, message: "请选择计量单位"}],
+      },
+      /** 品牌列表 */
+      brandList: [],
+      collapseVal: [],
+      /** 店铺分类列表 */
+      shopCategory: [],
+      /** 商品单位列表 */
+      goodsUnitList: {},
+      ignoreColumn: [
+        "_index",
+        "_rowKey",
+        "sn",
+        "cost",
+        "price",
+        "weight",
+        "quantity",
+        "specId",
+        "specValueId",
+      ],
+      skuValVisible: true,
     }
   },
   methods: {
+    /**
+     * 选择参数
+     * @paramsGroup 参数分组
+     * @groupIndex 参数分组下标
+     * @params 参数选项
+     * @paramIndex 参数下标值
+     * @value 参数选项值
+     */
+    selectParams(paramsGroup, groupIndex, params, paramsIndex, value) {
+      if (!this.baseInfoForm.goodsParamsDTOList[groupIndex]) {
+        this.baseInfoForm.goodsParamsDTOList[groupIndex] = {
+          groupId:'',
+          groupName:'',
+          goodsParamsItemDTOList:[]
+        }
+      }
+      //赋予分组id、分组名称
+      this.baseInfoForm.goodsParamsDTOList[groupIndex] = {
+        groupId : paramsGroup.groupId,
+        groupName : paramsGroup.groupName
+      }
+      //参数详细为空，则赋予
+      if (!this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[paramsIndex]) {
+        this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[paramsIndex]={
+          paramName: '',
+          paramValue: '',
+          isIndex: '',
+          required: '',
+          paramId: ''
+        }
+      }
+      this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[paramsIndex]={
+        paramName: params.paramName,
+        paramValue: value,
+        isIndex: params.isIndex,
+        required: params.required,
+        paramId: params.id
+      }
+    },
+    // 编辑sku图片
+    editSkuPicture(row) {
+      if (row.images && row.images.length > 0) {
+        this.previewPicture = row.images[0].url;
+      }
+      this.selectedSku = row;
+      this.showSkuPicture = true;
+    },
+    // 预览图片
+    handleView (url) {
+      this.previewPicture = url;
+      this.visible = true;
+    },
+    // 移除已选图片
+    handleRemove(item, index) {
+      this.selectedSku.images = this.selectedSku.images.filter(
+        (i) => i.url !== item.url
+      );
+      if (this.selectedSku.images.length > 0 && index === 0) {
+        this.previewPicture = this.selectedSku.images[0].url;
+      } else if (this.selectedSku.images.length < 0) {
+        this.previewPicture = "";
+      }
+    },
+    handleViewGoodsPicture(url) {
+      this.previewGoodsPicture = url;
+      this.goodsPictureVisible = true;
+    },
+    handleRemoveGoodsPicture(file) {
+      this.baseInfoForm.goodsGalleryFiles =
+        this.baseInfoForm.goodsGalleryFiles.filter((i) => i.url !== file.url);
+    },
+    updateSkuPicture() {
+      let _index = this.selectedSku._index;
+      this.skuTableData[_index] = this.selectedSku;
+    },
+    handleSuccess(res, file) {
+      if (file.response) {
+        file.url = file.response.result;
+        if (this.selectedSku.images) {
+          this.selectedSku.images.push(file);
+        } else {
+          this.selectedSku.images = [file];
+        }
+        this.previewPicture = file.url;
+      }
+    },
+    handleSuccessGoodsPicture(res, file) {
+      if (file.response) {
+        file.url = file.response.result;
+        this.baseInfoForm.goodsGalleryFiles.push(file);
+      }
+    },
+    handleFormatError(file) {
+      this.$Notice.warning({
+        title: "文件格式不正确",
+        desc:
+          "File format of " +
+          file.name +
+          " is incorrect, please select jpg or png.",
+      });
+    },
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "超过文件大小限制",
+        desc: "图片  " + file.name + " 不能超过2mb",
+      });
+    },
+    handleBeforeUploadGoodsPicture() {
+      const check = this.baseInfoForm.goodsGalleryFiles.length < 5;
+      if (!check) {
+        this.$Notice.warning({
+          title: "Up to five pictures can be uploaded.",
+        });
+      }
+      return check;
+    },
+    handleBeforeUpload() {
+      const check =
+        this.selectedSku.images !== undefined &&
+        this.selectedSku.images.length > 5;
+      if (check) {
+        this.$Notice.warning({
+          title: "Up to five pictures can be uploaded.",
+        });
+      }
+      return !check;
+    },
+   
+    /** 查询商品品牌列表 */
+    getGoodsBrandList() {
+      API_GOODS.getCategoryBrandListDataSeller(this.categoryId).then(
+        (response) => {
+          this.brandList = response;
+        }
+      );
+    },
+    // 获取商品单位
+    GET_GoodsUnit() {
+      API_GOODS.getGoodsUnitList().then((res) => {
+        if (res.success) {
+          this.goodsUnitList = res.result.records.map((i) => i.name);
+        }
+      });
+    },
+    // 获取当前店铺分类
+    GET_ShopGoodsLabel() {
+      API_GOODS.getShopGoodsLabelListSeller().then((res) => {
+        if (res.success) {
+          let shopCategories = !this.baseInfoForm.storeCategoryPath
+            ? []
+            : this.baseInfoForm.storeCategoryPath.split(",");
 
+          this.shopCategory = res.result.map((i) => {
+            i.title = i.labelName;
+            i.expand = false;
+            i.checked = shopCategories.some((o) => o === i.id);
+            i.children = i.children.map((j) => {
+              j.title = j.labelName;
+              j.expand = false;
+              j.checked = shopCategories.some((o) => o === j.id);
+              return j;
+            });
+            return i;
+          });
+        }
+      });
+    },
+    // 编辑时获取商品信息
+    async GET_GoodData() {
+      let response = {};
+      if (this.$route.query.draftId) {
+        response = await API_GOODS.getDraftGoodsDetail(this.$route.query.draftId);
+      } else {
+        response = await API_GOODS.getGoods(this.$route.query.id);
+        this.goodsId = response.result.id;
+      }
+      this.baseInfoForm = {...this.baseInfoForm,...response.result};
+
+      this.baseInfoForm.release = "true";
+      this.baseInfoForm.recommend = this.baseInfoForm.recommend
+        ? "true"
+        : "false";
+
+      //分类名称展示
+      this.activeCategoryName1 = response.result.categoryName[0];
+      this.activeCategoryName2 = response.result.categoryName[1];
+      this.activeCategoryName3 = response.result.categoryName[2];
+
+      this.baseInfoForm.categoryId = response.result.categoryPath.split(",");
+
+
+      if (
+        response.result.goodsGalleryList &&
+        response.result.goodsGalleryList.length > 0
+      ) {
+        this.baseInfoForm.goodsGalleryFiles =
+          response.result.goodsGalleryList.map((i) => {
+            let files = {url: i};
+            return files;
+          });
+      }
+
+      this.categoryId = this.baseInfoForm.categoryId[2];
+
+      this.Get_SkuInfoByCategory(this.categoryId)
+
+      this.renderGoodsDetailSku(response.result.skuList);
+
+      /** 查询品牌列表 */
+      this.getGoodsBrandList();
+      /** 查询商品参数 */
+      this.GET_GoodsParams();
+      /** 查询店铺商品分类 */
+      this.GET_ShopGoodsLabel();
+      this.GET_GoodsUnit();
+    },
+    // 渲染sku数据
+    renderGoodsDetailSku(skuList) {
+      let skus = [];
+      let skusInfo = [];
+      skuList.map((e) => {
+        let sku = {
+          id: e.id,
+          sn: e.sn,
+          price: e.price,
+          cost: e.cost,
+          quantity: e.quantity,
+          weight: e.weight,
+        };
+        e.specList.forEach((u) => {
+          if (u.specName === "images") {
+            sku.images = u.specImage;
+          } else {
+            sku[u.specName] = u.specValue;
+            if (
+              !skusInfo.some((s) => s.name === u.specName) &&
+              !this.ignoreColumn.includes(u.specName)
+            ) {
+              skusInfo.push({
+                name: u.specName,
+                spec_id: u.specNameId,
+                spec_values: [
+                  {
+                    id: u.specValueId,
+                    name: u.specName,
+                    value: u.specValue,
+                  },
+                ],
+              });
+            } else {
+              skusInfo = skusInfo.map((sk) => {
+                if (
+                  !sk.spec_values.some((s) => s.value === u.specValue) &&
+                  sk.name === u.specName
+                ) {
+                  sk.spec_values.push({
+                    id: u.specValueId,
+                    name: u.specName,
+                    value: u.specValue,
+                  });
+                }
+                if (!sk.spec_id && u.specName === "specId") {
+                  sk.spec_id = u.specValue;
+                }
+                return sk;
+              });
+            }
+          }
+        });
+        skus.push(sku);
+      });
+      this.skuInfo = skusInfo;
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+      this.skuTableData = skus;
+    },
+
+    /** 根据当前分类id查询商品应包含的参数 */
+    GET_GoodsParams() {
+      API_GOODS.getCategoryParamsListDataSeller(this.categoryId).then(
+        (response) => {
+          if (!response || response.length <= 0) {
+            return;
+          }
+          this.goodsParams = response;
+
+          //展开选项卡
+          this.goodsParams.forEach(item => {
+              this.params_panel.push(item.groupName)
+            }
+          )
+          if (this.baseInfoForm.goodsParamsDTOList) {
+            // 已选值集合
+            const paramsArr = []
+            this.baseInfoForm.goodsParamsDTOList.forEach(group =>{
+              group.goodsParamsItemDTOList.forEach(param => {
+                param.groupId = group.groupId
+                paramsArr.push(param)
+              })
+            })
+            // 循环参数分组
+            this.goodsParams.forEach((parmsGroup) => {
+              parmsGroup.params.forEach(param => {
+              
+                paramsArr.forEach(arr=>{
+                  if(param.paramName == arr.paramName){
+                    param.paramValue = arr.paramValue
+                  }
+                })
+              })
+            });
+          } else {
+            this.baseInfoForm.goodsParamsDTOList = []
+          }
+        }
+      );
+    },
+
+    /** 添加规格项 */
+    addSkuItem() {
+      if (this.skuInfo.length >= 5) {
+        this.$Message.error("规格项不能大于5个！");
+        return;
+      }
+      // 写入对象，下标，具体对象
+      this.$set(this.skuInfo, this.skuInfo.length, {
+        spec_values: [],
+      });
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    // 编辑规格名
+    editSkuItem() {
+      this.renderTableData();
+    },
+    // 编辑规格值
+    async skuValueChange(val, index, item) {
+ 
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    // 获取焦点时，取得规格名对应的规格值
+    changeSkuVals(name) {
+      if (name) {
+        this.skuData.forEach((e, index) => {
+          if (e === name) {
+            if (this.skuVal.length != this.skuVals[index].length) {
+              this.skuVal = this.skuVals[index]
+            }
+          }
+        })
+      }
+    },
+    /** 移除当前规格项 进行数据变化*/
+    handleCloseSkuItem($index) {
+      this.skuInfo.splice($index, 1);
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    // 添加规格值的验证
+    validateEmpty(params) {
+      let flag = true;
+      params.forEach((item) => {
+        for (var key in item) {
+          if (item[key] != "0" && !item.value) {
+            this.$Message.error("请必填规格项");
+            flag = false;
+            return false; // 终止程序
+          }
+        }
+      });
+
+      return flag;
+    },
+    /** 添加当前规格项的规格值*/
+    addSpec($index, item) {
+
+      if (this.validateEmpty(item.spec_values)) {
+        if (item.spec_values.length >= 10) {
+          this.$Message.error("规格值不能大于10个！");
+          return;
+        }
+        this.$set(
+          item.spec_values,
+          item.spec_values.length,
+          {
+            name: item.name,
+          }
+        );
+        this.baseInfoForm.regeneratorSkuFlag = true;
+        /**
+         * 渲染规格详细表格
+         */
+        this.renderTableData();
+      }
+    },
+
+    /** 移除当前规格值 */
+    handleCloseSkuValue(item, index) {
+      item.spec_values.splice(index, 1);
+
+      this.baseInfoForm.regeneratorSkuFlag = true;
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+
+    /**
+     * 渲染table所需要的column 和 data
+     */
+    renderTableData() {
+      this.skuTableColumn = [];
+      this.skuTableData = [];
+      let pushData = [];
+      //渲染头部
+      this.skuInfo.forEach((sku) => {
+        //列名称
+        let columnName = sku.name;
+        pushData.push({
+          title: columnName,
+          key: columnName,
+        });
+      });
+      
+      this.baseInfoForm.goodsType != "VIRTUAL_GOODS"
+        ? pushData.push({
+          title: "重量",
+          slot: "weight",
+        })
+        : "";
+      pushData.push(
+        {
+          title: "货号",
+          slot: "sn",
+        },
+        {
+          title: "库存",
+          slot: "quantity",
+        },
+        {
+          title: "成本价",
+          slot: "cost",
+        },
+        {
+          title: "价格",
+          slot: "price",
+        },
+        {
+          title: "图片",
+          slot: "images",
+        }
+      );
+
+      this.skuTableColumn = pushData;
+      //克隆所有渲染的数据
+      let cloneTemp = cloneObj(this.skuInfo);
+
+      //数据清空一次
+      this.skuTableData = [];
+      //判定 是否存在规格分组
+      if (cloneTemp[0]) {
+        //存放最终结果
+        let result = [];
+        //循环选中的 sku 数据
+        cloneTemp[0].spec_values.forEach((specItem) => {
+          result.push({
+            [cloneTemp[0].name]: specItem.value,
+            images: this.baseInfoForm.goodsGalleryFiles || [],
+          });
+        });
+        cloneTemp.splice(0, 1);
+        result = this.specIterator(result, cloneTemp);
+        this.skuTableData = result;
+      }
+    },
+     /**
+     * 迭代属性，形成表格
+     * result 渲染的数据
+     * array spec数据
+     */
+    specIterator(result, cloneTemp) {
+      //是否还可以循环
+      if (cloneTemp.length > 0) {
+        let table = [];
+        result.forEach((resItem) => {
+          cloneTemp[0].spec_values.forEach((valItem) => {
+            let obj = cloneObj(resItem);
+            obj[cloneTemp[0].name] = valItem.value;
+            table.push(obj);
+          });
+        });
+        result = [];
+        table.forEach((t) => {
+          result.push(t);
+        });
+        //清除当前循环的分组
+        cloneTemp.splice(0, 1);
+        
+      } else {
+        return result;
+      }
+      return this.specIterator(result, cloneTemp);
+    },
+    /** 根据分类id获取系统设置规格信息*/
+    Get_SkuInfoByCategory(categoryId) {
+      if (categoryId) {
+        API_GOODS.getGoodsSpecInfoSeller(categoryId).then(res => {
+            if (res.length) {
+              res.forEach(e => {
+                this.skuData.push(e.specName)
+                const vals = e.specValue ? e.specValue.split(',') : []
+                this.skuVals.push(Array.from(new Set(vals)))
+              })
+            }
+          }
+        );
+      }
+    },
+    /** 自动完成表单所需方法*/
+    filterMethod(value, option) {
+      return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
+    },
+   
+    // 规格表格操作
+    handleSpan({row, column, rowIndex, columnIndex}) {
+    },
+    /** 数据改变之后 抛出数据 */
+    updateSkuTable(row, item) {
+      let index = row._index;
+      // this.skuTableData[index][item] = row[item];
+      /** 进行自定义校验 判断是否是数字（小数也能通过）重量 */
+      if (item === "weight") {
+        if (
+          !/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(row[item]) ||
+          parseInt(row[item]) < 0 ||
+          parseInt(row[item]) > 99999999
+        ) {
+          // 校验未通过 加入错误存储列表中
+          this.validateError.push([index, item]);
+          this.validatatxt = "请输入0~99999999之间的数字值";
+          return;
+        }
+      } else if (item === "quantity") {
+        if (
+          !/^[0-9]\d*$/.test(row[item]) ||
+          parseInt(row[item]) < 0 ||
+          parseInt(row[item]) > 99999999
+        ) {
+          // 库存
+          this.validateError.push([index, item]);
+          this.validatatxt = "请输入0~99999999之间的整数";
+          return;
+        }
+      } else if (item === "cost" || item === "price") {
+        if (
+          !regular.money.test(row[item]) ||
+          parseInt(row[item]) < 0 ||
+          parseInt(row[item]) > 99999999
+        ) {
+          // 成本价 价格
+          this.validateError.push([index, item]);
+          this.validatatxt = "请输入0~99999999之间的价格";
+          return;
+        }
+      }
+      this.skuTableData[index][item] = row[item];
+    },
+    // 店内分类选择
+    selectTree(v) {
+      if (v.length > 0) {
+        // 转换null为""
+        for (let attr in v[0]) {
+          if (v[0][attr] == null) {
+            v[0][attr] = "";
+          }
+        }
+        let str = JSON.stringify(v[0]);
+        let menu = JSON.parse(str);
+        this.form = menu;
+        this.editTitle = menu.title;
+      }
+    },
+    // 店内分类选中
+    changeSelect(v) {
+      this.selectCount = v.length;
+      let ids = "";
+      v.forEach(function (e) {
+        ids += e.id + ",";
+      });
+      ids = ids.substring(0, ids.length - 1);
+      this.baseInfoForm.storeCategoryPath = ids;
+    },
+    /**  添加商品 **/
+    save() {
+      this.submitLoading = true;
+      this.$refs["baseInfoForm"].validate((valid) => {
+        if (valid) {
+          if (
+            this.baseInfoForm.goodsGalleryFiles &&
+            this.baseInfoForm.goodsGalleryFiles.length <= 0
+          ) {
+            this.submitLoading = false;
+            this.$Message.error("请上传商品图片");
+            return;
+          }
+          if (this.baseInfoForm.templateId === '') this.baseInfoForm.templateId = 0;
+          let flag = false;
+          let paramValue = "";
+          
+          if (flag) {
+            this.$Message.error(paramValue + " 参数值不能为空");
+            this.submitLoading = false;
+            return;
+          }
+
+          this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
+            delete sku._index;
+            delete sku._rowKey;
+            delete sku.specNameId;
+            delete sku.specValueId;
+            return sku;
+          });
+
+          if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
+            this.baseInfoForm.goodsGalleryList =
+              this.baseInfoForm.goodsGalleryFiles.map((i) => i.url);
+          }
+          /** 参数校验 **/
+          /* Object.keys(this.baseInfoForm.goodsParamsList).forEach((item) => {
+          });*/
+
+          if (this.goodsId) {
+            API_GOODS.editGoods(this.goodsId, this.baseInfoForm).then((res) => {
+              if (res.success) {
+                this.submitLoading = false;
+                this.$router.go(-1);
+              } else {
+                this.submitLoading = false;
+              }
+            });
+          } else {
+            // this.baseInfoForm.goodsType = "NORMAL";
+            API_GOODS.createGoods(this.baseInfoForm).then((res) => {
+              if (res.success) {
+                this.submitLoading = false;
+                this.activestep = 2;
+                window.scrollTo(0, 0);
+              } else {
+                this.submitLoading = false;
+              }
+            });
+          }
+        } else {
+          this.submitLoading = false;
+        }
+      });
+    },
+    /** 保存为模板 */
+    saveToDraft() {
+      this.baseInfoForm.skuList = this.skuTableData;
+      if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
+        this.baseInfoForm.goodsGalleryList =
+          this.baseInfoForm.goodsGalleryFiles.map((i) => i.url);
+      }
+      this.baseInfoForm.categoryName = [];
+      this.baseInfoForm.saveType = 'TEMPLATE';
+
+      if (this.$route.query.draftId) {
+        this.baseInfoForm.id = this.$route.query.draftId;
+        this.$Modal.confirm({
+          title: "当前模板已存在",
+          content: "当前模板已存在，保存为新模板或替换原模板",
+          okText: "保存新模板",
+          cancelText: "替换旧模板",
+          closable: true,
+          onOk: () => {
+            delete this.baseInfoForm.id;
+            this.SAVE_DRAFT_GOODS();
+            return;
+          },
+          onCancel: () => {
+            this.SAVE_DRAFT_GOODS();
+            return;
+          },
+        });
+        return;
+      }
+
+      this.$Modal.confirm({
+        title: "保存模板",
+        content: "是否确定保存",
+        okText: "保存",
+        closable: true,
+        onOk: () => {
+          this.SAVE_DRAFT_GOODS();
+        },
+      });
+    },
+    SAVE_DRAFT_GOODS() { // 保存模板
+      API_GOODS.saveDraftGoods(this.baseInfoForm).then((res) => {
+        if (res.success) {
+          this.$Message.info("保存成功！");
+          this.$router.back();
+        }
+      });
+    }
+  },
+  mounted () {
+    this.accessToken = {
+      accessToken: this.getStore("accessToken"),
+    };
+    // 获取物流模板
+    API_Shop.getShipTemplate().then((res) => {
+      if (res.success) {
+        this.logisticsTemplate = res.result;
+      }
+    })
   }
 }
 </script>
diff --git a/seller/src/views/goods/goods-seller/goodsOperationThird.vue b/seller/src/views/goods/goods-seller/goodsOperationThird.vue
index 5eaee9b6..e623de4a 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationThird.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationThird.vue
@@ -1,17 +1,34 @@
 <template>
-  <div>
-    
+  <div class="content-goods-publish">
+    <div class="success" style="text-align: left">
+      <h1>恭喜您，商品发布成功!</h1>
+      <div class="goToGoodsList" @click="gotoGoodsList">
+        <a>去店铺查看商品列表>></a>
+      </div>
+      <div class="operation">
+        <h3>您还可以：</h3>
+        <div>
+          1、继续
+          <a @click="gotoBack">发布商品</a>
+        </div>
+        <div>
+          2、进入卖家中心，管理
+          <a @click="gotoGoodsList">商品列表</a>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
 export default {
-  data() {
-    return {
-      
-    }
-  },
   methods: {
-
+     // 跳转商品列表
+    gotoGoodsList() {
+      this.$router.push({name: "goods"});
+    },
+    gotoBack() {
+      this.$router.go();
+    },
   }
 }
 </script>

From 1246810c01b58fe412762d2a900df188bd2c38d0 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Wed, 7 Jul 2021 15:34:38 +0800
Subject: [PATCH 05/12] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goodsDetail/ShowGoodsDetail.vue           |  2 +-
 buyer/src/config/index.js                     |  8 +-
 .../pages/home/orderCenter/OrderDetail.vue    | 11 ++-
 manager/src/config/index.js                   |  8 +-
 .../shrinkable-menu/shrinkable-menu.vue       |  9 +-
 .../shrinkable-menu/styles/menu.scss          |  9 +-
 manager/src/views/member/list/index.vue       | 23 ++----
 manager/src/views/promotion/coupon/coupon.vue |  8 +-
 .../views/promotion/coupon/couponPublish.vue  | 35 ++++----
 .../views/promotion/couponActivity/coupon.vue |  2 +-
 .../src/views/seller/shop/shopOperation.vue   | 82 +++++++++----------
 seller/src/config/index.js                    | 16 ++--
 .../views/goods/goods-seller/addGoods.scss    | 10 +--
 .../goods/goods-seller/goodsOperation.vue     | 35 ++++----
 .../shrinkable-menu/styles/menu.scss          |  9 +-
 .../src/views/my-components/lili/editor.vue   | 11 ++-
 seller/src/views/promotion/coupon/coupon.vue  |  9 +-
 .../views/promotion/coupon/couponPublish.vue  |  4 +-
 seller/src/views/promotion/live/addLive.vue   |  4 +-
 19 files changed, 144 insertions(+), 151 deletions(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index c52ac831..63d93656 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -222,7 +222,7 @@ export default {
     });
     window.addEventListener('scroll', this.handleScroll)
     this.getList();
-  },
+  }
 };
 </script>
 
diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index e3011596..f6d6212c 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -17,10 +17,10 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.100:8887'
+    // common: 'http://192.168.0.106:8890',
+    // buyer: 'http://192.168.0.106:8888',
+    // seller: 'http://192.168.0.106:8889',
+    // manager: 'http://192.168.0.106:8887'
 
     common: 'https://common-api.pickmall.cn',
     buyer: 'https://buyer-api.pickmall.cn',
diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue
index 5baf7772..08ddc03a 100644
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -46,9 +46,7 @@
         <thead>
           <tr>
             <th width="50%">商品</th>
-            <!-- <th width="20%">属性</th> -->
             <th width="20%">货号</th>
-            <!-- <th width="10%">发货仓库</th> -->
             <th width="10%">单价</th>
             <th width="10%">数量</th>
             <th width="10%">小计</th>
@@ -82,10 +80,11 @@
         <div>
           <span>运费：</span><span>+{{ order.order.freightPrice | unitPrice("￥") }}</span><br>
         </div>
-        <div><span>优惠金额：</span><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span></div>
+        <div><span>优惠券：</span><span>-{{ order.order.priceDetailDTO.couponPrice || 0 | unitPrice("￥") }}</span></div>
+        <div><span>活动优惠：</span><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span></div>
         <div>
-          <span>应付金额：</span
-          ><span class="actrual-price">{{ order.order.flowPrice | unitPrice("￥") }}</span>
+          <span>应付金额：</span>
+          <span class="actrual-price">{{ order.order.flowPrice | unitPrice("￥") }}</span>
         </div>
       </div>
     </div>
@@ -121,7 +120,7 @@ export default {
       });
       window.open(routeUrl.href, '_blank');
     },
-    getDetail () { // 订单详情
+    getDetail () { // 获取订单详情
       orderDetail(this.$route.query.sn).then(res => {
         if (res.success) {
           this.order = res.result;
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 47d48b7a..a4a19129 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -21,10 +21,10 @@ export default {
     buyer: "https://buyer-api.pickmall.cn",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
-    // common: 'http://192.168.0.105:8890',
-    // buyer: 'http://192.168.0.105:8888',
-    // seller: 'http://192.168.0.105:8889',
-    // manager: 'http://192.168.0.105:8887'
+    // common: 'http://192.168.0.106:8890',
+    // buyer: 'http://192.168.0.106:8888',
+    // seller: 'http://192.168.0.106:8889',
+    // manager: 'http://192.168.0.106:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",
diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index aabb380e..43783fa2 100644
--- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -51,8 +51,6 @@ export default {
       }
     }
   },
-  mounted() {
-  },
   methods: {
     changeMenu(name) { //二级路由点击
     console.log(name)
@@ -60,14 +58,9 @@ export default {
         name: name
       });
     },
-    selectNav(name) {
+    selectNav(name) { // 一级路由点击事件
       this.$store.commit("setCurrNav", name);
       this.setStore("currNav", name);
-      // if (this.$route.name != "home_index") {
-      //   this.$router.push({
-      //     name: "home_index"
-      //   });
-      // }
       util.initRouter(this);
     },
   }
diff --git a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
index f2a71fac..bfc7cf9b 100644
--- a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
+++ b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
@@ -3,9 +3,7 @@
     width: 180px;
     display: flex;
 }
-.ivu-menu-vertical .ivu-menu-item-group-title {
-    padding-left: 5px;
-}
+
 .ivu-btn-text:hover {
     background-color: rgba(255,255,255,.2) !important;
 }
@@ -21,3 +19,8 @@
 .ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
     color: #ed3f14;
 }
+/deep/.ivu-menu-vertical .ivu-menu-item-group-title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+}
\ No newline at end of file
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index d6a2ba21..be3cd83d 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -30,26 +30,22 @@
     </Card>
 
     <!-- 添加用户模态框 -->
-    <Modal v-model="addFlag" title="添加用户">
+    <Modal v-model="addFlag" title="添加会员">
       <Form ref="addMemberForm" :model="addMemberForm" :rules="addRule" :label-width="100">
         <FormItem label="手机号码" prop="mobile" style="width: 90%;">
           <Input v-model="addMemberForm.mobile" maxlength="11" placeholder="请输入手机号码" />
         </FormItem>
-        <FormItem label="会员名称" prop="uname" style="width: 90%">
+        <FormItem label="会员名称" prop="username" style="width: 90%">
           <Input v-model="addMemberForm.username" maxlength="15" placeholder="请输入会员名称" />
         </FormItem>
 
-        <FormItem label="会员密码" prop="pwd" style="width: 90%">
+        <FormItem label="会员密码" prop="password" style="width: 90%">
           <Input type="password" password v-model="addMemberForm.password" maxlength="20" placeholder="请输入会员密码" />
         </FormItem>
       </Form>
 
       <div slot="footer">
-        <Button @click="
-            () => {
-              addFlag = false;
-            }
-          ">
+        <Button @click="addFlag = false">
           取消
         </Button>
         <Button type="primary" :loading="handleAddLoading" @click="addMemberSubmit">
@@ -163,8 +159,8 @@ export default {
             message: "请输入正确的手机号",
           },
         ],
-        uname: [{ required: true, message: "请输入会员名称" }],
-        pwd: [{ required: true, message: "请输入密码" }],
+        username: [{ required: true, message: "请输入会员名称" }],
+        password: [{ required: true, message: "请输入密码" }],
       },
       ruleValidate: {}, //修改验证
       submitLoading: false, // 添加或编辑提交状态
@@ -421,11 +417,7 @@ export default {
     },
     addMember() {
       this.addFlag = true;
-      this.addMemberForm = {
-        mobile: "",
-        username: "",
-        password: "",
-      };
+      this.$refs.addMemberForm.resetFields()
     },
     /**
      * 查询查看会员详情
@@ -460,6 +452,7 @@ export default {
         if (valid) {
           API_Member.addMember(this.addMemberForm).then((res) => {
             if (res.result) {
+              this.$refs.addMemberForm.resetFields()
               this.getData();
               this.$Message.success("添加成功！");
               this.addFlag = false;
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
index b39dd19d..5027b6e7 100644
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -26,10 +26,10 @@
         <!-- <Button @click="upAll" >批量上架</Button> -->
       </Row>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-select-cancel="cancelSelect" @on-selection-change="changeSelect">
-        <template slot-scope="{ row,index }" slot="action">
-          <Button v-if="!checked && row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="primary" size="small" style="margin-right: 10px" @click="edit(row)">编辑
+        <template slot-scope="{ row }" slot="action">
+          <Button v-if="!checked && row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="success" :class="{'mr_10' : !checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'}" size="small" @click="edit(row)">编辑
           </Button>
-          <Button v-if="!checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error" size="small" style="margin-right: 10px" @click="remove(row)">下架
+          <Button v-if="!checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error" size="small" @click="remove(row)">下架
           </Button>
         </template>
       </Table>
@@ -215,7 +215,7 @@ export default {
           slot: "action",
           align: "center",
           fixed: "right",
-          maxWidth: 140,
+          width: 130,
         },
       ],
       data: [], // 表单数据
diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue
index 2247a931..fea242c2 100644
--- a/manager/src/views/promotion/coupon/couponPublish.vue
+++ b/manager/src/views/promotion/coupon/couponPublish.vue
@@ -68,7 +68,7 @@
               </div>
               <div v-if="rangeTimeType == 1">
                 <DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择"
-                            :options="options" style="width: 260px">
+                  :options="options" style="width: 260px">
                 </DatePicker>
               </div>
               <div class="effectiveDays" v-if="rangeTimeType == 0">
@@ -100,8 +100,8 @@
 
             <FormItem v-if="form.scopeType == 'PORTION_GOODS_CATEGORY'">
 
-              <Cascader @on-change="getGoodsCategory" :data="goodsCategoryList" style="width:300px;"
-                        v-model="form.scopeIdGoods"></Cascader>
+              <Cascader :data="goodsCategoryList" style="width:260px;"
+                v-model="form.scopeIdGoods"></Cascader>
 
             </FormItem>
             <div>
@@ -127,7 +127,7 @@ import {regular} from "@/utils";
 import skuSelect from "@/views/lili-dialog";
 
 export default {
-  name: "addCoupon",
+  name: "edit-platform-coupon",
   components: {
     skuSelect,
   },
@@ -140,6 +140,14 @@ export default {
       },
       deep: true,
     },
+    $route(e) { // 监听路由，参数变化调取接口
+      this.id = e.query.id;
+      if (this.id) {
+        this.getCoupon()
+      } else {
+        this.$refs.form.resetFiles()
+      }
+    }
   },
   data() {
     const checkPrice = (rule, value, callback) => {
@@ -165,7 +173,7 @@ export default {
       }
     };
     return {
-      rangeTimeType: 1,
+      rangeTimeType: 1, // 当前时间类型
       modalType: 0, // 是否编辑
       form: {
         /** 店铺承担比例 */
@@ -289,7 +297,7 @@ export default {
       },
     };
   },
-  async mounted() {
+  async mounted () {
     await this.getCagetoryList();
     // 如果id不为空则查询信息
     if (this.id) {
@@ -495,7 +503,7 @@ export default {
     async getCagetoryList() {
       // 获取全部商品分类
       let data = await getCategoryTree();
-      this.goodsCategoryList = this.filterCategory(data.result);
+      this.goodsCategoryList = data.result;
       // 过滤出可显示的值
 
       this.goodsCategoryList = this.goodsCategoryList.map((item) => {
@@ -523,18 +531,7 @@ export default {
         }
         return {value: item.id, label: item.name, children: item.children};
       });
-    },
-    filterCategory(list) {
-      // 递归删除空children
-      list.forEach((item) => {
-        if (item.children.length == 0) {
-          delete item.children;
-        } else {
-          this.filterCategory(item.children);
-        }
-      });
-
-      return list;
+      console.log(this.goodsCategoryList);
     },
     filterCategoryId(list, idArr) {
       // 递归获取分类id
diff --git a/manager/src/views/promotion/couponActivity/coupon.vue b/manager/src/views/promotion/couponActivity/coupon.vue
index afb89d0a..1a70ada7 100644
--- a/manager/src/views/promotion/couponActivity/coupon.vue
+++ b/manager/src/views/promotion/couponActivity/coupon.vue
@@ -7,7 +7,7 @@
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
 
         <template slot-scope="{ row,index }" slot="action">
-          <Button type="primary"
+          <Button type="info"
                   size="small" style="margin-right: 10px" @click="info(row)">查看
           </Button>
           <Button v-if="!checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error"
diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue
index 2f692e30..67257d80 100644
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -8,7 +8,7 @@
             <!-- 遮罩层  -->
             <div v-if="isRead" class="mask">只读不可修改</div>
             <div>
-              <FormItem label="会员名称" required prop="memberName">
+              <FormItem label="会员名称" prop="memberName">
                 <div class="item">
                   <Input disabled v-model="shopForm.memberName" />
                   <Button @click="selectMember()" v-if="!$route.query.shopId">选择会员</Button>
@@ -44,7 +44,7 @@
               <FormItem label="店铺所在地" prop="storeAddressPath">
                 <Input disabled v-model="shopForm.storeAddressPath" style="width: 350px" />
               </FormItem>
-              <FormItem label="店铺详细地址" required prop="storeAddressDetail">
+              <FormItem label="店铺详细地址"  prop="storeAddressDetail">
                 <Input v-model="shopForm.storeAddressDetail" clearable style="width: 350px" />
               </FormItem>
 
@@ -91,60 +91,60 @@
             <div v-if="isRead" class="mask">只读不可修改</div>
             <Divider orientation="left">公司信息</Divider>
             <div>
-              <FormItem label="公司名称" required prop="companyName">
+              <FormItem label="公司名称"  prop="companyName">
                 <Input v-model="shopForm.companyName" clearable style="width: 350px" />
               </FormItem>
 
-              <FormItem label="公司电话" required prop="companyPhone">
+              <FormItem label="公司电话"  prop="companyPhone">
                 <Input v-model="shopForm.companyPhone" clearable style="width: 350px" />
               </FormItem>
-              <FormItem label="公司所在地" required>
+              <FormItem label="公司所在地" >
                 <Input v-model="shopForm.companyAddressPath" disabled style="width: 260px" v-if="showRegion == false" />
                 <Button v-if="showRegion == false" @click="regionClick" :loading="submitLoading" type="primary" icon="ios-create-outline" style="margin-left: 8px">修改
                 </Button>
                 <region style="width: 350px" @selected="selectedRegion" v-if="showRegion == true" />
               </FormItem>
-              <FormItem label="公司详细地址" required prop="companyAddress">
+              <FormItem label="公司详细地址"  prop="companyAddress">
                 <Input v-model="shopForm.companyAddress" clearable style="width: 350px" />
               </FormItem>
-              <FormItem label="员工总数" required prop="employeeNum">
+              <FormItem label="员工总数"  prop="employeeNum">
                 <InputNumber style="width: 150px" :min="1" :max="9999999" v-model="shopForm.employeeNum">
                 </InputNumber>
               </FormItem>
-              <FormItem label="注册资金" required prop="registeredCapital">
+              <FormItem label="注册资金"  prop="registeredCapital">
                 <InputNumber style="width: 150px" :min="1" :max="9999999" v-model="shopForm.registeredCapital">
                 </InputNumber>
                 <span style="margin-left: 10px">万</span>
               </FormItem>
-              <FormItem label="联系人姓名" required prop="linkName">
+              <FormItem label="联系人姓名"  prop="linkName">
                 <Input v-model="shopForm.linkName" clearable style="width: 200px" />
               </FormItem>
-              <FormItem label="联系人手机" required prop="linkPhone">
+              <FormItem label="联系人手机"  prop="linkPhone">
                 <Input v-model="shopForm.linkPhone" maxlength="11" clearable style="width: 200px" />
               </FormItem>
-              <FormItem label="电子邮箱" required prop="companyEmail">
+              <FormItem label="电子邮箱"  prop="companyEmail">
                 <Input v-model="shopForm.companyEmail" clearable style="width: 200px" />
               </FormItem>
 
               <Divider orientation="left">营业执照信息</Divider>
 
-              <FormItem label="营业执照号" required prop="licenseNum">
+              <FormItem label="营业执照号"  prop="licenseNum">
                 <Input v-model="shopForm.licenseNum" clearable style="width: 200px" />
               </FormItem>
 
-              <FormItem label="法定经营范围" required prop="scope">
+              <FormItem label="法定经营范围"  prop="scope">
                 <Input v-model="shopForm.scope" clearable style="width: 200px" />
               </FormItem>
 
               <Divider orientation="left">法人信息</Divider>
 
-              <FormItem label="法人姓名" required prop="legalName">
+              <FormItem label="法人姓名"  prop="legalName">
                 <Input v-model="shopForm.legalName" clearable style="width: 200px" />
               </FormItem>
-              <FormItem label="法人证件号" required prop="legalId">
+              <FormItem label="法人证件号"  prop="legalId">
                 <Input v-model="shopForm.legalId" clearable style="width: 200px" />
               </FormItem>
-              <FormItem label="法人身份证照片" required ref="legalPhoto">
+              <FormItem label="法人身份证照片"  ref="legalPhoto">
                 <Avatar style="height: 100px;width: 100px" v-if="shopForm.legalPhoto" shape="square" icon="ios-person" size="default" :src="shopForm.legalPhoto" />
                 <div>
                   <Button @click="handleCLickImg('legalPhoto')" type="primary">选择图片</Button>
@@ -152,20 +152,20 @@
               </FormItem>
 
               <Divider orientation="left">结算银行信息</Divider>
-              <FormItem label="银行开户名" required prop="settlementBankAccountName">
+              <FormItem label="银行开户名"  prop="settlementBankAccountName">
                 <Input v-model="shopForm.settlementBankAccountName" clearable style="width: 200px" />
               </FormItem>
-              <FormItem label="银行账号" required prop="settlementBankAccountNum">
+              <FormItem label="银行账号"  prop="settlementBankAccountNum">
                 <Input v-model="shopForm.settlementBankAccountNum" clearable style="width: 200px" />
               </FormItem>
-              <FormItem label="银行支行名称" required prop="settlementBankBranchName">
+              <FormItem label="银行支行名称"  prop="settlementBankBranchName">
                 <Input v-model="shopForm.settlementBankBranchName" clearable style="width: 200px" />
               </FormItem>
-              <FormItem label="支行联行号" required prop="settlementBankJointName">
+              <FormItem label="支行联行号"  prop="settlementBankJointName">
                 <Input v-model="shopForm.settlementBankJointName" clearable style="width: 200px" />
               </FormItem>
 
-              <FormItem label="许可证电子版" required>
+              <FormItem label="许可证电子版" >
                 <Avatar style="height: 100px;width: 100px" v-if="shopForm.licencePhoto" shape="square" icon="ios-person" size="default" :src="shopForm.licencePhoto" />
                 <div>
                   <Button @click="handleCLickImg('licencePhoto')" type="primary">选择图片</Button>
@@ -262,28 +262,28 @@ export default {
       shopValidate: {
         // 表单验证规则
         memberName: [
-          { required: true, message: "会员不能为空", trigger: "blur" },
+          { required: true, message: "会员不能为空" },
         ],
         storeName: [
-          { required: true, message: "店铺名称不能为空", trigger: "blur" },
+          { required: true, message: "店铺名称不能为空" },
         ],
         companyAddress: [
-          { required: true, message: "公司地址不能为空", trigger: "blur" },
+          { required: true, message: "公司地址不能为空" },
         ],
         storeAddressDetail: [
-          { required: true, message: "店铺详细地址不能为空", trigger: "blur" },
+          { required: true, message: "店铺详细地址不能为空" },
         ],
         storeDesc: [
-          { required: true, message: "店铺简介不能为空", trigger: "blur" },
+          { required: true, message: "店铺简介不能为空" },
         ],
         storeCenter: [
-          { required: true, message: "店铺未定位", trigger: "change" },
+          { required: true, message: "店铺未定位" },
         ],
         companyName: [
-          { required: true, message: "公司名称不能为空", trigger: "blur" },
+          { required: true, message: "公司名称不能为空", },
         ],
         companyPhone: [
-          { required: true, message: "公司电话不能为空", trigger: "blur" },
+          { required: true, message: "公司电话不能为空", },
         ],
         employeeNum: [
           {
@@ -302,10 +302,10 @@ export default {
           },
         ],
         linkName: [
-          { required: true, message: "联系人姓名不能为空", trigger: "blur" },
+          { required: true, message: "联系人姓名不能为空", },
         ],
         linkPhone: [
-          { required: true, message: "联系人手机号不能为空", trigger: "blur" },
+          { required: true, message: "联系人手机号不能为空", },
           {
             type: "string",
             pattern: /^1[3|4|5|6|7|8][0-9]{9}$/,
@@ -314,32 +314,32 @@ export default {
           },
         ],
         companyEmail: [
-          { required: true, message: "邮箱不能为空", trigger: "blur" },
-          { type: "email", message: "邮箱格式错误", trigger: "blur" },
+          { required: true, message: "邮箱不能为空", },
+          { type: "email", message: "邮箱格式错误", },
         ],
         licenseNum: [
-          { required: true, message: "营业执照号不能为空", trigger: "blur" },
+          { required: true, message: "营业执照号不能为空", },
         ],
         scope: [
-          { required: true, message: "法定经营范围不能为空", trigger: "blur" },
+          { required: true, message: "法定经营范围不能为空", },
         ],
         legalName: [
-          { required: true, message: "法人姓名不能为空", trigger: "blur" },
+          { required: true, message: "法人姓名不能为空", },
         ],
         legalId: [
-          { required: true, message: "法人证件号不能为空", trigger: "blur" },
+          { required: true, message: "法人证件号不能为空", },
         ],
         settlementBankAccountName: [
-          { required: true, message: "银行开户名不能为空", trigger: "blur" },
+          { required: true, message: "银行开户名不能为空", },
         ],
         settlementBankAccountNum: [
-          { required: true, message: "银行账号不能为空", trigger: "blur" },
+          { required: true, message: "银行账号不能为空", },
         ],
         settlementBankBranchName: [
-          { required: true, message: "银行支行名称不能为空", trigger: "blur" },
+          { required: true, message: "银行支行名称不能为空", },
         ],
         settlementBankJointName: [
-          { required: true, message: "支行联行号不能为空", trigger: "blur" },
+          { required: true, message: "支行联行号不能为空", },
         ],
         salesConsigneeMobile: [
           {
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index ec12ba69..4a006259 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'https://common-api.pickmall.cn',
-    buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn',
-    // common: 'http://192.168.0.109:8890',
-    // buyer: 'http://192.168.0.109:8888',
-    // seller: 'http://192.168.0.109:8889',
-    // manager: 'http://192.168.0.109:8887'
+    // common: 'https://common-api.pickmall.cn',
+    // buyer: 'https://buyer-api.pickmall.cn',
+    // seller: 'https://store-api.pickmall.cn',
+    // manager: 'https://admin-api.pickmall.cn',
+    common: 'http://192.168.0.106:8890',
+    buyer: 'http://192.168.0.106:8888',
+    seller: 'http://192.168.0.106:8889',
+    manager: 'http://192.168.0.106:8887'
 
   },
   api_prod: {
diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss
index 54f0259f..a1b9d609 100644
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -77,10 +77,6 @@
   }
 }
 
-/*平铺*/
-div.base-info-item > div {
-  margin-left: 5%;
-}
 
 div.base-info-item {
   h4 {
@@ -94,13 +90,15 @@ div.base-info-item {
     line-height: 40px;
     text-align: left;
   }
-
+  >div{
+    padding-left: 5%;
+  }
   .form-item-view {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
     justify-content: space-between;
-    padding-left: 80px;
+    // padding-left: 80px;
 
     .layout {
       margin-bottom: 20px;
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index fdc33182..ed3fc207 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -74,7 +74,7 @@
       </template>
     </div>
 
-    <div class="content-goods-publish" v-show="activestep === 1">
+    <div class="content-goods-publish" style="min-width:1350px;" v-show="activestep === 1">
       <Form ref="baseInfoForm" :model="baseInfoForm" :label-width="120" :rules="baseInfoFormRule">
         <div class="base-info-item">
           <h4>基本信息</h4>
@@ -255,18 +255,24 @@
                               <img v-if="previewPicture !== ''" :src="previewPicture"/>
                             </div>
                             <Divider/>
-                            <div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
-                              <template v-if="img.status === 'finished'">
-                                <img :src="img.url"/>
-                                <div class="sku-upload-list-cover">
-                                  <Icon type="ios-eye-outline" @click="handleView(img.url)"></Icon>
-                                  <Icon type="ios-trash-outline" @click="handleRemove(img, __index)"></Icon>
-                                </div>
-                              </template>
-                              <template v-else>
-                                <Progress v-if="img.showProgress" :percent="img.percentage" hide-info></Progress>
-                              </template>
-                            </div>
+                            <vuedraggable
+                              :list="selectedSku.images"
+                              :animation="200"
+                              style="display:inline-block;"
+                            >
+                              <div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
+                                <template v-if="img.status === 'finished'">
+                                  <img :src="img.url"/>
+                                  <div class="sku-upload-list-cover">
+                                    <Icon type="ios-eye-outline" @click="handleView(img.url)"></Icon>
+                                    <Icon type="ios-trash-outline" @click="handleRemove(img, __index)"></Icon>
+                                  </div>
+                                </template>
+                                <template v-else>
+                                  <Progress v-if="img.showProgress" :percent="img.percentage" hide-info></Progress>
+                                </template>
+                              </div>
+                            </vuedraggable>
                             <Upload ref="uploadSku" :show-upload-list="false" :default-file-list="row.images"
                                     :on-success="handleSuccess" :format="['jpg', 'jpeg', 'png']"
                                     :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
@@ -297,6 +303,7 @@
                 <Tree
                   ref="tree"
                   :data="shopCategory"
+                  style="text-align:left;"
                   show-checkbox
                   @on-select-change="selectTree"
                   @on-check-change="changeSelect"
@@ -305,7 +312,7 @@
               </FormItem>
             </div>
             <FormItem class="form-item-view-el" label="商品描述" prop="intro">
-              <editor id="intro" v-model="baseInfoForm.intro"></editor>
+              <editor id="intro" showExpand v-model="baseInfoForm.intro"></editor>
             </FormItem>
             <FormItem class="form-item-view-el" label="移动端描述" prop="skuList">
               <editor id="mobileIntr" v-model="baseInfoForm.mobileIntro"></editor>
diff --git a/seller/src/views/main-components/shrinkable-menu/styles/menu.scss b/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
index 9169a5dc..3fc8c569 100644
--- a/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
+++ b/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
@@ -3,9 +3,7 @@
   width: 180px;
   display: flex;
 }
-.ivu-menu-vertical .ivu-menu-item-group-title {
-  padding-left: 5px;
-}
+
 .ivu-btn-text:hover {
   background-color: rgba(255,255,255,.2) !important;
 }
@@ -21,3 +19,8 @@
 .ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
   color: #ed3f14;
 }
+/deep/.ivu-menu-vertical .ivu-menu-item-group-title {
+  height: 40px;
+  line-height: 40px;
+  padding-left: 20px;
+}
\ No newline at end of file
diff --git a/seller/src/views/my-components/lili/editor.vue b/seller/src/views/my-components/lili/editor.vue
index 97c7b855..c8e65270 100644
--- a/seller/src/views/my-components/lili/editor.vue
+++ b/seller/src/views/my-components/lili/editor.vue
@@ -90,7 +90,6 @@ export default {
     initEditor() {
       let that = this;
       this.editor = new E(`#${this.id}`);
-
       // 编辑内容绑定数据
       this.editor.config.onchange = (html) => {
         if (this.openXss) {
@@ -195,6 +194,7 @@ export default {
       });
     },
     setData(value) {
+      // 设置数据
       if (!this.editor) {
         this.initEditor();
       }
@@ -204,15 +204,14 @@ export default {
         this.$emit("input", this.data);
         this.$emit("on-change", this.data);
       }
-    },
+    }
   },
   watch: {
     value: {
       immediate: true,
       handler: function (val) {
-
         this.setData(val);
-      }
+      },
     },
   },
   mounted() {
@@ -231,6 +230,10 @@ export default {
     color: #333;
   }
 }
+.w-e-toolbar {
+  // 给工具栏换行
+  flex-wrap: wrap;
+}
 .e-code {
   top: 6px;
   left: 976px;
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 5fae1965..a26b98c5 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -79,13 +79,11 @@ export default {
         {
           title: "活动名称",
           key: "promotionName",
-          minWidth: 100,
           fixed: "left",
         },
         {
           title: "优惠券名称",
           key: "couponName",
-          minWidth: 100,
           tooltip: true,
         },
         {
@@ -107,18 +105,16 @@ export default {
         {
           title: "领取数量/总数量",
           key: "publishNum",
-          width: 130,
           render: (h, params) => {
             return h(
               "div",
-              params.row.receivedNum + "/" + params.row.publishNum
+              params.row.receivedNum + "/" + (params.row.publishNum === 0 ? '无限制' : params.row.publishNum)
             );
           },
         },
         {
           title: "优惠券类型",
           key: "couponType",
-          width: 120,
           render: (h, params) => {
             let text = "未知";
             if (params.row.couponType === "DISCOUNT") {
@@ -195,8 +191,7 @@ export default {
                 text
               ),
             ]);
-          },
-          minWidth: 70,
+          }
         },
         {
           title: "操作",
diff --git a/seller/src/views/promotion/coupon/couponPublish.vue b/seller/src/views/promotion/coupon/couponPublish.vue
index 76d1c966..c0ba3b3e 100644
--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@@ -180,11 +180,11 @@ export default {
         ],
         publishNum: [
           { required: true, message: "请输入发放数量" },
-          { pattern: regular.integer, message: "请输入正整数" },
+          { pattern: regular.Integer, message: "请输入正整数" },
         ],
         couponLimitNum: [
           { required: true, message: "请输入领取限制" },
-          { pattern: regular.integer, message: "请输入正整数" },
+          { pattern: regular.Integer, message: "请输入正整数" },
         ],
         description: [{ required: true, message: "请输入范围描述" }],
       },
diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue
index 7c2e9993..22d51d12 100644
--- a/seller/src/views/promotion/live/addLive.vue
+++ b/seller/src/views/promotion/live/addLive.vue
@@ -277,6 +277,7 @@ export default {
 
       // 将数据回调到liveform里面
       if (result.success) {
+        console.log(result);
         let data = result.result;
         for (let key in data) {
           this.liveForm[key] = data[key];
@@ -494,11 +495,12 @@ export default {
       this.$refs["liveForm"].validate((valid) => {
         if (valid) {
           // 需判断当前是否是添加商品
-          if (this.$route.query.id && this.liveData.length != 0) {
+          if (this.$route.query.id) {
             this.spinShow = true;
             this.liveForm.commodityList = JSON.stringify(
               this.liveForm.commodityList
             );
+            delete this.liveForm.updateTime
             // 将当前直播间修改
             editLive(this.liveForm).then((res) => {
               if (res.success) {

From 872a5d198237e9bbc2b35560e37b2cc5f62b85c3 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Wed, 7 Jul 2021 16:03:48 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shrinkable-menu/shrinkable-menu.vue          | 12 ++++--------
 seller/src/config/index.js                       | 16 ++++++++--------
 .../shrinkable-menu/shrinkable-menu.vue          |  3 +++
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index 43783fa2..dbe7e4ec 100644
--- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -1,5 +1,3 @@
-
-
 <template>
   <div class="ivu-shrinkable-menu">
     <!-- 一级菜单 -->
@@ -38,6 +36,9 @@ export default {
     navList() {
       return this.$store.state.app.navList;
     },
+    currNav() {
+      return this.$store.state.app.currNav;
+    }
   },
   watch: {
     // 监听路由变化
@@ -45,15 +46,10 @@ export default {
       handler: function (val, oldVal) {
         console.log(val);
       }
-    },
-    menuList: {
-      handler: function (val, oldVal) {
-      }
-    }
+    } 
   },
   methods: {
     changeMenu(name) { //二级路由点击
-    console.log(name)
       this.$router.push({
         name: name
       });
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index 4a006259..baff612e 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'https://common-api.pickmall.cn',
-    // buyer: 'https://buyer-api.pickmall.cn',
-    // seller: 'https://store-api.pickmall.cn',
-    // manager: 'https://admin-api.pickmall.cn',
-    common: 'http://192.168.0.106:8890',
-    buyer: 'http://192.168.0.106:8888',
-    seller: 'http://192.168.0.106:8889',
-    manager: 'http://192.168.0.106:8887'
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn',
+    // common: 'http://192.168.0.106:8890',
+    // buyer: 'http://192.168.0.106:8888',
+    // seller: 'http://192.168.0.106:8889',
+    // manager: 'http://192.168.0.106:8887'
 
   },
   api_prod: {
diff --git a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index ba04942a..57da16e7 100644
--- a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -40,6 +40,9 @@ export default {
     navList() {
       return this.$store.state.app.navList;
     },
+    currNav() {
+      return this.$store.state.app.currNav;
+    }
   },
   methods: {
     changeMenu(name) { //二级路由点击

From e5449213c2ad8b121b58d320c24a25a9c714b6ec Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Wed, 7 Jul 2021 16:12:55 +0800
Subject: [PATCH 07/12] no message

---
 .../views/main-components/shrinkable-menu/shrinkable-menu.vue  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index 57da16e7..80f98804 100644
--- a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -1,7 +1,6 @@
 <style lang="scss" scoped>
 @import "./styles/menu.scss";
 </style>
-
 <template>
   <div class="ivu-shrinkable-menu">
     <!-- 一级菜单 -->
@@ -50,7 +49,7 @@ export default {
         name: name
       });
     },
-    selectNav(name) {
+    selectNav(name) { // 一级路由点击
       this.$store.commit("setCurrNav", name);
       this.setStore("currNav", name);
       util.initRouter(this);

From 9ff4197ec4a6b228ec1ecdbecf5098a439ebc1e7 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Wed, 7 Jul 2021 17:45:38 +0800
Subject: [PATCH 08/12] no message

---
 .../goods/goods-seller/goodsOperation.vue     |  2 +-
 .../goods-seller/goodsOperationFirst.vue      | 37 ++++++-------------
 .../goods/goods-seller/goodsOperationSec.vue  | 29 +++++++--------
 3 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index b128af30..5d3a9a41 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -26,7 +26,7 @@
 
 <script>
 
-import * as API_GOODS from "@/api/goods";
+
 
 import firstStep from  './goodsOperationFirst'
 import secondStep from  './goodsOperationSec'
diff --git a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
index 0c93a1dd..b4551d90 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
@@ -28,21 +28,21 @@
     <div class="content-goods-publish">
       <div class="goods-category">
         <ul v-if="categoryListLevel1.length > 0">
-          <li v-for="(item, index) in categoryListLevel1" :class="{ activeClass: category[0].name }"
+          <li v-for="(item, index) in categoryListLevel1" :class="{ activeClass: category[0].name === item.name }"
               @click="handleSelectCategory(item, index, 1)" :key="index">
             <span>{{ item.name }}</span>
             <span>&gt;</span>
           </li>
         </ul>
         <ul v-if="categoryListLevel2.length > 0">
-          <li v-for="(item, index) in categoryListLevel2" :class="{ activeClass: category[1].name }"
+          <li v-for="(item, index) in categoryListLevel2" :class="{ activeClass: category[1].name === item.name }"
               @click="handleSelectCategory(item, index, 2)" :key="index">
             <span>{{ item.name }}</span>
             <span>&gt;</span>
           </li>
         </ul>
         <ul v-if="categoryListLevel3.length > 0">
-          <li v-for="(item, index) in categoryListLevel3" :class="{ activeClass: category[2].name }"
+          <li v-for="(item, index) in categoryListLevel3" :class="{ activeClass: category[2].name === item.name }"
               @click="handleSelectCategory(item, index, 3)" :key="index">
             <span>{{ item.name }}</span>
           </li>
@@ -105,9 +105,8 @@ export default {
         {name: '', id: ''},
         {name: '', id: ''}
       ],
-
-      /** 当前商品分类名称3*/
-      activeCategoryName3: "",
+      // 商品类型
+      goodsType: '',
       /** 1级分类列表*/
       categoryListLevel1: [],
 
@@ -138,7 +137,7 @@ export default {
         this.showGoodsTemplates = true;
         this.GET_GoodsTemplate()
       } else {
-        // this.baseInfoForm.goodsType = val.type;
+        this.goodsType = val.type;
       }
     },
     // 获取商品模板
@@ -196,35 +195,21 @@ export default {
     // 下一步
     next() {
       window.scrollTo(0, 0);
-      if (this.$route.query.draftId) {
-        this.activestep = 1;
-        this.GET_GoodData();
-        return;
-      }
       /** 1级校验 */
       this.loading = true;
-      if (!this.baseInfoForm.goodsType) {
+      if (!this.goodsType) {
         this.$Message.error('请选择商品类型')
         this.loading = false;
         return
       }
-      if (!this.activeCategoryName1) {
+      if (!this.category[0].name) {
         this.$Message.error("请选择商品分类");
         return;
-      } else if (this.activeCategoryIndex3 === -1) {
+      } else if (!this.category[2].name) {
         this.$Message.error("必须选择到三级分类");
         return;
-      } else if (this.activeCategoryName3) {
-        /** 获取该商城分类下 商品参数信息 */
-        this.GET_GoodsParams();
-        /** 查询品牌列表 */
-        this.getGoodsBrandList();
-        /** 查询分类绑定的规格信息 */
-        this.Get_SkuInfoByCategory(this.baseInfoForm.categoryId);
-        // 获取商品单位
-        this.GET_GoodsUnit();
-        // 获取当前店铺分类
-        this.GET_ShopGoodsLabel();
+      } else if (this.category[2].name) {
+        this.$parent.activestep = 1;
       }
     },
   },
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index b437371a..b11d95df 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -210,6 +210,7 @@
               >
                 <Tree
                   ref="tree"
+                  style="text-align:left;"
                   :data="shopCategory"
                   show-checkbox
                   @on-select-change="selectTree"
@@ -310,6 +311,7 @@
   </div>
 </template>
 <script>
+import * as API_GOODS from "@/api/goods";
 import * as API_Shop from "@/api/shops";
 import cloneObj from "@/utils/index";
 import bus from '@/libs/eventBus'
@@ -768,9 +770,6 @@ export default {
         skus.push(sku);
       });
       this.skuInfo = skusInfo;
-      /**
-       * 渲染规格详细表格
-       */
       this.renderTableData();
       this.skuTableData = skus;
     },
@@ -815,7 +814,6 @@ export default {
         }
       );
     },
-
     /** 添加规格项 */
     addSkuItem() {
       if (this.skuInfo.length >= 5) {
@@ -826,9 +824,6 @@ export default {
       this.$set(this.skuInfo, this.skuInfo.length, {
         spec_values: [],
       });
-      /**
-       * 渲染规格详细表格
-       */
       this.renderTableData();
     },
     // 编辑规格名
@@ -837,10 +832,6 @@ export default {
     },
     // 编辑规格值
     async skuValueChange(val, index, item) {
- 
-      /**
-       * 渲染规格详细表格
-       */
       this.renderTableData();
     },
     // 获取焦点时，取得规格名对应的规格值
@@ -1027,10 +1018,6 @@ export default {
     filterMethod(value, option) {
       return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
     },
-   
-    // 规格表格操作
-    handleSpan({row, column, rowIndex, columnIndex}) {
-    },
     /** 数据改变之后 抛出数据 */
     updateSkuTable(row, item) {
       let index = row._index;
@@ -1222,7 +1209,17 @@ export default {
         this.logisticsTemplate = res.result;
       }
     })
-  }
+    /** 获取该商城分类下 商品参数信息 */
+    this.GET_GoodsParams();
+    /** 查询品牌列表 */
+    this.getGoodsBrandList();
+    /** 查询分类绑定的规格信息 */
+    this.Get_SkuInfoByCategory(this.baseInfoForm.categoryId);
+    // 获取商品单位
+    this.GET_GoodsUnit();
+    // 获取当前店铺分类
+    this.GET_ShopGoodsLabel();
+}
 }
 </script>
 <style lang="scss" scoped>

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 09/12] =?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)
             );
           },
         },

From 48c0dcb69bc94ad0aff3cb255ae5d9c9cd92b5c7 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 8 Jul 2021 14:36:05 +0800
Subject: [PATCH 10/12] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/footer/Footer.vue        |   5 +-
 buyer/src/components/verify/index.vue         |  16 +-
 buyer/src/pages/forgetPassword.vue            |   3 +-
 .../src/pages/home/orderCenter/AfterSale.vue  |   4 +-
 manager/src/router/router.js                  |  20 --
 manager/src/views/main-components/footer.vue  |   9 +-
 .../src/views/my-components/verify/index.vue  |  13 +-
 manager/src/views/promotion/coupon/coupon.vue | 220 +++++----------
 .../views/promotion/coupon/couponPublish.vue  |   4 +-
 .../views/promotion/coupon/couponSpecify.vue  | 172 ------------
 .../promotion/coupon/memberReceiveCoupon.vue  | 250 ------------------
 .../couponActivity/couponPublish.vue          |   4 +-
 .../promotion/pointsGoods/addPointsGoods.vue  |   4 +-
 seller/src/views/main-components/footer.vue   |   9 +-
 .../src/views/my-components/verify/index.vue  |  13 +-
 seller/src/views/promotion/coupon/coupon.vue  |   2 +-
 16 files changed, 104 insertions(+), 644 deletions(-)
 delete mode 100644 manager/src/views/promotion/coupon/couponSpecify.vue
 delete mode 100644 manager/src/views/promotion/coupon/memberReceiveCoupon.vue

diff --git a/buyer/src/components/footer/Footer.vue b/buyer/src/components/footer/Footer.vue
index 12116fa1..ff1459bb 100644
--- a/buyer/src/components/footer/Footer.vue
+++ b/buyer/src/components/footer/Footer.vue
@@ -40,7 +40,7 @@
         </div>
         <div class="clearfix"></div>
         <div class="copyright">
-          <p>Copyright © LILI</p>
+          <p>Copyright © {{year}} LILI</p>
         </div>
       </div>
     </footer>
@@ -58,7 +58,8 @@ export default {
         [ '支付方式', '货到付款', '在线支付', '分期付款', '邮局汇款', '公司转账' ],
         [ '售后服务', '售后政策', '价格保护', '退款说明', '返修/退换货', '取消订单' ]
       ],
-      moreLink: ['关于我们', '联系我们', '联系客服', '商家帮助', '隐私政策'] // 更多链接
+      moreLink: ['关于我们', '联系我们', '联系客服', '商家帮助', '隐私政策'], // 更多链接
+      year: new Date().getFullYear() // 当前年份
     };
   },
   methods: {
diff --git a/buyer/src/components/verify/index.vue b/buyer/src/components/verify/index.vue
index eb6cc5ef..2cbb8824 100644
--- a/buyer/src/components/verify/index.vue
+++ b/buyer/src/components/verify/index.vue
@@ -3,7 +3,7 @@
     <div class="imgBox" :style="{width:data.originalWidth+'px',height:data.originalHeight + 'px'}">
       <img :src="data.backImage" style="width:100%;height:100%" alt="">
       <img class="slider" :src="data.slidingImage" :style="{left:distance+'px',top:data.randomY+'px'}" :width="data.sliderWidth" :height="data.sliderHeight" alt="">
-      <Icon type="md-refresh" class="refresh" @click="refresh" />
+      <Icon type="md-refresh" class="refresh" @click="init" />
     </div>
     <div class="handle" :style="{width:data.originalWidth+'px'}">
       <span class="bgcolor" :style="{width:distance + 'px',background:bgColor}"></span>
@@ -82,26 +82,24 @@ export default {
             this.verifyText = '解锁失败';
             let that = this;
             setTimeout(() => {
-              that.refresh();
+              that.init();
             }, 1000);
             this.$emit('change', { status: false, distance: this.distance });
           }
         } else {
-          this.refresh()
+          this.init()
         }
-      }).catch(() => {
-        this.refresh()
+        
+      }).catch(()=>{
+        this.init()
       });
     },
-    refresh () { // 刷新滑块
+    init () { // 初始化数据
       this.flag = false;
       this.downX = 0;
       this.distance = 0;
       this.bgColor = '#04ad11';
       this.verifyText = '拖动滑块解锁';
-      this.init();
-    },
-    init () { // 初始化数据
       getVerifyImg(this.type).then(res => {
         if (res.result) {
           this.data = res.result;
diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue
index 88dced4e..469d329f 100644
--- a/buyer/src/pages/forgetPassword.vue
+++ b/buyer/src/pages/forgetPassword.vue
@@ -97,7 +97,7 @@
         <a class="item" href="https://pickmall.cn/" target="_blank">条款</a>
       </Row>
       <Row type="flex" justify="center" class="copyright">
-        Copyright © 2020 - Present
+        Copyright © {{year}} - Present
         <a href="https://pickmall.cn/" target="_blank" style="margin: 0 5px"
           >lili-shop</a
         >
@@ -130,6 +130,7 @@ export default {
         password: '',
         oncePasd: ''
       },
+      year: new Date().getFullYear(), // 当前年份
       step: 0, // 步骤
       ruleInline: {
         // 验证规则
diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue
index c5f896db..271fcc29 100644
--- a/buyer/src/pages/home/orderCenter/AfterSale.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSale.vue
@@ -84,7 +84,9 @@ export default {
       params: { // 请求参数
         pageNumber: 1,
         pageSize: 10,
-        keywords: ''
+        keywords: '',
+        sort: 'createTime',
+        order: 'desc'
       },
       // 状态数组
       afterSaleStatusList,
diff --git a/manager/src/router/router.js b/manager/src/router/router.js
index d60e240f..ca19e81f 100644
--- a/manager/src/router/router.js
+++ b/manager/src/router/router.js
@@ -230,13 +230,6 @@ export const otherRouter = {
       name: "edit-platform-coupon",
       component: () => import("@/views/promotion/coupon/couponPublish.vue")
     },
-    {
-      path: "promotion/member-receive-coupon",
-      title: "领取详情",
-      name: "member-receive-coupon",
-      component: () =>
-        import("@/views/promotion/coupon/memberReceiveCoupon.vue")
-    },
     {
       path: "promotion/platform-coupon-info",
       title: "详情",
@@ -261,25 +254,12 @@ export const otherRouter = {
       name: "coupon-activity-info",
       component: () => import("@/views/promotion/couponActivity/couponInfo.vue")
     },
-    {
-      path: "promotion/member-receive-coupon",
-      title: "领取详情",
-      name: "member-coupon-activity",
-      component: () =>
-        import("@/views/promotion/coupon/memberReceiveCoupon.vue")
-    },
     {
       path: "promotion/platform-coupon-info",
       title: "详情",
       name: "platform-coupon-activity",
       component: () => import("@/views/promotion/coupon/couponInfo.vue")
     },
-    {
-      path: "promotion/add-coupon-specify",
-      title: "精准发劵",
-      name: "add-coupon-specify",
-      component: () => import("@/views/promotion/coupon/couponSpecify.vue")
-    },
     {
       path: "promotion/manager-pintuan",
       title: "平台拼团",
diff --git a/manager/src/views/main-components/footer.vue b/manager/src/views/main-components/footer.vue
index e471877c..31d1d5f6 100644
--- a/manager/src/views/main-components/footer.vue
+++ b/manager/src/views/main-components/footer.vue
@@ -6,7 +6,7 @@
       <a class="item" href="https://pickmall.com" target="_blank">{{ $t('terms') }}</a>
     </Row>
     <Row type="flex" justify="center" class="copyright">
-      Copyright © 2020 - Present
+      Copyright © {{year}} - Present
       <a
         href="https://pickmall.cn/"
         target="_blank"
@@ -18,7 +18,12 @@
 
 <script>
 export default {
-  name: "footer"
+  name: "footer",
+  data() {
+    return {
+      year: new Date().getFullYear()
+    }
+  },
 };
 </script>
 
diff --git a/manager/src/views/my-components/verify/index.vue b/manager/src/views/my-components/verify/index.vue
index 5f13fee8..2cbb8824 100644
--- a/manager/src/views/my-components/verify/index.vue
+++ b/manager/src/views/my-components/verify/index.vue
@@ -3,7 +3,7 @@
     <div class="imgBox" :style="{width:data.originalWidth+'px',height:data.originalHeight + 'px'}">
       <img :src="data.backImage" style="width:100%;height:100%" alt="">
       <img class="slider" :src="data.slidingImage" :style="{left:distance+'px',top:data.randomY+'px'}" :width="data.sliderWidth" :height="data.sliderHeight" alt="">
-      <Icon type="md-refresh" class="refresh" @click="refresh" />
+      <Icon type="md-refresh" class="refresh" @click="init" />
     </div>
     <div class="handle" :style="{width:data.originalWidth+'px'}">
       <span class="bgcolor" :style="{width:distance + 'px',background:bgColor}"></span>
@@ -82,27 +82,24 @@ export default {
             this.verifyText = '解锁失败';
             let that = this;
             setTimeout(() => {
-              that.refresh();
+              that.init();
             }, 1000);
             this.$emit('change', { status: false, distance: this.distance });
           }
         } else {
-          this.refresh()
+          this.init()
         }
         
       }).catch(()=>{
-        this.refresh()
+        this.init()
       });
     },
-    refresh () { // 刷新滑块
+    init () { // 初始化数据
       this.flag = false;
       this.downX = 0;
       this.distance = 0;
       this.bgColor = '#04ad11';
       this.verifyText = '拖动滑块解锁';
-      this.init();
-    },
-    init () { // 初始化数据
       getVerifyImg(this.type).then(res => {
         if (res.result) {
           this.data = res.result;
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
index 5027b6e7..b91528b1 100644
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -1,35 +1,32 @@
 <template>
   <div class="search">
     <Card>
-      <Row>
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="活动名称" prop="couponName">
-            <Input type="text" v-model="searchForm.couponName" placeholder="请输入活动名称" clearable style="width: 200px" />
-          </Form-item>
-          <Form-item label="活动状态" prop="promotionStatus">
-            <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
-              <Option value="NEW">未开始</Option>
-              <Option value="START">已开始/上架</Option>
-              <Option value="END">已结束/下架</Option>
-              <Option value="CLOSE">紧急关闭/作废</Option>
-            </Select>
-          </Form-item>
-          <Form-item label="活动时间">
-            <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px"></DatePicker>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-        </Form>
-      </Row>
-      <Row class="operation padding-row">
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form mb_10">
+        <Form-item label="活动名称" prop="couponName">
+          <Input type="text" v-model="searchForm.couponName" placeholder="请输入活动名称" clearable style="width: 200px" />
+        </Form-item>
+        <Form-item label="活动状态" prop="promotionStatus">
+          <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
+            <Option value="NEW">未开始</Option>
+            <Option value="START">已开始/上架</Option>
+            <Option value="END">已结束/下架</Option>
+            <Option value="CLOSE">紧急关闭/作废</Option>
+          </Select>
+        </Form-item>
+        <Form-item label="活动时间">
+          <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px"></DatePicker>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+      </Form>
+      <Row class="operation padding-row" v-if="getType !== 'ACTIVITY'">
         <Button @click="add" type="primary">添加优惠券</Button>
         <Button @click="delAll">批量下架</Button>
-        <!-- <Button @click="upAll" >批量上架</Button> -->
       </Row>
-      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-select-cancel="cancelSelect" @on-selection-change="changeSelect">
+      <Table v-if="refreshTable" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
         <template slot-scope="{ row }" slot="action">
-          <Button v-if="!checked && row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="success" :class="{'mr_10' : !checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'}" size="small" @click="edit(row)">编辑
+          <Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="success" :class="{'mr_10' : row.promotionStatus === 'START' || row.promotionStatus === 'NEW'}" size="small" @click="edit(row)">编辑
           </Button>
-          <Button v-if="!checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error" size="small" @click="remove(row)">下架
+          <Button v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error" size="small" @click="remove(row)">下架
           </Button>
         </template>
       </Table>
@@ -220,15 +217,10 @@ export default {
       ],
       data: [], // 表单数据
       total: 0, // 表单数据总数
-      selectCoupon: [], //本级选中的优惠券
+      refreshTable: true, // 修改选中状态后刷新表格
     };
   },
   props: {
-    // 是否为选中模式
-    checked: {
-      type: Boolean,
-      default: false,
-    },
     //优惠券类型 查询参数
     getType: {
       type: String,
@@ -246,94 +238,73 @@ export default {
         this.init();
       }
     },
-  },
-  methods: {
     // 选中优惠券 父级传值
     selectedList: {
       handler(val) {
         // 判断是否是父级回调给自己已选择优惠券
-        if (val.length != 0) {
-          this.selectCoupon = val;
+        if (val.length) {
+          this.selectList = val;
+          this.data.forEach((item) => {
+            item._checked = false;
+            if (this.selectList.length) {
+              this.selectList.forEach((child) => {
+                if (item.id == child.id) {
+                  item._checked = true;
+                }
+              });
+            }
+          });
+        } else {
+          this.data.forEach((item) => {
+            item._checked = false;
+          });
         }
+        this.refreshTable = false;
+        this.$nextTick(() =>{
+          this.refreshTable = true;
+        })
       },
       deep: true,
-      immediate: true,
     },
-    check() {
-      // this.selectCoupon.push(this.selectList)
-      this.$emit("selected", this.selectCoupon);
+  },
+  methods: {
+    check() { // 选中的优惠券
+      this.$emit("selected", this.selectList);
     },
     init() {
       this.getDataList();
     },
-    add() {
+    add() { // 跳转添加页面
       this.$router.push({ name: "add-platform-coupon" });
     },
-    /** 跳转至领取详情页面 */
-    receiveInfo(v) {
-      this.$router.push({ name: "member-receive-coupon", query: { id: v.id } });
-    },
-    info(v) {
+    info(v) { // 查看优惠券
       this.$router.push({ name: "platform-coupon-info", query: { id: v.id } });
     },
-    changePage(v) {
+    changePage(v) { // 改变页码
       this.searchForm.pageNumber = v;
       this.getDataList();
-      // this.clearSelectAll();
     },
-    changePageSize(v) {
+    changePageSize(v) { // 改变页数
       this.searchForm.pageSize = v;
       this.getDataList();
     },
-    handleSearch() {
+    handleSearch() { // 搜索
       this.searchForm.pageNumber = 0;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-    clearSelectAll() {
+    clearSelectAll() { // 清除选中状态
       this.$refs.table.selectAll(false);
     },
-
-    /**
-     * 取消已选择的数据
-     */
-    cancelSelect(selection, row) {
-      console.log(row)
-      let findCoupon = this.selectCoupon.find((item) => {
-        return item.id == row.id;
-      });
-      // 如果没有则添加
-      if (!findCoupon) {
-        this.selectCoupon.push(row);
-      } else {
-        // 有重复数据就删除
-        this.selectCoupon.map((item, index) => {
-          if (item.id == findCoupon.id) {
-            this.selectCoupon.splice(index, 1);
-          }
-        });
-      }
-    },
     /**
      * 选择优惠券
      */
     changeSelect(e) {
-      if (this.checked && e.length != 0) {
-        this.selectCoupon.push(...e);
-        this.check();
-      }
       this.selectList = e;
       this.selectCount = e.length;
+      if (this.getType === 'ACTIVITY') this.check()
     },
-    getDataList() {
+    getDataList() { // 获取数据
       this.loading = true;
       if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
         this.searchForm.startTime = this.selectDate[0].getTime();
@@ -346,18 +317,6 @@ export default {
       getPlatformCouponList(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
-          res.result.records.forEach((item) => {
-            if (this.selectCoupon.length != 0) {
-              this.selectCoupon.forEach((child) => {
-                if (item.id == child.id) {
-                  item.___selected = true;
-                  item._checked = true;
-                }
-              });
-            }
-            item.___selected = false;
-          });
-
           this.data = res.result.records;
           this.total = res.result.total;
         }
@@ -365,43 +324,11 @@ export default {
       this.total = this.data.length;
       this.loading = false;
     },
-    handleSubmit() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.submitLoading = true;
-          if (this.modalType === 0) {
-            // 添加 避免编辑后传入id等数据 记得删除
-            delete this.form.id;
-            this.postRequest("/coupon/insertOrUpdate", this.form).then(
-              (res) => {
-                this.submitLoading = false;
-                if (res.success) {
-                  this.$Message.success("操作成功");
-                  this.getDataList();
-                  this.modalVisible = false;
-                }
-              }
-            );
-          } else {
-            // 编辑
-            this.postRequest("/coupon/insertOrUpdate", this.form).then(
-              (res) => {
-                this.submitLoading = false;
-                if (res.success) {
-                  this.$Message.success("操作成功");
-                  this.getDataList();
-                  this.modalVisible = false;
-                }
-              }
-            );
-          }
-        }
-      });
-    },
-    edit(v) {
+    
+    edit(v) {  // 跳转编辑页面
       this.$router.push({ name: "edit-platform-coupon", query: { id: v.id } });
     },
-    remove(v) {
+    remove(v) { // 下架优惠券
       this.$Modal.confirm({
         title: "确认下架",
         // 记得确认修改此处
@@ -426,7 +353,7 @@ export default {
         },
       });
     },
-    delAll() {
+    delAll() { // 批量下架
       if (this.selectCount <= 0) {
         this.$Message.warning("您还未选择要下架的优惠券");
         return;
@@ -456,41 +383,12 @@ export default {
         },
       });
     },
-    upAll() {
-      if (this.selectCount <= 0) {
-        this.$Message.warning("请选择要上架的优惠券");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "确认上架",
-        content: "您确认要上架所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
-          let ids = [];
-          this.selectList.forEach(function (e) {
-            ids.push(e.id);
-          });
-          let params = {
-            couponIds: ids.toString(),
-            promotionStatus: "START",
-          };
-          // 批量上架
-          updatePlatformCouponStatus(params).then((res) => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("上架成功");
-              this.clearSelectAll();
-              this.getDataList();
-            }
-          });
-        },
-      });
-    },
   },
   mounted() {
     //如果作为组件方式，传入了类型值，则搜索参数附加类型
     if (this.getType) {
       this.searchForm.getType = this.getType;
+      this.columns.pop()
     }
     this.init();
   },
diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue
index fea242c2..58f7dafa 100644
--- a/manager/src/views/promotion/coupon/couponPublish.vue
+++ b/manager/src/views/promotion/coupon/couponPublish.vue
@@ -229,11 +229,11 @@ export default {
         ],
         publishNum: [
           {required: true, message: "请输入发放数量"},
-          {pattern: regular.integer, message: "请输入正整数"},
+          {pattern: regular.Integer, message: "请输入正整数"},
         ],
         couponLimitNum: [
           {required: true, message: "领取限制不能为空"},
-          {pattern: regular.integer, message: "请输入正整数"},
+          {pattern: regular.Integer, message: "请输入正整数"},
         ],
         description: [{required: true, message: "请输入范围描述"}],
       },
diff --git a/manager/src/views/promotion/coupon/couponSpecify.vue b/manager/src/views/promotion/coupon/couponSpecify.vue
deleted file mode 100644
index a4553e87..00000000
--- a/manager/src/views/promotion/coupon/couponSpecify.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div>
-    <Card>
-      <Form ref="form" :model="form" :label-width="120">
-        <div class="base-info-item">
-          <h4>优惠券将在指定发放时间发放到用户账号中</h4>
-          <div class="form-item-view">
-            <FormItem label="活动名称" prop="promotionName">
-              <Input type="text" v-model="form.promotionName" placeholder="活动名称" clearable style="width: 260px" />
-            </FormItem>
-            <FormItem label="目标客户" prop="vipType">
-              <RadioGroup v-model="vipType">
-                <Radio :label="0">全平台客户</Radio>
-                <Radio :label="1">指定客户</Radio>
-              </RadioGroup>
-              <Button type="primary" v-if="vipType==1" icon="ios-add" @click="addVip" ghost>添加客户</Button>
-            </FormItem>
-            <FormItem label="发放时间" prop="couponDiscount">
-              <DatePicker type="datetime" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
-              </DatePicker>
-            </FormItem>
-            <FormItem label="选择优惠券" prop="couponType">
-              <Button type="primary" icon="ios-add" @click="checkCoupon=!checkCoupon" ghost>选择优惠券</Button>
-              <Table class="table" :columns="couponColumns" :data="couponData"></Table>
-            </FormItem>
-          </div>
-
-          <div style="margin-left:100px">
-            <Button type="text" @click="closeCurrentPage">返回</Button>
-            <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
-          </div>
-
-        </div>
-      </Form>
-      <Modal width="1200" v-model="checkCoupon">
-        <couponList checked @selected="callbackSelectCoupon" />
-      </Modal>
-      <Modal width="1200" v-model="checkUserList">
-        <userList @selected="callbackSelectUser" ref="memberLayout" />
-      </Modal>
-    </Card>
-
-  </div>
-</template>
-
-<script>
-import { addCouponActivity } from "@/api/promotion";
-
-import couponList from "./coupon";
-import userList from "@/views/member/list/index";
-// import userList from ''
-export default {
-  components: {
-    couponList,
-    userList,
-  },
-
-  data() {
-    return {
-      // 选择优惠券
-      checkCoupon: false,
-      // 选择用户
-      checkUserList: false,
-      // 优惠券表格title
-      couponColumns: [
-        {
-          title: "优惠券名称",
-          key: "name",
-        },
-        {
-          title: "有效期",
-          key: "age",
-        },
-        {
-          title: "优惠券数量",
-          key: "address",
-        },
-        {
-          title: "操作",
-          key: "action",
-        },
-      ],
-      // datpicker时间设置
-      options: {
-        disabledDate(date) {
-          return date && date.valueOf() < Date.now() - 86400000;
-        },
-      },
-
-      //
-      vipType: 0, //客户会员类型  0全平台客户 1指定客户
-      form: {},
-      formRule: {},
-      id: this.$route.query.id, // 优惠券id
-
-      callbackCoupon: [],
-    };
-  },
-  mounted() {},
-  methods: {
-
-    // 添加指定用户
-    addVip() {
-      this.checkUserList = true;
-      this.$nextTick(() => {
-        this.$refs.memberLayout.selectedMember = true;
-      });
-    },
-    // 返回已选择的用户
-    callbackSelectUser(val){
-      console.log(val)
-    },
-
-    // 返回已选择的优惠券
-    callbackSelectCoupon(val) {
-      if (val.___selected) {
-        this.callbackCoupon.forEach((item, index) => {
-          if (item.id == val.id) this.callbackCoupon.splice(index, 1);
-        });
-      } else {
-        this.callbackCoupon.push(val);
-      }
-    },
-    // 关闭当前页面
-    closeCurrentPage() {
-      this.$store.commit("removeTag", "add-coupon-specify");
-      localStorage.pageOpenedList = JSON.stringify(
-        this.$store.state.app.pageOpenedList
-      );
-      this.$router.go(-1);
-    },
-
-    async handleSubmit() {
-      let res = await addCouponActivity();
-    },
-  },
-};
-</script>
-
-<style lang="scss" scpoed>
-.table {
-  width: 800px;
-  margin: 20px 0;
-}
-h4 {
-  margin-bottom: 10px;
-  padding: 0 10px;
-  border: 1px solid #ddd;
-  background-color: #f8f8f8;
-  font-weight: bold;
-  color: #333;
-  font-size: 14px;
-  line-height: 40px;
-  text-align: left;
-}
-.form-item-view {
-  margin: 20px 0;
-}
-.describe {
-  font-size: 12px;
-  margin-left: 10px;
-  color: #999;
-}
-.effectiveDays {
-  font-size: 12px;
-  color: #999;
-  > * {
-    margin: 0 4px;
-  }
-}
-</style>
-
diff --git a/manager/src/views/promotion/coupon/memberReceiveCoupon.vue b/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
deleted file mode 100644
index 4291c1e3..00000000
--- a/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
+++ /dev/null
@@ -1,250 +0,0 @@
-<template>
-  <div class="search">
-    <Card>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      >
-        <template slot-scope="{ row }" slot="rangeTime">
-          <div>{{ row.startTime }} ~ {{ row.endTime }}</div>
-        </template>
-        <template slot-scope="{ row }" slot="action">
-          <Button
-            type="error"
-            ghost
-            size="small"
-            :disabled="row.memberCouponStatus != 'NEW'"
-            @click="remove(row)"
-            >作废</Button
-          >
-        </template>
-      </Table>
-      <Row type="flex" justify="end" class="page">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
-    </Card>
-  </div>
-</template>
-
-<script>
-import {
-  getMemberReceiveCouponList,
-  deleteMemberReceiveCoupon,
-} from "@/api/promotion";
-
-export default {
-  name: "memberReceiveCoupon",
-  components: {},
-  data() {
-    return {
-      loading: true, // 表单加载状态
-
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
-      },
-      id: this.$route.query.id, // 优惠券id
-
-      submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      columns: [
-        // 表头
-        {
-          title: "优惠券编号",
-          key: "couponId",
-          minWidth: 120,
-        },
-        {
-          title: "面额",
-          key: "price",
-          render: (h, params) => {
-            return h(
-              "div",
-              this.$options.filters.unitPrice(params.row.price, "￥")
-            );
-          },
-        },
-        {
-          title: "消费门槛",
-          key: "consumeThreshold",
-          render: (h, params) => {
-            return h(
-              "div",
-              this.$options.filters.unitPrice(params.row.consumeThreshold, "￥")
-            );
-          },
-        },
-        {
-          title: "有效期",
-          slot: "rangeTime",
-          minWidth: 120
-        },
-        {
-          title: "会员名称",
-          key: "memberName",
-          minWidth: 120
-        },
-        {
-          title: "适用范围",
-          key: "couponType",
-          minWidth: 50,
-          render: (h, params) => {
-            let text = "未知";
-            if (params.row.scopeType == "ALL") {
-              text = "全品类";
-            } else if (params.row.scopeType == "PORTION_CATEGORY") {
-              text = "部分商品分类";
-            } else if (params.row.scopeType == "PORTION_GOODS") {
-              text = "指定商品";
-            }
-            return h("div", [text]);
-          },
-        },
-        {
-          title: "会员名称",
-          key: "memberName",
-        },
-        {
-          title: "状态",
-          key: "memberCouponStatus",
-          minWidth: 50,
-          render: (h, params) => {
-            let text = "未知",
-              color = "";
-            if (params.row.memberCouponStatus == "NEW") {
-              text = "未使用";
-              color = "default";
-            } else if (params.row.memberCouponStatus == "USED") {
-              text = "已使用";
-              color = "green";
-            } else if (params.row.memberCouponStatus == "EXPIRE") {
-              text = "已过期";
-              color = "red";
-            } else if (params.row.memberCouponStatus == "CLOSED") {
-              text = "已作废";
-              color = "red";
-            }
-            return h("div", [
-              h(
-                "Tag",
-                {
-                  props: {
-                    color: color,
-                  },
-                },
-                text
-              ),
-            ]);
-          },
-        },
-        {
-          title: "操作",
-          slot: "action",
-          align: "center",
-          width: 100,
-        },
-      ],
-      data: [], // 表单数据
-      total: 0, // 表单数据总数
-    };
-  },
-  methods: {
-    init() {
-      this.getDataList();
-    },
-    changePage(v) {
-      this.searchForm.pageNumber = v;
-      this.getDataList();
-      this.clearSelectAll();
-    },
-    changePageSize(v) {
-      this.searchForm.pageSize = v;
-      this.getDataList();
-    },
-    handleSearch() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.getDataList();
-    },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    changeSelect(e) {
-      this.selectList = e;
-    },
-    /** 查询单个优惠券领取详情 */
-    getDataList() {
-      this.loading = true;
-      // 带多条件搜索参数获取表单数据 请自行修改接口
-      getMemberReceiveCouponList(this.id).then((res) => {
-        this.loading = false;
-        if (res.success) {
-          this.data = res.result.records;
-          this.total = res.result.total;
-        }
-      });
-      this.total = this.data.length;
-      this.loading = false;
-    },
-    /** 作废优惠券 */
-    remove(v) {
-      this.$Modal.confirm({
-        title: "确认作废",
-        content: "您确认要作废此优惠券?",
-        loading: true,
-        onOk: () => {
-          // 删除
-          deleteMemberReceiveCoupon(v.id).then((res) => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("作废成功");
-              this.getDataList();
-            }
-          });
-        },
-      });
-    },
-  },
-  mounted() {
-    this.init();
-  },
-};
-</script>
-<style lang="scss">
-@import "@/styles/table-common.scss";
-</style>
diff --git a/manager/src/views/promotion/couponActivity/couponPublish.vue b/manager/src/views/promotion/couponActivity/couponPublish.vue
index d2954c63..240ee401 100644
--- a/manager/src/views/promotion/couponActivity/couponPublish.vue
+++ b/manager/src/views/promotion/couponActivity/couponPublish.vue
@@ -275,14 +275,13 @@ export default {
       this.reSelectCoupon();
     },
     reSelectCoupon() {
-      //清空原有数据
+      // 清空原有数据
       this.form.couponActivityItems = this.selectCouponList.map((item) => {
         return {
           num: 0,
           couponId: item.id,
         }
       });
-      console.log(this.form.couponActivityItems)
     },
 
     // 添加指定用户
@@ -308,7 +307,6 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           const params = JSON.parse(JSON.stringify(this.form));
-          console.log(params);
           this.submitLoading = true;
           // 添加 避免编辑后传入id等数据 记得删除
           delete params.id;
diff --git a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
index 3e4244f0..1e0a8fd7 100644
--- a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
@@ -187,11 +187,11 @@ export default {
         ],
         publishNum: [
           { required: true, message: "请输入发放数量" },
-          { pattern: regular.integer, message: "请输入正整数" },
+          { pattern: regular.Integer, message: "请输入正整数" },
         ],
         couponLimitNum: [
           { required: true, message: "请输入领取限制" },
-          { pattern: regular.integer, message: "请输入正整数" },
+          { pattern: regular.Integer, message: "请输入正整数" },
         ],
         description: [{ required: true, message: "请输入范围描述" }],
       },
diff --git a/seller/src/views/main-components/footer.vue b/seller/src/views/main-components/footer.vue
index c1fb9ba6..6095500b 100644
--- a/seller/src/views/main-components/footer.vue
+++ b/seller/src/views/main-components/footer.vue
@@ -6,7 +6,7 @@
       <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('terms') }}</a>
     </Row>
     <Row type="flex" justify="center" class="copyright">
-      Copyright © 2020 - Present
+      Copyright © {{year}} - Present
       <a
         href="https://pickmall.cn/"
         target="_blank"
@@ -18,7 +18,12 @@
 
 <script>
 export default {
-  name: "footer"
+  name: "footer",
+  data() {
+    return {
+      year: new Date().getFullYear()
+    }
+  },
 };
 </script>
 
diff --git a/seller/src/views/my-components/verify/index.vue b/seller/src/views/my-components/verify/index.vue
index 5f13fee8..2cbb8824 100644
--- a/seller/src/views/my-components/verify/index.vue
+++ b/seller/src/views/my-components/verify/index.vue
@@ -3,7 +3,7 @@
     <div class="imgBox" :style="{width:data.originalWidth+'px',height:data.originalHeight + 'px'}">
       <img :src="data.backImage" style="width:100%;height:100%" alt="">
       <img class="slider" :src="data.slidingImage" :style="{left:distance+'px',top:data.randomY+'px'}" :width="data.sliderWidth" :height="data.sliderHeight" alt="">
-      <Icon type="md-refresh" class="refresh" @click="refresh" />
+      <Icon type="md-refresh" class="refresh" @click="init" />
     </div>
     <div class="handle" :style="{width:data.originalWidth+'px'}">
       <span class="bgcolor" :style="{width:distance + 'px',background:bgColor}"></span>
@@ -82,27 +82,24 @@ export default {
             this.verifyText = '解锁失败';
             let that = this;
             setTimeout(() => {
-              that.refresh();
+              that.init();
             }, 1000);
             this.$emit('change', { status: false, distance: this.distance });
           }
         } else {
-          this.refresh()
+          this.init()
         }
         
       }).catch(()=>{
-        this.refresh()
+        this.init()
       });
     },
-    refresh () { // 刷新滑块
+    init () { // 初始化数据
       this.flag = false;
       this.downX = 0;
       this.distance = 0;
       this.bgColor = '#04ad11';
       this.verifyText = '拖动滑块解锁';
-      this.init();
-    },
-    init () { // 初始化数据
       getVerifyImg(this.type).then(res => {
         if (res.result) {
           this.data = res.result;
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)
             );
           },
         },

From f5faad982c3e6efe7de84349ac9de4d84a779ab9 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 9 Jul 2021 15:04:02 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8B=86=E5=88=86=E5=AE=8C=E6=88=90=EF=BC=8C?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E8=AE=A2=E5=8D=95=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/config/index.js                   |  16 +-
 manager/src/views/order/order/orderList.vue   |  67 ++++----
 .../setting-manage/setting/ORDER_SETTING.vue  |  28 ++--
 .../goods/goods-seller/goodsOperation.vue     |  16 +-
 .../goods-seller/goodsOperationFirst.vue      |  52 +++---
 .../goods/goods-seller/goodsOperationSec.vue  | 154 ++++++++++--------
 6 files changed, 173 insertions(+), 160 deletions(-)

diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index a4a19129..596645d1 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -17,14 +17,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: "https://common-api.pickmall.cn",
-    buyer: "https://buyer-api.pickmall.cn",
-    seller: "https://store-api.pickmall.cn",
-    manager: "https://admin-api.pickmall.cn"
-    // common: 'http://192.168.0.106:8890',
-    // buyer: 'http://192.168.0.106:8888',
-    // seller: 'http://192.168.0.106:8889',
-    // manager: 'http://192.168.0.106:8887'
+    // common: "https://common-api.pickmall.cn",
+    // buyer: "https://buyer-api.pickmall.cn",
+    // seller: "https://store-api.pickmall.cn",
+    // manager: "https://admin-api.pickmall.cn"
+    common: 'http://192.168.0.103:8890',
+    buyer: 'http://192.168.0.103:8888',
+    seller: 'http://192.168.0.103:8889',
+    manager: 'http://192.168.0.103:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index ae5d0fd6..1a93e173 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -1,43 +1,38 @@
 <template>
   <div class="search">
-
     <Card>
+      <Form ref="searchForm" @keydown.enter.native="handleSearch" :model="searchForm" inline :label-width="70" class="search-form">
+        <Form-item label="订单号" prop="orderSn">
+          <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 160px" />
+        </Form-item>
+        <Form-item label="会员名称" prop="buyerName">
+          <Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 160px" />
+        </Form-item>
 
-      <Row @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="订单号" prop="orderSn">
-            <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 160px" />
-          </Form-item>
-          <Form-item label="会员名称" prop="buyerName">
-            <Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 160px" />
-          </Form-item>
-
-          <Form-item label="订单类型" prop="orderType">
-            <Select v-model="searchForm.orderType" placeholder="请选择" clearable style="width: 160px">
-              <Option value="NORMAL">普通订单</Option>
-              <Option value="PINTUAN">拼团订单</Option>
-              <Option value="GIFT">赠品订单</Option>
-              <Option value="VIRTUAL">核验订单</Option>
-            </Select>
-          </Form-item>
-          <Form-item label="订单状态" prop="orderStatus">
-            <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 160px">
-              <Option value="UNPAID">未付款</Option>
-              <Option value="PAID">已付款</Option>
-              <Option value="UNDELIVERED">待发货</Option>
-              <Option value="DELIVERED">已发货</Option>
-              <Option value="COMPLETED">已完成</Option>
-              <Option value="TAKE">待核验</Option>
-              <Option value="CANCELLED">已取消</Option>
-            </Select>
-          </Form-item>
-
-          <Form-item label="下单时间">
-            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 160px"></DatePicker>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-        </Form>
-      </Row>
+        <Form-item label="订单类型" prop="orderType">
+          <Select v-model="searchForm.orderType" placeholder="请选择" clearable style="width: 160px">
+            <Option value="NORMAL">普通订单</Option>
+            <Option value="PINTUAN">拼团订单</Option>
+            <Option value="GIFT">赠品订单</Option>
+            <Option value="VIRTUAL">核验订单</Option>
+          </Select>
+        </Form-item>
+        <Form-item label="订单状态" prop="orderStatus">
+          <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 160px">
+            <Option value="UNPAID">未付款</Option>
+            <Option value="PAID">已付款</Option>
+            <Option value="UNDELIVERED">待发货</Option>
+            <Option value="DELIVERED">已发货</Option>
+            <Option value="COMPLETED">已完成</Option>
+            <Option value="TAKE">待核验</Option>
+            <Option value="CANCELLED">已取消</Option>
+          </Select>
+        </Form-item>
+        <Form-item label="下单时间">
+          <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 160px"></DatePicker>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+      </Form>
       <div>
         <download-excel class="export-excel-wrapper" :data="data" :fields="fields" name="商品订单.xls">
           <Button type="info" class="export">
diff --git a/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue b/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
index 88f283e6..71949781 100644
--- a/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
@@ -12,13 +12,7 @@
         <Input type='number' v-model="formValidate.autoReceive">
         <span slot="append">天</span>
         </Input>
-
-      </FormItem>
-      <FormItem label="订单自动完成" prop="autoComplete">
-        <Input type='number' v-model="formValidate.autoComplete">
-        <span slot="append">天</span>
-        </Input>
-
+        <span class="desc">收货后，订单完成</span>
       </FormItem>
 
       <FormItem label="自动评价" prop="autoEvaluation">
@@ -27,11 +21,17 @@
         </Input>
 
       </FormItem>
-      <FormItem label="售后自动取消" prop="autoCancelAfterSale">
-        <Input type='number' v-model="formValidate.autoCancelAfterSale">
+      <FormItem label="已完成订单允许退单" prop="closeAfterSale">
+        <Input type='number' v-model="formValidate.closeAfterSale">
         <span slot="append">天</span>
         </Input>
-
+        <span class="desc">如果天数为0,则不允许退单</span>
+      </FormItem>
+      <FormItem label="已完成订单允许投诉" prop="closeComplaint">
+        <Input type='number' v-model="formValidate.closeComplaint">
+        <span slot="append">天</span>
+        </Input>
+        <span class="desc">如果天数为0,则不允许投诉</span>
       </FormItem>
 
       <div class="label-btns">
@@ -50,10 +50,10 @@ export default {
       ruleValidate: {}, // 验证规则
       formValidate: { // 表单数据
         autoCancel: "",
-        autoComplete: "",
         autoEvaluation: "",
         autoReceive: "",
-        autoCancelAfterSale: "",
+        closeAfterSale: "",
+        closeComplaint:""
       },
     };
   },
@@ -121,4 +121,8 @@ export default {
 /deep/ .ivu-input {
   width: 100px !important;
 }
+.desc {
+  font-size: 12px;
+  color: #999;
+}
 </style>
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 824bff12..45a010e7 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -8,9 +8,9 @@
       </steps>
     </div>
     <!-- 第一步 选择分类 -->
-    <first-step ref='first' v-show="activestep === 0"></first-step>
+    <first-step ref='first' v-show="activestep === 0" @change="getFirstData"></first-step>
     <!-- 第二步 商品详细信息 -->
-    <second-step ref='second' v-if="activestep === 1"></second-step>
+    <second-step ref='second' :firstData="firstData" v-if="activestep === 1"></second-step>
     <!-- 第三步 发布完成 -->
     <third-step ref='third' v-if="activestep === 2"></third-step>
     
@@ -33,20 +33,24 @@ export default {
     return {
       /** 当前激活步骤*/
       activestep: 0,
+      firstData: {}, // 第一步传递的数据
     };
   },
-
+  methods: {
+    getFirstData (item) {
+      this.firstData = item;
+      this.activestep = 1;
+    }
+  },
   mounted() {
     // 编辑商品、模板
     if (this.$route.query.id || this.$route.query.draftId) {
       this.activestep = 1;
     } else {
       this.activestep = 0
+      this.$refs.first.selectGoodsType = true;
     }
     
-  },
-  methods: {
-    
   }
 };
 </script>
diff --git a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
index b4551d90..ef282159 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
@@ -15,8 +15,8 @@
       <div v-else class="goods-type-list">
         <h2 @click="showGoodsTemplates = !showGoodsTemplates">返回</h2>
         <div class="goods-type-item template-item" @click="handleClickGoodsTemplate(item)"
-             v-for="(item,index) in goodsTemplates" :key="index">
-          <img :src="item.thumbnail"/>
+             v-for="(item,tempIndex) in goodsTemplates" :key="tempIndex">
+          <img :src="item.thumbnail" />
           <div>
             <h2>{{ item.goodsName }}</h2>
             <p>{{ item.sellingPoint || '' }}</p>
@@ -54,8 +54,8 @@
         <span v-show="category[1].name">> {{ category[1].name }}</span>
         <span v-show="category[2].name">> {{ category[2].name }}</span>
       </p>
-      <template>
-        <Divider>已选商品模版:{{checkedTemplate()}}</Divider>
+      <template v-if="selectedTemplate.goodsName">
+        <Divider>已选商品模版:{{selectedTemplate.goodsName}}</Divider>
       </template>
     </div>
     <!-- 底部按钮 -->
@@ -69,11 +69,10 @@
 </template>
 <script>
 import * as API_GOODS from "@/api/goods";
-import bus from '@/libs/eventBus'
 export default {
   data() {
     return {
-      draftId: '',
+      selectedTemplate: {}, // 已选模板
       selectGoodsType: false, // 展示选择商品分类modal
       goodsTemplates: [], // 商品模板列表
       showGoodsTemplates: false, //是否显示选择商品模板
@@ -118,14 +117,6 @@ export default {
     }
   },
   methods: {
-      // 获取已选模板
-    checkedTemplate () {
-      if(this.goodsTemplates.length) {
-        return this.goodsTemplates.find(item=>{return item.id == this.draftId}).goodsName
-      } else {
-        return ""
-      }
-    },
     // 点击商品类型
     handleClickGoodsType(val) {
       this.goodsTypeWay.map((item) => {
@@ -134,18 +125,26 @@ export default {
 
       val.check = !val.check;
       if (!val.type) {
-        this.showGoodsTemplates = true;
         this.GET_GoodsTemplate()
+        this.showGoodsTemplates = true;
       } else {
         this.goodsType = val.type;
+        this.selectedTemplate = {}
       }
     },
+    // 点击商品模板
+    handleClickGoodsTemplate(val) {
+      console.log(val);
+      this.selectedTemplate = val;
+      this.selectGoodsType = false;
+      this.$emit('change', {tempId: val.id})
+    },
     // 获取商品模板
     GET_GoodsTemplate() {
       let searchParams = {
         saveType: "TEMPLATE",
         sort: "create_time",
-        order: "desc",
+        order: "desc"
       };
       API_GOODS.getDraftGoodsListData(searchParams).then((res) => {
         if (res.success) {
@@ -153,10 +152,6 @@ export default {
         }
       });
     },
-    // 选择商品模板
-    handleClickGoodsTemplate(val) {
-      this.selectGoodsType = false;
-    },
     /** 选择商城商品分类 */
     handleSelectCategory(row, index, level) {
       if (level === 1) {
@@ -178,10 +173,6 @@ export default {
         this.category[2].name = row.name
         this.category[2].id = row.id
       }
-      // 设置当前商品分类ID
-      // this.baseInfoForm.categoryId = row.id;
-      // this.categoryId = row.id;
-      // this.baseInfoForm.categoryName = row.name;
     },
     /** 查询下一级 商城商品分类*/
     GET_NextLevelCategory(row) {
@@ -195,11 +186,8 @@ export default {
     // 下一步
     next() {
       window.scrollTo(0, 0);
-      /** 1级校验 */
-      this.loading = true;
-      if (!this.goodsType) {
+      if (!this.goodsType && !this.selectedTemplate.goodsName) {
         this.$Message.error('请选择商品类型')
-        this.loading = false;
         return
       }
       if (!this.category[0].name) {
@@ -209,13 +197,17 @@ export default {
         this.$Message.error("必须选择到三级分类");
         return;
       } else if (this.category[2].name) {
-        this.$parent.activestep = 1;
+        if (this.selectedTemplate.id) {
+          this.$emit('change',{tempId: this.selectedTemplate.id})
+        } else {
+          this.$emit('change',{category: this.category,goodsType:this.goodsType})
+        }
       }
     },
   },
   mounted () {
     this.GET_NextLevelCategory()
-    this.selectGoodsType = true;
+    
   }
 }
 </script>
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 72f77bfd..c33b168b 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -6,10 +6,10 @@
           <h4>基本信息</h4>
           <div class="form-item-view">
             <FormItem label="商品分类">
-              <span class="goods-category-name">{{ activeCategoryName1 }}</span>
-              <span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
-              <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
-              <span v-if="!activeCategoryName1" v-html="baseInfoForm.category_name"></span>
+              <span class="goods-category-name">{{ this.baseInfoForm.categoryName[0] }}</span>
+              <span> &gt; {{ this.baseInfoForm.categoryName[1] }}</span>
+              <span> &gt; {{ this.baseInfoForm.categoryName[2] }}</span>
+              
             </FormItem>
             <FormItem label="商品名称" prop="goodsName">
               <Input type="text" v-model="baseInfoForm.goodsName" placeholder="商品名称" clearable style="width: 260px"/>
@@ -169,18 +169,24 @@
                               <img v-if="previewPicture !== ''" :src="previewPicture"/>
                             </div>
                             <Divider/>
-                            <div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
-                              <template v-if="img.status === 'finished'">
-                                <img :src="img.url"/>
-                                <div class="sku-upload-list-cover">
-                                  <Icon type="ios-eye-outline" @click="handleView(img.url)"></Icon>
-                                  <Icon type="ios-trash-outline" @click="handleRemove(img, __index)"></Icon>
-                                </div>
-                              </template>
-                              <template v-else>
-                                <Progress v-if="img.showProgress" :percent="img.percentage" hide-info></Progress>
-                              </template>
-                            </div>
+                            <vuedraggable
+                              :list="baseInfoForm.goodsGalleryFiles"
+                              :animation="200"
+                              style="display:inline-block;"
+                            >
+                              <div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
+                                <template v-if="img.status === 'finished'">
+                                  <img :src="img.url"/>
+                                  <div class="sku-upload-list-cover">
+                                    <Icon type="ios-eye-outline" @click="handleView(img.url)"></Icon>
+                                    <Icon type="ios-trash-outline" @click="handleRemove(img, __index)"></Icon>
+                                  </div>
+                                </template>
+                                <template v-else>
+                                  <Progress v-if="img.showProgress" :percent="img.percentage" hide-info></Progress>
+                                </template>
+                              </div>
+                            </vuedraggable>
                             <Upload ref="uploadSku" :show-upload-list="false" :default-file-list="row.images"
                                 :on-success="handleSuccess" :format="['jpg', 'jpeg', 'png']"
                                 :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
@@ -193,7 +199,6 @@
                           </Modal>
                         </template>
                       </Table>
-
                     </div>
                   </div>
                 </Panel>
@@ -254,20 +259,20 @@
             <div class="form-item-view">
               <FormItem class="form-item-view-el" label="商品发布" prop="release">
                 <RadioGroup type="button" button-style="solid" v-model="baseInfoForm.release">
-                  <Radio title="立即发布" label="true">
+                  <Radio title="立即发布" :label="true">
                     <span>立即发布</span>
                   </Radio>
-                  <Radio title="放入仓库" label="false">
+                  <Radio title="放入仓库" :label="false">
                     <span>放入仓库</span>
                   </Radio>
                 </RadioGroup>
               </FormItem>
               <FormItem class="form-item-view-el" label="商品推荐" prop="skuList">
                 <RadioGroup type="button" button-style="solid" v-model="baseInfoForm.recommend">
-                  <Radio title="推荐" label="true">
+                  <Radio title="推荐" :label="true">
                     <span>推荐</span>
                   </Radio>
-                  <Radio title="不推荐" label="false">
+                  <Radio title="不推荐" :label="false">
                     <span>不推荐</span>
                   </Radio>
                 </RadioGroup>
@@ -275,9 +280,9 @@
             </div>
             <div class="form-item-view-bottom">
               <Collapse v-model="params_panel" v-for="(paramsGroup,groupIndex) in goodsParams"
-                        :title="paramsGroup.groupName"
-                        class="mb_10"
-                        style="text-align: left" :key="paramsGroup.groupName">
+                  :title="paramsGroup.groupName"
+                  class="mb_10"
+                  style="text-align: left" :key="paramsGroup.groupName">
                 <Panel :name="paramsGroup.groupName">
                   {{paramsGroup.groupName}}
                   <p slot="content">
@@ -314,7 +319,6 @@
 import * as API_GOODS from "@/api/goods";
 import * as API_Shop from "@/api/shops";
 import cloneObj from "@/utils/index";
-import bus from '@/libs/eventBus'
 import vuedraggable from "vuedraggable";
 import editor from "@/views/my-components/lili/editor";
 import {regular} from "@/utils";
@@ -322,7 +326,13 @@ import {regular} from "@/utils";
 export default {
   components:{
     editor,
-    vuedraggable,
+    vuedraggable
+  },
+  props: {
+    firstData: {
+      default: {},
+      type: Object
+    }
   },
   data () {
     // 表单验证项，商品价格
@@ -363,6 +373,7 @@ export default {
       }
     };
     return {
+      categoryId: '', // 商品分类第三级id
       //提交状态
       submitLoading: false,
       //上传图片路径
@@ -387,9 +398,9 @@ export default {
         /** 商品相册列表 */
         goodsGalleryFiles: [],
         /** 是否立即发布 true 立即发布 false 放入仓库 */
-        release: "true",
+        release: true,
         /** 是否为推荐商品 */
-        recommend: "true",
+        recommend: true,
         /** 店铺分类 */
         storeCategoryPath: "",
         brandId: 0,
@@ -411,6 +422,8 @@ export default {
         templateId: '',
         /** 参数组*/
         goodsParamsDTOList: [],
+        /** 商品分类中文名 */
+        categoryName: []
       },
       /** 表单数据*/
       skuForm: {},
@@ -482,7 +495,7 @@ export default {
       /** 店铺分类列表 */
       shopCategory: [],
       /** 商品单位列表 */
-      goodsUnitList: {},
+      goodsUnitList: [],
       ignoreColumn: [
         "_index",
         "_rowKey",
@@ -507,6 +520,7 @@ export default {
      * @value 参数选项值
      */
     selectParams(paramsGroup, groupIndex, params, paramsIndex, value) {
+      debugger
       if (!this.baseInfoForm.goodsParamsDTOList[groupIndex]) {
         this.baseInfoForm.goodsParamsDTOList[groupIndex] = {
           groupId:'',
@@ -515,10 +529,9 @@ export default {
         }
       }
       //赋予分组id、分组名称
-      this.baseInfoForm.goodsParamsDTOList[groupIndex] = {
-        groupId : paramsGroup.groupId,
-        groupName : paramsGroup.groupName
-      }
+      this.baseInfoForm.goodsParamsDTOList[groupIndex].groupId = paramsGroup.groupId
+      this.baseInfoForm.goodsParamsDTOList[groupIndex].groupName = paramsGroup.groupName
+        
       //参数详细为空，则赋予
       if (!this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[paramsIndex]) {
         this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[paramsIndex]={
@@ -573,6 +586,7 @@ export default {
         this.baseInfoForm.goodsGalleryFiles.filter((i) => i.url !== file.url);
     },
     updateSkuPicture() {
+      this.baseInfoForm.regeneratorSkuFlag = true;
       let _index = this.selectedSku._index;
       this.skuTableData[_index] = this.selectedSku;
     },
@@ -596,16 +610,13 @@ export default {
     handleFormatError(file) {
       this.$Notice.warning({
         title: "文件格式不正确",
-        desc:
-          "File format of " +
-          file.name +
-          " is incorrect, please select jpg or png.",
+        desc: "文件 " + file.name + " 的格式不正确"
       });
     },
     handleMaxSize(file) {
       this.$Notice.warning({
         title: "超过文件大小限制",
-        desc: "图片  " + file.name + " 不能超过2mb",
+        desc: "图片 " + file.name + " 不能超过2mb"
       });
     },
     handleBeforeUploadGoodsPicture() {
@@ -669,27 +680,19 @@ export default {
       });
     },
     // 编辑时获取商品信息
-    async GET_GoodData() {
+    async GET_GoodData(id,draftId) {
       let response = {};
-      if (this.$route.query.draftId) {
-        response = await API_GOODS.getDraftGoodsDetail(this.$route.query.draftId);
+      if (draftId) {
+        response = await API_GOODS.getDraftGoodsDetail(draftId);
       } else {
-        response = await API_GOODS.getGoods(this.$route.query.id);
+        response = await API_GOODS.getGoods(id);
         this.goodsId = response.result.id;
       }
       this.baseInfoForm = {...this.baseInfoForm,...response.result};
 
-      this.baseInfoForm.release = "true";
-      this.baseInfoForm.recommend = this.baseInfoForm.recommend
-        ? "true"
-        : "false";
+      this.baseInfoForm.release = true;
 
-      //分类名称展示
-      this.activeCategoryName1 = response.result.categoryName[0];
-      this.activeCategoryName2 = response.result.categoryName[1];
-      this.activeCategoryName3 = response.result.categoryName[2];
-
-      this.baseInfoForm.categoryId = response.result.categoryPath.split(",");
+      this.categoryId = response.result.categoryPath.split(",")[2];
 
 
       if (
@@ -703,8 +706,6 @@ export default {
           });
       }
 
-      this.categoryId = this.baseInfoForm.categoryId[2];
-
       this.Get_SkuInfoByCategory(this.categoryId)
 
       this.renderGoodsDetailSku(response.result.skuList);
@@ -1024,7 +1025,7 @@ export default {
     /** 数据改变之后 抛出数据 */
     updateSkuTable(row, item) {
       let index = row._index;
-      // this.skuTableData[index][item] = row[item];
+      this.baseInfoForm.regeneratorSkuFlag = true;
       /** 进行自定义校验 判断是否是数字（小数也能通过）重量 */
       if (item === "weight") {
         if (
@@ -1136,11 +1137,10 @@ export default {
               }
             });
           } else {
-            // this.baseInfoForm.goodsType = "NORMAL";
             API_GOODS.createGoods(this.baseInfoForm).then((res) => {
               if (res.success) {
                 this.submitLoading = false;
-                this.activestep = 2;
+                this.$parent.activestep = 2;
                 window.scrollTo(0, 0);
               } else {
                 this.submitLoading = false;
@@ -1197,7 +1197,7 @@ export default {
       API_GOODS.saveDraftGoods(this.baseInfoForm).then((res) => {
         if (res.success) {
           this.$Message.info("保存成功！");
-          this.$router.back();
+          this.$router.push({name: 'template-goods'});
         }
       });
     }
@@ -1212,16 +1212,34 @@ export default {
         this.logisticsTemplate = res.result;
       }
     })
-    /** 获取该商城分类下 商品参数信息 */
-    this.GET_GoodsParams();
-    /** 查询品牌列表 */
-    this.getGoodsBrandList();
-    /** 查询分类绑定的规格信息 */
-    this.Get_SkuInfoByCategory(this.baseInfoForm.categoryId);
-    // 获取商品单位
-    this.GET_GoodsUnit();
-    // 获取当前店铺分类
-    this.GET_ShopGoodsLabel();
+    if (this.$route.query.id || this.$route.query.draftId) {  // 编辑商品、模板
+      this.GET_GoodData(this.$route.query.id, this.$route.query.draftId)
+    } else { // 新增商品、模板
+      if (this.firstData.tempId) { // 选择模板
+        this.GET_GoodData('', this.firstData.tempId)
+      } else {
+        const cateId = []
+        this.firstData.category.forEach(cate => {
+          this.baseInfoForm.categoryName.push(cate.name)
+          cateId.push(cate.id)
+        })
+        this.categoryId = cateId[2]
+        this.baseInfoForm.categoryPath = cateId.toString()
+        this.baseInfoForm.goodsType = this.firstData.goodsType;
+        /** 获取该商城分类下 商品参数信息 */
+        this.GET_GoodsParams();
+        /** 查询品牌列表 */
+        this.getGoodsBrandList();
+        /** 查询分类绑定的规格信息 */
+        this.Get_SkuInfoByCategory(this.categoryId);
+        // 获取商品单位
+        this.GET_GoodsUnit();
+        // 获取当前店铺分类
+        this.GET_ShopGoodsLabel();
+      }
+      
+    }
+    
 }
 }
 </script>

From 4c0aec2f42c1c10f373aca6b111c2c84645c2583 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 9 Jul 2021 17:58:31 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB=EF=BC=8C=E6=94=B6=E6=AC=BE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=AD=89=E9=A1=B5=E9=9D=A2bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/home/orderCenter/OrderDetail.vue    |  4 +-
 manager/src/config/index.js                   | 16 +++---
 .../views/distribution/distributionOrder.vue  | 47 ++++++++++++-----
 .../src/views/goods/goods-manage/category.vue | 20 ++++----
 manager/src/views/order/flow/paymentLog.vue   | 50 ++++---------------
 manager/src/views/order/order/orderDetail.vue | 24 +++++++++
 manager/src/views/order/order/orderList.vue   | 37 +++-----------
 seller/src/config/index.js                    | 16 +++---
 seller/src/views/statistics/order.vue         |  8 +--
 9 files changed, 102 insertions(+), 120 deletions(-)

diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue
index 08ddc03a..bf0223fd 100644
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -80,8 +80,8 @@
         <div>
           <span>运费：</span><span>+{{ order.order.freightPrice | unitPrice("￥") }}</span><br>
         </div>
-        <div><span>优惠券：</span><span>-{{ order.order.priceDetailDTO.couponPrice || 0 | unitPrice("￥") }}</span></div>
-        <div><span>活动优惠：</span><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span></div>
+        <div v-if="order.order.priceDetailDTO.couponPrice"><span>优惠券：</span><span>-{{ order.order.priceDetailDTO.couponPrice || 0 | unitPrice("￥") }}</span></div>
+        <div v-if="order.order.discountPrice"><span>活动优惠：</span><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span></div>
         <div>
           <span>应付金额：</span>
           <span class="actrual-price">{{ order.order.flowPrice | unitPrice("￥") }}</span>
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 596645d1..deef8a67 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -17,14 +17,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: "https://common-api.pickmall.cn",
-    // buyer: "https://buyer-api.pickmall.cn",
-    // seller: "https://store-api.pickmall.cn",
-    // manager: "https://admin-api.pickmall.cn"
-    common: 'http://192.168.0.103:8890',
-    buyer: 'http://192.168.0.103:8888',
-    seller: 'http://192.168.0.103:8889',
-    manager: 'http://192.168.0.103:8887'
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+    // common: 'http://192.168.0.103:8890',
+    // buyer: 'http://192.168.0.103:8888',
+    // seller: 'http://192.168.0.103:8889',
+    // manager: 'http://192.168.0.103:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",
diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
index 0a828d92..b1f30079 100644
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -52,6 +52,9 @@
             </div>
           </div>
         </template>
+        <template slot-scope="{row}" slot="distributionOrderStatus">
+          <Tag :color="filterStatusColor(row.distributionOrderStatus)">{{filterStatus(row.distributionOrderStatus)}}</Tag>
+        </template>
       </Table>
       <Row type="flex" justify="end" class="page">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
@@ -121,20 +124,10 @@
           },
           {
             title: "状态",
-            key: "distributionOrderStatus",
-            width: 100,
-            sortable: false,
-            render: (h, params) => {
-              if (params.row.distributionOrderStatus == 'COMPLETE_CASH') {
-                return h('div', '提现完成')
-              } else if (params.row.distributionOrderStatus == 'WAIT_BILL') {
-                return h('div', '待结算')
-              } else if (params.row.distributionOrderStatus == 'WAIT_CASH') {
-                return h('div', '待提现')
-              }
-            }
+            slot: "distributionOrderStatus",
+            width: 120,
+            
           },
-
           {
             title: "佣金金额",
             key: "rebateGrade",
@@ -219,6 +212,34 @@
       },
       searchChange(val) { // 店铺搜索，键盘点击回调
         this.getShopList(val)
+      },
+      filterStatus (status) { // 过滤订单状态
+        const arr = [
+          {status: 'WAIT_BILL', title: '待结算'},
+          {status: 'WAIT_CASH', title: '待提现'},
+          {status: 'COMPLETE_CASH', title: '提现完成'},
+          {status: 'CANCEL', title: '订单取消'},
+          {status: 'REFUND', title: '退款'},
+        ]
+        for (let i=0;i<arr.length;i++) {
+          if (arr[i].status === status) {
+            return arr[i].title;
+          }
+        }
+      },
+      filterStatusColor (status) { // 状态tag标签颜色
+        const arr = [
+          {status: 'WAIT_BILL', color: 'magenta'},
+          {status: 'WAIT_CASH', color: 'warning'},
+          {status: 'COMPLETE_CASH', color: 'success'},
+          {status: 'CANCEL', color: 'default'},
+          {status: 'REFUND', color: 'error'},
+        ]
+        for (let i=0;i<arr.length;i++) {
+          if (arr[i].status === status) {
+            return arr[i].color;
+          }
+        }
       }
     },
     mounted() {
diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue
index 144de5d4..af3d2e41 100644
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -40,13 +40,8 @@
         {{ scope.row.commissionRate }}%
       </template>
 
-      <template slot="deleteFlag" slot-scope="scope">
-        <div v-if="scope.row.deleteFlag == 0">
-          <Badge text="正常启用" status="success"></Badge>
-        </div>
-        <div v-if="scope.row.deleteFlag == 1">
-          <Badge text="禁用" status="error"></Badge>
-        </div>
+      <template slot="deleteFlag" slot-scope="{row}">
+        <Tag :class="{'ml_10': row.deleteFlag}" :color="row.deleteFlag == false ? 'success' : 'error'">{{row.deleteFlag == false ? '正常启用' : '禁用'}}</Tag>
       </template>
     </Table>
 
@@ -129,7 +124,7 @@ import {
 } from "@/api/goods";
 
 import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
-
+import {regular} from "@/utils";
 export default {
   name: "lili-components",
   components: {
@@ -172,7 +167,12 @@ export default {
       brandWay: "", //请求绑定品牌的信息
       specForm: {},
       // 表单验证规则
-      formValidate: {},
+      formValidate: {
+        commissionRate: [
+          {required: true, message: '请填写佣金比例'},
+          {pattern: regular.Integer, message: "佣金比例不能为负"},
+        ]
+      },
       columns: [
         {
           title: "分类名称",
@@ -181,8 +181,6 @@ export default {
         },
         {
           title: "状态",
-          key: "deleteFlag",
-
           slot: "deleteFlag",
         },
         {
diff --git a/manager/src/views/order/flow/paymentLog.vue b/manager/src/views/order/flow/paymentLog.vue
index f0b66afe..f6a37a94 100644
--- a/manager/src/views/order/flow/paymentLog.vue
+++ b/manager/src/views/order/flow/paymentLog.vue
@@ -22,7 +22,7 @@
             </Select>
           </Form-item>
           <Form-item label="支付时间">
-            <DatePicker v-model="searchForm" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+            <DatePicker v-model="searchForm.paymentTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="changeDate" placeholder="选择支付时间" style="width: 200px"></DatePicker>
           </Form-item>
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         </Form>
@@ -53,10 +53,9 @@ export default {
         pageSize: 10, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
-        startDate: "", // 起始时间
-        endDate: "", // 终止时间
         sn: "",
         payStatus: "",
+        paymentTime: "",
       },
       columns: [
         {
@@ -151,61 +150,30 @@ export default {
     };
   },
   methods: {
-    dropDown() {
-      if (this.drop) {
-        this.dropDownContent = "展开";
-        this.dropDownIcon = "ios-arrow-down";
-      } else {
-        this.dropDownContent = "收起";
-        this.dropDownIcon = "ios-arrow-up";
-      }
-      this.drop = !this.drop;
-    },
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
     },
+    // 改变页数
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.selectDate = null;
-      this.searchForm.startDate = "";
-      this.searchForm.endDate = "";
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
-    selectDateRange(v) {
-      if (v) {
-        this.searchForm.startDate = v[0];
-        this.searchForm.endDate = v[1];
-      }
+    changeDate (val) { // 改变日期格式
+      this.searchForm.paymentTime = val
     },
+    // 获取列表
     getDataList() {
       this.loading = true;
       API_Order.paymentLog(this.searchForm).then((res) => {
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 70c04145..67767ffb 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -23,6 +23,11 @@
                 type="primary"
                 >订单取消</Button
               >
+              <Button
+                v-if="orderInfo.order.orderStatus === 'UNPAID'"
+                @click="confirmPrice"
+                type="success"
+                >收款</Button>
               <Button @click="orderLog" type="primary"
                 >订单日志</Button
               >
@@ -571,6 +576,25 @@ export default {
       this.showRegion = true;
       this.regionId = "";
     },
+    //确认收款
+    confirmPrice() {
+      this.$Modal.confirm({
+        title: "提示",
+        content:
+          "<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
+        onOk: () => {
+          API_Order.orderPay(this.sn).then((res) => {
+            if (res.success) {
+              this.$Message.success("收款成功");
+              this.getDataList();
+            } else {
+              this.$Message.error(res.message);
+            }
+          });
+        },
+      });
+    },
+    // 获取订单详情
     getDataList() {
       this.loading = true;
       API_Order.orderDetail(this.sn).then((res) => {
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 1a93e173..3998208d 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -207,20 +207,13 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
-          width: 150,
+          width: 100,
           render: (h, params) => {
-            return h("div", [h("Button", {props: {type: "primary", size: "small",},
-                attrs: {disabled: params.row.orderStatus == "UNPAID" ? false : true,},
+            return  h("Button", {props: {type: "info", size: "small",},
                 style: {marginRight: "5px",},
-                on: {click: () => {this.confirmPrice(params.row);},},
-                }, "收款"
-              ),
-              h("Button", {props: {type: "info", size: "small",},
-                  style: {marginRight: "5px",},
-                  on: {click: () => {this.detail(params.row);},},
-                }, "查看"
-              ),
-            ]);
+                on: {click: () => {this.detail(params.row);},},
+              }, "查看"
+            )
           },
         },
       ],
@@ -286,25 +279,7 @@ export default {
       this.total = this.data.length;
       this.loading = false;
     },
-    //确认收款
-    confirmPrice(v) {
-      this.$Modal.confirm({
-        title: "提示",
-        content:
-          "<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
-        onOk: () => {
-          API_Order.orderPay(v.sn).then((res) => {
-            if (res.success) {
-              this.$Message.success("收款成功");
-              this.getDataList();
-            } else {
-              this.$Message.error(res.message);
-            }
-          });
-        },
-      });
-    },
-
+    // 跳转详情页面
     detail(v) {
       let sn = v.sn;
       this.$router.push({
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index baff612e..9e225895 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'https://common-api.pickmall.cn',
-    buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn',
-    // common: 'http://192.168.0.106:8890',
-    // buyer: 'http://192.168.0.106:8888',
-    // seller: 'http://192.168.0.106:8889',
-    // manager: 'http://192.168.0.106:8887'
+    // common: 'https://common-api.pickmall.cn',
+    // buyer: 'https://buyer-api.pickmall.cn',
+    // seller: 'https://store-api.pickmall.cn',
+    // manager: 'https://admin-api.pickmall.cn',
+    common: 'http://192.168.0.103:8890',
+    buyer: 'http://192.168.0.103:8888',
+    seller: 'http://192.168.0.103:8889',
+    manager: 'http://192.168.0.103:8887'
 
   },
   api_prod: {
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index 0e8bb187..9ce0ca9e 100644
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@@ -37,7 +37,6 @@
 
               </div>
               <div class="transaction-card" v-if="item.label=='订单'">
-
                 <div class="card-item">
                   <div class="card-item-label">下单笔数</div>
                   <div class="card-item-value">{{overViewList.orderNum || 0}}</div>
@@ -48,7 +47,7 @@
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">下单金额</div>
-                  <div class="card-item-value">{{overViewList.orderAmount  ? ($options.filters.unitPrice(overViewList.orderAmount )) : 0 }}</div>
+                  <div class="card-item-value">{{overViewList.orderAmount || 0 | unitPrice('￥')}}</div>
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款笔数</div>
@@ -56,7 +55,7 @@
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款金额</div>
-                  <div class="card-item-value">{{ overViewList.paymentAmount ?  ($options.filters.unitPrice(overViewList.paymentAmount)) : 0 }}</div>
+                  <div class="card-item-value">{{ overViewList.paymentAmount || 0 | unitPrice('￥')}}</div>
                 </div>
 
               </div>
@@ -141,7 +140,6 @@
 
       </div>
     </Card>
-
     <Card class="card">
       <div>
         <h4>订退单统计</h4>
@@ -152,9 +150,7 @@
           <Table stripe :columns="columns" :data="data"></Table>
         </div>
         <Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="page" show-total show-elevator :total="total" />
-
       </div>
-
     </Card>
 
   </div>