From 93cc41f557d5a9162818619e92013913a7058613 Mon Sep 17 00:00:00 2001
From: dt_2916866708 <>
Date: Mon, 15 Jan 2024 11:15:59 +0800
Subject: [PATCH] 12

---
 src/api/product/productAttr.js                |   25 +
 src/router/index.js                           |    6 +
 src/views/product/brand/index.vue             |  134 +
 src/views/product/productAdd/index.vue        |    4 +-
 src/views/product/productAdd/newIndex.vue     | 2661 +++++++++--------
 src/views/product/productAttr/addAttr.vue     |   36 +-
 .../productAttr/components/attrList.vue       |    7 +-
 src/views/product/productAttr/index.vue       |   28 +-
 8 files changed, 1548 insertions(+), 1353 deletions(-)
 create mode 100644 src/views/product/brand/index.vue

diff --git a/src/api/product/productAttr.js b/src/api/product/productAttr.js
index 91a9c15..db7a5ef 100644
--- a/src/api/product/productAttr.js
+++ b/src/api/product/productAttr.js
@@ -1,6 +1,24 @@
 import request from '@/utils/request'
 var service_name = 'oil-mall' 
 export default {
+  brandGetByPage() {  
+    return request({
+      url: `/${service_name}/mallProductBrands/getByPage`,
+      method: 'get', 
+    })
+  },  
+  getAllAttributesType() {  
+    return request({
+      url: `/${service_name}/mallProductAttributesType/getAllAttributesType`,
+      method: 'get', 
+    })
+  },  
+  getClassificationTree() {  
+    return request({
+      url: `/${service_name}/mallProductClassification/getClassificationTree`,
+      method: 'get', 
+    })
+  },  
   classifySave(page) {  
     return request({
       url: `/${service_name}/mallProductClassification/save`,
@@ -70,6 +88,13 @@ delete(page) {
       data: page
     })
   },  
+  typeUpdate(page) {  
+    return request({
+      url: `/${service_name}/mallProductAttributes/update`,
+      method: 'post',
+      data: page
+    })
+  },  
   update(page) {  
     return request({
       url: `/${service_name}/mallProductAttributesType/update`,
diff --git a/src/router/index.js b/src/router/index.js
index d43ff99..3fe06e8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -36,6 +36,12 @@ export const constantRoutes = [{
       name: 'productAdd',
       meta: { title: '添加商品', icon: 'iconkongzhitai', affix: true }
     },
+    {
+      path: '/brand',
+      component: () => import('@/views/product/brand/index'),
+      name: 'brand',
+      meta: { title: '商品品牌', icon: 'iconkongzhitai', affix: true }
+    },
     {
       path: '/productClassify',
       component: () => import('@/views/product/productClassify/index'),
diff --git a/src/views/product/brand/index.vue b/src/views/product/brand/index.vue
new file mode 100644
index 0000000..77c9cab
--- /dev/null
+++ b/src/views/product/brand/index.vue
@@ -0,0 +1,134 @@
+<template>
+    <div>
+        <el-card :bordered="false" shadow="never" class="ivu-mt" :body-style="{ padding: 0 }">
+            <div class="padding-add">
+                <el-form ref="artFrom" :model="page" label-width="80px" label-position="right" class="tabform"
+                    @submit.native.prevent inline>
+                    <el-form-item label="输入搜索">
+                        <el-input clearable v-model="page.rule_name" placeholder="品牌名称/关键词"
+                            class="form_content_width"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="userSearchs">查询</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </el-card>
+        <el-card :bordered="false" shadow="never" class="ivu-mt-16">
+            <el-button type="primary" @click="addType">添加品牌</el-button>
+            <el-table @current-change="tableCurrentChange" ref="table" :data="tableData" v-loading="loading"
+                highlight-current-row :row-key="getRowKey" @selection-change="handleSelectRow" empty-text="暂无数据"
+                class="mt14">
+                <el-table-column type="selection" width="60" :reserve-selection="true"> </el-table-column>
+                <el-table-column label="编号">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.brandNum }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="品牌名称">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="品牌首字母">
+                    <template slot-scope="scope">
+                        <el-button @click="showAttrList(scope.row)" type="text">
+                            {{ scope.row.attrCount }}
+                        </el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column label="排序">
+                    <template slot-scope="scope">
+                        <el-button @click="showAttrList(scope.row)" type="text">
+                            {{ scope.row.attrCount }}
+                        </el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否显示">
+                    <template slot-scope="scope">
+                        <el-button @click="showAttrList(scope.row)" type="text">
+                            {{ scope.row.attrCount }}
+                        </el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                        <a @click="edit(scope.row)">编辑</a>
+                        <el-divider direction="vertical"></el-divider>
+                        <a @click="del(scope.row)">删除</a>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="acea-row row-right page">
+                <el-pagination 
+                @size-change="handleSizeChange" 
+                @current-change="handleCurrentChange"  
+                :current-page="page.currentPage" 
+                :page-sizes="[10, 15, 20, 30]" 
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper" 
+                :total="page.totalCount" />
+            </div>
+        </el-card>
+    </div>
+</template> 
+<script>
+import productApi from '@/api/product/productAttr.js';
+import { loadingFn } from "@/utils/validate"
+export default {
+    data() {
+        return {
+            selection: [],
+            selectAttrList: null,
+            isShowAttrList: false,
+            loading: false,
+            page: {
+                "currentPage": 1,
+                "pageSize": 10,
+                "params": {},
+                totalCount: 0
+            },
+            tableData: [],
+            total: 0,
+            selectedIds: new Set(), //选中合并项的id
+            ids: [],
+            multipleSelection: [],
+        };
+    },
+    computed: {},
+    created() { },
+    methods: {
+        tableCurrentChange(e) { },
+        handleCurrentChange(val) { },
+        handleSizeChange(val) { },
+        clearSelection() { },
+        onCancel() { },
+        addType() { },
+        showAttrList(e) { },
+        getRowKey(row) { },
+        //全选和取消全选时触发
+        handleSelectAll(selection) { },
+        //  选中某一行
+        handleSelectRow(selection) { },
+        setChecked() { },
+        // 删除
+        del(row) { },
+        addAttr(model) {
+        },
+        // 编辑
+        edit(row) {
+        },
+        // 列表
+        getList() {
+            loadingFn.call(this, "loading", productApi.brandGetByPage(this.page).then(res => {
+                if (res.code = 20000) ({ list: this.tableData = [], totalCount: this.page.totalCount = 0 } = res.data);
+            }));
+        },
+        // 表格搜索
+        userSearchs() { },
+    },
+};
+</script>
+  
+<style scoped></style>
+  
\ No newline at end of file
diff --git a/src/views/product/productAdd/index.vue b/src/views/product/productAdd/index.vue
index e9e0177..b7ef27c 100644
--- a/src/views/product/productAdd/index.vue
+++ b/src/views/product/productAdd/index.vue
@@ -717,7 +717,7 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="formValidate.freight == 3">
+          <!-- <el-col :span="24" v-if="formValidate.freight == 3">
             <el-form-item label="" prop="temp_id">
               <div class="acea-row">
                 <el-select
@@ -736,7 +736,7 @@
                 <span class="addfont" @click="addTemp">新增运费模板</span>
               </div>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <!-- 营销设置-->
         <el-row :gutter="24" v-show="headTab.length === 6 ? currentTab === '5' : currentTab === '4'">
diff --git a/src/views/product/productAdd/newIndex.vue b/src/views/product/productAdd/newIndex.vue
index c43f9e5..0a1faca 100644
--- a/src/views/product/productAdd/newIndex.vue
+++ b/src/views/product/productAdd/newIndex.vue
@@ -1,723 +1,664 @@
 <template>
-    <div class="divBox">
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
-          <el-steps :active="currentTab" align-center finish-status="success">
-            <el-step title="商品信息" />
-            <el-step title="商品详情" />
-            <el-step title="其他设置" />
-            <!--<el-step title="规格设置" />-->
-          </el-steps>
-        </div>
-        <el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate mt20" :rules="ruleValidate" :model="formValidate" label-width="120px" @submit.native.prevent>
-          <el-row v-show="currentTab === 0" :gutter="24">
-            <!-- 商品信息-->
-            <el-col v-bind="grid2">
-              <el-form-item label="商品名称：" prop="storeName">
-                <el-input v-model="formValidate.storeName" maxlength="249" placeholder="请输入商品名称" :disabled="isDisabled"/>
-              </el-form-item>
-            </el-col>
-            <el-col v-bind="grid2">
-              <el-form-item label="商品分类：" prop="cateIds">
-                <el-cascader v-model="formValidate.cateIds" :options="merCateList" :props="props2" clearable class="selWidth" :show-all-levels="false" :disabled="isDisabled"/>
-              </el-form-item>
-            </el-col>
-            <el-col v-bind="grid2">
-              <el-form-item label="商品关键字：" prop="keyword">
-                <el-input v-model="formValidate.keyword" placeholder="请输入商品关键字" :disabled="isDisabled"/>
-              </el-form-item>
-            </el-col>
-            <el-col v-bind="grid2">
-              <el-form-item label="单位：" prop="unitName">
-                <el-input v-model="formValidate.unitName" placeholder="请输入单位"  :disabled="isDisabled"/>
-              </el-form-item>
-            </el-col>
-            <el-col v-bind="grid2">
-              <el-form-item label="商品简介：" prop="storeInfo">
-                <el-input v-model="formValidate.storeInfo" type="textarea"  maxlength="250" :rows="3" placeholder="请输入商品简介"  :disabled="isDisabled"/>
-              </el-form-item>
-            </el-col>
-            <el-col v-bind="grid2">
-              <el-form-item label="商品封面图：" prop="image">
-                <div class="upLoadPicBox" @click="modalPicTap('1')" :disabled="isDisabled">
-                  <div v-if="formValidate.image" class="pictrue"><img :src="formValidate.image"></div>
-                  <div v-else class="upLoad">
-                    <i class="el-icon-camera cameraIconfont" />
-                  </div>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="商品轮播图：" prop="sliderImages">
-                <div class="acea-row">
-                  <div
-                    v-for="(item,index) in formValidate.sliderImages"
-                    :key="index"
-                    class="pictrue"
-                    draggable="true"
-                    @dragstart="handleDragStart($event, item)"
-                    @dragover.prevent="handleDragOver($event, item)"
-                    @dragenter="handleDragEnter($event, item)"
-                    @dragend="handleDragEnd($event, item)"
-                  >
-                    <img :src="item">
-                    <i v-if="!isDisabled" class="el-icon-error btndel" @click="handleRemove(index)"/>
-                  </div>
-                  <div v-if="formValidate.sliderImages.length<10 && !isDisabled" class="upLoadPicBox" @click="modalPicTap('2')">
-                    <div class="upLoad">
-                      <i class="el-icon-camera cameraIconfont" />
-                    </div>
-                  </div>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <el-steps :active="currentTab" align-center finish-status="success">
+          <el-step title="商品信息" />
+          <el-step title="商品详情" />
+          <el-step title="其他设置" />
+          <!--<el-step title="规格设置" />-->
+        </el-steps>
+      </div>
+      <el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate mt20" :rules="ruleValidate"
+        :model="formValidate" label-width="120px" @submit.native.prevent>
+        <el-row v-show="currentTab === 0" :gutter="24">
+          <!-- 商品信息-->
+          <el-col v-bind="grid2">
+            <el-form-item label="商品名称：" prop="storeName">
+              <el-input v-model="formValidate.storeName" maxlength="249" placeholder="请输入商品名称" :disabled="isDisabled" />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品分类：" prop="cateIds">
+              <el-cascader v-model="formValidate.cateIds" :options="merCateList" :props="props2" clearable
+                class="selWidth" :show-all-levels="false" :disabled="isDisabled" />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品关键字：" prop="keyword">
+              <el-input v-model="formValidate.keyword" placeholder="请输入商品关键字" :disabled="isDisabled" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col v-bind="grid2">
+            <el-form-item label="单位：" prop="unitName">
+              <el-input v-model="formValidate.unitName" placeholder="请输入单位" :disabled="isDisabled" />
+            </el-form-item>
+          </el-col> -->
+          <el-col v-bind="grid2">
+            <el-form-item label="商品简介：" prop="storeInfo">
+              <el-input v-model="formValidate.storeInfo" type="textarea" maxlength="250" :rows="3" placeholder="请输入商品简介"
+                :disabled="isDisabled" />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品封面图：" prop="image">
+              <div class="upLoadPicBox" @click="modalPicTap('1')" :disabled="isDisabled">
+                <div v-if="formValidate.image" class="pictrue"><img :src="formValidate.image"></div>
+                <div v-else class="upLoad">
+                  <i class="el-icon-camera cameraIconfont" />
                 </div>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="18" :sm="18" :md="18" :lg="12" :xl="12">
-              <el-form-item label="运费模板：" prop="tempId">
-                <el-select v-model="formValidate.tempId" placeholder="请选择" class="mr20" :disabled="isDisabled" style="width:100%;">
-                    <el-option
-                      v-for="item in shippingList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                    />
-                  </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="6" :sm="6" :md="6" :lg="12" :xl="12">
-              <el-button v-show="!isDisabled" class="mr15" @click="addTem">运费模板</el-button>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="商品规格：" props="specType">
-                <el-radio-group v-model="formValidate.specType" @change="onChangeSpec(formValidate.specType)" :disabled="isDisabled">
-                  <el-radio :label="false" class="radio">单规格</el-radio>
-                  <el-radio :label="true">多规格</el-radio>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item label="佣金设置：" props="isSub">
-                <el-radio-group v-model="formValidate.isSub" @change="onChangetype(formValidate.isSub)" :disabled="isDisabled">
-                  <el-radio :label="true" class="radio">单独设置</el-radio>
-                  <el-radio :label="false">默认设置</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <!-- 多规格添加-->
-            <el-col v-if="formValidate.specType && !isDisabled" :span="24" class="noForm">
-              <el-form-item label="选择规格：" prop="">
-                <div class="acea-row">
-                  <el-select v-model="formValidate.selectRule">
-                    <el-option v-for="item in ruleList" :key="item.id" :label="item.ruleName" :value="item.id" />
-                  </el-select>
-                  <el-button type="primary" class="mr20" @click="confirm">确认</el-button>
-                  <el-button class="mr15" @click="addRule">添加规格</el-button>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品轮播图：" prop="sliderImages">
+              <div class="acea-row">
+                <div v-for="(item, index) in formValidate.sliderImages" :key="index" class="pictrue" draggable="true"
+                  @dragstart="handleDragStart($event, item)" @dragover.prevent="handleDragOver($event, item)"
+                  @dragenter="handleDragEnter($event, item)" @dragend="handleDragEnd($event, item)">
+                  <img :src="item">
+                  <i v-if="!isDisabled" class="el-icon-error btndel" @click="handleRemove(index)" />
                 </div>
-              </el-form-item>
-              <el-form-item>
-                <div v-for="(item, index) in formValidate.attr" :key="index">
-                  <div class="acea-row row-middle"><span class="mr5">{{ item.attrName }}</span><i class="el-icon-circle-close" @click="handleRemoveAttr(index)" /></div>
-                  <div class="rulesBox">
-                    <el-tag
-                      v-for="(j, indexn) in item.attrValue"
-                      :key="indexn"
-                      closable
-                      size="medium"
-                      :disable-transitions="false"
-                      class="mb5 mr10"
-                      @close="handleClose(item.attrValue,indexn)"
-                    >
-                      {{ j }}
-                    </el-tag>
-                    <el-input
-                      v-if="item.inputVisible"
-                      ref="saveTagInput"
-                      v-model="item.attrValue.attrsVal"
-                      class="input-new-tag"
-                      size="small"
-                      @keyup.enter.native="createAttr(item.attrValue.attrsVal,index)"
-                      @blur="createAttr(item.attrValue.attrsVal,index)"
-                    />
-                    <el-button v-else class="button-new-tag" size="small" @click="showInput(item)">+ 添加</el-button>
+                <div v-if="formValidate.sliderImages.length < 10 && !isDisabled" class="upLoadPicBox"
+                  @click="modalPicTap('2')">
+                  <div class="upLoad">
+                    <i class="el-icon-camera cameraIconfont" />
                   </div>
                 </div>
-              </el-form-item>
-              <el-col v-if="isBtn">
-                <el-col :xl="6" :lg="9" :md="9" :sm="24" :xs="24">
-                  <el-form-item label="规格：">
-                    <el-input v-model="formDynamic.attrsName" placeholder="请输入规格" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xl="6" :lg="9" :md="9" :sm="24" :xs="24">
-                  <el-form-item label="规格值：">
-                    <el-input v-model="formDynamic.attrsVal" placeholder="请输入规格值" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xl="12" :lg="6" :md="6" :sm="24" :xs="24">
-                  <el-form-item class="noLeft">
-                    <el-button type="primary" class="mr15" @click="createAttrName">确定</el-button>
-                    <el-button @click="offAttrName">取消</el-button>
-                  </el-form-item>
-                </el-col>
+              </div>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :xs="18" :sm="18" :md="18" :lg="12" :xl="12">
+            <el-form-item label="运费模板：" prop="tempId">
+              <el-select v-model="formValidate.tempId" placeholder="请选择" class="mr20" :disabled="isDisabled"
+                style="width:100%;">
+                <el-option v-for="item in shippingList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :xs="6" :sm="6" :md="6" :lg="12" :xl="12">
+            <el-button v-show="!isDisabled" class="mr15" @click="addTem">运费模板</el-button>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item label="商品规格：" props="specType">
+              <el-radio-group v-model="formValidate.specType" @change="onChangeSpec(formValidate.specType)"
+                :disabled="isDisabled">
+                <el-radio :label="false" class="radio">单规格</el-radio>
+                <el-radio :label="true">多规格</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="佣金设置：" props="isSub">
+              <el-radio-group v-model="formValidate.isSub" @change="onChangetype(formValidate.isSub)"
+                :disabled="isDisabled">
+                <el-radio :label="true" class="radio">单独设置</el-radio>
+                <el-radio :label="false">默认设置</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <!-- 多规格添加-->
+          <el-col v-if="formValidate.specType && !isDisabled" :span="24" class="noForm">
+            <el-form-item label="选择规格：" prop="">
+              <div class="acea-row">
+                <el-select v-model="formValidate.selectRule">
+                  <el-option v-for="item in ruleList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+                <el-button type="primary" class="mr20" @click="confirm">确认</el-button>
+                <el-button class="mr15" @click="addRule">添加规格</el-button>
+              </div>
+            </el-form-item>
+            <el-form-item>
+              <div v-for="(item, index) in formValidate.attr" :key="index">
+                <div class="acea-row row-middle"><span class="mr5">{{ item.attributeName }}</span><i
+                    class="el-icon-circle-close" @click="handleRemoveAttr(index)" /></div>
+                <div class="rulesBox">
+                  <el-tag v-for="(j, indexn) in item.attributeContentList" :key="indexn" closable size="medium"
+                    :disable-transitions="false" class="mb5 mr10" @close="handleClose(item.attrValue, indexn)">
+                    {{ j }}
+                  </el-tag>
+                  <el-input v-if="item.inputVisible" ref="saveTagInput" v-model="item.attrValue.attrsVal"
+                    class="input-new-tag" size="small" @keyup.enter.native="createAttr(item.attrValue.attrsVal, index)"
+                    @blur="createAttr(item.attrValue.attrsVal, index)" />
+                  <el-button v-else class="button-new-tag" size="small" @click="showInput(item)">+ 添加</el-button>
+                </div>
+              </div>
+            </el-form-item>
+            <el-col v-if="isBtn">
+              <el-col :xl="6" :lg="9" :md="9" :sm="24" :xs="24">
+                <el-form-item label="规格：">
+                  <el-input v-model="formDynamic.attrsName" placeholder="请输入规格" />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="6" :lg="9" :md="9" :sm="24" :xs="24">
+                <el-form-item label="规格值：">
+                  <el-input v-model="formDynamic.attrsVal" placeholder="请输入规格值" />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="12" :lg="6" :md="6" :sm="24" :xs="24">
+                <el-form-item class="noLeft">
+                  <el-button type="primary" class="mr15" @click="createAttrName">确定</el-button>
+                  <el-button @click="offAttrName">取消</el-button>
+                </el-form-item>
               </el-col>
-              <el-form-item v-if="!isBtn">
-                <el-button type="primary" icon="md-add" class="mr15" @click="addBtn">添加新规格</el-button>
-              </el-form-item>
             </el-col>
-            <!-- 批量设置-->
-            <el-col v-if="formValidate.attr.length>0 && formValidate.specType && !isDisabled" :span="24" class="noForm">
-              <el-form-item label="批量设置：">
-                <el-table :data="oneFormBatch" border class="tabNumWidth" size="mini">
-                  <el-table-column align="center" label="图片" min-width="80">
-                    <template slot-scope="scope">
-                      <div class="upLoadPicBox" @click="modalPicTap('1','pi')">
-                        <div v-if="scope.row.image" class="pictrue tabPic"><img :src="scope.row.image"></div>
-                        <div v-else class="upLoad tabPic">
-                          <i class="el-icon-camera cameraIconfont" />
-                        </div>
+            <el-form-item v-if="!isBtn">
+              <el-button type="primary" icon="md-add" class="mr15" @click="addBtn">添加新规格</el-button>
+            </el-form-item>
+          </el-col>
+          <!-- 批量设置-->
+          <el-col v-if="formValidate.attr.length > 0 && formValidate.specType && !isDisabled" :span="24" class="noForm">
+            <el-form-item label="批量设置：">
+              <el-table :data="oneFormBatch" border class="tabNumWidth" size="mini">
+                <el-table-column align="center" label="图片" min-width="80">
+                  <template slot-scope="scope">
+                    <div class="upLoadPicBox" @click="modalPicTap('1', 'pi')">
+                      <div v-if="scope.row.image" class="pictrue tabPic"><img :src="scope.row.image"></div>
+                      <div v-else class="upLoad tabPic">
+                        <i class="el-icon-camera cameraIconfont" />
                       </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
-                    <template slot-scope="scope">
-                      <el-input v-model="scope.row[iii]" maxlength="9" min="0.01" class="priceBox" @blur="keyupEvent(iii, scope.row[iii], scope.$index, 1)"/>
-                    </template>
-                  </el-table-column>
-                  <template v-if="formValidate.isSub">
-                    <el-table-column align="center" label="一级返佣(元)" min-width="120">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.brokerage" type="number" :min="0" :max="scope.row.price" class="priceBox" />
-                      </template>
-                    </el-table-column>
-                    <el-table-column align="center" label="二级返佣(元)" min-width="120">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.brokerageTwo" type="number" :min="0" :max="scope.row.price" class="priceBox" />
-                      </template>
-                    </el-table-column>
+                    </div>
                   </template>
-                  <el-table-column align="center" label="操作" min-width="80">
-                    <template>
-                      <el-button type="text" class="submission" @click="batchAdd">批量添加</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </el-form-item>
-            </el-col>
-            <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-              <!-- 单规格表格-->
-              <el-form-item v-if="formValidate.specType === false">
-                <el-table :data="OneattrValue" border class="tabNumWidth" size="mini">
-                  <el-table-column align="center" label="图片" min-width="80">
+                </el-table-column>
+                <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center"
+                  min-width="120">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row[iii]" maxlength="9" min="0.01" class="priceBox"
+                      @blur="keyupEvent(iii, scope.row[iii], scope.$index, 1)" />
+                  </template>
+                </el-table-column>
+                <template v-if="formValidate.isSub">
+                  <el-table-column align="center" label="一级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <div class="upLoadPicBox" @click="modalPicTap('1', 'dan', 'pi')">
-                        <div v-if="formValidate.image" class="pictrue tabPic"><img :src="scope.row.image"></div>
-                        <div v-else class="upLoad tabPic">
-                          <i class="el-icon-camera cameraIconfont" />
-                        </div>
-                      </div>
+                      <el-input v-model="scope.row.brokerage" type="number" :min="0" :max="scope.row.price"
+                        class="priceBox" />
                     </template>
                   </el-table-column>
-                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
+                  <el-table-column align="center" label="二级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input :disabled="isDisabled" v-model="scope.row[iii]" maxlength="9" min="0.01" class="priceBox" @blur="keyupEvent(iii, scope.row[iii], scope.$index, 2)" />
+                      <el-input v-model="scope.row.brokerageTwo" type="number" :min="0" :max="scope.row.price"
+                        class="priceBox" />
                     </template>
                   </el-table-column>
-                  <template v-if="formValidate.isSub">
-                    <el-table-column align="center" label="一级返佣(元)" min-width="120">
-                      <template slot-scope="scope">
-                        <el-input :disabled="isDisabled" v-model="scope.row.brokerage" type="number" :min="0" class="priceBox" />
-                      </template>
-                    </el-table-column>
-                    <el-table-column align="center" label="二级返佣(元)" min-width="120">
-                      <template slot-scope="scope">
-                        <el-input :disabled="isDisabled" v-model="scope.row.brokerageTwo" type="number" :min="0" class="priceBox" />
-                      </template>
-                    </el-table-column>
+                </template>
+                <el-table-column align="center" label="操作" min-width="80">
+                  <template>
+                    <el-button type="text" class="submission" @click="batchAdd">批量添加</el-button>
                   </template>
-                </el-table>
-              </el-form-item>
-             <!-- <div>manyTabDate:{{manyTabDate}}</div> -->
-              <el-form-item label="全部sku：" v-if="$route.params.id && showAll">
-                <el-button type="default" @click="showAllSku()" :disabled="isDisabled">展示</el-button>
-              </el-form-item>
-              <!-- 多规格表格-->
-              <el-form-item v-if="formValidate.attr.length>0 && formValidate.specType" label="商品属性：" class="labeltop" :class="isDisabled?'disLabel':'disLabelmoren'">
-                <el-table :data="ManyAttrValue" border class="tabNumWidth" size="mini">
-                  <template v-if="manyTabDate">
-                    <el-table-column v-for="(item,iii) in manyTabDate" :key="iii" align="center" :label="manyTabTit[iii].title" min-width="80">
-                      <template slot-scope="scope">
-                        <span class="priceBox" v-text="scope.row[iii]"/>
-                      </template>
-                    </el-table-column>
-                  </template>
-                  <el-table-column align="center" label="图片" min-width="80">
-                    <template slot-scope="scope">
-                      <div class="upLoadPicBox" @click="modalPicTap('1','duo',scope.$index)">
-                        <div v-if="scope.row.image" class="pictrue tabPic"><img :src="scope.row.image"></div>
-                        <div v-else class="upLoad tabPic">
-                          <i class="el-icon-camera cameraIconfont" />
-                        </div>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+          <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+            <!-- 单规格表格-->
+            <el-form-item v-if="formValidate.specType === false">
+              <el-table :data="OneattrValue" border class="tabNumWidth" size="mini">
+                <el-table-column align="center" label="图片" min-width="80">
+                  <template slot-scope="scope">
+                    <div class="upLoadPicBox" @click="modalPicTap('1', 'dan', 'pi')">
+                      <div v-if="formValidate.image" class="pictrue tabPic"><img :src="scope.row.image"></div>
+                      <div v-else class="upLoad tabPic">
+                        <i class="el-icon-camera cameraIconfont" />
                       </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
-                    <template slot-scope="scope">
-  <!--                    <span>scope.row:{{scope.row}}</span>-->
-                      <el-input :disabled="isDisabled" maxlength="9" min="0.01"
-                                 v-model="scope.row[iii]" class="priceBox" @blur="keyupEvent(iii, scope.row[iii], scope.$index, 3)" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" label="一级返佣(元)" min-width="120" v-if="formValidate.isSub">
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center"
+                  min-width="120">
+                  <template slot-scope="scope">
+                    <el-input :disabled="isDisabled" v-model="scope.row[iii]" maxlength="9" min="0.01" class="priceBox"
+                      @blur="keyupEvent(iii, scope.row[iii], scope.$index, 2)" />
+                  </template>
+                </el-table-column>
+                <template v-if="formValidate.isSub">
+                  <el-table-column align="center" label="一级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input :disabled="isDisabled" v-model="scope.row.brokerage" type="number" :min="0" :max="scope.row.price" class="priceBox" />
+                      <el-input :disabled="isDisabled" v-model="scope.row.brokerage" type="number" :min="0"
+                        class="priceBox" />
                     </template>
                   </el-table-column>
-                  <el-table-column align="center" label="二级返佣(元)" min-width="120" v-if="formValidate.isSub">
+                  <el-table-column align="center" label="二级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input :disabled="isDisabled" v-model="scope.row.brokerageTwo" type="number" :min="0" :max="scope.row.price" class="priceBox" />
+                      <el-input :disabled="isDisabled" v-model="scope.row.brokerageTwo" type="number" :min="0"
+                        class="priceBox" />
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="!isDisabled" key="3" align="center" label="操作" min-width="80">
+                </template>
+              </el-table>
+            </el-form-item>
+            <!-- <div>manyTabDate:{{manyTabDate}}</div> -->
+            <el-form-item label="全部sku：" v-if="$route.params.id && showAll">
+              <el-button type="default" @click="showAllSku()" :disabled="isDisabled">展示</el-button>
+            </el-form-item>
+            <!-- 多规格表格-->
+            <el-form-item v-if="formValidate.attr.length > 0 && formValidate.specType" label="商品属性：" class="labeltop"
+              :class="isDisabled ? 'disLabel' : 'disLabelmoren'">
+              <el-table :data="ManyAttrValue" border class="tabNumWidth" size="mini">
+                <template v-if="manyTabDate">
+                  <el-table-column v-for="(item, iii) in manyTabDate" :key="iii" align="center"
+                    :label="manyTabTit[iii].title" min-width="80">
                     <template slot-scope="scope">
-                      <el-button type="text" class="submission" @click="delAttrTable(scope.$index)">删除</el-button>
+                      <span class="priceBox" v-text="scope.row[iii]" />
                     </template>
                   </el-table-column>
-                </el-table>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <!-- 商品详情-->
-          <el-row v-show="currentTab === 1 && !isDisabled">
-            <el-col :span="24">
-              <el-form-item label="商品详情：">
-                 <Tinymce v-model="formValidate.content"></Tinymce>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row v-show="currentTab === 1 && isDisabled">
-            <el-col :span="24">
-              <el-form-item label="商品详情：">
-                <span v-html="formValidate.content || '无'"></span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <!-- 其他设置-->
-          <el-row v-show="currentTab === 2">
-            <el-col :span="24">
-              <el-col v-bind="grid">
-                <el-form-item label="排序：">
-                  <el-input-number v-model="formValidate.sort" :min="0" placeholder="请输入排序" :disabled="isDisabled" />
-                </el-form-item>
-              </el-col>
-              <el-col v-bind="grid">
-                <el-form-item label="积分：">
-                  <el-input-number v-model="formValidate.giveIntegral" :min="0" placeholder="请输入排序" :disabled="isDisabled" />
-                </el-form-item>
-              </el-col>
-              <el-col v-bind="grid">
-                <el-form-item label="虚拟销量：">
-                  <el-input-number v-model="formValidate.ficti" :min="0" placeholder="请输入排序" :disabled="isDisabled" />
-                </el-form-item>
-              </el-col>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="商品推荐：">
-                <el-checkbox-group v-model="checkboxGroup" size="small" @change="onChangeGroup" :disabled="isDisabled">
-                  <el-checkbox v-for="(item, index) in recommend" :key="index" :label="item.value">{{ item.name }}</el-checkbox>
-                </el-checkbox-group>
+                </template>
+                <el-table-column align="center" label="图片" min-width="80">
+                  <template slot-scope="scope">
+                    <div class="upLoadPicBox" @click="modalPicTap('1', 'duo', scope.$index)">
+                      <div v-if="scope.row.image" class="pictrue tabPic"><img :src="scope.row.image"></div>
+                      <div v-else class="upLoad tabPic">
+                        <i class="el-icon-camera cameraIconfont" />
+                      </div>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center"
+                  min-width="120">
+                  <template slot-scope="scope">
+                    <!--                    <span>scope.row:{{scope.row}}</span>-->
+                    <el-input :disabled="isDisabled" maxlength="9" min="0.01" v-model="scope.row[iii]" class="priceBox"
+                      @blur="keyupEvent(iii, scope.row[iii], scope.$index, 3)" />
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="一级返佣(元)" min-width="120" v-if="formValidate.isSub">
+                  <template slot-scope="scope">
+                    <el-input :disabled="isDisabled" v-model="scope.row.brokerage" type="number" :min="0"
+                      :max="scope.row.price" class="priceBox" />
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="二级返佣(元)" min-width="120" v-if="formValidate.isSub">
+                  <template slot-scope="scope">
+                    <el-input :disabled="isDisabled" v-model="scope.row.brokerageTwo" type="number" :min="0"
+                      :max="scope.row.price" class="priceBox" />
+                  </template>
+                </el-table-column>
+                <el-table-column v-if="!isDisabled" key="3" align="center" label="操作" min-width="80">
+                  <template slot-scope="scope">
+                    <el-button type="text" class="submission" @click="delAttrTable(scope.$index)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 商品详情-->
+        <el-row v-show="currentTab === 1 && !isDisabled">
+          <el-col :span="24">
+            <el-form-item label="商品详情：">
+              <Tinymce v-model="formValidate.content"></Tinymce>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="currentTab === 1 && isDisabled">
+          <el-col :span="24">
+            <el-form-item label="商品详情：">
+              <span v-html="formValidate.content || '无'"></span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 其他设置-->
+        <el-row v-show="currentTab === 2">
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="排序：">
+                <el-input-number v-model="formValidate.sort" :min="0" placeholder="请输入排序" :disabled="isDisabled" />
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="活动优先级：">
-                <div class="color-list acea-row row-middle">
-                  <div
-                    :disabled="isDisabled"
-                    class="color-item" :class="activity[item]"
-                    v-for="item in formValidate.activity"
-                    :key="item"
-                    draggable="true"
-                    @dragstart="handleDragStart($event, item)"
-                    @dragover.prevent="handleDragOver($event, item)"
-                    @dragenter="handleDragEnterFont($event, item)"
-                    @dragend="handleDragEnd($event, item)"
-                  >{{item}}</div>
-                  <div class="tip">可拖动按钮调整活动的优先展示顺序</div>
-                </div>
+            <el-col v-bind="grid">
+              <el-form-item label="积分：">
+                <el-input-number v-model="formValidate.giveIntegral" :min="0" placeholder="请输入排序"
+                  :disabled="isDisabled" />
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="优惠券：" class="proCoupon">
-                <div class="acea-row">
-                  <el-tag
-                    v-for="(tag, index) in formValidate.coupons"
-                    :key="index"
-                    class="mr10 mb10"
-                    :closable="!isDisabled"
-                    :disable-transitions="false"
-                    @close="handleCloseCoupon(tag)"
-                  >
-                    {{ tag.name }}
-                  </el-tag>
-                  <!-- <span v-if="formValidate.couponIds == null">无</span> -->
-                  <el-button v-if="!isDisabled" class="mr15" @click="addCoupon">选择优惠券</el-button>
-                </div>
+            <el-col v-bind="grid">
+              <el-form-item label="虚拟销量：">
+                <el-input-number v-model="formValidate.ficti" :min="0" placeholder="请输入排序" :disabled="isDisabled" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-form-item>
-            <el-button v-show="currentTab>0" class="submission priamry_border" @click="handleSubmitUp">上一步</el-button>
-            <el-button v-show="currentTab<2" type="primary" class="submission" @click="handleSubmitNest('formValidate')">下一步</el-button>
-            <el-button v-show="(currentTab===2 || $route.params.id) && !isDisabled" type="primary" class="submission" @click="handleSubmit('formValidate')">提交</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-      <CreatTemplates ref="addTemplates" @getList="getShippingList" />
-    </div>
-  </template>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品推荐：">
+              <el-checkbox-group v-model="checkboxGroup" size="small" @change="onChangeGroup" :disabled="isDisabled">
+                <el-checkbox v-for="(item, index) in recommend" :key="index" :label="item.value">{{ item.name
+                }}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="活动优先级：">
+              <div class="color-list acea-row row-middle">
+                <div :disabled="isDisabled" class="color-item" :class="activity[item]"
+                  v-for="item in formValidate.activity" :key="item" draggable="true"
+                  @dragstart="handleDragStart($event, item)" @dragover.prevent="handleDragOver($event, item)"
+                  @dragenter="handleDragEnterFont($event, item)" @dragend="handleDragEnd($event, item)">{{ item }}</div>
+                <div class="tip">可拖动按钮调整活动的优先展示顺序</div>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="优惠券：" class="proCoupon">
+              <div class="acea-row">
+                <el-tag v-for="(tag, index) in formValidate.coupons" :key="index" class="mr10 mb10"
+                  :closable="!isDisabled" :disable-transitions="false" @close="handleCloseCoupon(tag)">
+                  {{ tag.name }}
+                </el-tag>
+                <!-- <span v-if="formValidate.couponIds == null">无</span> -->
+                <el-button v-if="!isDisabled" class="mr15" @click="addCoupon">选择优惠券</el-button>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item>
+          <el-button v-show="currentTab > 0" class="submission priamry_border" @click="handleSubmitUp">上一步</el-button>
+          <el-button v-show="currentTab < 2" type="primary" class="submission"
+            @click="handleSubmitNest('formValidate')">下一步</el-button>
+          <el-button v-show="(currentTab === 2 || $route.params.id) && !isDisabled" type="primary" class="submission"
+            @click="handleSubmit('formValidate')">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <CreatTemplates ref="addTemplates" @getList="getShippingList" />
+  </div>
+</template>
   
-  <script>
-    import Tinymce from '@/components/Tinymce/index'
-    // import { templateListApi, productCreateApi, categoryApi, productDetailApi, productUpdateApi } from '@/api/store'
-    // import { marketingSendApi} from '@/api/marketing';
-    // import { shippingTemplatesList } from '@/api/logistics'
-    // import { goodDesignList } from "@/api/systemGroup"; 
-    import CreatTemplates from '@/views/systemSetting/logistics/shippingTemplates/creatTemplates'
-    import Templates from "../../appSetting/wxAccount/wxTemplate/index";
-    import {Debounce} from '@/utils/validate'
-    const defaultObj = {
-      image: '',
-      sliderImages: [],
-      videoLink:'',
-      sliderImage: '',
-      storeName: '',
-      storeInfo: '',
-      keyword: '',
-      cateIds: [], // 商品分类id
-      cateId: null, // 商品分类id传值
-      unitName: '',
-      sort: 0,
-      giveIntegral: 0,
-      ficti: 0,
-      isShow: false,
-      isBenefit: false,
-      isNew: false,
-      isGood: false,
-      isHot: false,
-      isBest: false,
-      tempId: '',
-      attrValue: [{
-        image: '',
-        price: 0,
-        cost: 0,
-        otPrice: 0,
-        stock: 0,
-        barCode: '',
-        weight: 0,
-        volume: 0
-      }],
-      attr: [],
-      selectRule: '',
-      isSub: false,
-      content: '',
-      specType: false,
-      id: 0,
-      couponIds: [],
-      coupons: [],
-      activity: ['默认','秒杀','砍价','拼团']
-    }
-    const objTitle = {
-      price: {
-        title: '售价'
-      },
-      cost: {
-        title: '成本价'
-      },
-      otPrice: {
-        title: '原价'
+<script>
+import productApi from '@/api/product/productAttr.js';
+import Tinymce from '@/components/Tinymce/index'
+import CreatTemplates from '@/views/systemSetting/logistics/shippingTemplates/creatTemplates'
+import Templates from "../../appSetting/wxAccount/wxTemplate/index";
+import { Debounce } from '@/utils/validate'
+const defaultObj = {
+  image: '',
+  sliderImages: [],
+  videoLink: '',
+  sliderImage: '',
+  storeName: '',
+  storeInfo: '',
+  keyword: '',
+  cateIds: [], // 商品分类id
+  cateId: null, // 商品分类id传值
+  unitName: '',
+  sort: 0,
+  giveIntegral: 0,
+  ficti: 0,
+  isShow: false,
+  isBenefit: false,
+  isNew: false,
+  isGood: false,
+  isHot: false,
+  isBest: false,
+  tempId: '',
+  attrValue: [{
+    image: '',
+    price: 0,
+    cost: 0,
+    otPrice: 0,
+    stock: 0,
+    barCode: '',
+    weight: 0,
+    volume: 0
+  }],
+  attr: [],
+  selectRule: '',
+  isSub: false,
+  content: '',
+  specType: false,
+  id: 0,
+  couponIds: [],
+  coupons: [],
+  activity: ['默认', '秒杀', '砍价', '拼团']
+}
+const objTitle = {
+  price: {
+    title: '售价'
+  },
+  cost: {
+    title: '成本价'
+  },
+  otPrice: {
+    title: '原价'
+  },
+  stock: {
+    title: '库存'
+  },
+  barCode: {
+    title: '商品编号'
+  },
+  weight: {
+    title: '重量（KG）'
+  },
+  volume: {
+    title: '体积(m³)'
+  }
+}
+export default {
+  name: 'ProductProductAdd',
+  components: { Templates, CreatTemplates, Tinymce },
+  data() {
+    return { 
+      isDisabled: this.$route.params.isDisabled === '1' ? true : false,
+      activity: { '默认': 'red', '秒杀': 'blue', '砍价': 'green', '拼团': 'yellow' },
+      props2: {
+        children: 'children',
+        label: 'categoryName',
+        value: 'id'
       },
-      stock: {
-        title: '库存'
+      checkboxGroup: [],
+      recommend: [],
+      tabs: [],
+      fullscreenLoading: false,
+      props: { multiple: true },
+      active: 0,
+      OneattrValue: [Object.assign({}, defaultObj.attrValue[0])], // 单规格
+      ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])], // 多规格
+      ruleList: [],
+      merCateList: [], // 商户分类筛选
+      shippingList: [], // 运费模板
+      formThead: Object.assign({}, objTitle),
+      formValidate: Object.assign({}, defaultObj),
+      formDynamics: {
+        ruleName: '',
+        ruleValue: []
       },
-      barCode: {
-        title: '商品编号'
+      tempData: {
+        page: 1,
+        limit: 9999
       },
-      weight: {
-        title: '重量（KG）'
+      manyTabTit: {},
+      manyTabDate: {},
+      grid2: {
+        xl: 12,
+        lg: 12,
+        md: 12,
+        sm: 24,
+        xs: 24
       },
-      volume: {
-        title: '体积(m³)'
-      }
-    }
-    export default {
-      name: 'ProductProductAdd',
-      components: {Templates, CreatTemplates,Tinymce },
-      data() {
-        return {
-          isDisabled: this.$route.params.isDisabled==='1'?true:false,
-          activity: { '默认': 'red', '秒杀': 'blue', '砍价': 'green', '拼团': 'yellow' },
-          props2: {
-            children: 'child',
-            label: 'name',
-            value: 'id',
-            multiple: true,
-            emitPath: false
-          },
-          checkboxGroup: [],
-          recommend: [],
-          tabs: [],
-          fullscreenLoading: false,
-          props: { multiple: true },
-          active: 0,
-          OneattrValue: [Object.assign({}, defaultObj.attrValue[0])], // 单规格
-          ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])], // 多规格
-          ruleList: [],
-          merCateList: [], // 商户分类筛选
-          shippingList: [], // 运费模板
-          formThead: Object.assign({}, objTitle),
-          formValidate: Object.assign({}, defaultObj),
-          formDynamics: {
-            ruleName: '',
-            ruleValue: []
-          },
-          tempData: {
-            page: 1,
-            limit: 9999
-          },
-          manyTabTit: {},
-          manyTabDate: {},
-          grid2: {
-            xl: 12,
-            lg: 12,
-            md: 12,
-            sm: 24,
-            xs: 24
-          },
-          // 规格数据
-          formDynamic: {
-            attrsName: '',
-            attrsVal: ''
-          },
-          isBtn: false,
-          manyFormValidate: [],
-          currentTab: 0,
-          isChoice: '',
-          grid: {
-            xl: 8,
-            lg: 8,
-            md: 12,
-            sm: 24,
-            xs: 24
-          },
-          ruleValidate: {
-            storeName: [
-              { required: true, message: '请输入商品名称', trigger: 'blur' }
-            ],
-            cateIds: [
-              { required: true, message: '请选择商品分类', trigger: 'change', type: 'array', min: '1' }
-            ],
-            keyword: [
-              { required: true, message: '请输入商品关键字', trigger: 'blur' }
-            ],
-            unitName: [
-              { required: true, message: '请输入单位', trigger: 'blur' }
-            ],
-            storeInfo: [
-              { required: true, message: '请输入商品简介', trigger: 'blur' }
-            ],
-            tempId: [
-              { required: true, message: '请选择运费模板', trigger: 'change' }
-            ],
-            image: [
-              { required: true, message: '请上传商品图', trigger: 'change' }
-            ],
-            sliderImages: [
-              { required: true, message: '请上传商品轮播图', type: 'array', trigger: 'change' }
-            ],
-            specType: [
-              { required: true, message: '请选择商品规格', trigger: 'change' }
-            ]
-          },
-          attrInfo: {},
-          tableFrom: {
-            page: 1,
-            limit: 9999,
-            keywords: ''
-          },
-          tempRoute: {},
-          keyNum: 0,
-          isAttr: false,
-          showAll:false,
-          videoLink: "",
-        }
+      // 规格数据
+      formDynamic: {
+        attrsName: '',
+        attrsVal: ''
       },
-      computed: {
-        attrValue() {
-          const obj = Object.assign({}, defaultObj.attrValue[0])
-          delete obj.image
-          return obj
-        },
-        oneFormBatch() {
-          const obj = [Object.assign({}, defaultObj.attrValue[0])]
-          delete obj[0].barCode
-          return obj
-        }
+      isBtn: false,
+      manyFormValidate: [],
+      currentTab: 0,
+      isChoice: '',
+      grid: {
+        xl: 8,
+        lg: 8,
+        md: 12,
+        sm: 24,
+        xs: 24
       },
-      watch: {
-        'formValidate.attr': {
-          handler: function(val) {
-            if (this.formValidate.specType && this.isAttr) this.watCh(val) //重要！！！
-          },
-          immediate: false,
-          deep: true
-        }
+      ruleValidate: {
+        storeName: [
+          { required: true, message: '请输入商品名称', trigger: 'blur' }
+        ],
+        cateIds: [
+          { required: true, message: '请选择商品分类', trigger: 'change', type: 'array', min: '1' }
+        ],
+        keyword: [
+          { required: true, message: '请输入商品关键字', trigger: 'blur' }
+        ],
+        unitName: [
+          { required: true, message: '请输入单位', trigger: 'blur' }
+        ],
+        storeInfo: [
+          { required: true, message: '请输入商品简介', trigger: 'blur' }
+        ],
+        tempId: [
+          { required: true, message: '请选择运费模板', trigger: 'change' }
+        ],
+        image: [
+          { required: true, message: '请上传商品图', trigger: 'change' }
+        ],
+        sliderImages: [
+          { required: true, message: '请上传商品轮播图', type: 'array', trigger: 'change' }
+        ],
+        specType: [
+          { required: true, message: '请选择商品规格', trigger: 'change' }
+        ]
       },
-      created() {
-        this.tempRoute = Object.assign({}, this.$route)
-        if (this.$route.params.id && this.formValidate.specType) {
-          this.$watch('formValidate.attr', this.watCh)
-        }
+      attrInfo: {},
+      tableFrom: {
+        page: 1,
+        limit: 9999,
+        keywords: ''
       },
-      mounted() {
-        this.formValidate.sliderImages = []
-        if ( this.$route.params.id ) {
-          this.setTagsViewTitle()
-          this.getInfo()
-        }
-        this.getCategorySelect()
-        this.getShippingList()
-        this.getGoodsType()
+      tempRoute: {},
+      keyNum: 0,
+      isAttr: false,
+      showAll: false,
+      videoLink: "",
+    }
+  },
+  computed: {
+    attrValue() {
+      const obj = Object.assign({}, defaultObj.attrValue[0])
+      delete obj.image
+      return obj
+    },
+    oneFormBatch() {
+      const obj = [Object.assign({}, defaultObj.attrValue[0])]
+      delete obj[0].barCode
+      return obj
+    }
+  },
+  watch: {
+    'formValidate.attr': {
+      handler: function (val) {
+        if (this.formValidate.specType && this.isAttr) this.watCh(val) //重要！！！
       },
-      methods: {
-        // 校验输入框不能输入0，保留2位小数，库存为正整数
-        keyupEvent(key, val, index, num) {
-          if (key === 'barCode') return;
-          var re = /^\D*([0-9]\d*\.?\d{0,2})?.*$/;
-          switch (num) {
-            case 1:
-              if (val == 0) {
-                this.oneFormBatch[index][key] = key === 'stock' ? 0 : 0.01;
-              } else {
-                this.oneFormBatch[index][key] =
-                  key === 'stock'
-                    ? parseInt(val)
-                    : this.$set(this.oneFormBatch[index], key, val.toString().replace(re, '$1'));
-              }
-              break;
-            case 2:
-              if (val == 0) {
-                this.OneattrValue[index][key] = key === 'stock' ? 0 : 0.01;
-              } else {
-                this.OneattrValue[index][key] =
-                  key === 'stock'
-                    ? parseInt(val)
-                    : this.$set(this.OneattrValue[index], key, val.toString().replace(re, '$1'));
-              }
-              break;
-            default:
-              if (val == 0) {
-                this.ManyAttrValue[index][key] = key === 'stock' ? 0 : 0.01;
-              } else {
-                this.ManyAttrValue[index][key] =
-                  key === 'stock'
-                    ? parseInt(val)
-                    : this.$set(this.ManyAttrValue[index], key, val.toString().replace(re, '$1'));
-              }
-              break;
+      immediate: false,
+      deep: true
+    }
+  },
+  created() { 
+    this.getCategorySelect();
+    this.productGetRule()
+  },
+  mounted() { 
+  },
+  methods: { 
+    // 校验输入框不能输入0，保留2位小数，库存为正整数
+    keyupEvent(key, val, index, num) {
+      if (key === 'barCode') return;
+      var re = /^\D*([0-9]\d*\.?\d{0,2})?.*$/;
+      switch (num) {
+        case 1:
+          if (val == 0) {
+            this.oneFormBatch[index][key] = key === 'stock' ? 0 : 0.01;
+          } else {
+            this.oneFormBatch[index][key] =
+              key === 'stock'
+                ? parseInt(val)
+                : this.$set(this.oneFormBatch[index], key, val.toString().replace(re, '$1'));
           }
-        },
-        handleCloseCoupon(tag) {
-          this.isAttr = true
-          this.formValidate.coupons.splice(this.formValidate.coupons.indexOf(tag), 1)
-          this.formValidate.couponIds.splice(this.formValidate.couponIds.indexOf(tag.id), 1)
-        },
-        addCoupon() {
-          const _this = this
-          this.$modalCoupon('wu', this.keyNum += 1, this.formValidate.coupons, function(row) {
-            _this.formValidate.couponIds = []
-            _this.formValidate.coupons = row
-            row.map((item) => {
-              _this.formValidate.couponIds.push(item.id)
-            })
-          }, '')
-        },
-        setTagsViewTitle() {
-          const title = this.isDisabled?'商品详情':'编辑商品'
-          const route = Object.assign({}, this.tempRoute, { title: `${title}-${this.$route.params.id}` })
-          this.$store.dispatch('tagsView/updateVisitedView', route)
-        },
-        onChangeGroup() {
-          this.checkboxGroup.includes('isGood') ? this.formValidate.isGood = true : this.formValidate.isGood = false
-          this.checkboxGroup.includes('isBenefit') ? this.formValidate.isBenefit = true : this.formValidate.isBenefit = false
-          this.checkboxGroup.includes('isBest') ? this.formValidate.isBest = true : this.formValidate.isBest = false
-          this.checkboxGroup.includes('isNew') ? this.formValidate.isNew = true : this.formValidate.isNew = false
-          this.checkboxGroup.includes('isHot') ? this.formValidate.isHot = true : this.formValidate.isHot = false
-        },
-        watCh(val) {
-          const tmp = {}
-          const tmpTab = {}
-          this.formValidate.attr.forEach((o, i) => {
-            // tmp['value' + i] = { title: o.attrName }
-            // tmpTab['value' + i] = ''
-            tmp[o.attrName] = { title: o.attrName };
-            tmpTab[o.attrName] = '';
-          });
-          this.ManyAttrValue = this.attrFormat(val);
-          this.ManyAttrValue.forEach((val, index) => {
-            const key = Object.values(val.attrValue).sort().join('/')
-            if (this.attrInfo[key]) this.ManyAttrValue[index] = this.attrInfo[key]
-          })
-          this.attrInfo = [];
-          this.ManyAttrValue.forEach((val) => {
-            this.attrInfo[Object.values(val.attrValue).sort().join('/')] = val
-          })
-          this.manyTabTit = tmp
-          this.manyTabDate = tmpTab
-          this.formThead = Object.assign({}, this.formThead, tmp)
-        },
-        attrFormat(arr) {
-          let data = []
-          const res = []
-          return format(arr)
-          function format(arr) {
-            if (arr.length > 1) {
-              arr.forEach((v, i) => {
-                if (i === 0) data = arr[i]['attrValue']
-                const tmp = []
-                if(!data) return;
-                data.forEach(function(vv) {
-                  arr[i + 1] && arr[i + 1]['attrValue'] && arr[i + 1]['attrValue'].forEach(g => {
-                    const rep2 = (i !== 0 ? '' : arr[i]['attrName'] + '_') + vv + '$&' + arr[i + 1]['attrName'] + '_' + g
-                    tmp.push(rep2)
-                    if (i === (arr.length - 2)) {
-                      const rep4 = {
-                        image: '',
-                        price: 0,
-                        cost: 0,
-                        otPrice: 0,
-                        stock: 0,
-                        barCode: '',
-                        weight: 0,
-                        volume: 0,
-                        brokerage: 0,
-                        brokerage_two: 0
-                      }
-                      rep2.split('$&').forEach((h, k) => {
-                        const rep3 = h.split('_');
-                        if (!rep4['attrValue']) rep4['attrValue'] = {}
-                        rep4['attrValue'][rep3[0]] = rep3.length > 1 ? rep3[1] : ''
-                      })
-                      for (let attrValueKey in rep4.attrValue) {
-                        rep4[attrValueKey] = rep4.attrValue[attrValueKey];
-                      }
-                      res.push(rep4)
-                    }
-                  })
-                })
-                data = tmp.length ? tmp : []
-              })
-            } else {
-              const dataArr = []
-              arr.forEach((v, k) => {
-                v['attrValue'].forEach((vv, kk) => {
-                  dataArr[kk] = v['attrName'] + '_' + vv
-                  res[kk] = {
+          break;
+        case 2:
+          if (val == 0) {
+            this.OneattrValue[index][key] = key === 'stock' ? 0 : 0.01;
+          } else {
+            this.OneattrValue[index][key] =
+              key === 'stock'
+                ? parseInt(val)
+                : this.$set(this.OneattrValue[index], key, val.toString().replace(re, '$1'));
+          }
+          break;
+        default:
+          if (val == 0) {
+            this.ManyAttrValue[index][key] = key === 'stock' ? 0 : 0.01;
+          } else {
+            this.ManyAttrValue[index][key] =
+              key === 'stock'
+                ? parseInt(val)
+                : this.$set(this.ManyAttrValue[index], key, val.toString().replace(re, '$1'));
+          }
+          break;
+      }
+    },
+    handleCloseCoupon(tag) {
+      this.isAttr = true
+      this.formValidate.coupons.splice(this.formValidate.coupons.indexOf(tag), 1)
+      this.formValidate.couponIds.splice(this.formValidate.couponIds.indexOf(tag.id), 1)
+    },
+    addCoupon() {
+      const _this = this
+      this.$modalCoupon('wu', this.keyNum += 1, this.formValidate.coupons, function (row) {
+        _this.formValidate.couponIds = []
+        _this.formValidate.coupons = row
+        row.map((item) => {
+          _this.formValidate.couponIds.push(item.id)
+        })
+      }, '')
+    },
+    setTagsViewTitle() {
+      const title = this.isDisabled ? '商品详情' : '编辑商品'
+      const route = Object.assign({}, this.tempRoute, { title: `${title}-${this.$route.params.id}` })
+      this.$store.dispatch('tagsView/updateVisitedView', route)
+    },
+    onChangeGroup() {
+      this.checkboxGroup.includes('isGood') ? this.formValidate.isGood = true : this.formValidate.isGood = false
+      this.checkboxGroup.includes('isBenefit') ? this.formValidate.isBenefit = true : this.formValidate.isBenefit = false
+      this.checkboxGroup.includes('isBest') ? this.formValidate.isBest = true : this.formValidate.isBest = false
+      this.checkboxGroup.includes('isNew') ? this.formValidate.isNew = true : this.formValidate.isNew = false
+      this.checkboxGroup.includes('isHot') ? this.formValidate.isHot = true : this.formValidate.isHot = false
+    },
+    watCh(val) {
+      const tmp = {}
+      const tmpTab = {}
+      this.formValidate.attr.forEach((o, i) => {
+        // tmp['value' + i] = { title: o.attrName }
+        // tmpTab['value' + i] = ''
+        tmp[o.attrName] = { title: o.attrName };
+        tmpTab[o.attrName] = '';
+      });
+      this.ManyAttrValue = this.attrFormat(val);
+      this.ManyAttrValue.forEach((val, index) => {
+        const key = Object.values(val.attrValue).sort().join('/')
+        if (this.attrInfo[key]) this.ManyAttrValue[index] = this.attrInfo[key]
+      })
+      this.attrInfo = [];
+      this.ManyAttrValue.forEach((val) => {
+        this.attrInfo[Object.values(val.attrValue).sort().join('/')] = val
+      })
+      this.manyTabTit = tmp
+      this.manyTabDate = tmpTab
+      this.formThead = Object.assign({}, this.formThead, tmp)
+    },
+    attrFormat(arr) {
+      let data = []
+      const res = []
+      return format(arr)
+      function format(arr) {
+        if (arr.length > 1) {
+          arr.forEach((v, i) => {
+            if (i === 0) data = arr[i]['attrValue']
+            const tmp = []
+            if (!data) return;
+            data.forEach(function (vv) {
+              arr[i + 1] && arr[i + 1]['attrValue'] && arr[i + 1]['attrValue'].forEach(g => {
+                const rep2 = (i !== 0 ? '' : arr[i]['attrName'] + '_') + vv + '$&' + arr[i + 1]['attrName'] + '_' + g
+                tmp.push(rep2)
+                if (i === (arr.length - 2)) {
+                  const rep4 = {
                     image: '',
                     price: 0,
                     cost: 0,
@@ -727,674 +668,756 @@
                     weight: 0,
                     volume: 0,
                     brokerage: 0,
-                    brokerage_two: 0,
-                    attrValue: { [v['attrName']]: vv }
+                    brokerage_two: 0
                   }
-                  // Object.values(res[kk].attrValue).forEach((v, i) => {
-                  //   res[kk]['value' + i] = v
-                  // })
-                  for (let attrValueKey in res[kk].attrValue) {
-                    res[kk][attrValueKey] = res[kk].attrValue[attrValueKey];
+                  rep2.split('$&').forEach((h, k) => {
+                    const rep3 = h.split('_');
+                    if (!rep4['attrValue']) rep4['attrValue'] = {}
+                    rep4['attrValue'][rep3[0]] = rep3.length > 1 ? rep3[1] : ''
+                  })
+                  for (let attrValueKey in rep4.attrValue) {
+                    rep4[attrValueKey] = rep4.attrValue[attrValueKey];
                   }
-                })
+                  res.push(rep4)
+                }
               })
-              data.push(dataArr.join('$&'))
-            }
-            return res
-          }
-        },
-        // 运费模板
-        addTem() {
-          this.$refs.addTemplates.dialogVisible = true
-          this.$refs.addTemplates.getCityList()
-        },
-        // 添加规则；
-        addRule() {
-          const _this = this
-          this.$modalAttr(this.formDynamics, function() {
-            _this.productGetRule()
+            })
+            data = tmp.length ? tmp : []
           })
-        },
-        // 选择规格
-        onChangeSpec(num) {
-          this.isAttr = true;
-          if (num) this.productGetRule()
-        },
-        // 选择属性确认
-        confirm() {
-          this.isAttr = true
-          if (!this.formValidate.selectRule) {
-            return this.$message.warning('请选择属性')
+        } else {
+          const dataArr = []
+          arr.forEach((v, k) => {
+            v['attrValue'].forEach((vv, kk) => {
+              dataArr[kk] = v['attrName'] + '_' + vv
+              res[kk] = {
+                image: '',
+                price: 0,
+                cost: 0,
+                otPrice: 0,
+                stock: 0,
+                barCode: '',
+                weight: 0,
+                volume: 0,
+                brokerage: 0,
+                brokerage_two: 0,
+                attrValue: { [v['attrName']]: vv }
+              }
+              // Object.values(res[kk].attrValue).forEach((v, i) => {
+              //   res[kk]['value' + i] = v
+              // })
+              for (let attrValueKey in res[kk].attrValue) {
+                res[kk][attrValueKey] = res[kk].attrValue[attrValueKey];
+              }
+            })
+          })
+          data.push(dataArr.join('$&'))
+        }
+        return res
+      }
+    },
+    // 运费模板
+    addTem() {
+      this.$refs.addTemplates.dialogVisible = true
+      this.$refs.addTemplates.getCityList()
+    },
+    // 添加规则；
+    addRule() {
+      const _this = this
+      this.$modalAttr(this.formDynamics, function () {
+        _this.productGetRule()
+      })
+    },
+    // 选择规格
+    onChangeSpec(num) {
+      this.isAttr = true;
+      if (num) this.productGetRule()
+    },
+    // 选择属性确认
+    confirm() {
+      this.isAttr = true
+      if (!this.formValidate.selectRule) {
+        return this.$message.warning('请选择属性')
+      }
+      const data = [];
+      this.formValidate.attr = this.ruleList.find(item=>item.id==this.formValidate.selectRule).attributesList;
+
+      console.log(this.formValidate.attr,'attributeContentList')
+      // this.ruleList.forEach(item => { attributesList
+      //   if (item.id === this.formValidate.selectRule) {
+      //     item.ruleValue.forEach(i => {
+      //       data.push({
+      //         attrName: i.value,
+      //         attrValue: i.detail
+      //       })
+      //     })
+      //   }
+      //   this.formValidate.attr = data;
+      // });
+    },
+    // 商品分类；
+    getCategorySelect() {
+      productApi.getClassificationTree().then(res=>{
+        if(res.code==20000){
+        this.merCateList = res.data;
+        }
+      })
+      //   categoryApi({ status: -1, type: 1 }).then(res => {
+      //     this.merCateList = this.filerMerCateList(res)
+      //     let newArr = [];
+      //     res.forEach((value,index) => {
+      //       newArr[index] = value;
+      //       if(value.child) newArr[index].child = value.child.filter(item => item.status === true)
+      //     }) //过滤商品分类设置为隐藏的子分类不出现在树形列表里
+      //     this.merCateList = this.filerMerCateList(newArr)
+      //   })
+    },
+    filerMerCateList(treeData) {
+      return treeData.map((item) => {
+        if (!item.child) {
+          item.disabled = true
+        }
+        item.label = item.name
+        return item
+      })
+    },
+    // 获取商品属性模板；
+    productGetRule() {
+      productApi.getAllAttributesType().then(res=>{
+        if(res.code==20000){
+        this.ruleList = res.data.map(item=>{
+          return {
+            ...item,
+            attributesList:item.attributesList.map(citem=>{
+              return {
+                ...citem,
+                attributeContentList:citem.attributeContent.split(",")
+              }
+            })
           }
-          const data = []
-          this.ruleList.forEach(item => {
-            if (item.id === this.formValidate.selectRule) {
-              item.ruleValue.forEach(i => {
-                data.push({
-                  attrName: i.value,
-                  attrValue: i.detail
-                })
-              })
+        }); 
+        };
+        console.log( this.ruleList,' this.ruleList')
+      })
+      // templateListApi(this.tableFrom).then(res => {
+      //   const list = res.list
+      //   for (var i = 0; i < list.length; i++) {
+      //     list[i].ruleValue = JSON.parse(list[i].ruleValue)
+      //   }
+      //   this.ruleList = list
+      // })
+    },
+    // 运费模板；
+    getShippingList() {
+      shippingTemplatesList(this.tempData).then(res => {
+        this.shippingList = res.list
+      })
+    },
+    showInput(item) {
+      this.$set(item, 'inputVisible', true)
+    },
+    onChangetype(item) {
+      if (item === 1) {
+        this.OneattrValue.map(item => {
+          this.$set(item, 'brokerage', null)
+          this.$set(item, 'brokerageTwo', null)
+        })
+        this.ManyAttrValue.map(item => {
+          this.$set(item, 'brokerage', null)
+          this.$set(item, 'brokerageTwo', null)
+        })
+      } else {
+        this.OneattrValue.map(item => {
+          delete item.brokerage
+          delete item.brokerageTwo
+          this.$set(item, 'brokerage', null)
+          this.$set(item, 'brokerageTwo', null)
+        })
+        this.ManyAttrValue.map(item => {
+          delete item.brokerage
+          delete item.brokerageTwo
+        })
+      }
+    },
+    // 删除表格中的属性
+    delAttrTable(index) {
+      this.ManyAttrValue.splice(index, 1)
+    },
+    // 批量添加
+    batchAdd() {
+      // if (!this.oneFormBatch[0].pic || !this.oneFormBatch[0].price || !this.oneFormBatch[0].cost || !this.oneFormBatch[0].ot_price ||
+      //     !this.oneFormBatch[0].stock || !this.oneFormBatch[0].bar_code) return this.$Message.warning('请填写完整的批量设置内容！');
+      for (const val of this.ManyAttrValue) {
+        this.$set(val, 'image', this.oneFormBatch[0].image)
+        this.$set(val, 'price', this.oneFormBatch[0].price)
+        this.$set(val, 'cost', this.oneFormBatch[0].cost)
+        this.$set(val, 'otPrice', this.oneFormBatch[0].otPrice)
+        this.$set(val, 'stock', this.oneFormBatch[0].stock)
+        this.$set(val, 'barCode', this.oneFormBatch[0].barCode)
+        this.$set(val, 'weight', this.oneFormBatch[0].weight)
+        this.$set(val, 'volume', this.oneFormBatch[0].volume)
+        this.$set(val, 'brokerage', this.oneFormBatch[0].brokerage)
+        this.$set(val, 'brokerageTwo', this.oneFormBatch[0].brokerageTwo)
+      }
+    },
+    // 添加按钮
+    addBtn() {
+      this.clearAttr()
+      this.isBtn = true
+    },
+    // 取消
+    offAttrName() {
+      this.isBtn = false
+    },
+    clearAttr() {
+      this.isAttr = true
+      this.formDynamic.attrsName = ''
+      this.formDynamic.attrsVal = ''
+    },
+    // 删除规格
+    handleRemoveAttr(index) {
+      this.isAttr = true
+      this.formValidate.attr.splice(index, 1)
+      this.manyFormValidate.splice(index, 1)
+    },
+    // 删除属性
+    handleClose(item, index) {
+      item.splice(index, 1)
+    },
+    // 添加规则名称
+    createAttrName() {
+      this.isAttr = true
+      if (this.formDynamic.attrsName && this.formDynamic.attrsVal) {
+        const data = {
+          attrName: this.formDynamic.attrsName,
+          attrValue: [
+            this.formDynamic.attrsVal
+          ]
+        }
+        this.formValidate.attr.push(data)
+        var hash = {}
+        this.formValidate.attr = this.formValidate.attr.reduce(function (item, next) {
+          /* eslint-disable */
+          hash[next.attrName] ? '' : hash[next.attrName] = true && item.push(next)
+          return item
+        }, [])
+        this.clearAttr()
+        this.isBtn = false
+      } else {
+        this.$Message.warning('请添加完整的规格！');
+      }
+    },
+    // 添加属性
+    createAttr(num, idx) {
+      this.isAttr = true
+      if (num) {
+        this.formValidate.attr[idx].attrValue.push(num);
+        var hash = {};
+        this.formValidate.attr[idx].attrValue = this.formValidate.attr[idx].attrValue.reduce(function (item, next) {
+          /* eslint-disable */
+          hash[next] ? '' : hash[next] = true && item.push(next);
+          return item
+        }, []);
+        this.formValidate.attr[idx].inputVisible = false
+      } else {
+        this.$message.warning('请添加属性');
+      }
+    },
+    //点击展示所有多规格属性
+    showAllSku() {
+      if (this.isAttr == false) {
+        this.isAttr = true;
+        if (this.formValidate.specType && this.isAttr) this.watCh(this.formValidate.attr) //重要！！！
+      } else if (this.isAttr == true) {
+        this.isAttr = false;
+        this.getInfo();
+      }
+    },
+    // 详情
+    getInfo() {
+      this.fullscreenLoading = true
+      productDetailApi(this.$route.params.id).then(async res => {
+        // this.isAttr = true;
+        let info = res
+        this.formValidate = {
+          image: this.$selfUtil.setDomain(info.image),
+          sliderImage: info.sliderImage,
+          sliderImages: JSON.parse(info.sliderImage),
+          storeName: info.storeName,
+          storeInfo: info.storeInfo,
+          keyword: info.keyword,
+          cateIds: info.cateId.split(','), // 商品分类id
+          cateId: info.cateId,// 商品分类id传值
+          unitName: info.unitName,
+          sort: info.sort,
+          isShow: info.isShow,
+          isBenefit: info.isBenefit,
+          isNew: info.isNew,
+          isGood: info.isGood,
+          isHot: info.isHot,
+          isBest: info.isBest,
+          tempId: info.tempId,
+          attr: info.attr,
+          attrValue: info.attrValue,
+          selectRule: info.selectRule,
+          isSub: info.isSub,
+          content: this.$selfUtil.replaceImgSrcHttps(info.content),
+          specType: info.specType,
+          id: info.id,
+          giveIntegral: info.giveIntegral,
+          ficti: info.ficti,
+          coupons: info.coupons,
+          couponIds: info.couponIds,
+          activity: info.activityStr ? info.activityStr.split(',') : ['默认', '秒杀', '砍价', '拼团']
+        }
+        marketingSendApi({ type: 3 }).then(res => {
+          if (this.formValidate.couponIds !== null) {
+            let ids = this.formValidate.couponIds.toString();
+            let arr = res.list;
+            let obj = {};
+            for (let i in arr) {
+              obj[arr[i].id] = arr[i];
             }
-            this.formValidate.attr = data;
-          });
-        },
-        // 商品分类；
-        getCategorySelect() {
-        //   categoryApi({ status: -1, type: 1 }).then(res => {
-        //     this.merCateList = this.filerMerCateList(res)
-        //     let newArr = [];
-        //     res.forEach((value,index) => {
-        //       newArr[index] = value;
-        //       if(value.child) newArr[index].child = value.child.filter(item => item.status === true)
-        //     }) //过滤商品分类设置为隐藏的子分类不出现在树形列表里
-        //     this.merCateList = this.filerMerCateList(newArr)
-        //   })
-        },
-        filerMerCateList(treeData) {
-          return treeData.map((item) => {
-            if(!item.child){
-              item.disabled = true
+            let strArr = ids.split(',');
+            let newArr = [];
+            for (let item of strArr) {
+              if (obj[item]) {
+                newArr.push(obj[item]);
+              }
             }
-            item.label = item.name
-            return item
-          })
-        },
-        // 获取商品属性模板；
-        productGetRule() {
-          templateListApi(this.tableFrom).then(res => {
-            const list = res.list
-            for (var i = 0; i < list.length; i++) {
-              list[i].ruleValue = JSON.parse(list[i].ruleValue)
+            this.$set(this.formValidate, 'coupons', newArr); //在编辑回显时，让返回数据中的优惠券id，通过接口匹配显示,
+          }
+        })
+        let imgs = JSON.parse(info.sliderImage)
+        let imgss = []
+        Object.keys(imgs).map(i => {
+          imgss.push(this.$selfUtil.setDomain(imgs[i]))
+        })
+        this.formValidate.sliderImages = [...imgss]
+        if (info.isHot) this.checkboxGroup.push('isHot')
+        if (info.isGood) this.checkboxGroup.push('isGood')
+        if (info.isBenefit) this.checkboxGroup.push('isBenefit')
+        if (info.isBest) this.checkboxGroup.push('isBest')
+        if (info.isNew) this.checkboxGroup.push('isNew')
+        this.productGetRule()
+        if (info.specType) {
+          this.formValidate.attr = info.attr.map(item => {
+            return {
+              attrName: item.attrName,
+              attrValue: item.attrValues.split(',')
             }
-            this.ruleList = list
           })
-        },
-        // 运费模板；
-        getShippingList() {
-          shippingTemplatesList(this.tempData).then(res => {
-            this.shippingList = res.list
+          this.ManyAttrValue = info.attrValue;
+          this.ManyAttrValue.forEach((val) => {
+            val.image = this.$selfUtil.setDomain(val.image);
+            val.attrValue = JSON.parse(val.attrValue);
+            this.attrInfo[Object.values(val.attrValue).sort().join('/')] = val;
           })
-        },
-        showInput(item) {
-          this.$set(item, 'inputVisible', true)
-        },
-        onChangetype(item) {
-          if (item === 1) {
-            this.OneattrValue.map(item => {
-              this.$set(item, 'brokerage', null)
-              this.$set(item, 'brokerageTwo', null)
-            })
-            this.ManyAttrValue.map(item => {
-              this.$set(item, 'brokerage', null)
-              this.$set(item, 'brokerageTwo', null)
-            })
+          /***多规格商品如果被删除过sku，优先展示api返回的数据,否则会有没有删除的错觉***/
+          let manyAttr = this.attrFormat(this.formValidate.attr)
+          if (manyAttr.length !== this.ManyAttrValue.length) {
+            this.$set(this, 'showAll', true)
+            this.isAttr = false;
           } else {
-            this.OneattrValue.map(item => {
-              delete item.brokerage
-              delete item.brokerageTwo
-              this.$set(item, 'brokerage', null)
-              this.$set(item, 'brokerageTwo', null)
-            })
-            this.ManyAttrValue.map(item => {
-              delete item.brokerage
-              delete item.brokerageTwo
-            })
-          }
-        },
-        // 删除表格中的属性
-        delAttrTable(index) {
-          this.ManyAttrValue.splice(index, 1)
-        },
-        // 批量添加
-        batchAdd() {
-          // if (!this.oneFormBatch[0].pic || !this.oneFormBatch[0].price || !this.oneFormBatch[0].cost || !this.oneFormBatch[0].ot_price ||
-          //     !this.oneFormBatch[0].stock || !this.oneFormBatch[0].bar_code) return this.$Message.warning('请填写完整的批量设置内容！');
-          for (const val of this.ManyAttrValue) {
-            this.$set(val, 'image', this.oneFormBatch[0].image)
-            this.$set(val, 'price', this.oneFormBatch[0].price)
-            this.$set(val, 'cost', this.oneFormBatch[0].cost)
-            this.$set(val, 'otPrice', this.oneFormBatch[0].otPrice)
-            this.$set(val, 'stock', this.oneFormBatch[0].stock)
-            this.$set(val, 'barCode', this.oneFormBatch[0].barCode)
-            this.$set(val, 'weight', this.oneFormBatch[0].weight)
-            this.$set(val, 'volume', this.oneFormBatch[0].volume)
-            this.$set(val, 'brokerage', this.oneFormBatch[0].brokerage)
-            this.$set(val, 'brokerageTwo', this.oneFormBatch[0].brokerageTwo)
+            this.isAttr = true;
           }
-        },
-        // 添加按钮
-        addBtn() {
-          this.clearAttr()
-          this.isBtn = true
-        },
-        // 取消
-        offAttrName() {
-          this.isBtn = false
-        },
-        clearAttr() {
-          this.isAttr = true
-          this.formDynamic.attrsName = ''
-          this.formDynamic.attrsVal = ''
-        },
-        // 删除规格
-        handleRemoveAttr(index) {
-          this.isAttr = true
-          this.formValidate.attr.splice(index, 1)
-          this.manyFormValidate.splice(index, 1)
-        },
-        // 删除属性
-        handleClose(item, index) {
-          item.splice(index, 1)
-        },
-        // 添加规则名称
-        createAttrName() {
-          this.isAttr = true
-          if (this.formDynamic.attrsName && this.formDynamic.attrsVal) {
-            const data = {
-              attrName: this.formDynamic.attrsName,
-              attrValue: [
-                this.formDynamic.attrsVal
-              ]
+          /*******/
+          const tmp = {}
+          const tmpTab = {}
+          this.formValidate.attr.forEach((o, i) => {
+            // tmp['value' + i] = { title: o.attrName }
+            // tmpTab['value' + i] = ''
+            tmp[o.attrName] = { title: o.attrName };
+            tmpTab[o.attrName] = '';
+          })
+
+          // 此处手动实现后台原本value0 value1的逻辑
+          this.formValidate.attrValue.forEach(item => {
+            for (let attrValueKey in item.attrValue) {
+              item[attrValueKey] = item.attrValue[attrValueKey];
             }
-            this.formValidate.attr.push(data)
-            var hash = {}
-            this.formValidate.attr = this.formValidate.attr.reduce(function(item, next) {
-              /* eslint-disable */
-              hash[next.attrName] ? '' : hash[next.attrName] = true && item.push(next)
-              return item
-            }, [])
-            this.clearAttr()
-            this.isBtn = false
-          } else {
-            this.$Message.warning('请添加完整的规格！');
+          });
+
+          this.manyTabTit = tmp
+          this.manyTabDate = tmpTab
+          this.formThead = Object.assign({}, this.formThead, tmp)
+        } else {
+          this.OneattrValue = info.attrValue
+          // this.formValidate.attr = [] //单规格商品规格设置为空
+        }
+        this.fullscreenLoading = false
+      }).catch(res => {
+        this.fullscreenLoading = false
+        this.$message.error(res.message);
+      });
+    },
+    handleRemove(i) {
+      this.formValidate.sliderImages.splice(i, 1)
+    },
+    // 点击商品图
+    modalPicTap(tit, num, i, status) {
+      const _this = this;
+      if (_this.isDisabled) return;
+      this.$modalUpload(function (img) {
+        if (tit === '1' && !num) {
+          _this.formValidate.image = img[0].sattDir
+          _this.OneattrValue[0].image = img[0].sattDir
+        }
+        if (tit === '2' && !num) {
+          if (img.length > 10) return this.$message.warning("最多选择10张图片！");
+          if (img.length + _this.formValidate.sliderImages.length > 10) return this.$message.warning("最多选择10张图片！");
+          img.map((item) => {
+            _this.formValidate.sliderImages.push(item.sattDir)
+          });
+        }
+        if (tit === '1' && num === 'dan') {
+          _this.OneattrValue[0].image = img[0].sattDir
+        }
+        if (tit === '1' && num === 'duo') {
+          _this.ManyAttrValue[i].image = img[0].sattDir
+        }
+        if (tit === '1' && num === 'pi') {
+          _this.oneFormBatch[0].image = img[0].sattDir
+        }
+      }, tit, 'content')
+    },
+    handleSubmitUp() {
+      // this.currentTab --
+      if (this.currentTab-- < 0) this.currentTab = 0;
+    },
+    handleSubmitNest(name) {
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          if (this.currentTab++ > 2) this.currentTab = 0;
+        } else {
+          if (!this.formValidate.store_name || !this.formValidate.cate_id || !this.formValidate.keyword
+            || !this.formValidate.unit_name || !this.formValidate.store_info
+            || !this.formValidate.image || !this.formValidate.slider_image) {
+            this.$message.warning("请填写完整商品信息！");
           }
-        },
-        // 添加属性
-        createAttr (num, idx) {
-          this.isAttr = true
-          if (num) {
-            this.formValidate.attr[idx].attrValue.push(num);
-            var hash = {};
-            this.formValidate.attr[idx].attrValue = this.formValidate.attr[idx].attrValue.reduce(function (item, next) {
-              /* eslint-disable */
-              hash[next] ? '' : hash[next] = true && item.push(next);
-              return item
-            }, []);
-            this.formValidate.attr[idx].inputVisible = false
-          } else {
-            this.$message.warning('请添加属性');
+        }
+      })
+    },
+    // 提交
+    handleSubmit: Debounce(function (name) {
+      this.onChangeGroup()
+      if (this.formValidate.specType && this.formValidate.attr.length < 1) return this.$message.warning("请填写多规格属性！");
+      this.formValidate.cateId = this.formValidate.cateIds.join(',')
+      this.formValidate.sliderImage = JSON.stringify(this.formValidate.sliderImages)
+      if (this.formValidate.specType) {
+        this.formValidate.attrValue = this.ManyAttrValue;
+        this.formValidate.attr = this.formValidate.attr.map((item) => {
+          return {
+            attrName: item.attrName,
+            id: item.id,
+            attrValues: item.attrValue.join(','),
           }
-        },
-        //点击展示所有多规格属性
-        showAllSku(){
-            if(this.isAttr == false){
-              this.isAttr = true;
-              if (this.formValidate.specType && this.isAttr) this.watCh(this.formValidate.attr) //重要！！！
-            }else if(this.isAttr == true){
-              this.isAttr = false;
-              this.getInfo();
-            }
-        },
-        // 详情
-        getInfo () {
+        })
+        for (var i = 0; i < this.formValidate.attrValue.length; i++) {
+          this.$set(this.formValidate.attrValue[i], 'id', 0);
+          this.$set(this.formValidate.attrValue[i], 'productId', 0);
+          this.$set(this.formValidate.attrValue[i], 'attrValue', JSON.stringify(this.formValidate.attrValue[i].attrValue)); //
+          delete this.formValidate.attrValue[i].value0
+        }
+      } else {
+        this.formValidate.attr = [{ attrName: '规格', attrValues: '默认', id: this.$route.params.id ? this.formValidate.attr[0].id : 0 }]
+        this.OneattrValue.map(item => {
+          this.$set(item, 'attrValue', JSON.stringify({ '规格': '默认' }))
+        })
+        this.formValidate.attrValue = this.OneattrValue
+      }
+      this.$refs[name].validate((valid) => {
+        if (valid) {
           this.fullscreenLoading = true
-          productDetailApi(this.$route.params.id).then(async res => {
-            // this.isAttr = true;
-            let info = res
-            this.formValidate = {
-              image: this.$selfUtil.setDomain(info.image),
-              sliderImage: info.sliderImage,
-              sliderImages: JSON.parse(info.sliderImage),
-              storeName: info.storeName,
-              storeInfo: info.storeInfo,
-              keyword: info.keyword,
-              cateIds: info.cateId.split(','), // 商品分类id
-              cateId: info.cateId,// 商品分类id传值
-              unitName: info.unitName,
-              sort: info.sort,
-              isShow: info.isShow,
-              isBenefit: info.isBenefit,
-              isNew: info.isNew,
-              isGood: info.isGood,
-              isHot: info.isHot,
-              isBest: info.isBest,
-              tempId: info.tempId,
-              attr: info.attr,
-              attrValue: info.attrValue,
-              selectRule: info.selectRule,
-              isSub: info.isSub,
-              content: this.$selfUtil.replaceImgSrcHttps(info.content),
-              specType: info.specType,
-              id: info.id,
-              giveIntegral: info.giveIntegral,
-              ficti: info.ficti,
-              coupons: info.coupons,
-              couponIds: info.couponIds,
-              activity: info.activityStr ? info.activityStr.split(',') : ['默认','秒杀','砍价','拼团']
-            }
-            marketingSendApi({type:3}).then(res=>{
-              if(this.formValidate.couponIds !== null){
-                let ids = this.formValidate.couponIds.toString();
-                let arr = res.list;
-                let obj = {};
-                for (let i in arr) {
-                  obj[arr[i].id] = arr[i];
-                }
-                let strArr = ids.split(',');
-                let newArr = [];
-                for (let item of strArr) {
-                  if (obj[item]) {
-                    newArr.push(obj[item]);
-                  }
-                }
-                this.$set(this.formValidate,'coupons',newArr); //在编辑回显时，让返回数据中的优惠券id，通过接口匹配显示,
-              }
-            })
-            let imgs = JSON.parse(info.sliderImage)
-            let imgss = []
-            Object.keys(imgs).map(i => {
-              imgss.push(this.$selfUtil.setDomain(imgs[i]))
-            })
-            this.formValidate.sliderImages = [ ...imgss ]
-            if(info.isHot) this.checkboxGroup.push('isHot')
-            if(info.isGood) this.checkboxGroup.push('isGood')
-            if(info.isBenefit) this.checkboxGroup.push('isBenefit')
-            if(info.isBest) this.checkboxGroup.push('isBest')
-            if(info.isNew) this.checkboxGroup.push('isNew')
-            this.productGetRule()
-            if(info.specType){
-              this.formValidate.attr = info.attr.map(item => {
-                return {
-                  attrName : item.attrName,
-                  attrValue: item.attrValues.split(',')
-                }
-              })
-              this.ManyAttrValue = info.attrValue;
-              this.ManyAttrValue.forEach((val) => {
-                val.image = this.$selfUtil.setDomain(val.image);
-                val.attrValue = JSON.parse(val.attrValue);
-                this.attrInfo[Object.values(val.attrValue).sort().join('/')] = val;
-              })
-              /***多规格商品如果被删除过sku，优先展示api返回的数据,否则会有没有删除的错觉***/
-              let manyAttr = this.attrFormat(this.formValidate.attr)
-              if(manyAttr.length !== this.ManyAttrValue.length){
-                this.$set(this,'showAll',true)
-                this.isAttr = false;
-              }else{
-                this.isAttr = true;
-              }
-              /*******/
-              const tmp = {}
-              const tmpTab = {}
-              this.formValidate.attr.forEach((o, i) => {
-                // tmp['value' + i] = { title: o.attrName }
-                // tmpTab['value' + i] = ''
-                tmp[o.attrName] = { title: o.attrName };
-                tmpTab[o.attrName] = '';
-              })
-  
-              // 此处手动实现后台原本value0 value1的逻辑
-              this.formValidate.attrValue.forEach(item => {
-                for (let attrValueKey in item.attrValue) {
-                 item[attrValueKey] = item.attrValue[attrValueKey];
-                }
-              });
-  
-              this.manyTabTit = tmp
-              this.manyTabDate = tmpTab
-              this.formThead = Object.assign({}, this.formThead, tmp)
-            }else{
-              this.OneattrValue = info.attrValue
-              // this.formValidate.attr = [] //单规格商品规格设置为空
-            }
+          this.$route.params.id ? productUpdateApi(this.formValidate).then(async res => {
+            this.$message.success('编辑成功');
+            setTimeout(() => {
+              this.$router.push({ path: '/store/index' });
+            }, 500);
+            this.fullscreenLoading = false
+          }).catch(res => {
+            this.fullscreenLoading = false
+          }) : productCreateApi(this.formValidate).then(async res => {
+            this.$message.success('新增成功');
+            setTimeout(() => {
+              this.$router.push({ path: '/store/index' });
+            }, 500);
             this.fullscreenLoading = false
           }).catch(res => {
             this.fullscreenLoading = false
-            this.$message.error(res.message);
-          });
-        },
-        handleRemove (i) {
-          this.formValidate.sliderImages.splice(i, 1)
-        },
-        // 点击商品图
-        modalPicTap (tit, num, i,status) {
-          const _this = this;
-          if(_this.isDisabled) return;
-          this.$modalUpload(function(img) {
-            if(tit==='1'&& !num){
-              _this.formValidate.image = img[0].sattDir
-              _this.OneattrValue[0].image = img[0].sattDir
-            }
-            if(tit==='2'&& !num){
-              if(img.length>10) return this.$message.warning("最多选择10张图片！");
-              if(img.length + _this.formValidate.sliderImages.length > 10) return this.$message.warning("最多选择10张图片！");
-              img.map((item) => {
-                _this.formValidate.sliderImages.push(item.sattDir)
-              });
-            }
-            if(tit==='1'&& num === 'dan' ){
-              _this.OneattrValue[0].image = img[0].sattDir
-            }
-            if(tit==='1'&& num === 'duo' ){
-              _this.ManyAttrValue[i].image = img[0].sattDir
-            }
-            if(tit==='1'&& num === 'pi' ){
-              _this.oneFormBatch[0].image = img[0].sattDir
-            }
-          },tit, 'content')
-        },
-        handleSubmitUp(){
-          // this.currentTab --
-          if (this.currentTab-- <0) this.currentTab = 0;
-        },
-        handleSubmitNest(name){
-          this.$refs[name].validate((valid) => {
-            if (valid) {
-              if (this.currentTab++ > 2) this.currentTab = 0;
-            } else {
-              if(!this.formValidate.store_name || !this.formValidate.cate_id || !this.formValidate.keyword
-                || !this.formValidate.unit_name || !this.formValidate.store_info
-                || !this.formValidate.image || !this.formValidate.slider_image){
-                this.$message.warning("请填写完整商品信息！");
-              }
-            }
           })
-        },
-        // 提交
-        handleSubmit:Debounce(function(name) {
-          this.onChangeGroup()
-          if( this.formValidate.specType && this.formValidate.attr.length < 1 ) return this.$message.warning("请填写多规格属性！");
-          this.formValidate.cateId = this.formValidate.cateIds.join(',')
-          this.formValidate.sliderImage = JSON.stringify(this.formValidate.sliderImages)
-          if(this.formValidate.specType){
-            this.formValidate.attrValue=this.ManyAttrValue;
-            this.formValidate.attr = this.formValidate.attr.map((item) =>{
-              return {
-                attrName:item.attrName,
-                id:item.id,
-                attrValues:item.attrValue.join(','),
-              }
-            })
-            for (var i = 0; i < this.formValidate.attrValue.length; i++) {
-              this.$set(this.formValidate.attrValue[i],'id',0);
-              this.$set(this.formValidate.attrValue[i],'productId',0);
-              this.$set(this.formValidate.attrValue[i],'attrValue',JSON.stringify(this.formValidate.attrValue[i].attrValue)); //
-              delete this.formValidate.attrValue[i].value0
-            }
-          }else{
-            this.formValidate.attr = [{attrName:'规格',attrValues:'默认',id: this.$route.params.id? this.formValidate.attr[0].id : 0}]
-            this.OneattrValue.map(item => {
-              this.$set(item, 'attrValue', JSON.stringify({'规格':'默认'}))
-            })
-            this.formValidate.attrValue=this.OneattrValue
-          }
-          this.$refs[name].validate((valid) => {
-            if (valid) {
-              this.fullscreenLoading = true
-              this.$route.params.id?productUpdateApi(this.formValidate).then(async res => {
-                this.$message.success('编辑成功');
-                setTimeout(() => {
-                  this.$router.push({ path: '/store/index' });
-                }, 500);
-                this.fullscreenLoading = false
-              }).catch(res => {
-                this.fullscreenLoading = false
-              }):productCreateApi(this.formValidate).then(async res => {
-                this.$message.success('新增成功');
-                setTimeout(() => {
-                  this.$router.push({ path: '/store/index' });
-                }, 500);
-                this.fullscreenLoading = false
-              }).catch(res => {
-                this.fullscreenLoading = false
-              })
-            } else {
-              if(!this.formValidate.storeName || !this.formValidate.cateId  || !this.formValidate.keyword
-                || !this.formValidate.unitName || !this.formValidate.storeInfo || !this.formValidate.image || !this.formValidate.sliderImages){
-                this.$message.warning("请填写完整商品信息！");
-              }
-            }
-          });
-        }),
-        // 表单验证
-        validate (prop, status, error) {
-          if (status === false) {
-            this.$message.warning(error);
-          }
-        },
-        // 移动
-        handleDragStart (e, item) {
-          if(!this.isDisabled) this.dragging = item;
-        },
-        handleDragEnd (e, item) {
-          if(!this.isDisabled) this.dragging = null
-        },
-        handleDragOver (e) {
-          if(!this.isDisabled) e.dataTransfer.dropEffect = 'move'
-        },
-        handleDragEnter (e, item) {
-          if(!this.isDisabled){
-            e.dataTransfer.effectAllowed = 'move'
-            if (item === this.dragging) {
-              return
-            }
-            const newItems = [...this.formValidate.sliderImages]
-            const src = newItems.indexOf(this.dragging)
-            const dst = newItems.indexOf(item)
-            newItems.splice(dst, 0, ...newItems.splice(src, 1))
-            this.formValidate.sliderImages = newItems;
-          }
-        },
-        handleDragEnterFont(e, item) {
-          if(!this.isDisabled){
-            e.dataTransfer.effectAllowed = 'move'
-            if (item === this.dragging) {
-              return
-            }
-            const newItems = [...this.formValidate.activity]
-            const src = newItems.indexOf(this.dragging)
-            const dst = newItems.indexOf(item)
-            newItems.splice(dst, 0, ...newItems.splice(src, 1))
-            this.formValidate.activity = newItems;
+        } else {
+          if (!this.formValidate.storeName || !this.formValidate.cateId || !this.formValidate.keyword
+            || !this.formValidate.unitName || !this.formValidate.storeInfo || !this.formValidate.image || !this.formValidate.sliderImages) {
+            this.$message.warning("请填写完整商品信息！");
           }
-        },
-        getGoodsType(){
-          /** 让商品推荐列表的name属性与页面设置tab的name匹配**/
-          goodDesignList({gid:70}).then((response)=>{
-            let list = response.list;
-            let arr = [],arr1 = [];
-            const listArr = [{ name: '是否热卖', value: 'isGood' }];
-            let typeLists = [ 
-              { name: '', value: 'isHot',type:'2' },   //热门榜单 
-              { name: '', value: 'isBenefit' ,type:'4'}, //促销单品
-              { name: '', value: 'isBest',type:'1' }, //精品推荐
-              { name: '', value: 'isNew',type:'3' }]; //首发新品
-            list.forEach((item)=>{
-              let obj = {};
-              obj.value = JSON.parse(item.value);
-              obj.id = item.id;
-              obj.gid = item.gid;
-              obj.status = item.status;
-              arr.push(obj);
-            })
-            arr.forEach((item1)=>{
-              let obj1 = {};
-              obj1.name = item1.value.fields[1].value;
-              obj1.status = item1.status;
-              obj1.type = item1.value.fields[3].value;
-              arr1.push(obj1);
-            })
-            typeLists.forEach((item)=>{
-              arr1.forEach((item1)=>{
-                if(item.type == item1.type){
-                  listArr.push({
-                    name:item1.name,
-                    value:item.value,
-                    type:item.type
-                  })
-                }
-              })
-            })
-            this.recommend = listArr
-          })
-        },
-      }
-    }
-  </script>
-  <style scoped lang="scss">
-    .disLabel{
-      ::v-deep.el-form-item__label{
-        margin-left: 36px !important;
-      }
-    }
-    .disLabelmoren{
-      ::v-deep.el-form-item__label{
-        margin-left: 120px !important;
-      }
-    }
-    .priamry_border{
-      border: 1px solid #1890FF;
-      color: #1890FF;
-    }
-    .color-item{
-      height: 30px;
-      line-height: 30px;
-      padding: 0 10px;
-      color:#fff;
-      margin-right :10px;
-    }
-    .color-list .color-item.blue{
-      background-color: #1E9FFF;
-    }
-    .color-list .color-item.yellow{
-      background-color: rgb(254, 185, 0);
-    }
-    .color-list .color-item.green{
-      background-color: #009688;
-    }
-    .color-list .color-item.red{
-      background-color: #ed4014;
-    }
-    .proCoupon{
-      ::v-deep.el-form-item__content{
-        margin-top: 5px;
-      }
-    }
-    .tabPic{
-      width: 40px !important;
-      height: 40px !important;
-      img{
-        width: 100%;
-        height: 100%;
-      }
-    }
-    .noLeft{
-      ::v-deep.el-form-item__content{
-        margin-left: 0 !important;
-      }
-    }
-    .tabNumWidth{
-      ::v-deep.el-input-number--medium{
-        width: 121px !important;
-      }
-      ::v-deep.el-input-number__increase{
-        width: 20px !important;
-        font-size: 12px !important;
-      }
-      ::v-deep.el-input-number__decrease{
-        width: 20px !important;
-        font-size: 12px !important;
-      }
-      ::v-deep.el-input-number--medium .el-input__inner {
-        padding-left: 25px !important;
-        padding-right: 25px !important;
-      }
-      ::v-deep thead{
-        line-height: normal !important;
-      }
-      ::v-deep .el-table .cell{
-        line-height: normal !important;
-      }
-    }
-    .selWidth{
-      width: 100%;
-    }
-    .selWidthd{
-      width: 300px;
-    }
-    .button-new-tag {
-      height: 28px;
-      line-height: 26px;
-      padding-top: 0;
-      padding-bottom: 0;
-    }
-    .input-new-tag {
-      width: 90px;
-      margin-left: 10px;
-      vertical-align: bottom;
-    }
-    .pictrue{
-      width: 60px;
-      height: 60px;
-      border: 1px dotted rgba(0,0,0,0.1);
-      margin-right: 10px;
-      position: relative;
-      cursor: pointer;
-      img{
-        width: 100%;
-        height: 100%;
+        }
+      });
+    }),
+    // 表单验证
+    validate(prop, status, error) {
+      if (status === false) {
+        this.$message.warning(error);
       }
-      video{
-        width: 100%;
-        height: 100%;
+    },
+    // 移动
+    handleDragStart(e, item) {
+      if (!this.isDisabled) this.dragging = item;
+    },
+    handleDragEnd(e, item) {
+      if (!this.isDisabled) this.dragging = null
+    },
+    handleDragOver(e) {
+      if (!this.isDisabled) e.dataTransfer.dropEffect = 'move'
+    },
+    handleDragEnter(e, item) {
+      if (!this.isDisabled) {
+        e.dataTransfer.effectAllowed = 'move'
+        if (item === this.dragging) {
+          return
+        }
+        const newItems = [...this.formValidate.sliderImages]
+        const src = newItems.indexOf(this.dragging)
+        const dst = newItems.indexOf(item)
+        newItems.splice(dst, 0, ...newItems.splice(src, 1))
+        this.formValidate.sliderImages = newItems;
       }
-    }
-    .btndel{
-      position: absolute;
-      z-index: 1;
-      width :20px !important;
-      height: 20px !important;
-      left: 46px;
-      top: -4px;
-    }
-    .labeltop{
-      ::v-deep.el-form-item__label{
-        float: none !important;
-        display: inline-block !important;
-        width: auto !important;
+    },
+    handleDragEnterFont(e, item) {
+      if (!this.isDisabled) {
+        e.dataTransfer.effectAllowed = 'move'
+        if (item === this.dragging) {
+          return
+        }
+        const newItems = [...this.formValidate.activity]
+        const src = newItems.indexOf(this.dragging)
+        const dst = newItems.indexOf(item)
+        newItems.splice(dst, 0, ...newItems.splice(src, 1))
+        this.formValidate.activity = newItems;
       }
-    }
-    .iview-video-style {
-    width: 300px;
-    height: 180px;
-    border-radius: 10px;
-    background-color: #707070;
-    margin: 0 120px 20px;
-    position: relative;
-    overflow: hidden;
+    },
+    getGoodsType() {
+      /** 让商品推荐列表的name属性与页面设置tab的name匹配**/
+      goodDesignList({ gid: 70 }).then((response) => {
+        let list = response.list;
+        let arr = [], arr1 = [];
+        const listArr = [{ name: '是否热卖', value: 'isGood' }];
+        let typeLists = [
+          { name: '', value: 'isHot', type: '2' },   //热门榜单 
+          { name: '', value: 'isBenefit', type: '4' }, //促销单品
+          { name: '', value: 'isBest', type: '1' }, //精品推荐
+          { name: '', value: 'isNew', type: '3' }]; //首发新品
+        list.forEach((item) => {
+          let obj = {};
+          obj.value = JSON.parse(item.value);
+          obj.id = item.id;
+          obj.gid = item.gid;
+          obj.status = item.status;
+          arr.push(obj);
+        })
+        arr.forEach((item1) => {
+          let obj1 = {};
+          obj1.name = item1.value.fields[1].value;
+          obj1.status = item1.status;
+          obj1.type = item1.value.fields[3].value;
+          arr1.push(obj1);
+        })
+        typeLists.forEach((item) => {
+          arr1.forEach((item1) => {
+            if (item.type == item1.type) {
+              listArr.push({
+                name: item1.name,
+                value: item.value,
+                type: item.type
+              })
+            }
+          })
+        })
+        this.recommend = listArr
+      })
+    },
   }
-  
-  .iview-video-style .iconv {
-    color: #fff;
-    line-height: 180px;
-    width: 50px;
-    height: 50px;
-    display: inherit;
-    font-size: 26px;
-    position: absolute;
-    top: -74px;
-    left: 50%;
-    margin-left: -25px;
+}
+</script>
+<style scoped lang="scss">
+.disLabel {
+  ::v-deep.el-form-item__label {
+    margin-left: 36px !important;
   }
-  
-  .iview-video-style .mark {
-    position: absolute;
+}
+
+.disLabelmoren {
+  ::v-deep.el-form-item__label {
+    margin-left: 120px !important;
+  }
+}
+
+.priamry_border {
+  border: 1px solid #1890FF;
+  color: #1890FF;
+}
+
+.color-item {
+  height: 30px;
+  line-height: 30px;
+  padding: 0 10px;
+  color: #fff;
+  margin-right: 10px;
+}
+
+.color-list .color-item.blue {
+  background-color: #1E9FFF;
+}
+
+.color-list .color-item.yellow {
+  background-color: rgb(254, 185, 0);
+}
+
+.color-list .color-item.green {
+  background-color: #009688;
+}
+
+.color-list .color-item.red {
+  background-color: #ed4014;
+}
+
+.proCoupon {
+  ::v-deep.el-form-item__content {
+    margin-top: 5px;
+  }
+}
+
+.tabPic {
+  width: 40px !important;
+  height: 40px !important;
+
+  img {
     width: 100%;
-    height: 30px;
-    top: 0;
-    background-color: rgba(0, 0, 0, 0.5);
-    text-align: center;
+    height: 100%;
+  }
+}
+
+.noLeft {
+  ::v-deep.el-form-item__content {
+    margin-left: 0 !important;
+  }
+}
+
+.tabNumWidth {
+  ::v-deep.el-input-number--medium {
+    width: 121px !important;
+  }
+
+  ::v-deep.el-input-number__increase {
+    width: 20px !important;
+    font-size: 12px !important;
+  }
+
+  ::v-deep.el-input-number__decrease {
+    width: 20px !important;
+    font-size: 12px !important;
+  }
+
+  ::v-deep.el-input-number--medium .el-input__inner {
+    padding-left: 25px !important;
+    padding-right: 25px !important;
+  }
+
+  ::v-deep thead {
+    line-height: normal !important;
+  }
+
+  ::v-deep .el-table .cell {
+    line-height: normal !important;
+  }
+}
+
+.selWidth {
+  width: 100%;
+}
+
+.selWidthd {
+  width: 300px;
+}
+
+.button-new-tag {
+  height: 28px;
+  line-height: 26px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.input-new-tag {
+  width: 90px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
+
+.pictrue {
+  width: 60px;
+  height: 60px;
+  border: 1px dotted rgba(0, 0, 0, 0.1);
+  margin-right: 10px;
+  position: relative;
+  cursor: pointer;
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+
+  video {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.btndel {
+  position: absolute;
+  z-index: 1;
+  width: 20px !important;
+  height: 20px !important;
+  left: 46px;
+  top: -4px;
+}
+
+.labeltop {
+  ::v-deep.el-form-item__label {
+    float: none !important;
+    display: inline-block !important;
+    width: auto !important;
   }
-  </style>
+}
+
+.iview-video-style {
+  width: 300px;
+  height: 180px;
+  border-radius: 10px;
+  background-color: #707070;
+  margin: 0 120px 20px;
+  position: relative;
+  overflow: hidden;
+}
+
+.iview-video-style .iconv {
+  color: #fff;
+  line-height: 180px;
+  width: 50px;
+  height: 50px;
+  display: inherit;
+  font-size: 26px;
+  position: absolute;
+  top: -74px;
+  left: 50%;
+  margin-left: -25px;
+}
+
+.iview-video-style .mark {
+  position: absolute;
+  width: 100%;
+  height: 30px;
+  top: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  text-align: center;
+}
+</style>
   
\ No newline at end of file
diff --git a/src/views/product/productAttr/addAttr.vue b/src/views/product/productAttr/addAttr.vue
index 8fc8f89..21f96d1 100644
--- a/src/views/product/productAttr/addAttr.vue
+++ b/src/views/product/productAttr/addAttr.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="modal" @closed="onCancel" title="商品规格" width="1000px" v-loading="spinShow">
+  <el-dialog :visible.sync="modal" @close="onCancel" title="商品规格" width="1000px" v-loading="spinShow">
     <el-form ref="formDynamic" :model="formDynamic" :rules="rules" class="attrFrom" label-width="110px"
       label-position="right" @submit.native.prevent>
       <el-row :gutter="24">
@@ -47,7 +47,7 @@
           </el-col>
         </el-col>
       </el-row>
-      <el-button type="primary" @click="addBtn" v-if="!isBtn&model=='save'" class="add">添加新规格</el-button>
+      <el-button type="primary" @click="addBtn" v-if="!isBtn & model == 'save'" class="add">添加新规格</el-button>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="onClose">取消</el-button>
@@ -56,7 +56,7 @@
   </el-dialog>
 </template> 
 <script>
-import productApi from '@/api/product/productAttr.js'; 
+import productApi from '@/api/product/productAttr.js';
 export default {
   name: 'addAttr',
   props: {
@@ -104,13 +104,14 @@ export default {
       }
     }
   },
-  created() {
-    console.log(this.formDynamic)
-  },
+  created() { },
   methods: {
-    onCancel() { 
-      this.$parent.clearSelection();
-      this.$parent.selection = [];
+    onCancel() {
+      this.$parent.clearSelection(); 
+      this.formDynamic = {
+        name: '',
+        spec: [],
+      }
     },
     onClose() {
       this.ids = 0;
@@ -142,19 +143,23 @@ export default {
           if (this.formDynamic.spec.length === 0) {
             return this.$message.warning('请至少添加一条商品规格！');
           }
-          this.modal_loading = true;   
-          Promise.all([...this.formDynamic.spec.map(item => { 
-            return productApi[this.model]({
+          this.modal_loading = true;
+          Promise.all([...this.formDynamic.spec.map(item => {
+            return productApi[this.model](Object.assign({
               "attributeName": item.value,
               "attributeContent": item.detail.join(","),
-              "typeId": this.formDynamic.id,
               "sort": 1,
-            })
+            }, this.model == "save" ? {
+              "typeId": this.formDynamic.id,
+            } : {
+              "id": this.formDynamic.id || ""
+            }))
           })]).then(res => {
             this.$message.success("添加成功")
             this.modal = false;
           }).finally(() => {
             this.modal_loading = false;
+            this.model == "save" ? this.$parent.handleCurrentChange() : this.$parent.$refs.attrList.getByPage()
           })
 
         } else {
@@ -222,9 +227,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
-::v-deep .el-tag{
+::v-deep .el-tag {
   margin-right: 20px !important;
 }
+
 .rulesBox {
   display: flex;
   align-items: center;
diff --git a/src/views/product/productAttr/components/attrList.vue b/src/views/product/productAttr/components/attrList.vue
index 4116d3f..777feb9 100644
--- a/src/views/product/productAttr/components/attrList.vue
+++ b/src/views/product/productAttr/components/attrList.vue
@@ -34,8 +34,7 @@
     </div>
 </template> 
 <script>
-import productApi from '@/api/product/productAttr.js';
-
+import productApi from '@/api/product/productAttr.js'; 
 export default {
     name: "attrList",
     props: {
@@ -60,7 +59,7 @@ export default {
     },
     created() {
         this.init()
-    },
+    }, 
     methods: {
         isStrictPromise(value) {
             return !!value
@@ -111,7 +110,7 @@ export default {
                 }],
             })
             this.$parent.$parent.selection = [data];
-            this.$parent.$parent.addAttr('update');
+            this.$parent.$parent.addAttr('typeUpdate');
         },
         init() {
             if (this.selectAttrId && this.selectAttrId.indexOf("/") !== -1) {
diff --git a/src/views/product/productAttr/index.vue b/src/views/product/productAttr/index.vue
index a220b99..89618bf 100644
--- a/src/views/product/productAttr/index.vue
+++ b/src/views/product/productAttr/index.vue
@@ -52,8 +52,8 @@
       </div>
     </el-card>
     <add-attr :selection="selection" ref="addattr" @getList="userSearchs"></add-attr>
-    <el-dialog @closed="onCancel" title="属性列表" :visible.sync="isShowAttrList" width="30%">
-      <attrList :selectAttrId="selectAttrId" v-if="isShowAttrList"></attrList>
+    <el-dialog   title="属性列表" :visible.sync="isShowAttrList" width="30%">
+      <attrList ref="attrList" :selectAttrId="selectAttrId" v-if="isShowAttrList"></attrList>
     </el-dialog>
   </div>
 </template>
@@ -85,14 +85,18 @@ export default {
     };
   },
   computed: {},
+  watch:{
+    // isShowAttrList(n,o){
+    //   this.clearSelection()
+    // }
+  },
   created() {
     this.getDataList();
   },
   methods: {
     tableCurrentChange(e) {
-
       // this.$message.warning()
-      console.log(e, '===')
+      console.log(e,'===')
     },
     handleCurrentChange(val) {
       this.artFrom.currentPage = val
@@ -103,11 +107,11 @@ export default {
       this.getDataList()
     },
     clearSelection(){
-      this.$refs.table.clearSelection(); 
-    },
-    onCancel(){ 
-
+      this.selection = []; 
+      // this.handleSelectRow([]);
+      this.$refs.table.clearSelection();
     },
+    onCancel(){ },
     addType() {
       this.$prompt('请输入类型', '提示', {
         confirmButtonText: '确定',
@@ -153,9 +157,8 @@ export default {
       });
     },
     //  选中某一行
-    handleSelectRow(selection) {
-      console.log("selection",selection)
-      this.selection = selection;
+    handleSelectRow(selection) { 
+      this.selection = selection; 
     },
     setChecked() {
       //将new Set()转化为数组
@@ -207,8 +210,7 @@ export default {
     // 列表；
     getDataList() {
       this.loading = true;
-      productApi.typeFindByPage(this.artFrom).then(res => {
-        console.log(res.data);
+      productApi.typeFindByPage(this.artFrom).then(res => { 
         if (res.code = 20000) ({ list: this.tableList = [], totalCount: this.artFrom.totalCount = 0 } = res.data);
       }).finally(() => {
         this.loading = false;