diff --git a/manager/src/api/order.js b/manager/src/api/order.js
index 4981a96d..052ba454 100644
--- a/manager/src/api/order.js
+++ b/manager/src/api/order.js
@@ -160,3 +160,8 @@ export const refundLog = (params) => {
 export const storeAddress = (sn) => {
   return getRequest(`/order/afterSale/getStoreAfterSaleAddress/${sn}`)
 }
+
+// 订单核验
+export const orderTake = (sn, verificationCode) => {
+  return putRequest(`/order/order/take/${sn}/${verificationCode}`);
+};
diff --git a/manager/src/api/shops.js b/manager/src/api/shops.js
index 36cba3c3..972463e8 100644
--- a/manager/src/api/shops.js
+++ b/manager/src/api/shops.js
@@ -87,3 +87,11 @@ export const downloadBill = (id) => {
   return getRequest(`/order/bill/downLoad/${id}`, {}, 'blob')
 }
 
+// 获取物流模版
+export const getShipTemplate = (id) => {
+  // return getRequest(`/order/bill/shipTemplate`)
+}
+
+export const replyMemberComment = (id, params) => {
+  return putRequest(`/member/evaluation/reply/${id}`, params)
+}
diff --git a/manager/src/assets/goodsType1.png b/manager/src/assets/goodsType1.png
new file mode 100644
index 00000000..765c17c9
Binary files /dev/null and b/manager/src/assets/goodsType1.png differ
diff --git a/manager/src/assets/goodsType2.png b/manager/src/assets/goodsType2.png
new file mode 100644
index 00000000..7a957134
Binary files /dev/null and b/manager/src/assets/goodsType2.png differ
diff --git a/manager/src/assets/goodsTypeTpl.png b/manager/src/assets/goodsTypeTpl.png
new file mode 100644
index 00000000..dafa3393
Binary files /dev/null and b/manager/src/assets/goodsTypeTpl.png differ
diff --git a/manager/src/components/affix-time.vue b/manager/src/components/affix-time.vue
index a81b6d25..672e8762 100644
--- a/manager/src/components/affix-time.vue
+++ b/manager/src/components/affix-time.vue
@@ -10,14 +10,7 @@
             {{ item.year + '年' + item.month + '月' }}</Option>
         </Select>
       </div>
-      <div class="shop-list" v-if="!closeShop">
-        <Select clearable @on-change="changeshop(selectedWay)" v-model="storeId" placeholder="店铺查询"
-          style="width:200px;margin-left:10px;">
-          <Scroll :on-reach-bottom="handleReachBottom">
-            <Option v-for="(item, index) in shopsData" :value="item.id" :key="index">{{ item.storeName }}</Option>
-          </Scroll>
-        </Select>
-      </div>
+      
     </div>
   </div>
 </template>
diff --git a/manager/src/components/map/multiple-region.vue b/manager/src/components/map/multiple-region.vue
new file mode 100644
index 00000000..21f07bdc
--- /dev/null
+++ b/manager/src/components/map/multiple-region.vue
@@ -0,0 +1,222 @@
+<template>
+  <Modal :mask-closable="false" :value="switched" v-model="switched" title="选择地址" @on-ok="submit" @on-cancel="cancel">
+    <div class="flex">
+      <Spin size="large" fix v-if="spinShow"></Spin>
+      <Tree ref="tree" class="tree" :data="data" expand-node show-checkbox multiple></Tree>
+    </div>
+  </Modal>
+</template>
+<script>
+import { getAllCity } from "@/api/index";
+export default {
+  data() {
+    return {
+      switched: false, // 控制模态框显隐
+      spinShow: false, // 加载loading
+      data: [], // 地区数据
+      selectedWay: [], // 选择的地区
+      callBackData: "", // 打开组件的回显数据
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    clear() {  // 引用该组件的父组件会调用
+      this.data = [];
+      this.selectedWay = [];
+      this.init();
+    },
+    /**
+     * 关闭
+     */
+    cancel() {
+      this.switched = false;
+
+      // 关闭的时候所有数据设置成disabled为true
+      this.data.forEach((item) => {
+        this.$set(item, "disabled", false);
+        item.children.forEach((child) => {
+          this.$set(child, "disabled", false);
+        });
+      });
+    },
+
+    /**
+     * 打开地图选择器
+     * @param {val} 回调的数据
+     * @param {index} 当前操作的运费模板的索引
+     */
+    open(val, index) {
+      if (val) {
+        //已选中的地址
+        let checkedData = this.$store.state.shipTemplate;
+
+        let checkData = [];
+        let disabledData = checkedData.filter((item, i) => {
+          if (i != index) {
+            return i != index;
+          } else {
+            checkData.push(item);
+          }
+        });
+        // 选中
+        checkData.forEach((check) => {
+          // 循环出已经选中的地址id
+          check.areaId.split(",").forEach((ids) => {
+            this.data.forEach((item) => {
+              // 如果当前省份下市区全部选中则选中该省份
+              if (check.selectedAll) {
+                check.area.split(",").forEach((area) => {
+                  if (area == item.name) {
+                    this.$set(item, "checked", true);
+                  }
+                });
+              }
+
+              // 将市区继续循环
+              item.children.forEach((child, childIndex) => {
+                // 判断当前市区是否是已选中状态
+                if (item.checked) {
+                  this.$set(child, "checked", true);
+                }
+                if (child.id == ids) {
+                  this.$set(child, "checked", true);
+                }
+              });
+            });
+          });
+        });
+
+        // 禁用
+        disabledData.forEach((dis) => {
+          // 循环出已经选中的地址id
+          dis.areaId.split(",").forEach((ids) => {
+            // 循环出省份
+            this.data.forEach((item) => {
+              // 如果当前省份下市区全部选中则禁用该省份
+              if (dis.selectedAll) {
+                dis.area.split(",").forEach((area) => {
+                  if (area == item.name) {
+                    this.$set(item, "disabled", true);
+                  }
+                });
+              }
+              // 将市区继续循环
+              item.children.forEach((child, childIndex) => {
+                // 判断当前市区是否是已禁用状态
+                if (item.disabled) {
+                  this.$set(child, "disabled", true);
+                } else {
+                  if (child.id == ids) {
+                    this.$set(child, "disabled", true);
+                  }
+                }
+              });
+            });
+          });
+        });
+      }
+      this.switched ? (this.switched = true) : (this.switched = true);
+    },
+
+    /**
+     * 提交并筛选出省市
+     */
+    submit() {
+      // 筛选出省市
+      let list = this.$refs.tree.getCheckedAndIndeterminateNodes();
+
+      let sort = [];
+      list.forEach((item, i) => {
+        item.selectedList = [];
+        item.selectedAll = false;
+        // 筛选出当前的省份
+        if (item.level == "province" && !item.disabled) {
+          sort.push({
+            ...item,
+          });
+        }
+
+        // 筛选出当前选中的市
+        sort.forEach((sortItem, sortIndex) => {
+          if (
+            item.level != "province" &&
+            sortItem.id == item.parentId &&
+            !item.disabled
+          ) {
+            sortItem.selectedList.push({
+              ...item,
+            });
+          }
+        });
+      });
+
+      // 判断如果当前省是否全选
+      this.data.forEach((whether) => {
+        sort.forEach((item) => {
+          // 如果当前省匹配
+          if (
+            item.id == whether.id &&
+            item.selectedList.length == whether.children.length
+          ) {
+            // 给一个全选子级的标识符
+            item.selectedList.forEach((child) => {
+              this.$set(child, "selectedAll", true);
+            });
+            this.$set(item, "selectedAll", true);
+          }
+        });
+      });
+
+      this.$emit("selected", sort);
+
+      this.cancel();
+    },
+    // 初始化地区数据
+    init() {
+      getAllCity().then((res) => {
+        if (res.result) {
+          res.result.forEach((item) => {
+            item.children.forEach((child) => {
+              child.title = child.name;
+            });
+
+            let data = {
+              title: item.name,
+
+              ...item,
+            };
+            this.data.push(data);
+
+            this.selectedWay.push({ name: data.title, id: data.id });
+          });
+          this.$store.state.regions = this.data;
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.flex {
+  display: flex;
+  position: relative;
+}
+.tree {
+  flex: 2;
+}
+.form {
+  flex: 8;
+}
+.button-list {
+  margin-left: 80px;
+  > * {
+    margin: 0 4px;
+  }
+}
+/deep/ .ivu-modal-body {
+  height: 400px !important;
+  overflow: auto;
+}
+</style>
diff --git a/manager/src/router/router.js b/manager/src/router/router.js
index 89e9b6a7..5e16c9b4 100644
--- a/manager/src/router/router.js
+++ b/manager/src/router/router.js
@@ -31,6 +31,13 @@ export const otherRouter = {
       meta: { title: "个人中心" },
       component: () => import("@/views/personal-center/personal-center.vue")
     },
+    {
+      path: "goods-publish",
+      title: "商品发布",
+      name: "goods-publish",
+      meta: { title: "商品发布" },
+      component: () => import("@/views/goods/goodsOperation.vue")
+    },
     {
       path: "change-password",
       title: "修改密码",
diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
index 64b007bd..33116731 100644
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -20,12 +20,6 @@
             style="width: 200px"
           />
         </Form-item>
-        <Form-item label="店铺名称">
-          <Select v-model="searchForm.storeId" placeholder="请选择" @on-query-change="searchChange" filterable
-                  clearable style="width: 150px">
-            <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
-          </Select>
-        </Form-item>
         <Form-item label="订单时间">
           <DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间"
                       style="width: 210px"></DatePicker>
@@ -68,7 +62,6 @@
     getDistributionOrder
   } from "@/api/distribution";
   import {orderStatusList} from './dataJson'
-  import {getShopListData} from '@/api/shops'
   import vueQr from 'vue-qr'
 
   export default {
@@ -80,7 +73,6 @@
       return {
         timeRange: [], // 范围时间
         orderStatusList, // 订单状态列表
-        shopList: [], // 店铺列表
         distributionId: this.$route.query.id, // 分销id
         loading: true, // 表单加载状态
         searchForm: { // 搜索框初始化对象
@@ -109,12 +101,7 @@
             tooltip: true,
             minWidth:80,
           },
-          {
-            title: "店铺名称",
-            key: "storeName",
-            minWidth:80,
-            tooltip: true
-          },
+          
           {
             title: "状态",
             slot: "distributionOrderStatus",
@@ -147,7 +134,6 @@
       // 初始化数据
       init() {
         this.getDataList();
-        this.getShopList()
       },
       //分页 改变页码
       changePage(v) {
@@ -187,25 +173,7 @@
         this.total = this.data.length;
         this.loading = false;
       },
-      getShopList(val) { // 获取店铺列表 搜索用
-        const params = {
-          pageNumber: 1,
-          pageSize: 10,
-          storeName: ''
-        }
-        if (val) {
-          params.storeName = val;
-        } else {
-          params.storeName = ''
-        }
-
-        getShopListData(params).then(res => {
-          this.shopList = res.result.records
-        })
-      },
-      searchChange(val) { // 店铺搜索，键盘点击回调
-        this.getShopList(val)
-      },
+    
       filterStatus (status) { // 过滤订单状态
         const arr = [
           {status: 'WAIT_BILL', title: '待结算'},
diff --git a/manager/src/views/goods/addGoods.scss b/manager/src/views/goods/addGoods.scss
new file mode 100644
index 00000000..499380ab
--- /dev/null
+++ b/manager/src/views/goods/addGoods.scss
@@ -0,0 +1,528 @@
+/*选择商品品类*/
+.content-goods-publish {
+  padding: 15px;
+  margin: 0 auto;
+  text-align: center;
+  border-radius: 0.8em;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  background: none repeat 0 0 #fff;
+
+  /*商品品类*/
+  .goods-category {
+    min-height: 500px;
+    border-radius: 0.8em;
+    text-align: left;
+    padding: 10px;
+    background: #ededed;
+
+    ul {
+      padding: 12px 8px;
+      list-style: none;
+      width: 300px;
+      background: none repeat 0 0 #fff;
+      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+      border-radius: 0.4em;
+      display: inline-block;
+      letter-spacing: normal;
+      margin-right: 15px;
+      vertical-align: top;
+      word-spacing: normal;
+
+      li {
+        line-height: 20px;
+        padding: 10px 5px;
+        cursor: pointer;
+        color: #333;
+        font-size: 12px;
+        display: flex;
+        flex-wrap: nowrap;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+      }
+    }
+  }
+
+  /** 当前品类被选中的样式 */
+  .activeClass {
+    border-radius: 0.4em;
+    background-color: rgba($color: $theme_color, $alpha: 0.2);
+    border: 1px solid rgba($color: $theme_color, $alpha: 0.8);
+    color: #fff;
+  }
+
+  /*!*当前选择的商品品类文字*!*/
+  .current-goods-category {
+    text-align: left;
+    padding: 10px;
+    width: 100%;
+    border: 1px solid #fbeed5;
+    color: #c09853;
+    background-color: #fcf8e3;
+    margin: 10px auto;
+    padding: 8px 35px 8px 14px;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+    font-size: 12px;
+    font-weight: bold;
+  }
+}
+
+/*编辑基本信息*/
+.el-form {
+  padding-bottom: 80px;
+
+  .el-form-item {
+    width: 100%;
+    text-align: left;
+  }
+}
+
+.sku-val {
+  justify-content: flex-start;
+  flex-wrap: wrap;
+
+  >.ivu-form {
+    flex-wrap: wrap !important;
+  }
+
+  /deep/ .sku-item-content-val {
+    margin-right: 20px;
+  }
+}
+
+div.base-info-item {
+  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;
+  }
+
+  >div {
+    padding-left: 5%;
+  }
+
+  .form-item-view {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: space-between;
+    // padding-left: 80px;
+
+    .form-item-view-wholesale {
+      display: flex;
+
+      .form-item-view-wholesale-preview {
+        padding-left: 5%;
+      }
+
+    }
+
+    .layout {
+      margin-bottom: 20px;
+      width: 100%;
+      justify-content: center;
+
+      .sku-item-content {
+        margin: 20px 0;
+        display: flex;
+        width: 100% !important;
+        flex: 1;
+
+        flex-direction: column;
+        align-items: flex-start;
+        justify-content: flex-start;
+        width: 100%;
+
+        >.ivu-card-body {
+          width: 100%;
+        }
+
+        .ivu-card-body {
+          width: 100%;
+          justify-content: center;
+          align-items: flex-start;
+        }
+
+        .sku-item-content-name {
+          display: flex;
+          align-items: flex-start;
+          justify-content: flex-start;
+          width: 100%;
+        }
+      }
+    }
+
+    .shop-category-text {
+      font-size: 12px;
+    }
+  }
+
+  .form-item-view-bottom {
+    margin-bottom: 50px;
+  }
+
+  .item-goods-properts-row {
+    display: flex;
+    flex-direction: row;
+    word-break: break-all;
+    white-space: normal;
+    width: 300px;
+    height: 100px;
+  }
+
+  .item-goods-properts {
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 10px;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+  }
+
+  /** 审核信息-拒绝原因 */
+  .auth-info {
+    color: red;
+  }
+
+  .el-form-item {
+    width: 30%;
+    min-width: 300px;
+  }
+
+  .goods-name-width {
+    width: 50%;
+    min-width: 300px;
+  }
+
+  .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 7.5%;
+    text-align: left;
+    color: #999;
+    font-size: 13px;
+  }
+
+  /*teatarea*/
+  /deep/ .el-textarea {
+    width: 150%;
+  }
+
+  .seo-text {
+    width: 150%;
+  }
+}
+
+/*折叠面板*/
+.el-collapse-item {
+  /deep/ .el-collapse-item__header {
+    text-align: left;
+    background-color: #f8f8f8;
+    padding: 0 10px;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+  }
+
+  .el-form-item {
+    margin-left: 5%;
+    width: 25%;
+  }
+
+  /deep/ .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 12%;
+    text-align: left;
+    color: #999;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding: 10px 0;
+    text-align: left;
+  }
+}
+
+.success {
+  >h1 {
+    font-size: 28px;
+  }
+
+  >* {
+    margin: 10px;
+  }
+}
+
+.operation {
+  >* {
+    margin: 10px 0;
+  }
+}
+
+/*商品描述*/
+.goods-intro {
+  line-height: 40;
+}
+
+/** 底部步骤 */
+.footer {
+  width: 100%;
+  margin-top: 20px;
+  padding: 10px;
+  background-color: #ffc;
+  position: sticky;
+  bottom: 0px;
+  text-align: center;
+  z-index: 999;
+
+  >.ivu-btn {
+    margin: 0 10px;
+  }
+}
+
+/*图片上传组件第一张图设置封面*/
+.goods-images {
+  /deep/ li.el-upload-list__item:first-child {
+    position: relative;
+  }
+
+  /deep/ li.el-upload-list__item:first-child:after {
+    content: "封";
+    color: #fff;
+    font-weight: bold;
+    font-size: 12px;
+    position: absolute;
+    left: -15px;
+    top: -6px;
+    width: 40px;
+    height: 24px;
+    padding-top: 6px;
+    background: #13ce66;
+    text-align: center;
+    -webkit-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+    -webkit-box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+  }
+}
+
+.el-form-item__label {
+  word-break: break-all;
+}
+
+.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);
+}
+
+.add-sku-btn {
+  margin-top: 10px;
+}
+
+.sku-item:not(:first-child) {
+  margin-top: 10px;
+}
+
+.sku-upload-list {
+  text-align: center;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  margin-right: 8px;
+}
+
+.preview-picture {
+  width: 100%;
+  margin: 0 auto;
+  display: block;
+  // text-align: center;
+  border: 1px solid transparent;
+  // justify-self: center;
+  // align-self: center;
+}
+
+.preview-picture img {
+  width: 100%;
+  height: 100%;
+}
+
+.sku-upload-list img {
+  width: 100%;
+  height: 100%;
+}
+
+.sku-upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+
+.sku-upload-list:hover .sku-upload-list-cover {
+  display: block;
+}
+
+.sku-upload-list-cover i {
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+
+.required {
+  /deep/ .ivu-form-item-label::before {
+    content: "*";
+    display: inline-block;
+    margin-right: 4px;
+    line-height: 1;
+    font-family: SimSun;
+    font-size: 14px;
+    color: #ed4014;
+  }
+}
+
+.demo-upload-list {
+  width: 150px;
+  height: 150px;
+  text-align: center;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  display: inline-block;
+  background: #fff;
+  position: relative;
+  margin-right: 4px;
+  vertical-align: bottom;
+}
+
+.demo-upload-list img {
+  width: 100%;
+  height: 100%;
+}
+
+.demo-upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+
+  justify-content: space-between;
+  align-items: center;
+  flex-direction: column;
+}
+
+.demo-upload-list:hover .demo-upload-list-cover {
+  display: flex;
+}
+
+.demo-upload-list-cover div {
+  margin-top: 50px;
+  width: 100%;
+
+  >i {
+    width: 50%;
+    margin-top: 8px;
+    color: #fff;
+    font-size: 20px;
+    cursor: pointer;
+  }
+}
+
+.active-goods-type {
+  background: #e8e8e8;
+}
+
+.goods-type-list {
+  max-height: 500px;
+  overflow-y: auto;
+}
+
+.template-item {
+  justify-content: flex-start !important;
+}
+
+.tree-bar {
+  height: auto !important;
+  max-height: auto !important;
+  min-height: 240px !important;
+}
+
+.goods-type-item {
+  padding: 20px 0;
+  width: 100%;
+  cursor: pointer;
+  transition: 0.35s;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  /deep/ img {
+    margin-right: 20px;
+    width: 100px;
+    margin-left: 10px;
+  }
+
+
+
+  /deep/ p {
+    color: #999;
+    font-size: 14px;
+    margin-top: 10px;
+  }
+}
+
+.goods-type-item:hover {
+  background: #ededed;
+}
+
+.goods-list-box {
+  height: 450px;
+  overflow: auto;
+}
+
+h2 {
+  cursor: pointer;
+  font-size: 21px;
+  color: #333;
+}
+
+.form-item-view-wholesale-form-col {
+  height: 400px;
+}
+
+.form-item-view-wholesale-row-del {
+  display: "flex";
+  justify-content: "space-between";
+  align-items: "center";
+}
+.promise-intro-btn{
+  margin: 10px 0;
+  text-align: left;
+}
diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index 0154fdba..ebd1d0c5 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -69,6 +69,9 @@
           >搜索</Button
         >
       </Form>
+      <div class="mt_10">
+        <Button type="primary" @click="handleAdd">新增商品</Button>
+      </div>
       <Table
         :loading="loading"
         border
@@ -336,6 +339,10 @@ export default {
     };
   },
   methods: {
+    // 新增商品
+    handleAdd(){
+      this.$router.push('/goods-publish')
+    },
     // 初始化数据
     init() {
       this.getDataList();
@@ -410,7 +417,7 @@ export default {
     showDetail(v) {
       let id = v.id;
       this.$options.filters.customRouterPush({
-        name: "goods-detail",
+        name: "goods-publish",
         query: { id: id },
       })
     },
diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue
index 58e3eeaf..ec245449 100644
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -65,12 +65,6 @@
           </Button>
         </template>
 
-        <template slot="commissionRate" slot-scope="scope">
-          <priceColorScheme v-if="scope.row.commissionRate > 0" unit=""  :color="$mainColor" :value="scope.row.commissionRate">%</priceColorScheme>
-          <priceColorScheme v-else :value="scope.row.commissionRate" unit=""  >%</priceColorScheme>
-           <!-- {{ scope.row.commissionRate }}% -->
-        </template>
-
         <template slot="deleteFlag" slot-scope="{ row }">
           <Tag
             :class="{ ml_10: row.deleteFlag }"
@@ -113,9 +107,7 @@
           <FormItem label="排序值" prop="sortOrder" style="width: 345px">
             <InputNumber v-model="formAdd.sortOrder"></InputNumber>
           </FormItem>
-          <FormItem label="佣金比例(%)" prop="commissionRate" style="width: 345px">
-            <InputNumber :max="100" :min="0" v-model="formAdd.commissionRate"></InputNumber>
-          </FormItem>
+         
           <FormItem label="是否启用" prop="deleteFlag">
             <i-switch
               size="large"
@@ -240,7 +232,6 @@ export default {
       specForm: {}, // 规格数据
       // 表单验证规则
       formValidate: {
-        commissionRate: [regular.REQUIRED, regular.INTEGER],
         name: [regular.REQUIRED, regular.VARCHAR20],
         sortOrder: [regular.REQUIRED, regular.INTEGER],
       },
@@ -254,12 +245,7 @@ export default {
           title: "状态",
           slot: "deleteFlag",
         },
-        {
-          title: "佣金",
-          key: "commissionRate",
-
-          slot: "commissionRate",
-        },
+        
         {
           title: "操作",
           key: "action",
@@ -340,7 +326,7 @@ export default {
       this.modalTitle = "添加子分类";
       this.parentTitle = v.name;
       this.formAdd.level = eval(v.level + "+1");
-      this.formAdd.commissionRate = v.commissionRate;
+      this.formAdd.commissionRate = 0;
       this.showParent = true;
       delete this.formAdd.id;
       this.formAdd.parentId = v.id;
@@ -355,7 +341,7 @@ export default {
       this.formAdd.level = v.level;
       this.formAdd.parentId = v.parentId;
       this.formAdd.sortOrder = v.sortOrder;
-      this.formAdd.commissionRate = v.commissionRate;
+      this.formAdd.commissionRate = 0;
       this.formAdd.deleteFlag = v.deleteFlag;
       this.formAdd.image = v.image;
       this.showParent = false;
diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue
index e8cf4659..f9cfcd63 100644
--- a/manager/src/views/goods/goods-review/index.vue
+++ b/manager/src/views/goods/goods-review/index.vue
@@ -18,6 +18,11 @@
             <span slot="close">隐藏</span>
           </i-switch>
         </template>
+        <!-- 回复状态 -->
+        <template slot="replyStatus" slot-scope="scope">
+          <Tag v-if="scope.row.replyStatus" color="green">已回复</Tag>
+          <Tag v-if="!scope.row.replyStatus" color="red">未回复</Tag>
+        </template>
       </Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
@@ -73,22 +78,16 @@
               </div>
             </List>
           </div>
-          <div class="border-b" v-if="infoData.reply">
-            <div>
-              <div>
-                <div style="float: left"> 商家回复：</div>
-                <div style="margin-left: 60px">{{ infoData.reply }}</div>
-              </div>
-              <div v-if="infoData.haveReplyImage">
-                <div style="margin-left: 60px">
-                  <template  v-if="infoData.replyImage && infoData.replyImage.length">
-                    <img style="width: 100px;height: 110px" v-for="(img,index) in infoData.replyImage.split(',')" :key="index"
-                       :src="img" alt=""/>
-                  </template>
-                </div>
-              </div>
-            </div>
+          <div >
+            <Form ref="form" :model="replyForm" :label-width="100">
+              <FormItem prop="reply" label="平台回复">
+                <Input :disabled="infoData.reply" show-word-limit v-model="replyForm.reply" type="textarea"/>
+              </FormItem>
+              <FormItem prop="reply" label="回复图片">
+              </FormItem>
+            </Form>
           </div>
+          
         </div>
       </div>
     </Modal>
@@ -102,6 +101,10 @@ export default {
   name: "goods-review", // 会员评价
   data() {
     return {
+      replyForm:{
+        reply:'',
+        replyImage:[]
+      },
       infoData: {}, // 商品信息
       infoFlag: false, // 评价展示
       infoTitle: "", // modal名称
@@ -173,6 +176,14 @@ export default {
           align: "left",
           width: 170
         },
+
+        {
+          title: "回复状态",
+          key: "replyStatus",
+          align: "left",
+          width: 100,
+          slot: "replyStatus",
+        },
         {
           title: "页面展示",
           key: "shopDisable",
diff --git a/manager/src/views/goods/goodsOperation.vue b/manager/src/views/goods/goodsOperation.vue
new file mode 100644
index 00000000..77c41ece
--- /dev/null
+++ b/manager/src/views/goods/goodsOperation.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="goods-operation">
+    <div class="step-list">
+      <steps :current="activestep" style="height:60px;margin-top: 10px">
+        <step title="选择商品品类"/>
+        <step title="填写商品详情"/>
+        <step title="商品发布成功"/>
+      </steps>
+    </div>
+    <!-- 第一步 选择分类 -->
+    <first-step ref='first' v-show="activestep === 0" @change="getFirstData"></first-step>
+    <!-- 第二步 商品详细信息 -->
+    <second-step ref='second' :firstData="firstData" v-if="activestep === 1"></second-step>
+    <!-- 第三步 发布完成 -->
+    <third-step ref='third' v-if="activestep === 2"></third-step>
+    
+    
+  </div>
+</template>
+<script>
+import firstStep from  './goodsOperationFirst'
+import secondStep from  './goodsOperationSec'
+import thirdStep from  './goodsOperationThird'
+export default {
+  name: "addGoods",
+  components: {
+    firstStep,
+    secondStep,
+    thirdStep
+  },
+
+  data() {
+    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;
+    }
+    
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./addGoods.scss";
+</style>
diff --git a/manager/src/views/goods/goodsOperationFirst.vue b/manager/src/views/goods/goodsOperationFirst.vue
new file mode 100644
index 00000000..7653fe1a
--- /dev/null
+++ b/manager/src/views/goods/goodsOperationFirst.vue
@@ -0,0 +1,260 @@
+<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-list-box">
+          <Scroll :on-reach-bottom="handleReachBottom">
+            <div
+              class="goods-type-item template-item"
+              @click="handleClickGoodsTemplate(item)"
+              v-for="(item, tempIndex) in goodsTemplates"
+              :key="tempIndex"
+            >
+              <img :src="item.thumbnail" />
+              <div>
+                <h2>{{ item.goodsName }}</h2>
+                <p>{{ item.sellingPoint || "" }}</p>
+              </div>
+            </div>
+          </Scroll>
+        </div>
+      </div>
+    </Modal>
+    <!-- 商品分类 -->
+    <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 === 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 === 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 === item.name }"
+            @click="handleSelectCategory(item, index, 3)"
+            :key="index"
+          >
+            <span>{{ item.name }}</span>
+          </li>
+        </ul>
+      </div>
+      <p class="current-goods-category">
+        您当前选择的商品类别是：
+        <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="selectedTemplate.goodsName">
+        <Divider>已选商品模版:{{ selectedTemplate.goodsName }}</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";
+export default {
+  data() {
+    return {
+      selectedTemplate: {}, // 已选模板
+      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,
+        },
+      ],
+      // 商品分类选择数组
+      category: [
+        { name: "", id: "" },
+        { name: "", id: "" },
+        { name: "", id: "" },
+      ],
+      // 商品类型
+      goodsType: "",
+      /** 1级分类列表*/
+      categoryListLevel1: [],
+      /** 2级分类列表*/
+      categoryListLevel2: [],
+      /** 3级分类列表*/
+      categoryListLevel3: [],
+      searchParams: {
+        saveType: "TEMPLATE",
+        sort: "create_time",
+        order: "desc",
+        pageSize: 10,
+        pageNumber: 1,
+      },
+      templateTotal: 0,
+    };
+  },
+  methods: {
+    // 商品模版触底加载
+    handleReachBottom() {
+      setTimeout(() => {
+        if (
+          this.searchParams.pageNumber * this.searchParams.pageSize <=
+          this.templateTotal
+        ) {
+          this.searchParams.pageNumber++;
+          this.GET_GoodsTemplate();
+        }
+      }, 1000);
+    },
+    // 点击商品类型
+    handleClickGoodsType(val) {
+      this.goodsTypeWay.map((item) => {
+        return (item.check = false);
+      });
+
+      val.check = !val.check;
+      if (!val.type) {
+        this.GET_GoodsTemplate();
+        this.showGoodsTemplates = true;
+      } else {
+        this.goodsType = val.type;
+        this.selectedTemplate = {};
+      }
+    },
+    // 点击商品模板
+    handleClickGoodsTemplate(val) {
+      this.selectedTemplate = val;
+      this.selectGoodsType = false;
+      this.$emit("change", { tempId: val.id });
+    },
+    // 获取商品模板
+    GET_GoodsTemplate() {
+      API_GOODS.getDraftGoodsListData(this.searchParams).then((res) => {
+        if (res.success) {
+          this.goodsTemplates.push(...res.result.records);
+          this.templateTotal = res.result.total;
+        }
+      });
+    },
+    /** 选择商城商品分类 */
+    handleSelectCategory(row, index, level) {
+      if (level === 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.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.category[2].name = row.name;
+        this.category[2].id = row.id;
+      }
+    },
+    /** 查询下一级 商城商品分类*/
+    GET_NextLevelCategory(row) {
+      const _id = row && row.id !== 0 ? row.id : 0;
+      API_GOODS.getCategoryTree().then((res) => {
+        if (res.success && res.result) {
+          this.categoryListLevel1 = res.result;
+        }
+      });
+    },
+    // 下一步
+    next() {
+      window.scrollTo(0, 0);
+      if (!this.goodsType && !this.selectedTemplate.goodsName) {
+        this.$Message.error("请选择商品类型");
+        return;
+      }
+      if (!this.category[0].name) {
+        this.$Message.error("请选择商品分类");
+        return;
+      } else if (!this.category[2].name) {
+        this.$Message.error("必须选择到三级分类");
+        return;
+      } else if (this.category[2].name) {
+        let params = {
+          category: this.category,
+          goodsType: this.goodsType,
+        };
+        if (this.selectedTemplate.id) {
+          params.tempId = this.selectedTemplate.id;
+          this.$emit("change", params);
+        } else {
+          this.$emit("change", params);
+        }
+      }
+    },
+  },
+  mounted() {
+    this.GET_NextLevelCategory();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./addGoods.scss";
+/deep/ .ivu-scroll-container {
+  height: 450px !important;
+}
+</style>
diff --git a/manager/src/views/goods/goodsOperationSec.vue b/manager/src/views/goods/goodsOperationSec.vue
new file mode 100644
index 00000000..2ec73c3b
--- /dev/null
+++ b/manager/src/views/goods/goodsOperationSec.vue
@@ -0,0 +1,2023 @@
+<template>
+  <div>
+    <Modal v-model="visible" title="预览图片">
+      <img v-if="visible" :src="previewPicture" style="width: 100%">
+    </Modal>
+    <div class="content-goods-publish">
+      <Form ref="baseInfoForm" :label-width="120" :model="baseInfoForm" :rules="baseInfoFormRule">
+        <div class="base-info-item">
+          <h4>基本信息</h4>
+          <div class="form-item-view">
+            <FormItem label="商品分类">
+              <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 v-model="baseInfoForm.goodsName" clearable placeholder="商品名称" style="width: 260px"
+                     type="text"/>
+            </FormItem>
+
+            <FormItem label="商品价格" prop="price">
+              <Input v-model="baseInfoForm.price" clearable placeholder="商品价格" style="width: 260px" type="text"/>
+            </FormItem>
+            <FormItem label="商品卖点" prop="sellingPoint">
+              <Input v-model="baseInfoForm.sellingPoint" :rows="4" style="width: 260px" type="textarea"/>
+            </FormItem>
+            <FormItem label="商品品牌" prop="brandId">
+              <Select v-model="baseInfoForm.brandId" filterable style="width: 200px">
+                <Option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id"></Option>
+              </Select>
+              <Button class="refresh-icon" icon="md-refresh" shape="circle" type="text"
+                      @click="refresh('brand')"></Button>
+            </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="(item, index) in goodsUnitList" :key="index" :value="item">{{ item }}
+                </Option>
+              </Select>
+              <Button class="refresh-icon" icon="md-refresh" shape="circle" type="text"
+                      @click="refresh('goodsUnit')"></Button>
+            </FormItem>
+            <FormItem class="form-item-view-el" label="销售模式" prop="salesModel">
+              <RadioGroup v-if="baseInfoForm.goodsType != 'VIRTUAL_GOODS'" v-model="baseInfoForm.salesModel"
+                          button-style="solid" type="button" @on-change="renderTableData(skuTableData)">
+                <Radio label="RETAIL" title="零售型">零售型</Radio>
+                <Radio label="WHOLESALE" title="批发型">批发型</Radio>
+              </RadioGroup>
+              <RadioGroup v-else v-model="baseInfoForm.salesModel" button-style="solid" type="button">
+                <Radio label="RETAIL" title="零售型">
+                  <span>虚拟型</span>
+                </Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem v-if="baseInfoForm.salesModel == 'WHOLESALE'" class="form-item-view-el" label="销售规则"
+                      prop="wholesaleRule">
+              <div class="form-item-view-wholesale">
+                <div>
+                  <Table :columns="wholesaleColumns" :data="wholesaleData" border>
+                    <template slot="wholesaleNum" slot-scope="{ row, index }">
+                      <div>
+                        <Input v-model="wholesaleData[index].num" min="1" number type="number"
+                               @on-blur="checkWholesaleNum(index)">
+                        <span slot="append">{{
+                            baseInfoForm.goodsUnit || ""
+                          }}</span>
+                        </Input>
+                      </div>
+                    </template>
+                    <template slot="wholesalePrice" slot-scope="{ row, index }">
+                      <div style="
+                          display: flex;
+                          justify-content: space-between;
+                          align-items: center;
+                        ">
+                        <Input v-model="wholesaleData[index].price" min="1" number style="width: 190px" type="number"
+                               @on-blur="checkWholesalePrice(index)">
+                          <span slot="append">元</span>
+                        </Input>
+                        <Button v-if="index > 0" size="small" style="margin-left: 5px" type="error"
+                                @click="handleDeleteWholesaleData(index)">删除
+                        </Button>
+                      </div>
+                    </template>
+                  </Table>
+
+                  <Button v-if="wholesaleData.length < 3" icon="md-add" style="margin-top: 10px"
+                          @click="handleAddWholesaleData()">
+                    添加价格区间
+                  </Button>
+                </div>
+                <div class="form-item-view-wholesale-preview">
+                  <Table :columns="wholesalePreviewColumns" :data="wholesaleData" border></Table>
+                </div>
+              </div>
+            </FormItem>
+          </div>
+          <h4>商品规格及图片</h4>
+          <div class="form-item-view">
+            <FormItem class="form-item-view-el required" label="主图" prop="goodsGalleryFiles">
+              <div style="display: flex; flex-wrap: wrap;">
+                <vuedraggable :animation="200" :list="baseInfoForm.goodsGalleryFiles">
+                  <div v-for="(item, __index) in baseInfoForm.goodsGalleryFiles" :key="__index"
+                       class="demo-upload-list">
+                    <template>
+                      <img :src="item"/>
+                      <div class="demo-upload-list-cover">
+                        <div>
+                          <Icon size="30" type="md-search" @click.native="handleViewGoodsPicture(item)"></Icon>
+                          <Icon size="30" type="md-trash" @click.native="handleRemoveGoodsPicture(item)"></Icon>
+                        </div>
+                      </div>
+                    </template>
+                  </div>
+                </vuedraggable>
+                <!--<Upload ref="upload"-->
+                        <!--:action="uploadFileUrl" :before-upload="handleBeforeUploadGoodsPicture"-->
+                        <!--:format="['jpg', 'jpeg', 'png', 'webp']"-->
+                        <!--:headers="{ ...accessToken }"-->
+                        <!--:max-size="2048" :on-error="() => { $Spin.hide(); }" :on-exceeded-size="handleMaxSize"-->
+                        <!--:on-format-error="handleFormatError" :on-progress="() => { $Spin.show(); }"-->
+                        <!--:on-success="handleSuccessGoodsPicture" :show-upload-list="false" multiple-->
+                        <!--style="margin-left: 10px"-->
+                        <!--type="drag">-->
+                  <!--<div style="width: 148px; height: 148px; line-height: 148px">-->
+                    <!--<Icon size="20" type="md-add"></Icon>-->
+                  <!--</div>-->
+                <!--</Upload>-->
+              </div>
+              <div style="width: 100%;display: flex;justify-content: start;margin-top: 10px;">
+                <Button @click="handleCLickImg('goodsGalleryFiles')" type="primary">上传图片</Button>
+              </div>
+              <Modal v-model="goodsPictureVisible" title="View Image">
+                <img v-if="goodsPictureVisible" :src="previewGoodsPicture" style="width: 100%"/>
+              </Modal>
+            </FormItem>
+            <FormItem>
+              <div style="color: grey">主图仅支持png，jpg，jpeg格式，宽高至少600*600px，大小2M内，可拖拽调整主图顺序</div>
+            </FormItem>
+            <FormItem class="form-item-view-el" label="主图视频" prop="goodsVideo">
+              <div class="goods-video">
+                <div v-if="baseInfoForm.goodsVideo">
+                  <div>
+                    <video :src="baseInfoForm.goodsVideo" class="video" controls style="max-width: 300px;"/>
+                  </div>
+                </div>
+                <Upload ref="upload" :action="uploadFileUrl" :format="['avi', 'wmv', 'mpeg', 'mp4', 'mov']"
+                        :headers="{ ...accessToken }"
+                        :max-size="10240" :on-error="() => { loadingVideo = false }"
+                        :on-exceeded-size="handleVideoMaxSize"
+                        :on-format-error="handleFormatError" :on-progress="() => { loadingVideo = true }"
+                        :on-success="handleSuccessGoodsVideo" :show-upload-list="false"
+                        multiple
+                        style="margin-left: 10px" type="drag">
+                  <Button :loading="loadingVideo" icon="ios-cloud-upload-outline" type="text">
+                    <span v-if="!loadingVideo">
+                    {{ baseInfoForm.goodsVideo ? "已" : "" }}上传视频
+                    </span>
+                    <span v-else>
+                    正在上传...
+                    </span>
+                  </Button>
+                </Upload>
+              </div>
+            </FormItem>
+            <div class="layout" style="width: 100%">
+              <Collapse v-model="open_panel">
+                <Panel name="1">
+                  自定义规格项
+                  <div slot="content">
+                    <Form>
+                      <div v-for="(item, $index) in skuInfo" :key="$index" class="sku-item-content">
+                        <Card :bordered="true" class="ivu-card-body">
+                          <a slot="extra" style="margin-left: 6px">
+                            <Icon size="20" type="md-trash"  @click="handleCloseSkuItem($index, item)"></Icon>
+                          </a>
+                          <div>
+                            <div style="display: flex;margin-bottom: 10px;font-weight: bold">规格项</div>
+                            <FormItem class="sku-item-content-val flex" label="">
+
+                              <div>
+                                <AutoComplete v-model="item.name" :filter-method="filterMethod"
+                                              :maxlength="30" placeholder="请输入规格项名称" style="width: 150px"
+                                              @on-focus="changeSkuItem(item.name)" @on-change="editSkuItem(item.name, $index, item)">
+                                </AutoComplete>
+
+                                <iSwitch v-if="$index === 0" style="margin-left: 10px" size="small" @on-change="changeSkuOpenImage" v-model="openImage" /><span v-if="$index === 0" style="margin-left: 5px">添加规格图片</span>
+                              </div>
+                            </FormItem>
+
+                          </div>
+                          <div class="sku-val">
+                            <div style="margin-bottom: 10px;font-weight: bold;display: flex">规格值</div>
+                            <Form :model="item" class="flex">
+                              <!--规格值文本列表-->
+                              <FormItem v-for="(val, index) in item.spec_values" :key="index"
+                                        class="sku-item-content-val flex" label="" style="line-height: 32px;">
+                                <div style="display: flex; justify-content: center; align-items: center;">
+
+
+                                  <AutoComplete ref="input" v-model="val.value"
+                                                :filter-method="filterMethod"
+                                                :maxlength="30" placeholder="请输入规格值" style="width: 180px"
+                                                @on-focus="changeSkuVals(val, item.name)"
+                                                @on-blur="checkSkuVal(val, $index, item)"
+                                                @on-change="skuValueChange(val, index, item)">
+                                  </AutoComplete>
+                                  <a style="margin-left: 6px" v-if="val.value && val.value !== ''">
+                                    <Icon size="15" type="md-trash" @click="handleCloseSkuValue(val, index, item)"></Icon>
+                                  </a>
+                                </div>
+                                <div v-if="$index === 0 && openImage" style="margin-top: 10px">
+                                  <vuedraggable :animation="200" :list="val.images"
+                                  >
+                                    <div v-for="(img, __index) in val.images" :key="__index"
+                                         class="sku-upload-list"
+                                         style="width: 180px;height: 140px">
+                                      <template>
+                                        <img
+                                          :src="img"
+                                          style="width: 180px;height: 140px"
+                                        />
+                                        <div class="sku-upload-list-cover">
+                                          <div style="margin-top: 50px" >
+                                            <Icon size="25" type="md-search" @click="handleView(img)"></Icon>
+                                            <Icon size="25" type="md-trash" @click="handleRemove(val.images, __index)"></Icon>
+                                          </div>
+                                        </div>
+                                      </template>
+                                    </div>
+                                  </vuedraggable>
+                                  <Upload ref="uploadSku" :action="uploadFileUrl"
+                                          v-if="val.images < 1"
+                                          :before-upload="handleBeforeUpload"
+                                          :format="['jpg', 'jpeg', 'png', 'webp']"
+                                          :headers="{ ...accessToken }"
+                                          :max-size="2048"
+                                          :on-error="() => { $Spin.hide(); }"
+                                          :on-exceeded-size="handleMaxSize"
+                                          :on-format-error="handleFormatError"
+                                          :on-progress="() => { $Spin.show(); }"
+                                          :on-success="(res, file) => {
+                                              handleSuccess(res, file, val.images)
+                                            }"
+                                          :show-upload-list="false"
+                                          style="width: 180px;height: 140px;margin-right: 10px" type="drag">
+                                    <div>
+                                      <Icon size="136" type="ios-camera"></Icon>
+                                    </div>
+                                  </Upload>
+                                </div>
+                              </FormItem>
+
+                              <FormItem v-if="item.spec_values.length < 10 && item.spec_values.length >= 1 && item.spec_values[0].value !== ''" class="sku-item-content-val flex" label="" style="line-height: 32px;">
+                                <AutoComplete ref="input" v-model="newSkuValues[$index]"
+                                              :filter-method="filterMethod"
+                                              :maxlength="30" placeholder="自定义规格值" style="width: 180px"
+                                              @on-blur="addSpec($index, item)"
+                                              v-on:keyup.native.enter="addSpec($index, item)">
+                                </AutoComplete>
+                              </FormItem>
+                            </Form>
+                          </div>
+                        </Card>
+                      </div>
+                    </Form>
+                    <div style="display: flex">
+                      <Button class="add-sku-btn" type="primary" @click="addSkuItem">添加规格项
+                      </Button>
+                    </div>
+                    &nbsp;
+                    <!--                    <Button class="add-sku-btn" size="small" type="warning" @click="handleClearSku">清空规格项-->
+                    <!--                    </Button>-->
+                  </div>
+                </Panel>
+                <Panel name="2">
+                  规格详细
+                  <div slot="content">
+                    <div v-if="needToloadSku" class="topinfo" @click="handleLoadingSkuData">点击加载sku数据</div>
+                    <div slot="content" :class="needToloadSku ? 'mask': ''">
+                      <Table :columns="skuTableColumn" :data="skuTableData" class="mt_10" style="
+                          width: 100%;
+                          .ivu-table-overflowX {
+                            overflow-x: hidden;
+                          }
+                        ">
+                        <template slot="sn" slot-scope="{ row }">
+                          <Input v-model="row.sn" clearable placeholder="请输入货号"
+                                 @on-change="updateSkuTable(row, 'sn')"/>
+                        </template>
+                        <div v-if="baseInfoForm.goodsType !== 'VIRTUAL_GOODS'" slot="weight" slot-scope="{ row }">
+                          <Input v-model="row.weight" clearable placeholder="请输入重量"
+                                 @on-change="updateSkuTable(row, 'weight')">
+                            <span slot="append">kg</span>
+                          </Input>
+                        </div>
+                        <template slot="quantity" slot-scope="{ row }">
+                          <Input v-model="row.quantity" clearable placeholder="请输入库存"
+                                 @on-change="updateSkuTable(row, 'quantity')">
+                          <span slot="append">{{
+                              baseInfoForm.goodsUnit || ""
+                            }}</span>
+                          </Input>
+                        </template>
+                        <template slot="cost" slot-scope="{ row }">
+                          <Input v-model="row.cost" clearable placeholder="请输入成本价"
+                                 @on-change="updateSkuTable(row, 'cost')">
+                            <span slot="append">元</span>
+                          </Input>
+                        </template>
+                        <template slot="price" slot-scope="{ row }">
+                          <Input v-model="row.price" clearable placeholder="请输入价格"
+                                 @on-change="updateSkuTable(row, 'price')">
+                            <span slot="append">元</span>
+                          </Input>
+                        </template>
+                        <template slot="wholePrice0" slot-scope="{ row }">
+                          <Input v-if="wholesaleData[0]" v-model="wholesaleData[0].price" clearable disabled>
+                            <span slot="append">元</span>
+                          </Input>
+                        </template>
+                        <template slot="wholePrice1" slot-scope="{ row }">
+                          <Input v-if="wholesaleData[1]" v-model="wholesaleData[1].price" clearable disabled>
+                            <span slot="append">元</span>
+                          </Input>
+                        </template>
+                        <template slot="wholePrice2" slot-scope="{ row }">
+                          <Input v-if="wholesaleData[2]" v-model="wholesaleData[2].price" clearable disabled>
+                            <span slot="append">元</span>
+                          </Input>
+                        </template>
+                      </Table>
+                    </div>
+                  </div>
+                </Panel>
+              </Collapse>
+            </div>
+          </div>
+          <h4 v-if="showContent">规格描述内容</h4>
+          <div v-if="showContent" class="form-item-view">
+            <div>
+              <FormItem :label="contentImage" class="form-item-view-el">
+                <!-- {{item.url}} -->
+                <div v-for="(item, index) in listImages.images" :key="index" style="width:100%;display:flex;">
+                  <img :src="item.url" style="width:100px;flex:1;margin-top:10px;cursor:pointer;"
+                       @click="handleView(item.url)"/>
+                </div>
+              </FormItem>
+            </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" :check-strictly="false" :data="shopCategory" show-checkbox style="text-align: left"
+                      @on-select-change="selectTree" @on-check-change="changeSelect"></Tree>
+              </FormItem>
+            </div>
+            <FormItem class="form-item-view-el" label="PC商品描述" prop="intro" style="width: 100%">
+              <editor
+                ref="editor"
+                v-model="baseInfoForm.intro"
+                height="800px"
+                openXss
+              ></editor>
+              <div class="promise-intro-btn">
+                <Button type="primary" @click="promiseIntroEditor">将PC商品描述同步到移动端描述
+                </Button>
+              </div>
+            </FormItem>
+
+            <FormItem class="form-item-view-el" label="移动端描述" prop="skuList" style="width: 100%">
+              <editor
+                ref="introEditor"
+                v-model="baseInfoForm.mobileIntro"
+                height="800px"
+                openXss
+              ></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="templateId">
+                <Select v-model="baseInfoForm.templateId" style="width: 200px">
+                  <Option v-for="item in logisticsTemplate" :key="item.id" :value="item.id">{{ item.name }}
+                  </Option>
+                </Select>
+                <Button class="refresh-icon" icon="md-refresh" shape="circle" type="text"
+                        @click="refresh('template')"></Button>
+              </FormItem>
+              <FormItem v-if="baseInfoForm.salesModel == 'WHOLESALE'" class="form-item-view-el" label="商品重量"
+                        prop="weight">
+                <Input v-model="baseInfoForm.weight" placeholder="请输入商品重量">
+                  <span slot="append">kg</span></Input>
+              </FormItem>
+            </div>
+            <h4>其他信息</h4>
+            <div class="form-item-view">
+              <FormItem class="form-item-view-el" label="商品发布" prop="release">
+                <RadioGroup v-model="baseInfoForm.release" button-style="solid" type="button">
+                  <Radio :label="1" title="立即发布">
+                    <span>立即发布</span>
+                  </Radio>
+                  <Radio :label="0" title="放入仓库">
+                    <span>放入仓库</span>
+                  </Radio>
+                </RadioGroup>
+              </FormItem>
+              <FormItem class="form-item-view-el" label="商品推荐" prop="skuList">
+                <RadioGroup v-model="baseInfoForm.recommend" button-style="solid" type="button">
+                  <Radio :label="1" title="推荐">
+                    <span>推荐</span>
+                  </Radio>
+                  <Radio :label="0" title="不推荐">
+                    <span>不推荐</span>
+                  </Radio>
+                </RadioGroup>
+              </FormItem>
+            </div>
+            <div class="form-item-view-bottom">
+              <Collapse v-for="(paramsGroup, groupIndex) in goodsParams" :key="paramsGroup.groupName"
+                        v-model="params_panel" :title="paramsGroup.groupName" class="mb_10" style="text-align: left">
+                <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" clearable placeholder="请选择" style="width: 200px"
+                              @on-change="
+                        selectParams(
+                          paramsGroup,
+                          groupIndex,
+                          params,
+                          paramsIndex,
+                          params.paramValue
+                        )
+                        ">
+                        <Option v-for="option in params.options.split(',')" :key="option" :label="option"
+                                :value="option">
+                        </Option>
+                      </Select>
+                    </FormItem>
+                  </p>
+                </Panel>
+              </Collapse>
+            </div>
+          </div>
+        </div>
+      </Form>
+    </div>
+    <!-- 底部按钮 -->
+    <div class="footer">
+      <ButtonGroup>
+        <Button type="primary" @click="pre">上一步</Button>
+        <Button :loading="submitLoading" type="primary" @click="save">
+          {{ this.$route.query.id ? "保存" : "保存商品" }}
+        </Button>
+        <Button type="primary" @click="saveToDraft">保存为模版</Button>
+      </ButtonGroup>
+    </div>
+
+    <Modal v-model="showGoodsVideo" title="查看视频">
+      <div id="dplayer">
+
+      </div>
+    </Modal>
+
+    <!--<Modal width="1200px" v-model="picModelFlag">-->
+    <!--<ossManage @callback="callbackSelected" ref="ossManage" />-->
+    <!--</Modal>-->
+    <Modal v-model="picModelFlag" width="1200px" @on-ok="confirmUrls">
+      <ossManage ref="ossManage" :isComponent="true" :initialize="picModelFlag" @callback="callbackSelected" @selected="(list)=>{ selectedImage = list}"/>
+    </Modal>
+
+  </div>
+</template>
+<script>
+import * as API_GOODS from "@/api/goods";
+import * as API_Shop from "@/api/shops";
+import cloneObj from "@/utils/index";
+import vuedraggable from "vuedraggable";
+import tinymec from "@/components/editor/index.vue";
+
+import {uploadFile} from "@/libs/axios";
+import {regular} from "@/utils";
+import DPlayer from 'dplayer';
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/sys/oss-manage/ossManage";
+
+
+export default {
+  name: "goodsOperationSec",
+  components: {
+    editor: tinymec,
+    vuedraggable,
+    ossManage
+  },
+  props: {
+    firstData: {
+      default: {},
+      type: Object,
+    },
+  },
+  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);
+    };
+    return {
+      regular,
+      openImage: false,
+      needToloadSku: false,
+      total: 0,
+      goodsVideo: "",
+      showContent: false,
+      loadingVideo: false,
+      listImages: [],
+      newSkuValues: [],
+      contentImage: "",
+      previewImage: '', // 预览图片地址
+      global: 0,
+      accessToken: "", //令牌token
+      goodsParams: "",
+      categoryId: "", // 商品分类第三级id
+      //提交状态
+      submitLoading: false,
+      //上传图片路径
+      uploadFileUrl: uploadFile,
+      // 预览图片路径
+      previewPicture: "",
+      //商品图片
+      previewGoodsPicture: "",
+      //展示图片层
+      visible: false,
+      //展示商品图片
+      goodsPictureVisible: false,
+      //展示sku图片
+      showSkuPicture: false,
+      //选择的sku
+      selectedSku: {},
+      wholesalePreviewColumns: [
+        {
+          title: "销售规则",
+          width: 300,
+          render: (h, params) => {
+            let guide =
+              "当商品购买数量 ≥" +
+              params.row.num +
+              " 时，售价为 ￥" +
+              params.row.price +
+              " /" +
+              this.baseInfoForm.goodsUnit;
+            return h("div", guide);
+          },
+        },
+      ],
+      wholesaleColumns: [
+        {
+          title: "购买数量",
+          key: "num",
+          align: "center",
+          slot: "wholesaleNum",
+        },
+        {
+          title: "商品单价",
+          key: "price",
+          align: "center",
+          width: "280px",
+          slot: "wholesalePrice",
+        },
+      ],
+      wholesaleData: [
+        {
+          num: 0,
+          price: 0,
+          goodsId: this.goodsId,
+        },
+      ],
+      /** 发布商品基本参数 */
+      baseInfoForm: {
+        salesModel: "RETAIL",
+        /** 商品相册列表 */
+        goodsGalleryFiles: [],
+        /** 是否立即发布 true 立即发布 false 放入仓库 */
+        release: 1,
+        /** 是否为推荐商品 */
+        recommend: 1,
+        /** 店铺分类 */
+        storeCategoryPath: "",
+        brandId: 0,
+        /** 计量单位 **/
+        goodsUnit: "",
+        /** 商品类型 **/
+        goodsType: "",
+        /** 分类路径 **/
+        categoryPath: "",
+        /** 商品卖点 **/
+        sellingPoint: "",
+        /** 商品详情 **/
+        intro: "",
+        mobileIntro: "",
+        updateSku: true,
+        /** 是否重新生成sku */
+        regeneratorSkuFlag: false,
+        /** 物流模板id **/
+        templateId: "",
+        /** 参数组*/
+        goodsParamsDTOList: [],
+        /** 商品分类中文名 */
+        categoryName: [],
+        goodsVideo: "",
+      },
+      /** 表格头 */
+      skuTableColumn: [],
+      /** 表格数据 */
+      skuTableData: [],
+      /** 默认的规格参数 */
+      skuData: [],
+      /** 默认的规格值 */
+      skuVals: [],
+      // 某一规格名下的规格值
+      skuVal: [],
+      // 规格展开的项
+      open_panel: [1, 2],
+      /** 要提交的规格数据*/
+      skuInfo: [],
+      /** 物流模板 **/
+      logisticsTemplate: [],
+
+      /** 固定列校验提示内容 */
+      validatatxt: "请输入0~99999999之间的数字值",
+      //参数panel展示
+      params_panel: [],
+      /** 存储未通过校验的单元格位置  */
+      validateError: [],
+      baseInfoFormRule: {
+        goodsName: [regular.REQUIRED, regular.WHITE_SPACE, regular.VARCHAR60],
+        price: [regular.REQUIRED, {validator: checkPrice}],
+        sellingPoint: [regular.REQUIRED, regular.VARCHAR60],
+        goodsUnit: [{required: true, message: "请选择计量单位"}],
+        name: [regular.REQUIRED, regular.VARCHAR5],
+        value: [regular.REQUIRED, regular.VARCHAR60],
+        templateId: [regular.REQUIRED],
+        weight: [regular.REQUIRED],
+      },
+      params: {
+        pageNumber: 1,
+        pageSize: 1000,
+      },
+      currentSkuVal: "",
+      skuInfoRules: {},
+      /** 品牌列表 */
+      brandList: [],
+      /** 店铺分类列表 */
+      shopCategory: [],
+      /** 商品单位列表 */
+      goodsUnitList: [],
+      // 展示商品视频
+      showGoodsVideo: false,
+      ignoreColumn: [
+        // 添加规格时需要忽略的参数
+        "_index",
+        "_rowKey",
+        "sn",
+        // "cost",
+        "price",
+        "weight",
+        "quantity",
+        // "alertQuantity",
+        "specId",
+        "specValueId",
+      ],
+      picModelFlag: false, // 图片选择器
+      selectedFormBtnName: "", // 点击图片绑定form
+      selectedImage: [],
+      lastEditSkuValue: '',
+    };
+  },
+  watch: {
+    // 如果点击了展示商品视频，则初始化商品视频
+    showGoodsVideo(val) {
+      if (val) {
+        this.initVideo();
+      }
+    }
+  },
+  methods: {
+    // 选择图片modal
+    handleCLickImg(val, index) {
+      this.$refs.ossManage.selectImage = true;
+      this.picModelFlag = true;
+      this.selectedFormBtnName = val;
+      // this.picIndex = index;
+    },
+    handleLoadingSkuData() {
+      this.needToloadSku = false
+      this.renderTableData(this.skuTableData)
+    },
+    changeSkuOpenImage() {
+      this.skuTableData.forEach(item => {
+        item.images = []
+      })
+      if (this.skuInfo.length > 0 && this.skuInfo[0].spec_values.length > 0) {
+        this.skuInfo[0].spec_values.forEach(item => {
+          item.images = []
+        })
+      }
+    },
+    // ship大小不正确
+    handleVideoMaxSize(file) {
+      this.$Notice.warning({
+        title: "超过文件大小限制",
+        desc: "视频大小不能超过10MB",
+      });
+    },
+    onAddSku(index) {
+      if (!this.newSkuValues[index]) {
+        this.$Message.error('请输入规格值')
+        return
+      }
+      this.skuInfo[index].spec_values.push({
+        name: this.newSkuValues[index].name,
+        value: this.newSkuValues[index],
+        images: this.openImage ? [] : this.baseInfoForm.goodsGalleryFiles
+      })
+    },
+    // 图片选择后回调
+    callbackSelected(val) {
+      this.picModelFlag = false;
+      if (val && this.selectedFormBtnName == 'selectedSkuImages') {
+        this.selectedSku.images.push(val);
+      } else {
+        this.baseInfoForm[this.selectedFormBtnName].push(val.url);
+      }
+
+    },
+    confirmUrls() {
+      if (this.selectedImage && this.selectedFormBtnName == 'selectedSkuImages') {
+        this.selectedSku.images = [...this.selectedSku.images, ...this.selectedImage];
+      } else {
+        this.baseInfoForm[this.selectedFormBtnName] = [...this.baseInfoForm[this.selectedFormBtnName], ...this.selectedImage];
+      }
+    },
+    // 局部刷新
+    refresh(v) {
+      if (v == 'template') {
+        this.GET_ShipTemplate('localRefresh');
+      } else if (v == 'goodsUnit') {
+        this.goodsUnitList = []
+        this.GET_GoodsUnit('localRefresh');
+      } else {
+        this.getGoodsBrandList('localRefresh');
+      }
+    },
+    getImages(v) {
+      this.previewImage = v;
+      this.visible = true;
+    },
+    mouseOver(v) {
+      this.showContent = true
+      this.listImages = v
+      if (this.listImages.images.length <= 0) {
+        this.contentImage = '规格专属图片暂无'
+      } else {
+        this.contentImage = '当前规格专属图片'
+      }
+    },
+    mouseLeave() {
+      // this.showContent = false
+    },
+    /**
+     * 选择参数
+     * @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: "",
+          sort: "",
+        };
+      }
+      this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[
+        paramsIndex
+        ] = {
+        paramName: params.paramName,
+        paramValue: value,
+        isIndex: params.isIndex,
+        // required: params.required,
+        paramId: params.id,
+        sort: params.sort,
+      };
+    },
+    // 编辑sku图片
+    editSkuPicture(row) {
+      this.showContent = false
+      if (row.images && row.images.length > 0) {
+        this.previewPicture = row.images[0];
+      }
+      this.selectedSku = row;
+      this.showSkuPicture = true;
+    },
+    // 初始化视频操作
+    initVideo() {
+      if (this.baseInfoForm.goodsVideo) {
+        this.goodsVideo = new DPlayer({
+          container: document.getElementById('dplayer'),
+          video: {
+            url: this.baseInfoForm.goodsVideo,
+            pic: ''
+          },
+        });
+      }
+    },
+    pre() {
+      // 上一步
+      this.$parent.activestep--;
+    },
+    // 预览图片
+    handleView(url) {
+      this.previewPicture = url;
+      this.visible = true;
+    },
+    // 移除已选图片
+    handleRemove(item, index) {
+      item.splice(index, 1)
+      this.previewPicture = "";
+    },
+    // 查看商品大图
+    handleViewGoodsPicture(url) {
+      this.previewGoodsPicture = url;
+      this.goodsPictureVisible = true;
+    },
+    // 移除商品图片
+    handleRemoveGoodsPicture(file) {
+      this.baseInfoForm.goodsGalleryFiles =
+        this.baseInfoForm.goodsGalleryFiles.filter((i) => i !== file);
+    },
+    // 更新sku图片
+    updateSkuPicture() {
+      this.baseInfoForm.regeneratorSkuFlag = true;
+      let _index = this.selectedSku._index;
+      this.skuTableData[_index] = this.selectedSku;
+    },
+    // sku图片上传成功
+    handleSuccess(res, file, images) {
+      this.$Spin.hide();
+      if (file.response) {
+        file.url = file.response.result;
+        if (images) {
+          images.push(file.url);
+        } else {
+          images = [file.url];
+        }
+        this.previewPicture = file.url;
+      }
+    },
+    handleAddWholesaleData() {
+      if (
+        this.wholesaleData.length === 1 &&
+        (this.wholesaleData[0].price <= 0 || this.wholesaleData[0].num <= 0)
+      ) {
+        this.$Message.error("请输入正确的销售规则");
+        return;
+      }
+      if (this.wholesaleData.length < 3) {
+        this.wholesaleData.push({
+          price:
+            Number(this.wholesaleData[this.wholesaleData.length - 1].price) -
+            0.01,
+          num:
+            Number(this.wholesaleData[this.wholesaleData.length - 1].num) + 1,
+          goodsId: this.goodsId,
+        });
+      }
+      this.renderTableData(this.skuTableData);
+    },
+    handleDeleteWholesaleData(index) {
+      this.wholesaleData.splice(index, 1);
+      this.renderTableData(this.skuTableData);
+    },
+    checkWholesaleNum(index) {
+      if (this.wholesaleData[index].num < 0) {
+        this.$Message.error("购买数量必须大于0");
+        this.wholesaleData[index].num = 0;
+        return;
+      }
+      if (
+        index > 0 &&
+        this.wholesaleData[index - 1].num >= this.wholesaleData[index].num
+      ) {
+        this.$Notice.error({
+          title: "在批发模式的销售规则中",
+          desc: "下一个购买数量必须大于上一个购买数量",
+          duration: 5,
+        });
+        this.wholesaleData[index].num = this.wholesaleData[index - 1].num + 1;
+      }
+      this.renderTableData(this.skuTableData);
+    },
+    checkWholesalePrice(index) {
+      if (this.wholesaleData[index].price < 0) {
+        this.$Message.error("商品单价必须大于0");
+        this.wholesaleData[index].price = 0;
+        return;
+      }
+      if (
+        index > 0 &&
+        this.wholesaleData[index - 1].price <= this.wholesaleData[index].price
+      ) {
+        this.$Notice.error({
+          title: "在批发模式的销售规则中",
+          desc: "下一个商品单价必须小于上一个商品单价",
+          duration: 5,
+        });
+        this.wholesaleData[index].price =
+          this.wholesaleData[index - 1].price - 0.01;
+      }
+      this.renderTableData(this.skuTableData);
+    },
+    // 商品图片上传成功
+    handleSuccessGoodsPicture(res, file) {
+      this.$Spin.hide();
+      if (file.response) {
+        file.url = file.response.result;
+        this.baseInfoForm.goodsGalleryFiles.push(file.url);
+      }
+    },
+    // 图片格式不正确
+    handleFormatError(file) {
+      this.$Notice.warning({
+        title: "文件格式不正确",
+        desc: "文件 " + file.name + " 的格式不正确",
+      });
+    },
+    handleSuccessGoodsVideo(res, file) {
+      if (file.response) {
+        file.url = file.response.result;
+        this.baseInfoForm.goodsVideo = file.url;
+      }
+    },
+    // 图片大小不正确
+    handleMaxSize(size = 2) {
+      this.$Notice.warning({
+        title: "超过文件大小限制",
+        desc: `图片大小不能超过${size}MB`,
+      });
+    },
+    // 图片上传前钩子
+    handleBeforeUploadGoodsPicture(file) {
+      const check = this.baseInfoForm.goodsGalleryFiles.length < 5;
+      if (!check) {
+        this.$Notice.warning({
+          title: "图片数量不能大于五张",
+        });
+        return false;
+      }
+    },
+    // sku图片上传前钩子
+    handleBeforeUpload(file) {
+      const check =
+        this.selectedSku.images !== undefined &&
+        this.selectedSku.images.length > 5;
+      if (check) {
+        this.$Notice.warning({title: "图片数量不能大于五张"});
+        return false;
+      }
+    },
+
+    /** 查询商品品牌列表 */
+    getGoodsBrandList(type) {
+      API_GOODS.getCategoryBrandListDataSeller(this.categoryId).then(
+        (response) => {
+          this.brandList = response;
+          if (type === 'localRefresh') {
+            this.$Message.success("刷新成功");
+          }
+        }
+      ).catch(() => {
+        if (type === 'localRefresh') {
+          this.$Message.error("刷新失败，请重试");
+        }
+      });
+    },
+
+    // 获取商品单位
+    GET_GoodsUnit(type) {
+      API_GOODS.getGoodsUnitList(this.params).then((res) => {
+        if (res.success) {
+          this.goodsUnitList.push(...res.result.records.map((i) => i.name));
+          this.total = res.result.total;
+        }
+        if (type === 'localRefresh' && res.success) {
+          this.$Message.success("刷新成功");
+        } else if (type === 'localRefresh') {
+          this.$Message.error("刷新失败，请重试");
+        }
+      });
+    },
+   
+    // 编辑时获取商品信息
+    async GET_GoodData(id, draftId) {
+      let response = {};
+      if (draftId) {
+        response = await API_GOODS.getDraftGoodsDetail(draftId);
+      } else {
+        response = await API_GOODS.getGoods(id);
+        this.goodsId = response.result.id;
+      }
+
+      response.result.recommend
+        ? (response.result.recommend = 1)
+        : (response.result.recommend = 0);
+      this.baseInfoForm = {...this.baseInfoForm, ...response.result};
+      this.baseInfoForm.release = 1; //即使是被放入仓库，修改的时候也会显示会立即发布
+      this.categoryId = response.result.categoryPath.split(",")[2];
+
+      if (
+        response.result.goodsGalleryList &&
+        response.result.goodsGalleryList.length > 0
+      ) {
+        this.baseInfoForm.goodsGalleryFiles =
+          response.result.goodsGalleryList.map((i) => {
+            return i;
+          });
+      }
+
+      if (
+        response.result.wholesaleList &&
+        response.result.wholesaleList.length > 0
+      ) {
+        this.wholesaleData = response.result.wholesaleList;
+      }
+
+      if (response.result.salesModel === "WHOLESALE") {
+        this.baseInfoForm.weight = response.result.skuList[0].weight;
+      }
+
+      this.Get_SkuInfoByCategory(this.categoryId);
+
+      this.renderGoodsDetailSku(response.result.skuList);
+
+      /** 查询品牌列表 */
+      this.getGoodsBrandList();
+
+     
+      this.GET_GoodsUnit();
+
+      if (this.firstData.category) {
+        const cateId = [];
+        this.baseInfoForm.categoryName = [];
+        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.firstData.goodsType &&
+      (this.baseInfoForm.goodsType = this.firstData.goodsType);
+      /** 查询商品参数 */
+      this.GET_GoodsParams();
+    },
+    // 渲染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,
+          // alertQuantity: e.alertQuantity,
+          weight: e.weight,
+        };
+        if (e.goodsGalleryList && e.goodsGalleryList.length >= 1) {
+          this.openImage = true
+        } else {
+          this.openImage = false
+        }
+        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 || "",
+                    images: e.goodsGalleryList || []
+                  },
+                ],
+              });
+            } 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 || "",
+                    images: e.goodsGalleryList || []
+                  });
+                }
+                if (!sk.spec_id && u.specName === "specId") {
+                  sk.spec_id = u.specValue;
+                }
+                return sk;
+              });
+            }
+          }
+        });
+        skus.push(sku);
+      });
+      this.skuInfo = skusInfo;
+      this.skuTableData = skus;
+      this.renderTableData(skus);
+    },
+    // 将pc商品描述同步给移动端
+    promiseIntroEditor() {
+      this.$nextTick(() => {
+        this.$refs.introEditor.setContent(this.baseInfoForm.intro);
+      })
+
+      this.baseInfoForm.mobileIntro = this.baseInfoForm.intro;
+
+      this.$forceUpdate();
+    },
+
+    /** 根据当前分类id查询商品应包含的参数 */
+    GET_GoodsParams() {
+      this.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((paramsGroup) => {
+              paramsGroup.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;
+      }
+      if (this.skuInfo.find((i) => i.name === "")) {
+        this.$Message.error("规格项不能为空！");
+        return;
+      }
+      // 写入对象，下标，具体对象
+      this.$set(this.skuInfo, this.skuInfo.length, {
+        spec_values: [{name: "", value: "", images: []}],
+        name: "",
+      });
+
+      this.renderTableData(this.skuTableData);
+    },
+    changeSkuItem(val) {
+      this.currentSkuItem = val;
+    },
+    // 编辑规格名
+    editSkuItem(val, index, item) {
+      if (this.skuTableData.find((i) => i[val])) {
+        this.$Message.error("已存在相同规格项！");
+        return;
+      }
+      if (this.zz(0, val) > 20) {
+        this.$Message.error("规格值最多十个字符长度！");
+        // val = val.toString().slice(0, 4);
+        this.skuInfo[index].name = this.countCharacters(val, 10);
+        this.$forceUpdate();// 调用该方法会触发组件的重新渲染
+        // return;
+      }
+      this.skuTableData = this.skuTableData.map((e) => {
+        e[val] = e[this.currentSkuItem];
+        delete e[this.currentSkuItem];
+        return e;
+      });
+      this.currentSkuItem = val;
+      this.renderTableData(this.skuTableData);
+    },
+    // 正则验证（中文超过10个英文数字超过20个）
+    zz(len, value) {
+      for (let i = 0; i < value.length; i++) {
+        //正则表达式判断中文
+        if (/[\u4e00-\u9fa5]/.test(value[i])) {
+          len += 2;
+        } else {
+          len++;
+        }
+      }
+      return len;
+    },
+    countCharacters(defaultStr, defaultNum) {
+      let str = '' + defaultStr || '',
+        num = +defaultNum || 0,
+        res = '',
+        length = 0;
+      if (!str || !num) {
+        return str;
+      }
+      // 循环字符串，判断长度 最少也会返回一个字
+      for (const i in str) {
+        res += str[i];
+        // 测试长度
+        length += /[\u4e00-\u9fa5]/.test(str[i]) ? 2 : 1;
+        // 如果长度大于设置长度 或者 循环到最后则终止循环
+        if (length >= num || +i == str.length - 1) {
+          break;
+        }
+      }
+      return res;
+    },
+    // 编辑规格值
+    skuValueChange(val, index, item, $index) {
+      if (this.skuTableData.find((i) => i[val.name] === val.value)) {
+        this.$Message.error("已存在相同规格值！");
+        return;
+      }
+      if (val.value === '') {
+        return;
+      }
+      if (this.zz(0, val.value) > 20) {
+        this.$Message.error("规格值最多十个字符长度！");
+        // val.value = val.value.toString().slice(0, 4);
+        this.skuInfo[$index].spec_values[index].value = this.countCharacters(val.value, 10);
+        this.$forceUpdate();// 调用该方法会触发组件的重新渲染
+        // return;
+      }
+      this.lastEditSkuValue = val.value;
+      let curVal = this.currentSkuVal;
+      this.skuTableData = this.skuTableData.map((e) => {
+        if (e[val.name] === curVal) {
+          e[val.name] = val.value;
+        }
+        return e;
+      });
+      this.currentSkuVal = val.value;
+      this.renderTableData(this.skuTableData);
+    },
+    // 获取焦点时，取得规格名对应的规格值
+    changeSkuVals(val, name) {
+      this.currentSkuVal = val.value;
+      if (name) {
+        this.skuData.forEach((e, index) => {
+          if (e === name) {
+            if (this.skuVal.length !== this.skuVals[index].length) {
+              this.skuVal = this.skuVals[index];
+            }
+          }
+        });
+      }
+    },
+    checkSkuVal(val) {
+      if (val.value === "") {
+        this.$Message.error("规格值不能为空！");
+        this.skuInfo[skuIndex] && (this.skuInfo[skuIndex].spec_values = this.skuInfo[skuIndex].spec_values.filter((i) => i.value !== ""));
+        this.skuTableData = this.skuTableData.filter(
+          (e) => e[spec.name] !== this.lastEditSkuValue
+        );
+      }
+    },
+    /** 移除当前规格项 进行数据变化*/
+    handleCloseSkuItem($index, item) {
+      if ($index === 0 && this.skuInfo.length === 1) {
+        this.skuInfo = [];
+        this.skuTableData = [];
+      } else {
+        // 获取当前操作的规格项，在规格项数组中的位置（下标）
+        let itemIndex = 0;
+        this.skuInfo.forEach((i, _index) => {
+          if (i.name === item.name) {
+            itemIndex = _index;
+          }
+        });
+        if (itemIndex === this.skuInfo.length - 1) {
+          // 如果当前为最后一个规格项，则按照下标按照最后一个规格项生成规则删除
+          // 最后一个规格项生成规格数据规则： 如为最后一个规格项，则在规格列表每隔1个中删除n(n为最后一个规格项的规格值列表数量 - 1)个规格数据，生成一个规格数据
+
+          // 除了当前操作的规格项的规格项列表，用于获取所有规格项的规格值列表总数
+          let filterSkuInfo = this.skuInfo.filter((i) => i.name !== item.name);
+          let index = 1;
+          let totalLength = 1;
+          filterSkuInfo.forEach((skuInfo) => {
+            totalLength *= skuInfo.spec_values.length;
+          });
+          // 去除第一个，因为第一个不需要生成新的规格数据
+          item.spec_values.splice(0, 1);
+          for (let i = 0; i < totalLength; i++) {
+            // 移除对应的规格数据
+            this.skuTableData.splice(index, item.spec_values.length);
+            index++;
+          }
+        } else {
+          // 当前规格项生成规格数据的时候，每次应该生成的条数
+          let currentNum =
+            this.skuInfo[this.skuInfo.length - 1].spec_values.length;
+          for (let i = this.skuInfo.length - 2; i > itemIndex; i--) {
+            // 计算每次删除规格数据后移动的位置（计算规则为，以最后的规格项的规格值数量为基础，乘以其他规格项的规格值总数）
+            currentNum *= this.skuInfo[i].spec_values.length;
+          }
+          // 移除对应规格数据的起始索引，起始位置为每次生成条数的下一位
+          let beginIndex = currentNum + 1;
+
+          let filterSkuInfo = this.skuInfo.filter((i) => i.name !== item.name);
+          let totalLength = 1;
+          filterSkuInfo.forEach((skuInfo) => {
+            totalLength *= skuInfo.spec_values.length;
+          });
+          for (let i = 0; i < totalLength; i++) {
+            // 移除对应的规格数据，删除数量为 每次生成条数 * （当前规格项的规格值总数 - 1）
+            this.skuTableData.splice(
+              beginIndex,
+              currentNum * (item.spec_values.length - 1)
+            );
+            beginIndex += currentNum;
+          }
+        }
+        this.skuInfo.splice($index, 1);
+
+        this.skuTableData = this.skuTableData.map((e) => {
+          delete e[item.name];
+          return e;
+        });
+      }
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData(this.skuTableData);
+    },
+    // 添加规格值的验证
+    validateEmpty(params) {
+      let flag = true;
+      params.forEach((item) => {
+        for (const key in item) {
+          if (item[key] !== "0" && !item.value) {
+            this.$Message.error("请必填规格项");
+            flag = false;
+            return false; // 终止程序
+          }
+        }
+      });
+
+      return flag;
+    },
+    /** 添加当前规格项的规格值*/
+    addSpec($index, item) {
+      if (!this.newSkuValues[$index]) {
+        this.$Message.error("请输入规格值");
+        return;
+      }
+      if (this.validateEmpty(item.spec_values)) {
+        if (item.spec_values.length >= 10) {
+          this.$Message.error("规格值不能大于10个！");
+          return;
+        }
+        let beforeLength = item.spec_values.length;
+        let itemValue = {
+          name: item.name,
+          value: this.newSkuValues[$index],
+        };
+        if (this.openImage) {
+          itemValue.images = []
+        } else {
+          itemValue.images = this.baseInfoForm.goodsGalleryFiles
+        }
+        this.$set(item.spec_values, item.spec_values.length, itemValue);
+        if (item.spec_values.length > 1) {
+          let index = beforeLength;
+          let filterSkuInfo = this.skuInfo.filter((i) => i.name !== item.name);
+          let totalLength = 1;
+          filterSkuInfo.forEach((skuInfo) => {
+            totalLength *= skuInfo.spec_values.length;
+          });
+          if ($index === 0) {
+            index = 1;
+            for (let i = 0; i < totalLength; i++) {
+              let find = cloneObj(this.skuTableData[index - 1]);
+              find[item.name] = this.newSkuValues[$index];
+              find.id = "";
+              find.price && (find.price = "");
+              find.sn && (find.sn = "");
+              // find.cost && (find.cost = "");
+              find.quantity && (find.quantity = "");
+              // find.alertQuantity && (find.alertQuantity = "");
+              find.weight && (find.weight = "");
+
+              this.skuTableData.splice(this.skuTableData.length, 0, find);
+              index++;
+            }
+          } else {
+            for (let i = 0; i < totalLength; i++) {
+              let find = cloneObj(this.skuTableData[index - 1]);
+              find[item.name] = this.newSkuValues[$index];
+              find.id = "";
+              find.price && (find.price = "");
+              find.sn && (find.sn = "");
+              // find.cost && (find.cost = "");
+              find.quantity && (find.quantity = "");
+              // find.alertQuantity && (find.alertQuantity = "");
+              find.weight && (find.weight = "");
+
+              this.skuTableData.splice(index, 0, find);
+              index += $index === 0 ? beforeLength : beforeLength + 1;
+            }
+          }
+        }
+        this.baseInfoForm.regeneratorSkuFlag = true;
+        this.newSkuValues[$index] = "";
+      }
+    },
+    handleClearSku() {
+      this.skuInfo = [];
+      this.skuTableData = [];
+      this.renderTableData(this.skuTableData);
+    },
+    /** 移除当前规格值 */
+    handleCloseSkuValue(item, index, spec) {
+      if (spec.spec_values.length <= 1) {
+        this.$Message.error("至少保留一个规格值！");
+        return;
+      }
+      this.skuInfo.forEach((i) => {
+        if (i.name === spec.name) {
+          i.spec_values.splice(index, 1);
+        }
+      });
+      this.skuTableData = this.skuTableData.filter(
+        (e) => e[spec.name] !== item.value
+      );
+      this.baseInfoForm.regeneratorSkuFlag = true;
+    },
+
+    /**
+     * 渲染table所需要的column 和 data
+     */
+    renderTableData(skus) {
+      this.skuTableColumn = [];
+      let pushData = [];
+      // 渲染头部
+      this.skuInfo.forEach((sku) => {
+        // 列名称
+        let columnName = sku.name;
+        pushData.push({
+          title: columnName,
+          key: columnName,
+        });
+      });
+      // 有成本价和价格的情况
+      if (this.baseInfoForm.salesModel !== "WHOLESALE") {
+        pushData.push(
+          // {
+          //   title: "成本价",
+          //   slot: "cost",
+          // },
+          {
+            title: "价格",
+            slot: "price",
+          }
+        );
+      }
+
+      if (this.baseInfoForm.salesModel === "WHOLESALE" && this.wholesaleData) {
+        this.wholesaleData.forEach((item, index) => {
+          pushData.push({
+            title: "购买量 ≥ " + item.num,
+            slot: "wholePrice" + index,
+          });
+        });
+      }
+
+      // 有重量的情况
+      if (
+        this.baseInfoForm.goodsType !== "VIRTUAL_GOODS" &&
+        this.baseInfoForm.salesModel !== "WHOLESALE"
+      ) {
+        pushData.push({
+          title: "重量",
+          slot: "weight",
+        });
+      }
+      pushData.push(
+        {
+          title: "库存",
+          slot: "quantity",
+        },
+        // {
+        //   title: "库存预警",
+        //   slot: "alertQuantity",
+        // },
+        {
+          title: "货号",
+          slot: "sn",
+        },
+      );
+
+      this.skuTableColumn = pushData;
+      //克隆所有渲染的数据
+      if (this.skuInfo.length > 0) {
+        //存放最终结果
+        let result = [];
+        this.skuIndex = 0;
+
+        this.skuTableData = this.specIterator(
+          result,
+          this.skuInfo,
+          this.skuTableData
+        );
+      }
+    },
+
+    /**
+     * 迭代属性，形成表格
+     * result 渲染的数据
+     * array spec数据
+     */
+    specIterator(result, spec, skus) {
+      let table = result;
+      if (spec.length > 0) {
+        //清除当前循环的分组
+        let cloneTemp = cloneObj(spec);
+        cloneTemp.shift();
+        spec[0].spec_values.forEach((specItem) => {
+          let index = this.skuIndex;
+          if (table[index]) {
+            table[index][spec[0].name] = specItem.value;
+          } else if (skus && skus[index] && specItem.value !== "") {
+            let obj = {
+              ...skus[index],
+              id: skus[index].id,
+              sn: skus[index].sn,
+              quantity: skus[index].quantity,
+              cost: skus[index].cost,
+              price: skus[index].price,
+              // [spec[0].name]: skus[index][spec[0].name] ? skus[index][spec[0].name] : specItem.value,
+              [spec[0].name]: specItem.value,
+              images:
+                skus[index].images || this.baseInfoForm.goodsGalleryFiles || [],
+            };
+            if (specItem.value !== "") {
+              obj.id = skus[index].id;
+            }
+            if (skus[index].weight !== "") {
+              obj.weight = skus[index].weight;
+            }
+            table.push(obj);
+          } else {
+            table.push({
+              [spec[0].name]: specItem.value,
+              images: this.baseInfoForm.goodsGalleryFiles || [],
+            });
+          }
+
+          table = this.specIterator(table, cloneTemp, skus, index);
+        });
+      } else {
+        this.skuIndex++;
+      }
+      return table;
+    },
+    /** 根据分类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)));
+            });
+          }
+        });
+      }
+    },
+    // 判断相同数组的值
+    scalarArrayEquals(array1, array2) {
+      return (
+        array1.length === array2.length &&
+        array1.every(function (v, i) {
+          return v === array2[i];
+        })
+      );
+    },
+    /** 自动完成表单所需方法*/
+    filterMethod(value, option) {
+      return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
+    },
+    /** 数据改变之后 抛出数据 */
+    updateSkuTable(row, item, type = "default") {
+      let index = row._index;
+      this.baseInfoForm.regeneratorSkuFlag = true;
+      /** 进行自定义校验 判断是否是数字（小数也能通过）重量 */
+      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 === "alertQuantity") {
+      //   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.$nextTick(() => {
+        this.skuTableData[index][item] = row[item];
+      });
+      // this.$set(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);
+
+      if (ids.length > 100) {
+        this.$Message.error("选择了过多的店铺分类，请谨慎选择");
+      }
+      this.baseInfoForm.storeCategoryPath = ids;
+    },
+    /**  添加商品 **/
+    save() {
+      this.submitLoading = true;
+      this.$refs["baseInfoForm"].validate((valid) => {
+        if (valid) {
+          if (this.baseInfoForm.salesModel === "WHOLESALE") {
+            for (let i = 0; i < this.wholesaleData.length; i++) {
+              this.checkWholesaleNum(i);
+              this.checkWholesalePrice(i);
+              this.wholesaleData[i].goodsId = this.goodsId;
+            }
+            this.baseInfoForm.wholesaleList = this.wholesaleData;
+          }
+          this.baseInfoForm.goodsId = this.goodsId;
+          let submit = JSON.parse(JSON.stringify(this.baseInfoForm));
+          if (
+            submit.goodsGalleryFiles &&
+            submit.goodsGalleryFiles.length <= 0
+          ) {
+            this.submitLoading = false;
+            this.$Message.error("请上传商品图片");
+            return;
+          }
+          if (submit.templateId === "") submit.templateId = 0;
+          let flag = false;
+          let paramValue = "";
+
+          if (flag) {
+            this.$Message.error(paramValue + " 参数值不能为空");
+            this.submitLoading = false;
+            return;
+          }
+
+          if (this.goodsUnitList && !this.goodsUnitList.find(i => i === this.baseInfoForm.goodsUnit)) {
+            submit.goodsUnit = ""
+            this.$Message.error("商品单位不存在");
+            this.submitLoading = false;
+            return;
+          }
+          let skuInfoNames = this.skuInfo.map((n) => n.name);
+          submit.skuList = [];
+          let containEmptyImage = false;
+          this.skuTableData.map((sku) => {
+            let skuCopy = {
+              cost: 1,
+              price: sku.price,
+              quantity: sku.quantity,
+              // alertQuantity: sku.alertQuantity,
+              sn: sku.sn,
+              images: [],
+            };
+            if (this.openImage) {
+              this.skuInfo[0].spec_values.forEach(item => {
+                if (!item.images || item.images.length === 0) {
+                  containEmptyImage = true;
+                  return;
+                }
+                if (item.value === sku[this.skuInfo[0].name]) {
+                  skuCopy.images = item.images
+                }
+              })
+
+            }
+            if (sku.weight) {
+              skuCopy.weight = sku.weight;
+            }
+            if (this.baseInfoForm.weight) {
+              skuCopy.weight = this.baseInfoForm.weight;
+            }
+            if (sku.id) {
+              skuCopy.id = sku.id;
+            }
+            for (let skuInfoName of skuInfoNames) {
+              skuCopy[skuInfoName] = sku[skuInfoName];
+            }
+            submit.skuList.push(skuCopy);
+          });
+          if (containEmptyImage) {
+            this.$Message.error("开启规格图片，所有规格图片不能为空！");
+            this.submitLoading = false;
+            return;
+          }
+          if (submit.goodsGalleryFiles.length > 0) {
+            submit.goodsGalleryList = submit.goodsGalleryFiles.map(
+              (i) => i
+            );
+          }
+          /** 参数校验 **/
+          /* Object.keys(submit.goodsParamsList).forEach((item) => {
+          });*/
+          submit.release ? (submit.release = true) : (submit.release = false);
+          submit.recommend
+            ? (submit.recommend = true)
+            : (submit.recommend = false);
+          if (this.goodsId) {
+            API_GOODS.editGoods(this.goodsId, submit).then((res) => {
+              if (res.success) {
+                this.submitLoading = false;
+                this.$router.go(-1);
+              } else {
+                this.submitLoading = false;
+              }
+            });
+          } else {
+            API_GOODS.createGoods(submit).then((res) => {
+              if (res.success) {
+                this.submitLoading = false;
+                this.$parent.activestep = 2;
+                window.scrollTo(0, 0);
+              } else {
+                this.submitLoading = false;
+              }
+            });
+          }
+        } else {
+          this.submitLoading = false;
+
+          this.$Message.error("还有必填项未做处理，请检查表单");
+        }
+      });
+    },
+    /** 保存为模板 */
+    saveToDraft() {
+      this.baseInfoForm.skuList = this.skuTableData;
+      if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
+        this.baseInfoForm.goodsGalleryList =
+          this.baseInfoForm.goodsGalleryFiles.map((i) => i);
+      }
+      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();
+          },
+          onCancel: () => {
+            this.SAVE_DRAFT_GOODS();
+          },
+        });
+        return;
+      }
+
+      this.$Modal.confirm({
+        title: "保存模板",
+        content: "是否确定保存",
+        okText: "保存",
+        closable: true,
+        onOk: () => {
+          this.SAVE_DRAFT_GOODS();
+        },
+      });
+    },
+    SAVE_DRAFT_GOODS() {
+      if (this.baseInfoForm.salesModel === "WHOLESALE") {
+        this.baseInfoForm.wholesaleList = this.wholesaleData;
+      }
+      // 保存模板
+      API_GOODS.saveDraftGoods(this.baseInfoForm).then((res) => {
+        if (res.success) {
+          this.$Message.info("保存成功！");
+          this.$router.push({name: "template-goods"});
+        }
+      });
+    },
+    GET_ShipTemplate(type) {
+      // 获取物流模板
+      API_Shop.getShipTemplate().then((res) => {
+        if (res.success) {
+          this.logisticsTemplate = res.result;
+        }
+        if (type === 'localRefresh' && res.success) {
+          this.$Message.success("刷新成功");
+        } else if (type === 'localRefresh') {
+          this.$Message.error("刷新失败，请重试");
+        }
+      });
+    }
+  },
+  mounted() {
+    this.accessToken = {
+      accessToken: this.getStore("accessToken"),
+    };
+    this.GET_ShipTemplate()
+    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();
+       
+      }
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./addGoods.scss";
+</style>
+
+<style scoped>
+.ivu-select .ivu-select-dropdown {
+  overflow: hidden !important;
+}
+
+.editor-alert {
+  text-align: left;
+}
+
+#dplayer {
+
+}
+
+/* .tox-notifications-container{
+  display: none !important;
+} */
+.goods-video-label {
+  width: 120px;
+  text-align: right;
+  padding: 10px 12px 10px 0;
+}
+
+.goods-video {
+  align-items: center;
+}
+
+.mb-10 {
+  margin-bottom: 10px;
+}
+
+.view-video {
+  margin: 0 10px;
+}
+
+.refresh-icon {
+  margin-left: 10px;
+}
+</style>
diff --git a/manager/src/views/goods/goodsOperationThird.vue b/manager/src/views/goods/goodsOperationThird.vue
new file mode 100644
index 00000000..b2b90859
--- /dev/null
+++ b/manager/src/views/goods/goodsOperationThird.vue
@@ -0,0 +1,38 @@
+<template>
+  <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 {
+  methods: {
+     // 跳转商品列表
+    gotoGoodsList() {
+      this.$router.push({name: "goods"});
+    },
+    // 刷新页面
+    gotoBack() {
+      this.$router.go();
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+  @import "./addGoods.scss";
+</style>
\ No newline at end of file
diff --git a/manager/src/views/logistics/company.vue b/manager/src/views/logistics/company.vue
new file mode 100644
index 00000000..b332dd7f
--- /dev/null
+++ b/manager/src/views/logistics/company.vue
@@ -0,0 +1,321 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row class="operation padding-row">
+        <Button @click="add" type="primary">添加</Button>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+      >
+        <!-- 页面展示 -->
+        <template slot="disableSlot" slot-scope="{row}">
+          <i-switch size="large"  :true-value="true" :false-value="false"  :value="row.switch" @on-change="changeSwitch(row)">
+            <span slot="open">开启</span>
+            <span slot="close">禁用</span>
+          </i-switch>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="mt_10">
+        <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>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="120" :rules="formValidate">
+        <FormItem label="物流公司名称" prop="name">
+          <Input v-model="form.name" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="物流公司代码" prop="code">
+          <Input v-model="form.code" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="支持电子面单">
+          <i-switch   v-model="form.standBy" size="large">
+            <span slot="open">开</span>
+            <span slot="close">关</span>
+          </i-switch>
+        </FormItem>
+
+        <FormItem label="禁用状态" prop="disabled">
+
+          <i-switch true-value="OPEN" false-value="CLOSE" v-model="form.disabled" size="large">
+            <span slot="open">开启</span>
+            <span slot="close">禁用</span>
+          </i-switch>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import {
+    getLogisticsPage,
+    updateLogistics,
+    addLogistics,
+    delLogistics,
+  } from "@/api/logistics";
+
+  export default {
+    name: "logistics",
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        modalVisible: false, // 添加或编辑显示
+        modalTitle: "", // 添加或编辑标题
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          name: "",
+        },
+        form: {
+          // 添加或编辑表单对象初始化数据
+          name: "",
+          disabled:"CLOSE"
+        },
+        // 表单验证规则
+        formValidate: {
+          name: [
+            {
+              required: true,
+              message: "请输入物流公司名称",
+              trigger: "blur",
+            },
+          ],
+        },
+        submitLoading: false, // 添加或编辑提交状态
+        columns: [
+          {
+            title: "物流公司名称",
+            key: "name",
+            minWidth: 120,
+            sortable: false,
+          },
+          {
+            title: "物流公司编码",
+            key: "code",
+            minWidth: 120,
+            sortable: false,
+          },
+          {
+            title: "状态",
+            key: "disabled",
+            width: 150,
+            slot: "disableSlot",
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+            width: 180,
+            sortable: false,
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 150,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "修改"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.remove(params.row);
+                      },
+                    },
+                  },
+                  "删除"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      // 初始化
+      init() {
+        this.getDataList();
+      },
+      // 分页 改变页码
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+      },
+      // 分页 改变页数
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      // 获取列表
+      getDataList() {
+        this.loading = true;
+
+        getLogisticsPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            const data = res.result.records;
+            data.forEach(e => {
+              e.switch = e.disabled === 'OPEN' ? true : false;
+              e.standBy = e.standBy == 'null' || !e.standBy ? false : true;
+            });
+            this.data = data;
+            console.log(data)
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      // switch 切换状态
+      changeSwitch (v) {
+        this.form.name = v.name;
+        this.form.code = v.code;
+        this.form.standBy = v.standBy;
+
+        this.form.disabled = v.disabled === 'CLOSE' ? 'OPEN' : 'CLOSE';
+        updateLogistics(v.id, this.form).then((res) => {
+          if (res.success) {
+            this.$Message.success("操作成功");
+            this.getDataList();
+          }
+        });
+      },
+      // 确认提交
+      handleSubmit() {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.submitLoading = true;
+
+            if (this.modalTitle == "添加") {
+              // 添加 避免编辑后传入id等数据 记得删除
+              delete this.form.id;
+
+
+              addLogistics(this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            } else {
+              // 编辑
+              updateLogistics(this.id, this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            }
+          }
+        });
+      },
+      // 添加信息
+      add() {
+        this.modalTitle = "添加";
+        this.form = {};
+        this.$refs.form.resetFields();
+
+        this.modalVisible = true;
+      },
+      // 编辑
+      detail(v) {
+        this.id = v.id;
+        this.modalTitle = "修改";
+        this.modalVisible = true;
+
+        this.form.name = v.name;
+        this.form.code = v.code;
+        console.log(v)
+        this.form.standBy = v.standBy;
+
+
+
+
+        this.form.disabled = v.disabled
+      },
+      // 删除物流公司
+      remove(v) {
+        this.$Modal.confirm({
+          title: "确认删除",
+          // 记得确认修改此处
+          content: "您确认要删除 " + v.name + " ?",
+          loading: true,
+          onOk: () => {
+            // 删除
+            delLogistics(v.id).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
diff --git a/manager/src/views/logistics/index.vue b/manager/src/views/logistics/index.vue
index b332dd7f..ada85b41 100644
--- a/manager/src/views/logistics/index.vue
+++ b/manager/src/views/logistics/index.vue
@@ -1,321 +1,32 @@
 <template>
-  <div class="search">
-    <Card>
-      <Row class="operation padding-row">
-        <Button @click="add" type="primary">添加</Button>
-      </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-      >
-        <!-- 页面展示 -->
-        <template slot="disableSlot" slot-scope="{row}">
-          <i-switch size="large"  :true-value="true" :false-value="false"  :value="row.switch" @on-change="changeSwitch(row)">
-            <span slot="open">开启</span>
-            <span slot="close">禁用</span>
-          </i-switch>
-        </template>
-      </Table>
-      <Row type="flex" justify="end" class="mt_10">
-        <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>
-    <Modal
-      :title="modalTitle"
-      v-model="modalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
-      <Form ref="form" :model="form" :label-width="120" :rules="formValidate">
-        <FormItem label="物流公司名称" prop="name">
-          <Input v-model="form.name" clearable style="width: 100%"/>
-        </FormItem>
-        <FormItem label="物流公司代码" prop="code">
-          <Input v-model="form.code" clearable style="width: 100%"/>
-        </FormItem>
-        <FormItem label="支持电子面单">
-          <i-switch   v-model="form.standBy" size="large">
-            <span slot="open">开</span>
-            <span slot="close">关</span>
-          </i-switch>
-        </FormItem>
-
-        <FormItem label="禁用状态" prop="disabled">
-
-          <i-switch true-value="OPEN" false-value="CLOSE" v-model="form.disabled" size="large">
-            <span slot="open">开启</span>
-            <span slot="close">禁用</span>
-          </i-switch>
-        </FormItem>
-      </Form>
-      <div slot="footer">
-        <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
-        >提交
-        </Button
-        >
-      </div>
-    </Modal>
-  </div>
+  <Card>
+    <Tabs :value="type">
+        <TabPane label="物流公司" name="company">
+          <company/>
+        </TabPane>
+        <TabPane label="物流模版" name="template">
+          <!-- <shipTemplate/> -->
+        </TabPane>
+    </Tabs>
+  </Card>
 </template>
 
 <script>
-  import {
-    getLogisticsPage,
-    updateLogistics,
-    addLogistics,
-    delLogistics,
-  } from "@/api/logistics";
-
+import company from './company.vue'
+import shipTemplate from './shipTemplate.vue';
   export default {
-    name: "logistics",
-    data() {
-      return {
-        loading: true, // 表单加载状态
-        modalVisible: false, // 添加或编辑显示
-        modalTitle: "", // 添加或编辑标题
-        searchForm: {
-          // 搜索框初始化对象
-          pageNumber: 1, // 当前页数
-          pageSize: 20, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
-          name: "",
-        },
-        form: {
-          // 添加或编辑表单对象初始化数据
-          name: "",
-          disabled:"CLOSE"
-        },
-        // 表单验证规则
-        formValidate: {
-          name: [
-            {
-              required: true,
-              message: "请输入物流公司名称",
-              trigger: "blur",
-            },
-          ],
-        },
-        submitLoading: false, // 添加或编辑提交状态
-        columns: [
-          {
-            title: "物流公司名称",
-            key: "name",
-            minWidth: 120,
-            sortable: false,
-          },
-          {
-            title: "物流公司编码",
-            key: "code",
-            minWidth: 120,
-            sortable: false,
-          },
-          {
-            title: "状态",
-            key: "disabled",
-            width: 150,
-            slot: "disableSlot",
-          },
-          {
-            title: "创建时间",
-            key: "createTime",
-            width: 180,
-            sortable: false,
-          },
-          {
-            title: "操作",
-            key: "action",
-            align: "center",
-            width: 150,
-            render: (h, params) => {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.detail(params.row);
-                      },
-                    },
-                  },
-                  "修改"
-                ),
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "error",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.remove(params.row);
-                      },
-                    },
-                  },
-                  "删除"
-                ),
-              ]);
-            },
-          },
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-      };
+    components:{
+      company,
+      shipTemplate
     },
-    methods: {
-      // 初始化
-      init() {
-        this.getDataList();
-      },
-      // 分页 改变页码
-      changePage(v) {
-        this.searchForm.pageNumber = v;
-        this.getDataList();
-      },
-      // 分页 改变页数
-      changePageSize(v) {
-        this.searchForm.pageSize = v;
-        this.getDataList();
-      },
-      // 获取列表
-      getDataList() {
-        this.loading = true;
-
-        getLogisticsPage(this.searchForm).then((res) => {
-          this.loading = false;
-          if (res.success) {
-            const data = res.result.records;
-            data.forEach(e => {
-              e.switch = e.disabled === 'OPEN' ? true : false;
-              e.standBy = e.standBy == 'null' || !e.standBy ? false : true;
-            });
-            this.data = data;
-            console.log(data)
-            this.total = res.result.total;
-          }
-        });
-        this.total = this.data.length;
-        this.loading = false;
-      },
-      // switch 切换状态
-      changeSwitch (v) {
-        this.form.name = v.name;
-        this.form.code = v.code;
-        this.form.standBy = v.standBy;
-
-        this.form.disabled = v.disabled === 'CLOSE' ? 'OPEN' : 'CLOSE';
-        updateLogistics(v.id, this.form).then((res) => {
-          if (res.success) {
-            this.$Message.success("操作成功");
-            this.getDataList();
-          }
-        });
-      },
-      // 确认提交
-      handleSubmit() {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.submitLoading = true;
-
-            if (this.modalTitle == "添加") {
-              // 添加 避免编辑后传入id等数据 记得删除
-              delete this.form.id;
-
-
-              addLogistics(this.form).then((res) => {
-                this.submitLoading = false;
-                if (res.success) {
-                  this.$Message.success("操作成功");
-                  this.getDataList();
-                  this.modalVisible = false;
-                }
-              });
-            } else {
-              // 编辑
-              updateLogistics(this.id, this.form).then((res) => {
-                this.submitLoading = false;
-                if (res.success) {
-                  this.$Message.success("操作成功");
-                  this.getDataList();
-                  this.modalVisible = false;
-                }
-              });
-            }
-          }
-        });
-      },
-      // 添加信息
-      add() {
-        this.modalTitle = "添加";
-        this.form = {};
-        this.$refs.form.resetFields();
-
-        this.modalVisible = true;
-      },
-      // 编辑
-      detail(v) {
-        this.id = v.id;
-        this.modalTitle = "修改";
-        this.modalVisible = true;
-
-        this.form.name = v.name;
-        this.form.code = v.code;
-        console.log(v)
-        this.form.standBy = v.standBy;
-
-
-
-
-        this.form.disabled = v.disabled
-      },
-      // 删除物流公司
-      remove(v) {
-        this.$Modal.confirm({
-          title: "确认删除",
-          // 记得确认修改此处
-          content: "您确认要删除 " + v.name + " ?",
-          loading: true,
-          onOk: () => {
-            // 删除
-            delLogistics(v.id).then((res) => {
-              this.$Modal.remove();
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.getDataList();
-              }
-            });
-          },
-        });
-      },
-    },
-    mounted() {
-      this.init();
-    },
-  };
+    data(){
+      return{
+        type:'company'
+      }
+    }
+  }
 </script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/manager/src/views/logistics/shipTemplate.vue b/manager/src/views/logistics/shipTemplate.vue
new file mode 100644
index 00000000..48e80c91
--- /dev/null
+++ b/manager/src/views/logistics/shipTemplate.vue
@@ -0,0 +1,633 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row>
+        <Button @click="refresh">刷新</Button>
+        <Button @click="add" type="primary">添加</Button>
+      </Row>
+      <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
+        <TabPane label="运费模板" name="INFO">
+          <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
+            <tbody>
+              <tr>
+                <td class="sep-row" colspan="20"></td>
+              </tr>
+              <tr>
+                <th colspan="20">
+                  <span class="temp-name">{{item.name}}</span>
+                  <Tag v-if="item.pricingMethod==='FREE'" class="baoyou" color="warning">包邮</Tag>
+                  <span class="fr m-r-5">
+                    <time style="margin-right: 20px" title="最后编辑时间">
+                      <i class="icon-time"></i>{{item.updateTime}}
+                    </time>
+                    <Button @click="edit(item)" type="info">修改</Button>
+                    <Button @click="remove(item.id)" type="error">删除</Button>
+                  </span>
+                </th>
+              </tr>
+              <tr v-if="item.pricingMethod!=='FREE'">
+                <td class="w10 bdl"></td>
+                <td class="cell-area tl w150">运送到</td>
+                <td class="w150">首件(重)</td>
+                <td class="w150">运费</td>
+                <td class="w150">续件(重)</td>
+                <td class="w150 bdr">运费</td>
+              </tr>
+              <template v-if="item.pricingMethod!=='FREE'">
+                <tr v-for="(children,index) in item.freightTemplateChildList" :key="index">
+                  <td class="bdl"></td>
+                  <td class="cell-area tl w150" style="width: 60%;white-space:normal;">{{children.area}}</td>
+                  <td>
+                    {{children.firstCompany}}
+                  </td>
+                  <td>
+                    <span class="yuan">￥</span><span class="integer">{{children.firstPrice | unitPrice}}</span>
+                  </td>
+                  <td>
+                    {{children.continuedCompany}}
+                  </td>
+                  <td class="bdr">
+                    <span class="yuan">￥</span><span class="integer">{{children.continuedPrice | unitPrice}}</span>
+                  </td>
+                </tr>
+              </template>
+            </tbody>
+          </table>
+        </TabPane>
+        <TabPane v-if="csTab" :label="title" :name="operation">
+          <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+            <FormItem label="模板名称" prop="name">
+              <Input v-model="form.name" maxlength="10" clearable style="width: 20%" />
+            </FormItem>
+            <FormItem label="计价方式" prop="pricingMethod">
+              <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
+                <Radio label="WEIGHT">按重量</Radio>
+                <Radio label="NUM">按件数</Radio>
+                <Radio label="FREE">包邮</Radio>
+              </RadioGroup>
+            </FormItem>
+
+            <FormItem label="详细设置" v-if="form.pricingMethod !== 'FREE'">
+              <Alert type="warning" >点击右侧修改按钮编辑数据</Alert>
+              <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
+                <div class="entity">
+                  <div class="tbl-except">
+                    <table cellspacing="0" class="ncsc-default-table">
+                      <thead>
+                        <tr style="border-bottom: 1px solid #ddd;">
+                          <th class="w10"></th>
+                          <th class="tl">运送到</th>
+                          <th class="w10"></th>
+                          <th class="w50">首件(重)</th>
+                          <th class="w110">首费</th>
+                          <th class="w50">续件(重)</th>
+                          <th class="w110">续费</th>
+                          <th class="w150">操作</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr class="bd-line" data-group="n1" v-for="(item,index) in form.freightTemplateChildList"
+                          :key="index">
+                          <td></td>
+                          <td class="tl cell-area">
+                            <span class="area-group">
+                              <p style="display:inline-block">{{item.area}}</p>
+                            </span>
+                          </td>
+                          <td></td>
+                          <td>
+                            <InputNumber class="text w40" type="text" v-model="item.firstCompany" :max="999" :min="0" :step="0.1" clearable/>
+                          </td>
+                          <td>
+                            <InputNumber class="text w60" type="text" v-model="item.firstPrice" :max="999999" :min="0" clearable  :formatter="value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+            :parser="value => value.replace(/\¥\s?|(,*)/g, '')">
+                            </InputNumber>
+                          </td>
+                          <td>
+                            <InputNumber class="text w40" type="text" v-model="item.continuedCompany" :max="999" :min="0" :step="0.1"
+                              />
+                          </td>
+                          <td>
+                            <InputNumber class="text w60" type="text" v-model="item.continuedPrice" :max="999999" :min="0" clearable  :formatter="value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+            :parser="value => value.replace(/\¥\s?|(,*)/g, '')">
+                            </InputNumber>
+                          </td>
+                          <td class="nscs-table-handle">
+                            <Button @click="editRegion(item,index)" type="info" size="small"
+                              style="margin-bottom: 5px">修改
+                            </Button>
+                            <Button @click="removeTemplateChildren(index)"  type="error"
+                              size="small" style="margin-bottom: 5px">删除
+                            </Button>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                  <div class="tbl-attach p-5">
+                    <div class="div-error" v-if="saveError">
+                      <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+                      <Icon type="ios-information-circle-outline" />
+                      指定地区城市为空或指定错误
+                      <!-- <Icon type="ios-information-circle-outline" />
+                      首费应输入正确的金额
+                      <Icon type="ios-information-circle-outline" />
+                      续费应输入正确的金额 -->
+                      <Icon type="ios-information-circle-outline" />
+                      首(续)件(重)费应输入大于0的整数
+                    </div>
+
+                  </div>
+                </div>
+              </div>
+            </FormItem>
+            <Form-item>
+              <Button @click="addShipTemplateChildren(index)" v-if="form.pricingMethod !== 'FREE'"
+                icon="ios-create-outline">为指定城市设置运费模板
+              </Button>
+              <Button @click="handleSubmit" type="primary" style="margin-right:5px">保存
+              </Button>
+            </Form-item>
+          </Form>
+        </TabPane>
+      </Tabs>
+    </Card>
+    <multiple-region ref="region" @selected="handleSelect">
+
+    </multiple-region>
+
+  </div>
+</template>
+
+<script>
+import * as API_Shop from "@/api/shops";
+import multipleRegion from "@/components/map/multiple-region";
+
+export default {
+  name: "shipTemplate",
+  components: {
+    multipleRegion,
+  },
+  data() {
+    return {
+      gotop: false,
+      index:'0',
+      selectedIndex: 0, //选中的地址模板下标
+      item: "", //运费模板子模板
+      shipInfo: {}, // 运费模板数据
+      title: "添加运费模板", // 模态框标题
+      operation: "add", // 操作状态
+      currentTab: "", // 当前模板tab
+      // submitLoading:false,
+      saveError: false, // 是否显示错误提示
+      csTab: false, // 添加运费模板显示
+      form: {
+        // 添加或编辑表单对象初始化数据
+        name: "",
+        pricingMethod: "WEIGHT",
+      },
+      formValidate: {
+        name: [
+          {
+            required: true,
+            message: "请输入模板名称",
+            trigger: "blur",
+          },
+        ],
+        pricingMethod: [
+          // 计费方式
+          {
+            required: true,
+            message: "请选择计费方式",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    regions() {
+      return this.$store.state.regions;
+    },
+  },
+  methods: {
+    // 初始化数据
+    init() {
+      this.getData();
+    },
+    //切换tabPane
+    handleClickType(v) {
+      if (v == "INFO") {
+        this.getData();
+        this.csTab = false;
+      }
+    },
+    //添加运费模板
+    add() {
+      this.$refs.region.clear();
+      this.title = "添加运费模板";
+      this.csTab = true;
+      this.operation = "ADD";
+      this.currentTab = "ADD";
+      this.saveError = false;
+      this.form = {
+        pricingMethod: "WEIGHT",
+        name: "",
+        freightTemplateChildList: [
+          {
+            area: "",
+            areaId: "",
+            firstCompany: 0,
+            firstPrice: 0,
+            continuedCompany: 0,
+            continuedPrice: 0,
+            selectedAll: false,
+          },
+        ],
+      };
+    },
+    handleScroll(){
+       let scrolltop = document.documentElement.scrollTop || document.body.scrollTop;
+      scrolltop > 30 ? (this.gotop = true) : (this.gotop = false);
+    },
+    //修改运费模板
+    edit(item) {
+      this.title = "修改运费模板";
+      this.csTab = true;
+      this.operation = "EDIT";
+      this.currentTab = "EDIT";
+      this.saveError = false;
+      //给form赋值
+      this.form = item;
+
+      let top = document.documentElement.scrollTop || document.body.scrollTop;
+      // 实现滚动效果
+      const timeTop = setInterval(() => {
+        document.body.scrollTop = document.documentElement.scrollTop = top -= 50;
+        if (top <= 0) {
+          clearInterval(timeTop);
+        }
+      }, 0);
+    },
+    //选择地区
+    editRegion(item, index) {
+      this.selectedIndex = index;
+      this.item = item;
+
+      this.regions.forEach((addr) => {
+        this.form.freightTemplateChildList.forEach((child) => {
+          child.area.split(",").forEach((area) => {
+            if (addr.name == area) {
+              addr.selectedAll = true;
+              this.$set(child, "selectedAll", true);
+            }
+          });
+        });
+      });
+      this.$store.state.shipTemplate = this.form.freightTemplateChildList;
+
+      this.$refs.region.open(item, index);
+    },
+    //刷细数据
+    refresh() {
+      this.csTab = false;
+      this.operation = "INFO";
+      this.currentTab = "INFO";
+      this.getData();
+      this.$Message.success("刷新成功");
+    },
+    //运费模板数据
+    getData() {
+      API_Shop.getShipTemplate().then((res) => {
+        this.shipInfo = res.result;
+      });
+    },
+    /**
+     * 选择地址回调
+     */
+    handleSelect(v) {
+      let area = "";
+      let areaId = "";
+      if (v != "") {
+        v.forEach((child) => {
+          if (child.selectedList != "") {
+            // 只显示省份
+
+            if (child.selectedAll) {
+              area += child.name + ",";
+              this.form.freightTemplateChildList[
+                this.selectedIndex
+              ].selectedAll = true;
+            }
+
+            child.selectedList.forEach((son) => {
+              if (child.selectedAll) {
+                areaId += son.id + ",";
+                return;
+              } else {
+                // 显示城市
+                area += son.name + ",";
+                areaId += son.id + ",";
+              }
+            });
+          }
+        });
+      }
+      this.item.area = area;
+      this.item.areaId = areaId;
+    },
+    //添加或者修改运费模板
+    handleSubmit() {
+      const headers = {
+        "Content-Type": "application/json;charset=utf-8",
+      };
+
+      this.$refs.form.validate((valid) => {
+        // const regNumber = /^\+?[1-9][0-9]*$/;
+        // const regMoney =
+        //   /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
+        if (valid) {
+          if (this.form.pricingMethod != "FREE") {
+            //校验运费模板详细信息
+            for (
+              let i = 0;
+              i < this.form.freightTemplateChildList.length;
+              i++
+            ) {
+              if (
+                this.form.freightTemplateChildList[i].area == "" ||
+                this.form.freightTemplateChildList[i].firstCompany == "" ||
+                // this.form.freightTemplateChildList[i].firstPrice == "" ||
+                this.form.freightTemplateChildList[i].continuedCompany == ""
+                // this.form.freightTemplateChildList[i].continuedPrice == ""
+              ) {
+                this.saveError = true;
+                return;
+              }
+              //  if (
+              //   regNumber.test(
+              //     this.form.freightTemplateChildList[i].firstCompany
+              //   ) == false ||
+              //   regNumber.test(
+              //     this.form.freightTemplateChildList[i].continuedCompany
+              //   ) == false ||
+              //   regMoney.test(
+              //     this.form.freightTemplateChildList[i].firstPrice
+              //   ) == false ||
+              //   regMoney.test(
+              //     this.form.freightTemplateChildList[i].continuedPrice
+              //   ) == false
+              // ) {
+              //   this.saveError = true;
+              //   return;
+              // }
+            }
+          }
+
+          if (this.operation == "ADD") {
+            API_Shop.addShipTemplate(this.form, headers).then((res) => {
+              if (res.success) {
+                this.$Message.success("新增成功");
+                this.operation = "INFO";
+                this.currentTab = "INFO";
+                this.csTab = false;
+                this.getData();
+              }
+            });
+          } else {
+            API_Shop.editShipTemplate(this.form.id, this.form, headers).then(
+              (res) => {
+                if (res.success) {
+                  this.$Message.success("新增成功");
+                  this.operation = "INFO";
+                  this.currentTab = "INFO";
+                  this.csTab = false;
+                  this.getData();
+                }
+              }
+            );
+          }
+        }
+      });
+    },
+    //添加子模板
+    addShipTemplateChildren() {
+      const params = {
+        area: "",
+        areaId: "",
+        firstCompany: 0,
+        firstPrice: 0,
+        continuedCompany: 0,
+        continuedPrice: 0,
+        selectedAll: false,
+      };
+      this.form.freightTemplateChildList.push(params);
+    },
+    //删除一个子模板
+    removeTemplateChildren(index) {
+      if (Object.keys(this.form.freightTemplateChildList).length == 1) {
+        this.$Message.error("必须保留一个子模板");
+        return;
+      }
+      this.form.freightTemplateChildList.splice(index, 1);
+    },
+    //删除运费模板
+    remove(id) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除此运费模板 ?",
+        loading: true,
+        onOk: () => {
+          API_Shop.deleteShipTemplate(id).then((res) => {
+            if (res.success) {
+              this.$Message.success("删除成功");
+            }
+            this.$Modal.remove();
+            this.getData();
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+    window.addEventListener("scroll", this.handleScroll, true);
+  },
+};
+</script>
+<style lang="scss" scoped>
+.ncsc-default-table thead th {
+  line-height: 20px;
+  color: #555;
+  background-color: #fafafa;
+  text-align: center;
+  height: 20px;
+  padding: 9px 0;
+  border-bottom: solid 1px #ddd;
+}
+
+.ncsc-default-table {
+  line-height: 20px;
+  width: 100%;
+  border-collapse: collapse;
+
+  tbody th {
+    background-color: #fafafa;
+    border: solid #e6e6e6;
+    border-width: 1px 0;
+    padding: 4px 0;
+  }
+
+  tbody td {
+    color: #999;
+    background-color: #fff;
+    text-align: center;
+    padding: 6px 0;
+  }
+}
+
+.order tbody tr td {
+  border-bottom: 1px solid #e6e6e6;
+  vertical-align: top;
+}
+
+.order tbody tr td.bdr {
+  border-right: 1px solid #e6e6e6;
+}
+
+.order tbody tr th {
+  border: solid 1px #ddd;
+}
+
+.order tbody tr td.sep-row {
+  height: 14px;
+  border: 0;
+}
+
+.w10 {
+  width: 10px !important;
+}
+
+.tl {
+  text-align: left !important;
+}
+
+.order tbody tr td.bdl {
+  border-left: 1px solid #e6e6e6;
+}
+
+.order tbody tr th .temp-name {
+  float: left;
+  font-size: 14px;
+  color: #555;
+  // line-height: 44px;
+  margin: 7px 0 0 10px;
+}
+
+.m-r-5 {
+  margin-right: 5px !important;
+}
+
+.fr {
+  float: right !important;
+}
+
+.m-b-30 {
+  margin-bottom: 10px !important;
+}
+
+Button {
+  margin: 3px 5px 0px 5px;
+}
+
+thead {
+  display: table-header-group;
+  vertical-align: middle;
+  border-color: inherit;
+}
+
+tr {
+  display: table-row;
+  vertical-align: inherit;
+  border-color: inherit;
+}
+
+caption,
+th {
+  text-align: left;
+}
+
+.tl {
+  text-align: left !important;
+}
+
+colgroup {
+  display: table-column-group;
+}
+
+button,
+input,
+select,
+textarea {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+.bd-line td {
+  border-bottom: solid 1px #eee;
+}
+
+.w40 {
+  width: 60px !important;
+}
+
+.w60 {
+  width: 100px !important;
+  margin: 0 auto;
+}
+
+Input[type="text"],
+Input[type="password"],
+Input.text,
+Input.password {
+  display: inline-block;
+  min-height: 20px;
+  padding: 10px;
+  border: solid 1px #e6e9ee;
+  outline: 0 none;
+}
+
+ncsc-default-table {
+  line-height: 20px;
+  width: 100%;
+  border-collapse: collapse;
+  clear: both;
+}
+
+.ncsu-trans-type {
+  background-color: #fff;
+  border: solid #ddd 1px;
+}
+
+i,
+cite,
+em {
+  font-style: normal;
+}
+
+.cell-area {
+  width: 50%;
+}
+
+.div-error {
+  margin-left: 7px;
+  margin-bottom: -8px;
+  font-size: 15px;
+  color: #f00;
+}
+.baoyou {
+  margin: 6px 10px 0;
+}
+</style>
diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue
index a03c260d..9bd4a02f 100644
--- a/manager/src/views/member/list/memberDetail.vue
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -563,12 +563,7 @@
               }
             }
           },
-          {
-            title: "购买店铺",
-            key: "storeName",
-            width: 120,
-            tooltip: true
-          },
+          
           {
             title: "下单时间",
             key: "createTime",
diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
index a5d605c3..6c710283 100644
--- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue
+++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
@@ -127,37 +127,7 @@
               </dd>
             </dl>
           </div>
-          <div class="div-form-default" v-if="afterSaleInfo.serviceStatus != 'APPLY'">
-            <h3>商家处理</h3>
-            <dl>
-              <dt>商家</dt>
-              <dd>
-                <div class="div-content">
-                  {{ afterSaleInfo.storeName }}
-                </div>
-              </dd>
-            </dl>
-            <!-- <dl>
-              <dt>审核结果</dt>
-              <dd>
-                <div class="div-content">
-                  <span v-if="params.serviceStatus=='PASS'">
-                    审核通过
-                  </span>
-                  <span v-else>
-                    审核拒绝
-                  </span>
-                </div>
 
-              </dd>
-            </dl> -->
-            <dl>
-              <dt>备注信息</dt>
-              <dd>
-                {{ afterSaleInfo.auditRemark || "暂无备注信息" }}
-              </dd>
-            </dl>
-          </div>
         </div>
         <div class="div-flow-center"></div>
         <div class="div-flow-right">
@@ -248,14 +218,7 @@
             "
           >
             <h3>物流信息</h3>
-            <dl>
-              <dt>收货商家</dt>
-              <dd>{{ afterSaleInfo.storeName }}</dd>
-            </dl>
-            <dl>
-              <dt>收货商家手机</dt>
-              <dd>{{ storeMsg.salesConsigneeMobile }}</dd>
-            </dl>
+
             <dl>
               <dt>收货地址</dt>
               <dd>
diff --git a/manager/src/views/order/after-order/orderComplaintDetail.vue b/manager/src/views/order/after-order/orderComplaintDetail.vue
index 84281dfa..b5de5efb 100644
--- a/manager/src/views/order/after-order/orderComplaintDetail.vue
+++ b/manager/src/views/order/after-order/orderComplaintDetail.vue
@@ -137,9 +137,9 @@
                 <Button type="primary" ghost :loading="submitLoading" v-if="arbitrationResultShow == false" @click="arbitrationHandle">
                   直接仲裁结束投诉流程
                 </Button>
-                <Button :loading="submitLoading" v-if="complaintInfo.complainStatus == 'NEW'" @click="handleStoreComplaint">
+                <!-- <Button :loading="submitLoading" v-if="complaintInfo.complainStatus == 'NEW'" @click="handleStoreComplaint">
                   交由商家申诉
-                </Button>
+                </Button> -->
                 <Button type="primary" :loading="submitLoading" v-if="arbitrationResultShow == true" @click="arbitrationHandleSubmit">
                   提交仲裁
                 </Button>
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index dbf46b14..3845b868 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -7,6 +7,10 @@
           <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary" ghost>修改收货地址</Button>
           <Button v-if="allowOperation.cancel" @click="orderCancel" type="warning" ghost>订单取消</Button>
           <Button v-if="orderInfo.order.orderStatus === 'UNPAID'" @click="confirmPrice" type="primary">收款</Button>
+          <Button v-if="allowOperation.ship" @click="groupShip" type="primary">分包裹发货</Button>
+
+          <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
+
           <Button @click="orderLog" type="info" ghost>订单日志</Button>
           <Button @click="printOrder" type="primary" ghost style="float:right;"
             v-if="$route.query.orderType != 'VIRTUAL'">打印发货单</Button>
@@ -431,7 +435,80 @@
       </div>
     </Modal>
 
+    <!--订单分包裹发货-->
+    <Modal v-model="groupShipModal" :loading="shipLoading" title="分包裹发快递" width="1000">
+      <div>
+        <Form ref="groupOrderDeliveryForm" :model="groupOrderDeliveryForm" :label-width="90" :rules="groupOrderDeliverFormValidate" style="position: relative">
+          <FormItem label="物流公司" prop="logisticsId">
+            <Select v-model="groupOrderDeliveryForm.logisticsId" placeholder="请选择" style="width: 250px">
+              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.logisticsId">{{ item.name }}
+              </Option>
+            </Select>
+          </FormItem>
+          <FormItem label="物流单号" prop="logisticsNo">
+            <Input v-model="groupOrderDeliveryForm.logisticsNo" style="width: 250px" />
+          </FormItem>
+        </Form>
+      </div>
+      <Table @on-select="selectGroupShipGoodsMethods" @on-selection-change="selectGroupShipGoodsMethods"
+             @on-select-all="selectGroupShipGoodsMethods" :data="data" :columns="groupShipColumns" border>
+        <template slot="goodsSlot" slot-scope="{ row }">
+          <div style="margin-top: 5px; height: 80px; display: flex">
+            <div style="">
+              <img :src="row.image" style="height: 60px; margin-top: 1px; width: 60px" />
+            </div>
 
+            <div style="margin-left: 13px">
+              <div class="div-zoom">
+                <a @click="linkTo(row.goodsId, row.skuId)">{{
+                  row.goodsName
+                  }}</a>
+              </div>
+              <span v-for="(item, key) in JSON.parse(row.specs)" :key="key">
+                <span v-show="key != 'images'" style="font-size: 12px; color: #999999">
+                  {{ key }} : {{ item }}
+                </span>
+              </span>
+              <Poptip trigger="hover" style="display: block" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId, row.skuId)" :margin="0" colorDark="#000" colorLight="#fff"
+                          :size="150"></vue-qr>
+                </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="" />
+              </Poptip>
+            </div>
+          </div>
+        </template>
+        <template slot="numSlot" slot-scope="{ row, index }">
+          <InputNumber :min="0" :max="row.___num - row.deliverNumber" v-model="data[index].canNum">
+          </InputNumber>
+        </template>
+      </Table>
+      <div slot="footer">
+        <Button type="default" @click="groupShipModal = false">取消</Button>
+        <Button type="primary" @click="confirmShipGroupGoods">确定</Button>
+      </div>
+    </Modal>
+
+    <!-- 订单核销 -->
+    <Modal v-model="orderTakeModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>订单核销</span>
+      </p>
+      <div>
+        <Form ref="orderTakeForm" :model="orderTakeForm" label-position="left" :label-width="100"
+          :rules="orderTakeValidate">
+          <FormItem label="核销码" prop="qrCode">
+            <Input v-model="orderTakeForm.qrCode" size="large" maxlength="10"></Input>
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button @click="orderTakeModal = false">关闭</Button>
+        <Button type="primary" @click="orderTakeSubmit">核销</Button>
+      </div>
+    </Modal>
     <multipleMap ref="map" @callback="selectedRegion" />
   </div>
 </template>
@@ -451,6 +528,34 @@ export default {
   },
   data () {
     return {
+       // 分包裹发货
+      groupShipModal: false,
+      shipLoading: true,
+      groupOrderDeliveryForm: {
+        logisticsNo: "", //发货单号
+        logisticsId: "", //物流公司
+      },
+      checkedLogistics: [], //选中的物流公司集合
+
+      orderTakeModal: false, //订单核销弹出框
+
+      //订单核销表单
+      orderTakeForm: {
+        qrCode: "",
+      },
+      //验证要调整的订单金额
+      orderTakeValidate: {
+        qrCode: [
+          { required: true, message: "订单核销码不能为空", trigger: "blur" },
+        ],
+      },
+
+      groupOrderDeliverFormValidate: {
+        logisticsNo: [{ required: true, message: "发货单号不能为空", trigger: "change" },],
+        logisticsId: [{ required: true, message: "请选择物流公司", trigger: "blur" },],
+      },
+
+
       typeList: [],
       showPrices: false,
       printHiddenFlag: false,//隐藏信息
@@ -634,6 +739,40 @@ export default {
           minWidth: 200,
         },
       ],
+       // 选择要发货的商品
+       selectGroupShipGoods: [],
+      groupShipColumns: [
+        {type: "selection", width: 60, align: "center",},
+        {title: "商品", key: "goodsName", width: 300, slot: "goodsSlot",},
+        {
+          title: "单价",
+          key: "unitPrice",
+          slot: "priceSlot",
+          width: 100,
+          render: (h, params) => {
+            if (!params.row.unitPrice) {
+              return h("div", this.$options.filters.unitPrice(0, "￥"));
+            }
+            return h("div", this.$options.filters.unitPrice(params.row.unitPrice, "￥"));
+          },
+        },
+        {title: "数量", key: "num", slot: "numSlot", width: 120,},
+        {
+          title: "已发包裹",
+          key: "deliverNumber",
+          render: (h, params) => {
+            return h("div", params.row.deliverNumber ? params.row.deliverNumber : 0);
+          },
+        },
+        {
+          title: "小计",
+          key: "subTotal",
+          width: 120,
+          render: (h, params) => {
+            return h("div", this.$options.filters.unitPrice(params.row.subTotal, "￥"));
+          },
+        },
+      ],
     };
   },
   watch: {
@@ -642,6 +781,81 @@ export default {
     },
   },
   methods: {
+    // 选中
+    selectGroupShipGoodsMethods (selected) {
+      this.selectGroupShipGoods = selected;
+    },
+    //订单核销提交
+    orderTakeSubmit () {
+      this.$refs.orderTakeForm.validate((valid) => {
+        if (valid) {
+          API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then(
+            (res) => {
+              if (res.success) {
+                this.$Message.success("订单核销成功");
+                this.orderTakeModal = false;
+                this.getDataDetail();
+              }
+            }
+          );
+        }
+      });
+    },
+     //弹出订单核销框
+     orderTake () {
+      this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode;
+      this.orderTakeModal = true;
+    },
+    // 分包裹发货
+    groupShip () {
+      this.groupShipModal = true;
+      this.getLogisticsList();
+    },
+    // 分页获取物流公司
+    getLogisticsList () {
+      API_Order.getLogisticsChecked().then((res) => {
+        if (res.success) {
+          this.checkedLogistics = res.result;
+        }
+      });
+    },
+     // 分包裹发货
+     confirmShipGroupGoods () {
+      this.$refs.groupOrderDeliveryForm.validate(async (valid) => {
+        if (valid) {
+          if (this.selectGroupShipGoods.length) {
+            let submit = {
+              ...this.groupOrderDeliveryForm,
+              orderSn: this.sn,
+              partDeliveryDTOList: this.selectGroupShipGoods.map((item) => {
+                return {
+                  orderItemId: item.id,
+                  deliveryNum: item.canNum ? item.canNum : item.num,
+                };
+              }),
+            };
+            const res = await API_Order.partDelivery(this.sn, submit);
+            if (res.success) {
+              this.$Message.success("发货成功!");
+              this.shipLoading = false;
+              this.getDataDetail();
+              this.getOrderPackage();
+              this.groupShipModal = false;
+              this.groupOrderDeliveryForm = []
+            } else {
+              this.shipLoading = false;
+              this.groupShipModal = true;
+            }
+          } else {
+            this.shipLoading = false;
+            this.groupShipModal = true;
+            this.$Message.error("请选择要发货的商品");
+          }
+        } else {
+          this.shipLoading = false;
+        }
+      });
+    },
     gotoHomes () {
       return false
     },
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 0b8c503b..4768b050 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -53,23 +53,6 @@
             style="width: 160px"
           ></DatePicker>
         </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>-->
-<!--            <Option value="STAY_PICKED_UP">待自提</Option>-->
-<!--          </Select>-->
-<!--        </Form-item>-->
         <Button
           @click="handleSearch"
           type="primary"
@@ -283,6 +266,10 @@ export default {
               return h("div", [
                 h("tag", { props: { color: "red" } }, "已关闭"),
               ]);
+            }else if (params.row.orderStatus == "PARTS_DELIVERED") {
+              return h("div", [
+                h("tag", { props: { color: "orange" } }, "部分发货"),
+              ]);
             }
           },
         },
@@ -321,6 +308,7 @@ export default {
         {title: '已付款', value: 'PAID'},
         {title: '待发货', value: 'UNDELIVERED'},
         {title: '已发货', value: 'DELIVERED'},
+        {title: '部分发货', value: 'PARTS_DELIVERED'},
         {title: '待核验', value: 'TAKE'},
         {title: '待自提', value: 'STAY_PICKED_UP'},
         {title: '已完成', value: 'COMPLETED'},
diff --git a/manager/src/views/sys/message/noticeMessageTemplate.vue b/manager/src/views/sys/message/noticeMessageTemplate.vue
index 5287482f..e3ce7ac0 100644
--- a/manager/src/views/sys/message/noticeMessageTemplate.vue
+++ b/manager/src/views/sys/message/noticeMessageTemplate.vue
@@ -150,7 +150,6 @@
           <RadioGroup type="button" button-style="solid" v-model="messageSendForm.messageClient"
                       @on-change="selectObject">
             <Radio label="member">会员</Radio>
-            <Radio label="store">商家</Radio>
           </RadioGroup>
         </FormItem>
 
@@ -161,14 +160,7 @@
             <Radio v-if="messageSendForm.messageClient == 'member'" label="MEMBER">指定会员</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="指定商家" v-if="shopShow">
-          <Select v-model="messageSendForm.userIds" filterable multiple style="width: 90%;"
-                  label-in-value @on-change="getName">
-            <Option v-for="item in shopList" :value="item.id" :key="item.id" :lable="item.storeName">{{ item.storeName
-              }}
-            </Option>
-          </Select>
-        </FormItem>
+        
         <FormItem label="选择会员" prop="scopeType"
                   v-if="memberShow">
           <Button type="primary" icon="ios-add" @click="addVip" ghost>选择会员</Button>