diff --git a/src/components/Category/edit.vue b/src/components/Category/edit.vue
index 05fbdc5..44a86a8 100644
--- a/src/components/Category/edit.vue
+++ b/src/components/Category/edit.vue
@@ -1,111 +1,109 @@
-<template>
-  <div> 
-    <el-form ref="editPram" :model="editPram" label-width="130px">
-      <el-form-item label="分类名称" prop="categoryName" :rules="[{ required: true, message: '请输入分类名称', trigger: ['blur', 'change'] }]">
-        <el-input v-model="editPram.categoryName" placeholder="分类名称" />
-      </el-form-item>
-      <el-form-item v-if="editPram.parentCategoryName" label="父级"  > 
-          {{  editPram.parentCategoryName  }}
-      </el-form-item>
-      <el-form-item label="分类图标(180*180)">
-        <div class="upLoadPicBox" @click="modalPicTap('1')">
-          <upload :photo="editPram.icon" @success="uploadSuccess" tip="图标尺寸为18*18比例，大小不能超过200KB，图片只能为jpg、png、gif格式"></upload>
-        </div>
-      </el-form-item>
-      <el-form-item label="排序">
-        <el-input-number v-model="editPram.sort" :min="0" />
-      </el-form-item>
-      <el-form-item label="状态">
-        <el-switch v-model="editPram.showFlag" active-text="显示" inactive-text="隐藏" active-value="1"
-          inactive-value="2" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" :loading="loadingBtn" @click="handlerSubmit">确定</el-button>
-        <el-button @click="close">取消</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-<!--创建和编辑公用一个组件-->
-<script>
-import upload from '@/components/Upload/index'
-import productApi from '@/api/product/productAttr.js';
-import { loadingFn } from "@/utils/validate"
-
-export default {
-  // name: "edit",
-  components: { upload },
-  props: {
-    parentOptions: {
-      type: Array,
-      default: () => []
-    }
-  },
-  data() {
-    return { 
-      model:"classifySave",
-      loadingBtn: false,
-      constants: [],
-      editPram: {
-        level: 1,
-        icon:"",
-        showFlag: 1,
-        categoryName: "",
-        sort:1,
-        parentId:"",
-        parentCategoryName:""
-      },
-      categoryProps: {
-        value: 'id',
-        label: 'categoryName',
-        children: 'children'
-      }
-    }
-  },
-  mounted() {
-    // this.initEditData()
-  },
-  methods: {
-    updateModel(e){
-      this.model = e
-    },
-    uploadSuccess(e, res) {
-      if (res.code == 20000) {
-        ({ publicUrl: this.editPram.icon } = res.data);
-      } 
-    },
-    // 点击图标
-    addIcon() { },
-    // 点击商品图
-    modalPicTap(tit, num, i) {
-    },
-    close() {
-      this.$parent.$parent.editDialogConfig.visible=false; 
-    },
-    initEditData() {
-    },
-    addTreeListLabelForCasCard(arr, child) {
-    },
-    handlerSubmit() {   
-      productApi[this.model](this.editPram).then((result) => {
-        if(result.code==20000){
-          this.$parent.$parent.editDialogConfig.visible=false;
-          this.$message.success("添加成功！");
-          this.$parent.$parent.handleCurrentChange();
-
-        }        
-      }).catch((err) => {
-        
-      });
-    },
-    handlerSaveOrUpdate(isSave) {
-    }
-  }
-}
-</script>
-
-<style scoped>
-::v-deep .photo-container {
-  align-items: flex-start !important;
-}
-</style>
+<template>
+  <div>
+    <el-form ref="editPram" :model="editPram" label-width="130px">
+      <el-form-item label="分类名称" prop="categoryName" :rules="[{ required: true, message: '请输入分类名称', trigger: ['blur', 'change'] }]">
+        <el-input v-model="editPram.categoryName" placeholder="分类名称" />
+      </el-form-item>
+      <el-form-item v-if="editPram.parentCategoryName" label="父级">
+        {{ editPram.parentCategoryName }}
+      </el-form-item>
+      <el-form-item label="分类图标(180*180)" prop="icon" :rules="[{ required: true, message: '请上传分类图标！', trigger: ['blur', 'change'] }]">
+        <div class="upLoadPicBox" @click="modalPicTap('1')">
+          <upload :photo="editPram.icon" @success="uploadSuccess" tip="图标尺寸为18*18比例，大小不能超过50KB，图片只能为jpg、png格式"></upload>
+        </div>
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number v-model="editPram.sort" :min="0" />
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-switch v-model="editPram.showFlag" active-text="显示" inactive-text="隐藏" active-value="1" inactive-value="2" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" :loading="loadingBtn" @click="handlerSubmit">确定</el-button>
+        <el-button @click="close">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<!--创建和编辑公用一个组件-->
+<script>
+import upload from '@/components/Upload/index'
+import productApi from '@/api/product/productAttr.js'
+import { loadingFn } from '@/utils/validate'
+
+export default {
+  // name: "edit",
+  components: { upload },
+  props: {
+    parentOptions: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      model: 'classifySave',
+      loadingBtn: false,
+      constants: [],
+      editPram: {
+        level: 1,
+        icon: '',
+        showFlag: 1,
+        categoryName: '',
+        sort: 1,
+        parentId: '',
+        parentCategoryName: ''
+      },
+      categoryProps: {
+        value: 'id',
+        label: 'categoryName',
+        children: 'children'
+      }
+    }
+  },
+  mounted() {
+    // this.initEditData()
+  },
+  methods: {
+    updateModel(e) {
+      this.model = e
+    },
+    uploadSuccess(e, res) {
+      if (res.code == 20000) {
+        ;({ publicUrl: this.editPram.icon } = res.data)
+      }
+    },
+    // 点击图标
+    addIcon() {},
+    // 点击商品图
+    modalPicTap(tit, num, i) {},
+    close() {
+      this.$parent.$parent.editDialogConfig.visible = false
+    },
+    initEditData() {},
+    addTreeListLabelForCasCard(arr, child) {},
+    handlerSubmit() {
+      this.$refs.editPram.validate(valid => {
+        if (valid) {
+          productApi[this.model](this.editPram)
+            .then(result => {
+              if (result.code == 20000) {
+                this.$parent.$parent.editDialogConfig.visible = false
+                this.$message.success('添加成功！')
+                this.$parent.$parent.handleCurrentChange()
+              }
+            })
+            .catch(err => {})
+        }
+      })
+    },
+    handlerSaveOrUpdate(isSave) {}
+  }
+}
+</script>
+
+<style scoped>
+::v-deep .photo-container {
+  align-items: flex-start !important;
+}
+</style>
diff --git a/src/views/marketing/advertisement/advertisementList.vue b/src/views/marketing/advertisement/advertisementList.vue
index bab6710..695424d 100644
--- a/src/views/marketing/advertisement/advertisementList.vue
+++ b/src/views/marketing/advertisement/advertisementList.vue
@@ -35,7 +35,7 @@
         <el-table-column prop="advertisePosition" label="广告位置"></el-table-column>
         <el-table-column prop="positionImage" label="广告图片" min-width="80">
           <template slot-scope="scope">
-            <el-image style="width: 50px; height: 50px" :src="scope.row.positionImage"> </el-image>
+            <el-image style="width: 50px; height: 50px" :src="scope.row.positionImage" :preview-src-list="[scope.row.positionImage]"> </el-image>
           </template>
         </el-table-column>
         <el-table-column label="时间" min-width="150">
diff --git a/src/views/product/brand/components/AddOrEdit.vue b/src/views/product/brand/components/AddOrEdit.vue
index a00efa3..646db26 100644
--- a/src/views/product/brand/components/AddOrEdit.vue
+++ b/src/views/product/brand/components/AddOrEdit.vue
@@ -1,72 +1,83 @@
-<template>
-    <div>
-        <el-form ref="form" :model="form">
-            <el-form-item  prop="brandName" label="品牌名称" label-width="100px"
-                :rules="[{ required: true, message: '请输入品牌名称', trigger: ['blur', 'change'] }]">
-                <el-input v-model="form.brandName"></el-input>
-            </el-form-item>
-            <el-form-item label="品牌首字母" prop="firstLetter" label-width="100px"
-                :rules="[{ required: true, message: '请输入品牌首字母', trigger: ['blur', 'change'] }]">
-                <el-input v-model="form.firstLetter"></el-input>
-            </el-form-item>
-            <el-form-item label=" 品牌LOGO" label-width="100px">
-                <upload :photo="form.logoUrl" @success="uploadSuccess" tip="只能上传jpg/png格式文件，文件不能超过50kb">
-                </upload>
-            </el-form-item>
-            <el-form-item label="排序" label-width="100px">
-                <el-input-number v-model="form.sort" :min="0" />
-            </el-form-item>
-            <el-form-item label="是否显示" label-width="100px">
-                <el-switch v-model="form.showFlag" active-text="显示" inactive-text="隐藏" active-value="1"
-                    inactive-value="2" />
-            </el-form-item>
-        </el-form>
-        <div slot="footer" class="footer">
-            <el-button @click="$emit('close')" >取 消</el-button>
-            <el-button @click="save" type="primary">确 定</el-button>
-        </div>
-    </div>
-</template>
-
-<script>
-import upload from '@/components/Upload/index'
-export default {
-    components: { upload },
-
-    data() {
-        return {
-            apiMode:"brandSave",
-            form: {
-                "brandName": "",
-                "firstLetter": "",
-                "logoUrl": "",
-                "showFlag": "1",
-                "sort": "1"
-            }
-        }
-    },
-    methods: {
-        save() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                  this.$emit("brandSave",this.form,this.apiMode)
-                }  
-            });
-        },
-        uploadSuccess(e, res) {
-            console.log(...arguments,"uploadSuccess")
-            if (res.code == 20000) {
-                ({ publicUrl: this.form.logoUrl } = res.data);
-            }
-        },
-    }
-}
-</script>
-
-<style scoped>
-.footer {
-    width: 100%;
-    display: flex;
-    justify-content: center;
-}
-</style>
\ No newline at end of file
+<template>
+  <div>
+    <el-form ref="form" :model="form">
+      <el-form-item
+        prop="brandName"
+        label="品牌名称"
+        label-width="100px"
+        :rules="[{ required: true, message: '请输入品牌名称', trigger: ['blur', 'change'] }]"
+      >
+        <el-input v-model="form.brandName"></el-input>
+      </el-form-item>
+      <el-form-item
+        label="品牌首字母"
+        prop="firstLetter"
+        label-width="100px"
+        :rules="[{ required: true, message: '请输入品牌首字母', trigger: ['blur', 'change'] }]"
+      >
+        <el-input v-model="form.firstLetter"></el-input>
+      </el-form-item>
+      <el-form-item
+        label=" 品牌LOGO"
+        label-width="100px"
+        prop="logoUrl"
+        :rules="[{ required: true, message: '请上传品牌LOGO', trigger: ['blur', 'change'] }]"
+      >
+        <upload :photo="form.logoUrl" @success="uploadSuccess" tip="只能上传jpg/png格式文件，文件不能超过50kb"> </upload>
+      </el-form-item>
+      <el-form-item label="排序" label-width="100px">
+        <el-input-number v-model="form.sort" :min="0" />
+      </el-form-item>
+      <el-form-item label="是否显示" label-width="100px">
+        <el-switch v-model="form.showFlag" active-text="显示" inactive-text="隐藏" active-value="1" inactive-value="2" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="footer">
+      <el-button @click="$emit('close')">取 消</el-button>
+      <el-button @click="save" type="primary">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import upload from '@/components/Upload/index'
+export default {
+  components: { upload },
+
+  data() {
+    return {
+      apiMode: 'brandSave',
+      form: {
+        brandName: '',
+        firstLetter: '',
+        logoUrl: '',
+        showFlag: '1',
+        sort: '1'
+      }
+    }
+  },
+  methods: {
+    save() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.$emit('brandSave', this.form, this.apiMode)
+        }
+      })
+    },
+    uploadSuccess(e, res) {
+      console.log(...arguments, 'uploadSuccess')
+      if (res.code == 20000) {
+        ;({ publicUrl: this.form.logoUrl } = res.data)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.footer {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/product/brand/index.vue b/src/views/product/brand/index.vue
index c1f0e83..3d3e2eb 100644
--- a/src/views/product/brand/index.vue
+++ b/src/views/product/brand/index.vue
@@ -1,175 +1,195 @@
-<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.brandName" 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="addBrand">添加品牌</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.brandName }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="品牌首字母" prop="firstLetter"> </el-table-column>
-                <el-table-column label="排序" prop="sort"> </el-table-column>
-                <el-table-column label="是否显示">
-                    <template slot-scope="scope">
-                        <el-switch disabled active-value="1" inactive-value="0" v-model="scope.row.showFlag"
-                            active-color="#13ce66" inactive-color="#ff4949">
-                        </el-switch>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button type="text" @click="edit(scope.row)">编辑</el-button>
-                        <el-divider direction="vertical"></el-divider>
-                        <el-button type="text" @click="del(scope.row)">删除</el-button>
-                    </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>
-        <el-dialog title="品牌设置" :visible.sync="isAddOrEdit" v-loading="addLoading">
-            <addOrEdit v-if="isAddOrEdit" @close="isAddOrEdit = false" @brandSave="brandSave" ref="addOrEdit"></addOrEdit>
-        </el-dialog>
-    </div>
-</template> 
-<script>
-import productApi from '@/api/product/productAttr.js';
-import { loadingFn } from "@/utils/validate"
-import addOrEdit from "./components/AddOrEdit.vue"
-export default {
-    components: { addOrEdit },
-    data() {
-        return {
-            addLoading: false,
-            isAddOrEdit: false,
-            selection: [],
-            selectAttrList: null,
-            isShowAttrList: false,
-            loading: false,
-            page: {
-                "currentPage": 1,
-                "pageSize": 10,
-                "params": {
-                    brandName:""
-                },
-                totalCount: 0
-            },
-            tableData: [],
-            total: 0,
-            selectedIds: new Set(), //选中合并项的id
-            ids: [],
-            multipleSelection: [],
-        };
-    },
-    computed: {},
-    created() {
-        this.init()
-    },
-    methods: {
-        addBrand() { 
-            this.isAddOrEdit = true;
-        },
-        brandSave(e,model="brandSave") {
-            loadingFn.call(this, "addLoading", productApi[model](e).then(res => {
-                if (res.code == 20000) {
-                    this.$message.success("操作成功")
-                    setTimeout(() => {
-                    this.isAddOrEdit = false; 
-                    this.getList(); 
-
-                    }, 1000);
-                }
-            }), 1000);
-
-        },
-        tableCurrentChange(e) { },
-        handleCurrentChange(val) {
-            this.page.currentPage = val;
-            this.getList()
-        },
-        handleSizeChange(val) {
-            this.page.pageSize = val
-            this.getList()
-        },
-        clearSelection() { },
-        onCancel() { },
-
-        showAttrList(e) { },
-        getRowKey(row) { },
-        //全选和取消全选时触发
-        handleSelectAll(selection) { },
-        //  选中某一行
-        handleSelectRow(selection) { },
-        setChecked() { },
-        // 删除
-        del(row) {
-            this.$alert('请确定删除该数据!', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                    if (action == "confirm") {
-                        loadingFn.call(this, "loading", productApi.brandDelete(row).then(res => {
-                            if (res.code = 20000) {
-                                this.$message.success("操作成功！")
-                                this.handleCurrentChange()
-                            }
-                        }));
-                    }
-                }
-            });
-        },
-        addAttr(model) {
-        },
-        // 编辑
-        edit(row) { 
-            this.isAddOrEdit = true;
-            this.$nextTick(() => {
-                this.$refs.addOrEdit.apiMode = "brandUpdate"
-                this.$refs.addOrEdit.form = Object.assign(this.$refs.addOrEdit.form, 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() {
-            this.handleCurrentChange()
-        },
-        // 初始化
-        init() {
-            this.getList()
-        }
-    },
-};
-</script>
-  
-<style scoped></style>
-  
\ No newline at end of file
+<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.params.brandName" 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="addBrand">添加品牌</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.brandName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="品牌首字母" prop="firstLetter"> </el-table-column>
+        <el-table-column label="排序" prop="sort"> </el-table-column>
+        <el-table-column label="是否显示">
+          <template slot-scope="scope">
+            <el-switch disabled active-value="1" inactive-value="0" v-model="scope.row.showFlag" active-color="#13ce66" inactive-color="#ff4949">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-divider direction="vertical"></el-divider>
+            <el-button type="text" @click="del(scope.row)">删除</el-button>
+          </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>
+    <el-dialog title="品牌设置" :visible.sync="isAddOrEdit" v-loading="addLoading">
+      <addOrEdit v-if="isAddOrEdit" @close="isAddOrEdit = false" @brandSave="brandSave" ref="addOrEdit"></addOrEdit>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import productApi from '@/api/product/productAttr.js'
+import { loadingFn } from '@/utils/validate'
+import addOrEdit from './components/AddOrEdit.vue'
+export default {
+  components: { addOrEdit },
+  data() {
+    return {
+      addLoading: false,
+      isAddOrEdit: false,
+      selection: [],
+      selectAttrList: null,
+      isShowAttrList: false,
+      loading: false,
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        params: {
+          brandName: ''
+        },
+        totalCount: 0
+      },
+      tableData: [],
+      total: 0,
+      selectedIds: new Set(), //选中合并项的id
+      ids: [],
+      multipleSelection: []
+    }
+  },
+  computed: {},
+  created() {
+    this.init()
+  },
+  methods: {
+    addBrand() {
+      this.isAddOrEdit = true
+    },
+    brandSave(e, model = 'brandSave') {
+      loadingFn.call(
+        this,
+        'addLoading',
+        productApi[model](e).then(res => {
+          if (res.code == 20000) {
+            this.$message.success('操作成功')
+            setTimeout(() => {
+              this.isAddOrEdit = false
+              this.getList()
+            }, 1000)
+          }
+        }),
+        1000
+      )
+    },
+    tableCurrentChange(e) {},
+    handleCurrentChange(val) {
+      this.page.currentPage = val
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.page.pageSize = val
+      this.getList()
+    },
+    clearSelection() {},
+    onCancel() {},
+
+    showAttrList(e) {},
+    getRowKey(row) {},
+    //全选和取消全选时触发
+    handleSelectAll(selection) {},
+    //  选中某一行
+    handleSelectRow(selection) {},
+    setChecked() {},
+    // 删除
+    del(row) {
+      this.$alert('请确定删除该数据!', '提示', {
+        confirmButtonText: '确定',
+        callback: action => {
+          if (action == 'confirm') {
+            loadingFn.call(
+              this,
+              'loading',
+              productApi.brandDelete(row).then(res => {
+                if ((res.code = 20000)) {
+                  this.$message.success('操作成功！')
+                  this.handleCurrentChange()
+                }
+              })
+            )
+          }
+        }
+      })
+    },
+    addAttr(model) {},
+    // 编辑
+    edit(row) {
+      this.isAddOrEdit = true
+      this.$nextTick(() => {
+        this.$refs.addOrEdit.apiMode = 'brandUpdate'
+        this.$refs.addOrEdit.form = Object.assign(this.$refs.addOrEdit.form, 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() {
+      this.handleCurrentChange()
+    },
+    // 初始化
+    init() {
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/views/product/productAdd/newIndex.vue b/src/views/product/productAdd/newIndex.vue
index fc9cc98..0f0e53a 100644
--- a/src/views/product/productAdd/newIndex.vue
+++ b/src/views/product/productAdd/newIndex.vue
@@ -1,1499 +1,1580 @@
-<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="loading" 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="categorys">
-              <el-cascader @change="cascaderChange" v-model="formValidate.categorys" :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="productName">
-              <el-input v-model="formValidate.productName" maxlength="249" placeholder="请输入商品名称" :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="brandId">
-              <el-select style="width: 100%;" v-model="formValidate.brandId" placeholder="请选择">
-                <el-option v-for="item in brandOptions" :key="item.id" :label="item.brandName" :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col v-bind="grid2">
-            <el-form-item label="商品货号" prop="productNum">
-              <el-input v-model="formValidate.productNum" maxlength="249" placeholder="请输入商品货号" :disabled="isDisabled" />
-            </el-form-item>
-          </el-col>
-          <el-col v-bind="grid2">
-            <el-form-item label="商品售价" prop="price">
-              <el-input v-model="formValidate.price" maxlength="249" placeholder="请输入商品售价" :disabled="isDisabled" />
-            </el-form-item>
-          </el-col>
-          <el-col v-bind="grid2">
-            <el-form-item label="商品类型：" prop="productType">
-              <el-select style="width: 100%;" v-model="formValidate.productType" placeholder="请选择商品类型">
-                <el-option label="店铺商品" value="2"> </el-option>
-                <el-option label="平台商品" value="1"> </el-option>
-              </el-select>
-            </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="siteIds">
-              <el-tag style="margin-left: 10px;" :key="tagIndex" v-for="(tag, tagIndex) in OilStationSelectionList"
-                closable :disable-transitions="false" @close="delectOilStationSelectionList(tag, tagIndex)">
-                {{ tag.siteName }}
-              </el-tag>
-              <el-button class="button-new-tag" size="small" @click="isOilStationSelection = true">+ 添加油站</el-button>
-            </el-form-item>
-          </el-col>
-          <el-col v-bind="grid2">
-            <el-form-item label="商品推荐：">
-              <el-select style="width: 100%;" v-model="formValidate.recommendOrNewMark" placeholder="请选择商品类型">
-                <el-option label="新品" value="1"> </el-option>
-                <el-option label="推荐" value="2"> </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="商品上架" prop="productStatus">
-              <el-switch active-value="1" inactive-value="2" v-model="formValidate.productStatus" active-color="#13ce66"
-                inactive-color="#ff4949">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="商品封面图：" prop="image">
-              <CustomUpload ref="CustomUpload"></CustomUpload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="商品相册：" prop="sliderImages">
-              <CustomUpload :limit="5" ref="CustomLBUpload">
-              </CustomUpload>
-            </el-form-item>
-          </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-col> -->
-          <!-- 多规格添加-->
-          <el-col v-if="!isDisabled" :span="24" class="noForm">
-            <el-form-item label="选择规格：">
-              <div class="acea-row">
-                <el-select v-model="formValidate.attributesTypeId">
-                  <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.sku.value" :key="indexn" closable size="medium"
-                    :disable-transitions="false" class="mb5 mr10" @close="handleClose(item.sku.value, indexn, index)">
-                    {{ j }}
-                  </el-tag>
-                </div>
-              </div>
-            </el-form-item>
-          </el-col>
-          <!-- 批量设置-->
-          <el-col v-if="formValidate.attr.length > 0 && !isDisabled" :span="24" class="noForm">
-            <el-form-item label="批量设置：">
-              <el-table :data="oneFormBatch" border class="tabNumWidth" size="mini">
-                <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="item.label" align="center"
-                  min-width="120">
-                  <template slot-scope="scope">
-                    <el-input :disabled="isDisabled" maxlength="9" min="0.01" v-model="scope.row[item.value]"
-                      class="priceBox" @blur="keyupEvent(iii, scope.row[item.value], scope.$index, 3)" />
-                  </template>
-                </el-table-column>
-                <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 v-for="(item, iii) in attrValue" :key="iii" :label="item.label" align="center"
-                  min-width="120">
-                  <template slot-scope="scope">
-                    <el-input :disabled="isDisabled" maxlength="9" min="0.01" v-model="scope.row[item.value]"
-                      class="priceBox" @blur="keyupEvent(iii, scope.row[item.value], scope.$index, 3)" />
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-form-item> -->
-            <!-- <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" 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) in manyTabDate" :key="item" align="center" :label="item" min-width="80">
-                    <template slot-scope="scope">
-                      <span class="priceBox" v-text="scope.row[item]" />
-                    </template>
-                  </el-table-column>
-                </template>
-                <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="item.label" align="center"
-                  min-width="120">
-                  <template slot-scope="scope">
-                    <el-input :disabled="isDisabled" maxlength="9" min="0.01" v-model="scope.row[item.value]"
-                      class="priceBox" @blur="keyupEvent(iii, scope.row[item.value], scope.$index, 3)" />
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right">
-                  <template slot-scope="scope">
-                    <el-button type="text" @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.productDetail"></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.productDetail || '无'"></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>
-            </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 < 1" type="primary" class="submission"
-            @click="handleSubmitNest('formValidate')">下一步</el-button>
-          <el-button v-show="(currentTab === 1 || $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" />
-    <el-dialog title="选择油站" :visible.sync="isOilStationSelection">
-      <OilStationSelection :OilStationSelectionList="OilStationSelectionList" @submit="oilStationSelectionSubmit">
-      </OilStationSelection>
-    </el-dialog>
-  </div>
-</template>
-  
-<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'
-import CustomUpload from './components/CustomUpload.vue';
-import OilStationSelection from './components/OilStationSelection.vue';
-import { loadingFn } 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: 'SKU编号'
-  },
-  barCode: {
-    title: '兑换积分'
-  }
-}
-export default {
-  name: 'ProductProductAdd',
-  components: { Templates, CreatTemplates, Tinymce, CustomUpload, OilStationSelection },
-  data() {
-    return {
-      loading: false,
-      OilStationSelectionList: [],
-      isOilStationSelection: false,
-      brandOptions: [],
-      isDisabled: this.$route.params.isDisabled === '1' ? true : false,
-      activity: { '默认': 'red', '秒杀': 'blue', '砍价': 'green', '拼团': 'yellow' },
-      props2: {
-        children: 'children',
-        label: 'categoryName',
-        value: 'id'
-      },
-      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: {
-        recommendOrNewMark: "1",
-        productStatus: "1",
-        attr: [],
-        productDetail:""
-      },
-      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: "",
-      attrValue: [
-        {
-          label: "市场价格",
-          name: "市场价格",
-          value: "marketPrice"
-        },
-        {
-          label: "销售价格",
-          name: "销售价格",
-          value: "sellPrice"
-        },
-        {
-          label: "商品库存",
-          name: "商品库存",
-          value: "stock"
-        },
-        {
-          label: "SKU编号",
-          name: "SKU编号",
-
-          value: "skuNum"
-        },
-        {
-          label: "兑换积分",
-          name: "兑换积分",
-          value: "integral"
-        }
-      ]
-    }
-  },
-  computed: {
-    oneFormBatch() {
-      const obj = [Object.assign({}, defaultObj.attrValue[0])]
-      delete obj[0].barCode
-      return obj
-    }
-  },
-  watch: {
-    $route(to, from) {
-      if(from.path=="/productList"&&to.params.id){
-        this.chenkId()
-      }
-      console.log(from.path);//从哪来
-      console.log(to.path,to.params);//到哪去
-    },
-    "formValidate.content": function (n) {
-      console.log(n, "++++++++++++++++++++++")
-    },
-    ManyAttrValue(n) { },
-    'formValidate.attr': {
-      handler: function (val) {
-        if (this.isAttr) this.watCh(val) //重要！！！
-      },
-      immediate: false,
-      deep: true
-    }
-  },
-  created() {
-    this.chenkId();
-    this.getCategorySelect();
-    this.productGetRule();
-    this.brandGetAll()
-  },
-  mounted() { },
-  methods: {
-    chenkId() { 
-      if (this.$route.params && this.$route.params.id) {
-        this.getproductInfo(this.$route.params.id)
-      }
-    },
-    productAddGetSites(ids) { 
-      Promise.all(ids.map(id => {
-        return productApi.productAddGetSites(id);
-      })).then(res => {
-        console.log(res, "productAddGetSites")
-      })
-    },
-    async inverseAnalysis(data) { 
-      let { categoryOneId, categoryTwoId } = data;
-      let categorys = [categoryOneId, categoryTwoId];  
-      this.OilStationSelectionList = data.siteInfos;   
-      Object.assign(this.formValidate,{
-        categorys,
-        ...data
-      }); 
-      this.$refs.CustomUpload.fileList = [...this.formValidate.images.filter(item=>item.mainMark=="1")];
-      this.$refs.CustomLBUpload.fileList = [...this.formValidate.images.filter(item=>item.mainMark!="1")] ;
-      await this.confirm();
-      this.$nextTick(()=>{  
-         this.formValidate.attr = this.formValidate.attr.map(item=>{
-          let align = this.formValidate.checkedList.find(i=>item.id==i.attributeId); 
-          if(align){
-            return {
-              ...item,
-              sku:{
-                ...item.sku,
-                value:align.checked.split(",")
-              }
-            }
-          }else{
-            return null
-          }
-        }).filter(item=>item); 
-        setTimeout(() => {
-        this.ManyAttrValue.forEach((item,index)=>{ 
-         let data =  this.formValidate.stockList.find(i=>i.attributeJson==JSON.stringify(item.data))
-          if(data){  
-            Object.assign(item,data); 
-          } 
-       }) 
-        }, 1000);
-   
-      })
-
-    },
-    getproductInfo(id) {
-      productApi.productAddGetEdit(id).then(res => {
-        if (res.code == 20000) {
-          this.inverseAnalysis(res.data)
-        }
-      })
-    },
-    setPreferred(setPreferred) {
-      console.log(setPreferred, "setPreferred")
-    },
-    delectOilStationSelectionList(e, index) {
-      this.OilStationSelectionList.splice(index, 1)
-    },
-    oilStationSelectionSubmit(e) {
-      this.OilStationSelectionList = e;
-      this.isOilStationSelection = false;
-    },
-    brandGetAll() {
-      productApi.brandGetAll().then(res => {
-        if (res.code == 20000) {
-          this.brandOptions = res.data
-        }
-      })
-    },
-    cascaderChange(e) {
-      console.log(e, "cascaderChange")
-    },
-    // 校验输入框不能输入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;
-      }
-    },
-    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
-    },
-    // sku算法 
-    watCh(val) {
-      let arr = [];
-      this.manyTabDate = [];
-      for (let i = 0; i < val.length; i++) {
-        arr.push(val[i].sku);
-        this.manyTabDate.push(val[i].sku.name)
-      };
-      this.ManyAttrValue = arr.reduce((a, b, c) => {
-        let res = [];
-        a.map(x => {
-          b.value.map(y => {
-            res.push({
-              ...x,
-              [b.name]: y,
-              data: Object.assign({}, x.data || {}, { [b.name]: y }),
-              ...Object.fromEntries(this.attrValue.map(item => {
-                return [item.value, ""]
-              }))
-            })
-          })
-        })
-        return res
-      }, [{}]);
-    },
-    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] = {
-                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()
-    },
-    // 选择属性确认
-    async confirm(is=true) {
-      this.isAttr = true
-      if(is){
-        if (!this.formValidate.attributesTypeId) {
-        return this.$message.warning('请选择属性')
-      }
-      await this.productGetRule();
-      this.formValidate.attr = JSON.parse(JSON.stringify(this.ruleList.find(item => item.id == this.formValidate.attributesTypeId).attributesList));
-      }
-    },
-    // 商品分类；
-    getCategorySelect() {
-      productApi.getClassificationTree().then(res => {
-        if (res.code == 20000) {
-          this.merCateList = res.data;
-        }
-      })
-    },
-    filerMerCateList(treeData) {
-      return treeData.map((item) => {
-        if (!item.child) {
-          item.disabled = true
-        }
-        item.label = item.name
-        return item
-      })
-    },
-    // 获取商品属性模板；
-    productGetRule() {
-      return new Promise((re, rj) => {
-        productApi.getAllAttributesType().then(res => {
-          if (res.code == 20000) {
-            this.ruleList = res.data.map(item => {
-              return {
-                ...item,
-                attributesList: item.attributesList.map(citem => {
-                  return {
-                    ...citem,
-                    sku: { name: citem.attributeName, value: citem.attributeContent.split(",") }
-                  }
-                })
-              }
-            });
-            re(this.ruleList)
-          };
-        })
-      });
-
-    },
-    // 运费模板；
-    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('请填写完整的批量设置内容！');
-      console.log(this.ManyAttrValue, this.oneFormBatch, " this.ManyAttrValue");
-      this.ManyAttrValue.forEach(item => {
-        Object.assign(item, this.oneFormBatch[0])
-      })
-    },
-    // 添加按钮
-    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, parentIndex) {
-      if (item.length == 1) {
-        this.handleRemoveAttr(parentIndex)
-      } else {
-        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];
-            }
-            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.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) {
-      let cover = this.$refs.CustomUpload.getFileList();
-      let Carousel = this.$refs.CustomLBUpload.getFileList();
-      cover.length && (cover[0]["mainMark"] = 1);
-      let [categoryOneId, categoryTwoId] = this.formValidate.categorys;
-      let isRecommendOrNewMark = this.formValidate.recommendOrNewMark == "1" ? "newMark" : "recommend";
-      let siteIds = this.OilStationSelectionList.map(item => item.siteId);
-      let checkedList = this.formValidate.attr.map(item => {
-        let attributeId = item.id;
-        let checked = item.sku.value.join(',');
-        return { attributeId, checked }
-      });
-      let images = cover.concat(Carousel).map((item, index) => {
-        let { name, url, mainMark = "" } = item;
-        return {
-          name,
-          url,
-          mainMark
-        }
-      });
-      let stockList = this.ManyAttrValue.map(item => {
-        let { marketPrice = "", sellPrice = "", stock = "", integral = "", skuNum = "",id=""} = item;
-        return {
-          attributeJson: JSON.stringify(item.data),
-          marketPrice,
-          sellPrice,
-          stock,
-          integral,
-          skuNum,
-          id
-        }
-      })
-      console.log(this.formValidate, "formValidate");
-      console.log(categoryOneId, categoryTwoId, "categoryOneId categoryTwoId");
-      console.log(isRecommendOrNewMark, "isRecommendOrNewMark");
-      console.log(siteIds, "siteIds");
-      console.log(checkedList, "checkedList");
-      console.log(images, "images");
-      console.log(stockList, "stockList");
-      this.formValidate[isRecommendOrNewMark] = "1";
-      loadingFn.call(this, "loading", productApi[this.$route.params.id?"addUpdate":"addSave"](Object.assign(this.formValidate, {
-        categoryOneId,
-        categoryTwoId,
-        siteIds,
-        checkedList,
-        images,
-        stockList
-      })).then(res => {
-        if (res.code == 20000) {
-          this.$message.success("操作成功");
-          setTimeout(() => {
-            this.$router.push({ path: 'productList' });
-            this.$destroy();
-          }, 1000);
-        }
-      }));
-
-
-
-
-
-
-
-
-
-      // 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;
-      }
-    },
-    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%;
-  }
-
-  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;
-  }
-}
-
-.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
+<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="loading"
+        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="categorys" :rules="[{ required: true, message: '请选择商品分类', trigger: ['blur', 'change'] }]">
+              <el-cascader
+                @change="cascaderChange"
+                v-model="formValidate.categorys"
+                :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="productName" :rules="[{ required: true, message: '请输入商品名称', trigger: ['blur', 'change'] }]">
+              <el-input v-model="formValidate.productName" maxlength="249" placeholder="请输入商品名称" :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="brandId" :rules="[{ required: true, message: '请选择商品品牌', trigger: ['blur', 'change'] }]">
+              <el-select style="width: 100%;" v-model="formValidate.brandId" placeholder="请选择">
+                <el-option v-for="item in brandOptions" :key="item.id" :label="item.brandName" :value="item.id"> </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品货号" prop="productNum">
+              <el-input v-model="formValidate.productNum" maxlength="249" placeholder="请输入商品货号" :disabled="isDisabled" />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品售价" prop="price" :rules="[{ required: true, message: '请输入商品售价', trigger: ['blur', 'change'] }]">
+              <el-input v-model="formValidate.price" maxlength="249" type="number" placeholder="请输入商品售价" :disabled="isDisabled" />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品类型：" prop="productType" :rules="[{ required: true, message: '请选择商品类型', trigger: ['blur', 'change'] }]">
+              <el-select style="width: 100%;" v-model="formValidate.productType" placeholder="请选择商品类型">
+                <el-option label="店铺商品" value="2"> </el-option>
+                <el-option label="平台商品" value="1"> </el-option>
+              </el-select>
+            </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="siteIds" :rules="[{ required: true, message: '请选择自提油站', trigger: ['blur', 'change'] }]">
+              <el-tag
+                v-model="formValidate.siteIds"
+                style="margin-left: 10px;"
+                :key="tagIndex"
+                v-for="(tag, tagIndex) in OilStationSelectionList"
+                closable
+                :disable-transitions="false"
+                @close="delectOilStationSelectionList(tag, tagIndex)"
+              >
+                {{ tag.siteName }}
+              </el-tag>
+              <el-button class="button-new-tag" size="small" @click="isOilStationSelection = true">+ 添加油站</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品推荐：">
+              <el-select style="width: 100%;" v-model="formValidate.recommendOrNewMark" placeholder="请选择商品类型">
+                <el-option label="新品" value="1"> </el-option>
+                <el-option label="推荐" value="2"> </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品上架" prop="productStatus">
+              <el-switch active-value="1" inactive-value="2" v-model="formValidate.productStatus" active-color="#13ce66" inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品封面图：" prop="image">
+              <CustomUpload ref="CustomUpload"></CustomUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品相册：" prop="sliderImages">
+              <CustomUpload :limit="5" ref="CustomLBUpload"> </CustomUpload>
+            </el-form-item>
+          </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-col> -->
+          <!-- 多规格添加-->
+          <el-col v-if="!isDisabled" :span="24" class="noForm">
+            <el-form-item
+              label="选择规格："
+              prop="attributesTypeId"
+              :rules="[{ required: true, message: '请选择规格', trigger: ['blur', 'change'] }]"
+            >
+              <div class="acea-row">
+                <el-select v-model="formValidate.attributesTypeId">
+                  <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.sku.value"
+                    :key="indexn"
+                    closable
+                    size="medium"
+                    :disable-transitions="false"
+                    class="mb5 mr10"
+                    @close="handleClose(item.sku.value, indexn, index)"
+                  >
+                    {{ j }}
+                  </el-tag>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+          <!-- 批量设置-->
+          <el-col v-if="formValidate.attr.length > 0 && !isDisabled" :span="24" class="noForm">
+            <el-form-item label="批量设置：">
+              <el-table :data="oneFormBatch" border class="tabNumWidth" size="mini">
+                <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="item.label" align="center" min-width="120">
+                  <template slot-scope="scope">
+                    <el-input
+                      :disabled="isDisabled"
+                      maxlength="9"
+                      min="0.01"
+                      v-model="scope.row[item.value]"
+                      class="priceBox"
+                      @blur="keyupEvent(iii, scope.row[item.value], scope.$index, 3)"
+                    />
+                  </template>
+                </el-table-column>
+                <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 v-for="(item, iii) in attrValue" :key="iii" :label="item.label" align="center"
+                  min-width="120">
+                  <template slot-scope="scope">
+                    <el-input :disabled="isDisabled" maxlength="9" min="0.01" v-model="scope.row[item.value]"
+                      class="priceBox" @blur="keyupEvent(iii, scope.row[item.value], scope.$index, 3)" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item> -->
+            <!-- <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" 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 in manyTabDate" :key="item" align="center" :label="item" min-width="80">
+                    <template slot-scope="scope">
+                      <span class="priceBox" v-text="scope.row[item]" />
+                    </template>
+                  </el-table-column>
+                </template>
+                <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="item.label" align="center" min-width="120">
+                  <template slot-scope="scope">
+                    <el-input
+                      :disabled="isDisabled"
+                      maxlength="9"
+                      min="0.01"
+                      v-model="scope.row[item.value]"
+                      class="priceBox"
+                      @blur="keyupEvent(iii, scope.row[item.value], scope.$index, 3)"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right">
+                  <template slot-scope="scope">
+                    <el-button type="text" @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.productDetail"></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.productDetail || '无'"></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>
+            </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 < 1" type="primary" class="submission" @click="handleSubmitNest('formValidate')">下一步</el-button>
+          <el-button
+            v-show="(currentTab === 1 || $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" />
+    <el-dialog title="选择油站" :visible.sync="isOilStationSelection">
+      <OilStationSelection :OilStationSelectionList="OilStationSelectionList" @submit="oilStationSelectionSubmit"> </OilStationSelection>
+    </el-dialog>
+  </div>
+</template>
+
+<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'
+import CustomUpload from './components/CustomUpload.vue'
+import OilStationSelection from './components/OilStationSelection.vue'
+import { loadingFn } 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: 'SKU编号'
+  },
+  barCode: {
+    title: '兑换积分'
+  }
+}
+export default {
+  name: 'ProductProductAdd',
+  components: { Templates, CreatTemplates, Tinymce, CustomUpload, OilStationSelection },
+  data() {
+    return {
+      loading: false,
+      OilStationSelectionList: [],
+      isOilStationSelection: false,
+      brandOptions: [],
+      isDisabled: this.$route.params.isDisabled === '1' ? true : false,
+      activity: { 默认: 'red', 秒杀: 'blue', 砍价: 'green', 拼团: 'yellow' },
+      props2: {
+        children: 'children',
+        label: 'categoryName',
+        value: 'id'
+      },
+      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: {
+        recommendOrNewMark: '1',
+        productStatus: '1',
+        attr: [],
+        productDetail: ''
+      },
+      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: '',
+      attrValue: [
+        {
+          label: '市场价格',
+          name: '市场价格',
+          value: 'marketPrice'
+        },
+        {
+          label: '销售价格',
+          name: '销售价格',
+          value: 'sellPrice'
+        },
+        {
+          label: '商品库存',
+          name: '商品库存',
+          value: 'stock'
+        },
+        {
+          label: 'SKU编号',
+          name: 'SKU编号',
+
+          value: 'skuNum'
+        },
+        {
+          label: '兑换积分',
+          name: '兑换积分',
+          value: 'integral'
+        }
+      ]
+    }
+  },
+  computed: {
+    oneFormBatch() {
+      const obj = [Object.assign({}, defaultObj.attrValue[0])]
+      delete obj[0].barCode
+      return obj
+    }
+  },
+  watch: {
+    $route(to, from) {
+      if (from.path == '/productList' && to.params.id) {
+        this.chenkId()
+      }
+      console.log(from.path) //从哪来
+      console.log(to.path, to.params) //到哪去
+    },
+    'formValidate.content': function(n) {
+      console.log(n, '++++++++++++++++++++++')
+    },
+    ManyAttrValue(n) {},
+    'formValidate.attr': {
+      handler: function(val) {
+        if (this.isAttr) this.watCh(val) //重要！！！
+      },
+      immediate: false,
+      deep: true
+    }
+  },
+  created() {
+    this.chenkId()
+    this.getCategorySelect()
+    this.productGetRule()
+    this.brandGetAll()
+  },
+  mounted() {},
+  methods: {
+    chenkId() {
+      if (this.$route.params && this.$route.params.id) {
+        this.getproductInfo(this.$route.params.id)
+      }
+    },
+    productAddGetSites(ids) {
+      Promise.all(
+        ids.map(id => {
+          return productApi.productAddGetSites(id)
+        })
+      ).then(res => {
+        console.log(res, 'productAddGetSites')
+      })
+    },
+    async inverseAnalysis(data) {
+      let { categoryOneId, categoryTwoId } = data
+      let categorys = [categoryOneId, categoryTwoId]
+      this.OilStationSelectionList = data.siteInfos
+      Object.assign(this.formValidate, {
+        categorys,
+        ...data
+      })
+      this.$refs.CustomUpload.fileList = [...this.formValidate.images.filter(item => item.mainMark == '1')]
+      this.$refs.CustomLBUpload.fileList = [...this.formValidate.images.filter(item => item.mainMark != '1')]
+      await this.confirm()
+      this.$nextTick(() => {
+        this.formValidate.attr = this.formValidate.attr
+          .map(item => {
+            let align = this.formValidate.checkedList.find(i => item.id == i.attributeId)
+            if (align) {
+              return {
+                ...item,
+                sku: {
+                  ...item.sku,
+                  value: align.checked.split(',')
+                }
+              }
+            } else {
+              return null
+            }
+          })
+          .filter(item => item)
+        setTimeout(() => {
+          this.ManyAttrValue.forEach((item, index) => {
+            let data = this.formValidate.stockList.find(i => i.attributeJson == JSON.stringify(item.data))
+            if (data) {
+              Object.assign(item, data)
+            }
+          })
+        }, 1000)
+      })
+    },
+    getproductInfo(id) {
+      productApi.productAddGetEdit(id).then(res => {
+        if (res.code == 20000) {
+          this.inverseAnalysis(res.data)
+        }
+      })
+    },
+    setPreferred(setPreferred) {
+      console.log(setPreferred, 'setPreferred')
+    },
+    delectOilStationSelectionList(e, index) {
+      this.OilStationSelectionList.splice(index, 1)
+    },
+    oilStationSelectionSubmit(e) {
+      this.OilStationSelectionList = e
+      this.isOilStationSelection = false
+      this.formValidate.siteIds = e.map(item => item.siteId)
+    },
+    brandGetAll() {
+      productApi.brandGetAll().then(res => {
+        if (res.code == 20000) {
+          this.brandOptions = res.data
+        }
+      })
+    },
+    cascaderChange(e) {
+      console.log(e, 'cascaderChange')
+    },
+    // 校验输入框不能输入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
+      }
+    },
+    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)
+    },
+    // sku算法
+    watCh(val) {
+      let arr = []
+      this.manyTabDate = []
+      for (let i = 0; i < val.length; i++) {
+        arr.push(val[i].sku)
+        this.manyTabDate.push(val[i].sku.name)
+      }
+      this.ManyAttrValue = arr.reduce(
+        (a, b, c) => {
+          let res = []
+          a.map(x => {
+            b.value.map(y => {
+              res.push({
+                ...x,
+                [b.name]: y,
+                data: Object.assign({}, x.data || {}, { [b.name]: y }),
+                ...Object.fromEntries(
+                  this.attrValue.map(item => {
+                    return [item.value, '']
+                  })
+                )
+              })
+            })
+          })
+          return res
+        },
+        [{}]
+      )
+    },
+    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] = {
+                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()
+    },
+    // 选择属性确认
+    async confirm(is = true) {
+      this.isAttr = true
+      if (is) {
+        if (!this.formValidate.attributesTypeId) {
+          return this.$message.warning('请选择属性')
+        }
+        await this.productGetRule()
+        this.formValidate.attr = JSON.parse(JSON.stringify(this.ruleList.find(item => item.id == this.formValidate.attributesTypeId).attributesList))
+      }
+    },
+    // 商品分类；
+    getCategorySelect() {
+      productApi.getClassificationTree().then(res => {
+        if (res.code == 20000) {
+          this.merCateList = res.data
+        }
+      })
+    },
+    filerMerCateList(treeData) {
+      return treeData.map(item => {
+        if (!item.child) {
+          item.disabled = true
+        }
+        item.label = item.name
+        return item
+      })
+    },
+    // 获取商品属性模板；
+    productGetRule() {
+      return new Promise((re, rj) => {
+        productApi.getAllAttributesType().then(res => {
+          if (res.code == 20000) {
+            this.ruleList = res.data.map(item => {
+              return {
+                ...item,
+                attributesList: item.attributesList.map(citem => {
+                  return {
+                    ...citem,
+                    sku: { name: citem.attributeName, value: citem.attributeContent.split(',') }
+                  }
+                })
+              }
+            })
+            re(this.ruleList)
+          }
+        })
+      })
+    },
+    // 运费模板；
+    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('请填写完整的批量设置内容！');
+      console.log(this.ManyAttrValue, this.oneFormBatch, ' this.ManyAttrValue')
+      this.ManyAttrValue.forEach(item => {
+        Object.assign(item, this.oneFormBatch[0])
+      })
+    },
+    // 添加按钮
+    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, parentIndex) {
+      if (item.length == 1) {
+        this.handleRemoveAttr(parentIndex)
+      } else {
+        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]
+              }
+              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.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) {
+      let cover = this.$refs.CustomUpload.getFileList()
+      let Carousel = this.$refs.CustomLBUpload.getFileList()
+      cover.length && (cover[0]['mainMark'] = 1)
+      let [categoryOneId, categoryTwoId] = this.formValidate.categorys
+      let isRecommendOrNewMark = this.formValidate.recommendOrNewMark == '1' ? 'newMark' : 'recommend'
+      let siteIds = this.OilStationSelectionList.map(item => item.siteId)
+
+      let checkedList = this.formValidate.attr.map(item => {
+        let attributeId = item.id
+        let checked = item.sku.value.join(',')
+        return { attributeId, checked }
+      })
+      let images = cover.concat(Carousel).map((item, index) => {
+        let { name, url, mainMark = '' } = item
+        return {
+          name,
+          url,
+          mainMark
+        }
+      })
+      let stockList = this.ManyAttrValue.map(item => {
+        let { marketPrice = '', sellPrice = '', stock = '', integral = '', skuNum = '', id = '' } = item
+        return {
+          attributeJson: JSON.stringify(item.data),
+          marketPrice,
+          sellPrice,
+          stock,
+          integral,
+          skuNum,
+          id
+        }
+      })
+      console.log(this.formValidate, 'formValidate')
+      console.log(categoryOneId, categoryTwoId, 'categoryOneId categoryTwoId')
+      console.log(isRecommendOrNewMark, 'isRecommendOrNewMark')
+      console.log(siteIds, 'siteIds')
+      console.log(checkedList, 'checkedList')
+      console.log(images, 'images')
+      console.log(stockList, 'stockList')
+      this.formValidate[isRecommendOrNewMark] = '1'
+      loadingFn.call(
+        this,
+        'loading',
+        productApi[this.$route.params.id ? 'addUpdate' : 'addSave'](
+          Object.assign(this.formValidate, {
+            categoryOneId,
+            categoryTwoId,
+            siteIds,
+            checkedList,
+            images,
+            stockList
+          })
+        ).then(res => {
+          if (res.code == 20000) {
+            this.$message.success('操作成功')
+            setTimeout(() => {
+              this.$router.push({ path: 'productList' })
+              this.$destroy()
+            }, 1000)
+          }
+        })
+      )
+
+      // 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
+      }
+    },
+    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%;
+  }
+
+  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;
+  }
+}
+
+.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>
diff --git a/src/views/product/productClassify/index.vue b/src/views/product/productClassify/index.vue
index 46e8060..ba21a64 100644
--- a/src/views/product/productClassify/index.vue
+++ b/src/views/product/productClassify/index.vue
@@ -1,257 +1,257 @@
-<template>
-  <div class="article-manager">
-    <!-- <el-card :bordered="false" shadow="never" class="ivu-mt-16" :body-style="{ padding: 0 }">
-      <div class="padding-add">
-        <el-form ref="artFrom" :model="artFrom" inline label-width="80px" label-position="right" @submit.native.prevent>
-          <el-form-item label="商品分类：" prop="pid" label-for="pid">
-            <el-select v-model="artFrom.pid" placeholder="请选择商品分类" @change="userSearchs" clearable
-              class="form_content_width">
-              <el-option v-for="item in treeSelect" :value="item.id" :label="item.cate_name" :key="item.id">{{
-                item.cate_name
-              }}</el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="分类状态：" label-for="is_show">
-            <el-select v-model="artFrom.is_show" placeholder="请选择分类状态" clearable @change="userSearchs"
-              class="form_content_width">
-              <el-option value="1" label="显示"></el-option>
-              <el-option value="0" label="隐藏"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="分类名称：" label-for="status2">
-            <el-input clearable placeholder="请输入分类名称" v-model="artFrom.cate_name" class="form_content_width" />
-          </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" class="bnt" @click="addClass(null)">添加分类</el-button>
-      <el-table row-key="id" class="mt14" v-loading="loading" :tree-props="{ children: 'children' }" :data="tableData">
-        <el-table-column prop="categoryNum" label="编号"></el-table-column>
-        <el-table-column prop="categoryName" label="分类名称"></el-table-column>
-        <el-table-column prop="level" label="级别"></el-table-column>
-        <el-table-column prop="icon" label="分类图标" min-width="100">
-          <template slot-scope="scope">
-            <el-image style="width: 50px; height: 50px" :src="scope.row.icon" :preview-src-list="[scope.row.icon]">
-            </el-image>
-          </template>
-        </el-table-column>
-        <el-table-column prop="showFlag" label="是否显示">
-          <template slot-scope="scope">
-            <el-switch disabled active-value="1" inactive-value="0" v-model="scope.row.showFlag" active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column prop="sort" label="排序" min-width="100" tooltip="true"></el-table-column>
-        <el-table-column prop="date" label="操作" width="120" fixed="right">
-          <template slot-scope="scope">
-            <el-dropdown>
-              <el-button type=text>设置<i class="el-icon-arrow-down el-icon--right"></i></el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  <span @click="edit(scope.row)">编辑</span>
-                </el-dropdown-item>
-                <el-dropdown-item v-if="scope.row.level == 1">
-                  <span @click="addClass(scope.row)">新增下级</span>
-                </el-dropdown-item>
-                <el-dropdown-item v-if="scope.row.level == 1">查看下级 </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-            <el-button type=text>
-            </el-button>
-            <el-button @click="del(scope.row, scope)" type=text>删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <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>
-
-    <!-- 添加 编辑表单-->
-    <edit-from ref="edits" :FromData="FromData" @submitFail="userSearchs"></edit-from>
-    <el-dialog title="分类" :visible.sync="editDialogConfig.visible" destroy-on-close :close-on-click-modal="false">
-      <edit ref="edit" :parentOptions="tableData" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import edit from '@/components/Category/edit'
-import editFrom from '../../../components/from/from';
-import productApi from '@/api/product/productAttr.js';
-import { loadingFn } from "@/utils/validate"
-export default {
-  name: 'product_productClassify',
-  components: {
-    editFrom,
-    edit
-  },
-  data() {
-    return {
-      editDialogConfig: {
-        visible: false
-      },
-      treeSelect: [],
-      FromData: null,
-      grid: {
-        xl: 7,
-        lg: 7,
-        md: 12,
-        sm: 24,
-        xs: 24,
-      },
-      loading: false,
-      page: {
-        "currentPage": 1,
-        "pageSize": 10,
-        "params": {},
-        totalCount: 0
-      },
-      total: 0,
-      tableData: [],
-    };
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    handleCommand(e) {
-
-    },
-    handleSizeChange(val) {
-      this.page.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.page.currentPage = val
-      this.getList()
-    },
-    // 商品分类；
-    goodsCategory() {
-    },
-    // 列表
-    getList() {
-      loadingFn.call(this, "loading", productApi.classifyGetByPage(this.page).then(res => {
-        if (res.code = 20000) ({ list: this.tableData = [], totalCount: this.page.totalCount = 0 } = res.data);
-      }));
-    },
-    pageChange(index) {
-      this.artFrom.page = index;
-      this.getList();
-    },
-    // 添加
-    addClass(parent = null) {
-      this.editDialogConfig.visible = true; 
-      if (parent) {
-        let { categoryName, id } = parent;
-        this.$nextTick(() => {
-          this.$refs.edit.updateModel("classifySave");
-          this.$refs.edit.editPram = Object.assign(this.$refs.edit.editPram, { parentCategoryName: categoryName, parentId: id, level: 2 });
-        })
-      }
-    },
-    // 编辑
-    edit(row) {
-      this.editDialogConfig.visible = true;
-      this.$nextTick(() => {
-        let { level, icon, showFlag, categoryName, sort, parentId, id } = row;
-        this.$refs.edit.updateModel("classifyUpdate");
-        if (row.level == 1) {
-          this.$refs.edit.editPram = Object.assign(this.$refs.edit.editPram, { level, icon, showFlag, categoryName, sort, parentId, id })
-        } else {
-          this.$refs.edit.editPram = Object.assign(this.$refs.edit.editPram,
-            {
-              level,
-              icon,
-              showFlag,
-              parentCategoryName: this.tableData.find(item => item.id == parentId).categoryName,
-              categoryName,
-              sort,
-              parentId, id
-            })
-        }
-      })
-    },
-    // 修改状态
-    onchangeIsShow(row) {
-      let data = {
-        id: row.id,
-        is_show: row.is_show,
-      };
-      setShowApi(data)
-        .then(async (res) => {
-          this.$message.success(res.msg);
-        })
-        .catch((res) => {
-          this.$message.error(res.msg);
-        });
-    },
-    // 下拉树
-    handleCheckChange(data) {
-      let value = '';
-      let title = '';
-      this.list = [];
-      this.artFrom.pid = 0;
-      data.forEach((item, index) => {
-        value += `${item.id},`;
-        title += `${item.title},`;
-      });
-      value = value.substring(0, value.length - 1);
-      title = title.substring(0, title.length - 1);
-      this.list.push({
-        value,
-        title,
-      });
-      this.artFrom.pid = value;
-      this.getList();
-    },
-    // 删除
-    del(row, scope) {
-      console.log(scope)
-      this.$alert('请确定删除！', '提示', {
-        confirmButtonText: '确定',
-        callback: action => {
-          if (action == "confirm") {
-            loadingFn.call(this, "loading", productApi.classifyDelete(row).then(res => {
-              if (res.code = 20000) {
-                this.$message.success("操作成功！")
-                this.handleCurrentChange()
-              }
-            }));
-          }
-        }
-      });
-    },
-    // 表格搜索
-    userSearchs() {
-      this.artFrom.page = 1;
-      this.getList();
-    },
-  },
-};
-</script>
-<style scoped lang="stylus">
-.treeSel ::v-deep .ivu-select-dropdown-list {
-  padding: 0 10px !important;
-  box-sizing: border-box;
-}
-
-.tabBox_img {
-  width: 36px;
-  height: 36px;
-  border-radius: 4px;
-  cursor: pointer;
-
-  img {
-    width: 100%;
-    height: 100%;
-  }
-}
-</style>
+<template>
+  <div class="article-manager">
+    <!-- <el-card :bordered="false" shadow="never" class="ivu-mt-16" :body-style="{ padding: 0 }">
+      <div class="padding-add">
+        <el-form ref="artFrom" :model="artFrom" inline label-width="80px" label-position="right" @submit.native.prevent>
+          <el-form-item label="商品分类：" prop="pid" label-for="pid">
+            <el-select v-model="artFrom.pid" placeholder="请选择商品分类" @change="userSearchs" clearable
+              class="form_content_width">
+              <el-option v-for="item in treeSelect" :value="item.id" :label="item.cate_name" :key="item.id">{{
+                item.cate_name
+              }}</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="分类状态：" label-for="is_show">
+            <el-select v-model="artFrom.is_show" placeholder="请选择分类状态" clearable @change="userSearchs"
+              class="form_content_width">
+              <el-option value="1" label="显示"></el-option>
+              <el-option value="0" label="隐藏"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="分类名称：" label-for="status2">
+            <el-input clearable placeholder="请输入分类名称" v-model="artFrom.cate_name" class="form_content_width" />
+          </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" class="bnt" @click="addClass(null)">添加分类</el-button>
+      <el-table row-key="id" class="mt14" v-loading="loading" :tree-props="{ children: 'children' }" :data="tableData">
+        <el-table-column prop="categoryNum" label="编号"></el-table-column>
+        <el-table-column prop="categoryName" label="分类名称"></el-table-column>
+        <el-table-column prop="level" label="级别"></el-table-column>
+        <el-table-column prop="icon" label="分类图标" min-width="100">
+          <template slot-scope="scope">
+            <el-image style="width: 50px; height: 50px" :src="scope.row.icon" :preview-src-list="[scope.row.icon]">
+            </el-image>
+          </template>
+        </el-table-column>
+        <el-table-column prop="showFlag" label="是否显示">
+          <template slot-scope="scope">
+            <el-switch disabled active-value="1" inactive-value="0" v-model="scope.row.showFlag" active-color="#13ce66"
+              inactive-color="#ff4949">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column prop="sort" label="排序" min-width="100" tooltip="true"></el-table-column>
+        <el-table-column prop="date" label="操作" width="120" fixed="right">
+          <template slot-scope="scope">
+            <el-dropdown>
+              <el-button type=text>设置<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <span @click="edit(scope.row)">编辑</span>
+                </el-dropdown-item>
+                <el-dropdown-item v-if="scope.row.level == 1">
+                  <span @click="addClass(scope.row)">新增下级</span>
+                </el-dropdown-item>
+                <!-- <el-dropdown-item v-if="scope.row.level == 1">查看下级 </el-dropdown-item> -->
+              </el-dropdown-menu>
+            </el-dropdown>
+            <el-button type=text>
+            </el-button>
+            <el-button @click="del(scope.row, scope)" type=text>删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <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>
+
+    <!-- 添加 编辑表单-->
+    <edit-from ref="edits" :FromData="FromData" @submitFail="userSearchs"></edit-from>
+    <el-dialog title="分类" :visible.sync="editDialogConfig.visible" destroy-on-close :close-on-click-modal="false">
+      <edit ref="edit" :parentOptions="tableData" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import edit from '@/components/Category/edit'
+import editFrom from '../../../components/from/from';
+import productApi from '@/api/product/productAttr.js';
+import { loadingFn } from "@/utils/validate"
+export default {
+  name: 'product_productClassify',
+  components: {
+    editFrom,
+    edit
+  },
+  data() {
+    return {
+      editDialogConfig: {
+        visible: false
+      },
+      treeSelect: [],
+      FromData: null,
+      grid: {
+        xl: 7,
+        lg: 7,
+        md: 12,
+        sm: 24,
+        xs: 24,
+      },
+      loading: false,
+      page: {
+        "currentPage": 1,
+        "pageSize": 10,
+        "params": {},
+        totalCount: 0
+      },
+      total: 0,
+      tableData: [],
+    };
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    handleCommand(e) {
+
+    },
+    handleSizeChange(val) {
+      this.page.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.page.currentPage = val
+      this.getList()
+    },
+    // 商品分类；
+    goodsCategory() {
+    },
+    // 列表
+    getList() {
+      loadingFn.call(this, "loading", productApi.classifyGetByPage(this.page).then(res => {
+        if (res.code = 20000) ({ list: this.tableData = [], totalCount: this.page.totalCount = 0 } = res.data);
+      }));
+    },
+    pageChange(index) {
+      this.artFrom.page = index;
+      this.getList();
+    },
+    // 添加
+    addClass(parent = null) {
+      this.editDialogConfig.visible = true; 
+      if (parent) {
+        let { categoryName, id } = parent;
+        this.$nextTick(() => {
+          this.$refs.edit.updateModel("classifySave");
+          this.$refs.edit.editPram = Object.assign(this.$refs.edit.editPram, { parentCategoryName: categoryName, parentId: id, level: 2 });
+        })
+      }
+    },
+    // 编辑
+    edit(row) {
+      this.editDialogConfig.visible = true;
+      this.$nextTick(() => {
+        let { level, icon, showFlag, categoryName, sort, parentId, id } = row;
+        this.$refs.edit.updateModel("classifyUpdate");
+        if (row.level == 1) {
+          this.$refs.edit.editPram = Object.assign(this.$refs.edit.editPram, { level, icon, showFlag, categoryName, sort, parentId, id })
+        } else {
+          this.$refs.edit.editPram = Object.assign(this.$refs.edit.editPram,
+            {
+              level,
+              icon,
+              showFlag,
+              parentCategoryName: this.tableData.find(item => item.id == parentId).categoryName,
+              categoryName,
+              sort,
+              parentId, id
+            })
+        }
+      })
+    },
+    // 修改状态
+    onchangeIsShow(row) {
+      let data = {
+        id: row.id,
+        is_show: row.is_show,
+      };
+      setShowApi(data)
+        .then(async (res) => {
+          this.$message.success(res.msg);
+        })
+        .catch((res) => {
+          this.$message.error(res.msg);
+        });
+    },
+    // 下拉树
+    handleCheckChange(data) {
+      let value = '';
+      let title = '';
+      this.list = [];
+      this.artFrom.pid = 0;
+      data.forEach((item, index) => {
+        value += `${item.id},`;
+        title += `${item.title},`;
+      });
+      value = value.substring(0, value.length - 1);
+      title = title.substring(0, title.length - 1);
+      this.list.push({
+        value,
+        title,
+      });
+      this.artFrom.pid = value;
+      this.getList();
+    },
+    // 删除
+    del(row, scope) {
+      console.log(scope)
+      this.$alert('请确定删除！', '提示', {
+        confirmButtonText: '确定',
+        callback: action => {
+          if (action == "confirm") {
+            loadingFn.call(this, "loading", productApi.classifyDelete(row).then(res => {
+              if (res.code = 20000) {
+                this.$message.success("操作成功！")
+                this.handleCurrentChange()
+              }
+            }));
+          }
+        }
+      });
+    },
+    // 表格搜索
+    userSearchs() {
+      this.artFrom.page = 1;
+      this.getList();
+    },
+  },
+};
+</script>
+<style scoped lang="stylus">
+.treeSel ::v-deep .ivu-select-dropdown-list {
+  padding: 0 10px !important;
+  box-sizing: border-box;
+}
+
+.tabBox_img {
+  width: 36px;
+  height: 36px;
+  border-radius: 4px;
+  cursor: pointer;
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue
index ef919eb..ceaa962 100644
--- a/src/views/product/productList/index.vue
+++ b/src/views/product/productList/index.vue
@@ -1,789 +1,859 @@
-<template>
-  <div class="article-manager">
-    <el-card :bordered="false" shadow="never" class="ivu-mt mt16" :body-style="{ padding: '0 20px 20px' }">
-      <el-tabs v-model="page.params.type" @tab-click="onClickTab">
-        <el-tab-pane :label="item.name + '(' + item.count + ')'" :name="item.type.toString()"
-          v-for="(item, index) in headeNum" :key="index" />
-      </el-tabs>
-      <div>
-        <el-form ref="artFrom" :model="page" label-width="80px" label-position="right" inline @submit.native.prevent>
-          <el-form-item label="商品搜索：" label-for="store_name">
-            <el-input clearable placeholder="请输入商品名称" v-model="page.params.productName" class="form_content_width" />
-          </el-form-item>
-          <el-form-item label="商品分类：" label-for="pid">
-            <el-cascader v-model="page.params.categorys" size="small" :options="treeSelect" :props="{
-              multiple: false, emitPath: false, checkStrictly: true, children: 'children',
-              label: 'categoryName',
-              value: 'id'
-            }" clearable class="form_content_width"></el-cascader>
-          </el-form-item>
-          <el-form-item label="商品类型：" prop="productType">
-            <el-select style="width: 100%;" v-model="page.params.productType" placeholder="请选择商品类型">
-              <el-option label="店铺商品" value="2"> </el-option>
-              <el-option label="平台商品" value="1"> </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="油站名称：" label-for="siteName">
-            <el-input clearable placeholder="请输入油站名称：" v-model="page.siteName" class="form_content_width" />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="userSearchs">查询</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="Button">
-        <el-button type="primary" class="mr14">添加商品</el-button>
-        <el-button type="success" class="mr14" @click="onCopy">商品采集</el-button>
-        <!-- <el-dropdown class="bnt mr14" @command="batchSelect">
-          <el-button>批量修改<i class="el-icon-arrow-down el-icon--right"></i></el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :command="1">商品分类</el-dropdown-item>
-            <el-dropdown-item :command="2">物流设置</el-dropdown-item>
-            <el-dropdown-item :command="3">购买送积分</el-dropdown-item>
-            <el-dropdown-item :command="4">购买送优惠券</el-dropdown-item>
-            <el-dropdown-item :command="5">关联用户标签</el-dropdown-item>
-            <el-dropdown-item :command="6">活动推荐</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown> -->
-        <el-button @click="onDismount" v-show="artFrom.type === '1'">批量下架</el-button>
-        <el-button @click="onShelves" v-show="artFrom.type === '2'">批量上架</el-button>
-        <el-button class="export" @click="exports">导出</el-button>
-      </div>
-      <el-table ref="table" :data="tableList" class="ivu-mt mt14" v-loading="loading" highlight-current-row
-        :row-key="getRowKey" @selection-change="handleSelectRow" empty-text="暂无数据">
-        <el-table-column type="selection" width="60" :reserve-selection="true"> </el-table-column>
-        <el-table-column label="编号">
-          <template slot-scope="scope">
-            <span>{{ scope.row.id }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品类型">
-          <template slot-scope="scope">
-            <span>{{ scope.row.productType ? '平台' : '店铺' }}</span>
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="商品图" min-width="90">
-          <template slot-scope="scope">
-            <div class="tabBox_img" v-viewer>
-              <img v-lazy="scope.row.image" />
-            </div>
-          </template>
-        </el-table-column> -->
-        <el-table-column label="商品名称" min-width="250">
-          <template slot-scope="scope">
-            <span>{{ scope.row.productName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="价格/货号" min-width="100">
-          <template slot-scope="scope">
-            <span>价格：¥{{ scope.row.price }}</span> <br />
-            <span>货号：{{ scope.row.productNum }}</span>
-
-          </template>
-        </el-table-column>
-        <el-table-column label="标签" min-width="100">
-          <template slot-scope="scope">
-            <div>
-              上架：
-              <el-switch disabled active-value="1" inactive-value="2" v-model="scope.row.productStatus"
-                active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-            </div>
-            <div>
-              新品：
-              <el-switch disabled active-value="1" inactive-value="2" v-model="scope.row.newMark" active-color="#13ce66"
-                inactive-color="#ff4949"> </el-switch>
-            </div>
-            <div>
-              推荐：
-              <el-switch disabled active-value="1" inactive-value="2" v-model="scope.row.recommend" active-color="#13ce66"
-                inactive-color="#ff4949"> </el-switch>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="库存" min-width="100">
-          <template slot-scope="scope">
-            <span>{{ scope.row.stockList.length }}</span> <br />
-            <!-- <el-button type="text"> {{ scope.row.stockList.length }}</el-button> <br/>  -->
-            <el-button @click="stockList=scope.row;isEditorStock=true" type="text"> 编辑库存</el-button> <br />
-          </template>
-        </el-table-column>
-        <el-table-column label="更新时间" min-width="100">
-          <template slot-scope="scope">
-            <span>
-              {{ scope.row.updateTime }}
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="审核状态" min-width="100">
-          <template slot-scope="scope">
-            <span>{{ scope.row.auditStatus | auditStatusFilter }}</span> <br />
-            <el-button @click="openAuditingDetail(scope.row.id)" type="text">审核详情</el-button>
-
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" minWidth="100">
-          <template slot-scope="scope">
-            <el-button @click="edit(scope.row)" type="text">编辑</el-button>
-           
-            <el-button @click="del(scope.row)" type="text">删除</el-button>
-            <el-dropdown v-if="scope.row.auditStatus==1" size="small">
-              <span class="el-dropdown-link">
-                <el-button   type="text">审核</el-button>
-              <i class="el-icon-arrow-down el-icon--right"></i> </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  <el-button @click="auditing(scope.row,2)" type="text">审核通过</el-button>
-                </el-dropdown-item>  
-                <el-dropdown-item>
-                  <el-button @click="auditing(scope.row,3)" type="text">审核驳回</el-button>
-                </el-dropdown-item>  
-              </el-dropdown-menu>
-            </el-dropdown>
-            <!-- <a @click="edit(scope.row)">编辑</a>
-            <el-divider direction="vertical"></el-divider>
-            <el-dropdown size="small">
-              <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  查看评论
-                </el-dropdown-item>
-                <el-dropdown-item v-if="artFrom.type === '6'"
-                  @click.native="del(scope.row, '恢复商品', scope.$index)">恢复商品</el-dropdown-item>
-                <el-dropdown-item v-else @click.native="del(scope.row, '移入回收站', scope.$index)">移到回收站</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown> -->
-          </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>
-      <attribute :attrTemplate="attrTemplate" v-on:changeTemplate="changeTemplate"></attribute>
-    </el-card>
-    <!-- 生成淘宝京东表单
-    <el-dialog
-      :visible.sync="modals"
-      class="Box"
-      title="复制淘宝、天猫、京东、苏宁、1688"
-      :close-on-click-modal="false"
-      width="720px"
-    >
-      <tao-bao ref="taobaos" v-if="modals" @on-close="onClose"></tao-bao>
-    </el-dialog> -->
-    <el-dialog :visible.sync="batchModal" class="batch-box" title="批量设置" :show-close="true" :close-on-click-modal="false"
-      width="540px">
-      <el-form class="batchFormData" ref="batchFormData" :rules="ruleBatch" :model="batchFormData" label-width="90px"
-        label-position="right" @submit.native.prevent>
-        <el-row :gutter="24">
-          <el-col :span="24" v-if="batchType == 1">
-            <el-form-item label="商品分类：" prop="cate_id">
-              <el-cascader v-model="batchFormData.cate_id" size="small" :options="treeSelect"
-                :props="{ multiple: true, emitPath: false, checkStrictly: true }" clearable
-                style="width: 400px"></el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="batchType == 2">
-            <el-form-item label="物流方式：" prop="logistics">
-              <el-checkbox-group v-model="batchFormData.logistics" @change="logisticsBtn">
-                <el-checkbox label="1">快递</el-checkbox>
-                <el-checkbox label="2">到店核销</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-            <el-form-item label="运费设置：">
-              <el-radio-group v-model="batchFormData.freight">
-                <!-- <el-radio :label="1">包邮</el-radio> -->
-                <el-radio :label="2">固定邮费</el-radio>
-                <el-radio :label="3">运费模板</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="" v-if="batchFormData.freight == 2">
-              <div class="acea-row">
-                <el-input-number :controls="false" :min="0" v-model="batchFormData.postage" placeholder="请输入金额"
-                  class="perW20 maxW" />
-              </div>
-            </el-form-item>
-            <el-form-item label="" v-if="batchFormData.freight == 3" prop="temp_id">
-              <div class="acea-row">
-                <el-select v-model="batchFormData.temp_id" clearable placeholder="请选择运费模板" style="width: 414px">
-                  <el-option v-for="(item, index) in templateList" :value="item.id" :key="index"
-                    :label="item.name"></el-option>
-                </el-select>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="[3, 4, 5, 6].includes(batchType)">
-            <el-form-item label="赠送积分：" prop="give_integral" v-if="batchType == 3">
-              <el-input-number :controls="false" v-model="batchFormData.give_integral" :min="0" :max="9999999999"
-                placeholder="请输入积分" style="width: 100%" />
-            </el-form-item>
-            <el-form-item label="赠送优惠券：" v-if="batchType == 4">
-              <div v-if="couponName.length" class="mb20">
-                <el-tag closable v-for="(item, index) in couponName" :key="index" @close="handleClose(item)">{{
-                  item.title
-                }}</el-tag>
-              </div>
-              <el-button type="primary" @click="addCoupon">添加优惠券</el-button>
-            </el-form-item>
-            <el-form-item label="关联标签：" prop="label_id" v-if="batchType == 5">
-              <div class="acea-row label_width">
-                <div class="labelInput acea-row row-between-wrapper" @click="openLabel">
-                  <div style="width: 90%">
-                    <div v-if="dataLabel.length">
-                      <el-tag closable v-for="(item, index) in dataLabel" @close="closeLabel(item)" :key="index">{{
-                        item.label_name
-                      }}</el-tag>
-                    </div>
-                    <span class="span" v-else>选择用户关联标签</span>
-                  </div>
-                  <div class="iconfont iconxiayi"></div>
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item label="商品推荐：" v-if="batchType == 6">
-              <el-checkbox-group v-model="batchFormData.recommend">
-                <el-checkbox label="is_hot">热卖单品</el-checkbox>
-                <el-checkbox label="is_benefit">促销单品</el-checkbox>
-                <el-checkbox label="is_best">精品推荐</el-checkbox>
-                <el-checkbox label="is_new">首发新品</el-checkbox>
-                <el-checkbox label="is_good">优品推荐</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="clearBatchData">取 消</el-button>
-        <el-button type="primary" @click="batchSub">确 定</el-button>
-      </span>
-    </el-dialog>
-    <!-- 用户标签 -->
-    <el-dialog :visible.sync="labelShow" title="请选择用户标签" width="540px" :show-close="true" :close-on-click-modal="false">
-      <userLabel ref="userLabel" @activeData="activeData" @close="labelClose"></userLabel>
-    </el-dialog>
-    <!-- 商品弹窗 -->
-    <div v-if="isProductBox">
-      <div class="bg" @click="isProductBox = false"></div>
-      <goodsDetail :goodsId="goodsId"></goodsDetail>
-    </div>
-    <coupon-list ref="couponTemplates" @nameId="nameId" :couponids="batchFormData.coupon_ids"></coupon-list>
-    <el-dialog title="库存编辑" :visible.sync="isEditorStock">
-      <EditorStock v-if="isEditorStock" @editorStockSubmit="editorStockSubmit" :stockList="stockList"></EditorStock>
-    </el-dialog>
-    <el-dialog title="审核详情" :visible.sync="isAuditingDetail">
-      <AuditingDetail ref="AuditingDetail" v-if="isAuditingDetail"></AuditingDetail>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import expandRow from './tableExpand.vue';
-import attribute from './attribute';
-import taoBao from './taoBao';
-import goodsDetail from './components/goodsDetail.vue';
-import couponList from '@/components/couponList';
-import userLabel from '@/components/labelList';
-import productApi from '@/api/product/productAttr.js';
-import { loadingFn } from "@/utils/validate";
-import EditorStock from './components/EditorStock.vue'
-import AuditingDetail from './components/AuditingDetail.vue'
-
-export default {
-  filters: {
-    auditStatusFilter(e) {
-      switch (e) {
-        case '1':
-          return "待审核"
-        case '2':
-          return "通过"
-        case '3':
-          return "不通过"
-        default:
-          return "暂无数据"
-      }
-    }
-  },
-  name: 'product_productList',
-  components: { expandRow, attribute, taoBao, goodsDetail, userLabel, couponList,EditorStock,AuditingDetail },
-  data() {
-    return {
-      isAuditingDetail:false,
-      stockList:{},
-      isEditorStock:false,
-      template: false,
-      modals: false,
-      batchModal: false,
-      labelShow: false,
-      batchType: 1, // 批量设置类型
-      batchFormData: {
-        cate_id: [],
-        logistics: [],
-        freight: 2,
-        postage: 0,
-        temp_id: null,
-        give_integral: 0,
-        label_id: [],
-        coupon_ids: [],
-        recommend: [],
-      },
-      ruleBatch: {},
-      couponName: [], // 优惠券
-      dataLabel: [], // 标签
-      templateList: [], // 运费模版
-      grid: {
-        xl: 6,
-        lg: 8,
-        md: 12,
-        sm: 24,
-        xs: 24,
-      },
-      page: {
-        "currentPage": 1,
-        "pageSize": 10,
-        "params": {
-          brandName: "",
-          type:"0"
-        },
-        totalCount: 0
-      },
-      artFrom: {
-        page: 1,
-        limit: 15,
-        cate_id: '',
-        type: '1',
-        store_name: '',
-      },
-      list: [],
-      tableList: [],
-      headeNum: [
-        {
-          "count": 2,
-          "name": "全部商品",
-          "type":0,
-          "params": {}
-        },
-        {
-          "count": 40,
-          "name": "已上架",
-          "type": 1,
-          "params": {
-            "productStatus": "1"
-          }
-        },
-        {
-          "count": 5,
-          "name": "未上架",
-          "type": 2,
-          "params": {
-            "productStatus": "2"
-          }
-        },
-        {
-          "count": 10,
-          "name": "待审核",
-          "type": 3,
-          "params": {
-            "auditStatus": "1"
-          }
-        },
-      ],
-      loading: false,
-      data: [],
-      total: 0,
-      attrTemplate: false,
-      ids: [],
-      goodsId: '',
-      isProductBox: false,
-      treeSelect: [],
-      multipleSelection: [],
-    };
-  },
-  created() {
-    this.init()
-  },
-  activated() { },
-  methods: {
-    auditing(row,auditStatus){
-      this.$prompt('审核', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          inputPlaceholder:"请输入审核说明",
-          inputPattern: /^.+$/,
-          inputErrorMessage: '审核说明不能为空'
-        }).then(({ value }) => { 
-          productApi.productListAuditProduct(Object.assign(row,{auditRemark:value,auditStatus})).then(res=>{
-            if(res.code==20000){
-              this.$message.success("操作成功!");
-            this.handleCurrentChange();
-
-            }
-          })
-        }).catch((e) => {  
-          console.log(e)
-        });
-    },
-    openAuditingDetail(id){
-      this.isAuditingDetail=true;
-      this.$nextTick(()=>{
-      this.$refs.AuditingDetail.getByPage(id); 
-      })
-    },
-    editorStockSubmit(stockList){
-      let { id:productId} = this.stockList; 
-      productApi.productListUpdateBatchList({
-        productId,
-        stockList:stockList.map(item=>{ return {
-          ...item,
-          attributeJson:JSON.stringify( item.attributeJson)
-        } })
-      }).then(res=>{
-        this.handleCurrentChange()
-      })
-    },
-    init() {
-      this.getCategorySelect();
-      this.getDataList();
-    },
-    handleCurrentChange(val) {
-      this.page.currentPage = val;
-      this.getDataList()
-    },
-    handleSizeChange(val) {
-      this.page.pageSize = val
-      this.getDataList()
-    },
-    // 商品分类；
-    getCategorySelect() {
-      productApi.getClassificationTree().then(res => {
-        if (res.code == 20000) {
-          this.treeSelect = res.data;
-        }
-      })
-    },
-    getList() { },
-
-    batchSub() { },
-    clearBatchData(status) { },
-    // 批量设置商品
-    batchSelect(type) { },
-    activeData(dataLabel) { },
-    nameId(id, names) { },
-    handleClose(name) { },
-    //对象数组去重；
-    unique(arr) {
-      const res = new Map();
-      return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
-    },
-    // 获取运费模板；
-    productGetTemplate() { },
-    // 标签弹窗关闭
-    labelClose() { },
-    look(row) {
-      this.goodsId = row.id;
-      this.isProductBox = true;
-    },
-    // 物流方式
-    logisticsBtn(e) {
-      this.batchFormData.logistics = e;
-    },
-    // 关联用户标签
-    openLabel() {
-      this.labelShow = true;
-    },
-    closeLabel(label) {
-      let index = this.dataLabel.indexOf(this.dataLabel.filter((d) => d.id == label.id)[0]);
-      this.dataLabel.splice(index, 1);
-    },
-    // 添加优惠券
-    addCoupon() { },
-    getPath() { },
-    // 导出
-    async exports() {
-      let [th, filekey, data, fileName] = [[], [], [], ''];
-      let excelData = JSON.parse(JSON.stringify(this.artFrom));
-      excelData.page = 1;
-      excelData.limit = 50;
-      excelData.ids = this.ids;
-      for (let i = 0; i < excelData.page + 1; i++) {
-        let lebData = await this.getExcelData(excelData);
-        if (!fileName) fileName = lebData.filename;
-        if (!filekey.length) {
-          filekey = lebData.fileKey;
-        }
-        if (!th.length) th = lebData.header;
-        if (lebData.export.length) {
-          data = data.concat(lebData.export);
-          excelData.page++;
-        } else {
-          this.$exportExcel(th, filekey, fileName, data);
-          return;
-        }
-      }
-    },
-    getExcelData(excelData) { },
-    freight() { },
-    // 批量上架
-    onShelves() { },
-    // 批量下架
-    onDismount() { },
-    getRowKey(row) {
-      return row.id;
-    },
-    //  选中某一行
-    handleSelectRow(selection) {
-      const uniqueArr = [];
-      const ids = [];
-      for (let i = 0; i < selection.length; i++) {
-        const item = selection[i];
-        if (!ids.includes(item.id)) {
-          uniqueArr.push(item);
-          ids.push(item.id);
-        }
-      }
-      this.ids = ids;
-      this.multipleSelection = uniqueArr;
-    },
-    // 添加淘宝商品成功
-    onClose() {
-      this.modals = false;
-    },
-    // 复制淘宝
-    onCopy() {
-      // this.$router.push({
-      //   path: this.$routeProStr + '/product/add_product',
-      //   query: { type: -1 },
-      // }); 
-    },
-    // tab选择
-    onClickTab() {
-      console.log(this.page.params.type,"params");
-      this.page.currentPage = 1;
-      this.multipleSelection = [];
-      this.$refs.table.clearSelection();
-      this.page.params = {type:this.page.params.type};
-      this.getDataList( Object.assign({},this.page,{params:this.headeNum[this.page.params.type].params}));
-    },
-    // 下拉树
-    handleCheckChange(data) {
-      let value = '';
-      let title = '';
-      this.list = [];
-      this.artFrom.cate_id = 0;
-      data.forEach((item, index) => {
-        value += `${item.id},`;
-        title += `${item.title},`;
-      });
-      value = value.substring(0, value.length - 1);
-      title = title.substring(0, title.length - 1);
-      this.list.push({
-        value,
-        title,
-      });
-      this.artFrom.cate_id = value;
-      this.getDataList();
-    },
-    // 获取商品表单头数量
-    goodHeade() { },
-    // 商品分类；
-    goodsCategory() {
-    },
-    // 商品列表；
-    getDataList(page) {
-      loadingFn.call(this, "loading", productApi.productListGetByPage(page?page:this.page).then(res => {
-        if (res.code = 20000) ({ list: this.tableList = [], totalCount: this.page.totalCount = 0 } = res.data);
-      }));
-    },
-    showSelectData() {
-    },
-    // 表格搜索
-    userSearchs() {
-      this.handleCurrentChange();
-      // this.artFrom.page = 1;
-    },
-    // 上下架
-    changeSwitch(row) { },
-    // 数据导出；
-    exportData: function () {
-      // let th = ['商品名称', '商品简介', '商品分类', '价格', '库存', '销量', '收藏人数'];
-      // let filterVal = ['store_name', 'store_info', 'cate_name', 'price', 'stock', 'sales', 'collect'];
-      // this.where.page = 'nopage';
-      // getGoods(this.where).then((res) => {
-      //   let data = res.data.map((v) => filterVal.map((k) => v[k]));
-      //   let fileTime = Date.parse(new Date());
-      //   let [fileName, fileType, sheetName] = ['商户数据_' + fileTime, 'xlsx', '商户数据'];
-      //   // toExcel({ th, data, fileName, fileType, sheetName });
-      // });
-    },
-    // 属性弹出；
-    attrTap() {
-      this.attrTemplate = true;
-    },
-    changeTemplate(msg) {
-      this.attrTemplate = msg;
-    },
-    // 编辑
-    edit(row) {
-      console.log(row)
-      this.$router.push({
-        name:"productAdd",
-        params:{
-          id:row.id
-        }
-      })
-      // this.$router.push({ path: this.$routeProStr + '/product/add_product/' + row.id });
-    },
-    // 确认
-    del(row, tit, num) {
-      this.$alert('请确定删除！', '提示', {
-        confirmButtonText: '确定',
-        callback: action => {
-          if (action == "confirm") {
-            productApi.productListDelete(row).then(res => {
-              if (res.code == 20000) {
-                this.$message.success("操作成功！")
-                this.handleCurrentChange()
-              }
-
-            })
-          }
-        }
-      });
-      // let delfromData = {
-      //   title: tit,
-      //   num: num,
-      //   url: `product/product/${row.id}`,
-      //   method: 'DELETE',
-      //   ids: '',
-      //   un: 1,
-      // };
-      // this.$modalSure(delfromData)
-      //   .then((res) => {
-      //     this.$message.success(res.msg);
-      //     this.tableList.splice(num, 1);
-      //     this.goodHeade();
-      //     this.getDataList();
-      //   })
-      //   .catch((res) => {
-      //     this.$message.error(res.msg);
-      //   });
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-::v-deep .el-tabs__item {
-  height: 54px !important;
-  line-height: 54px !important;
-}
-
-::v-deep .ivu-modal-mask {
-  z-index: 999 !important;
-}
-
-::v-deep .ivu-modal-wrap {
-  z-index: 999 !important;
-}
-
-.Box {
-  ::v-deep .ivu-modal-body {
-    height: 700px;
-    overflow: auto;
-  }
-}
-
-.batch-box {
-  ::v-deep .ivu-modal-body {
-    overflow: auto;
-    min-height: 350px;
-  }
-}
-
-.tabBox_img {
-  width: 36px;
-  height: 36px;
-  border-radius: 4px;
-  cursor: pointer;
-
-  img {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.bg {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.5);
-  z-index: 11;
-}
-
-::v-deep .happy-scroll-content {
-  width: 100%;
-
-  .demo-spin-icon-load {
-    animation: ani-demo-spin 1s linear infinite;
-  }
-
-  @keyframes ani-demo-spin {
-    from {
-      transform: rotate(0deg);
-    }
-
-    50% {
-      transform: rotate(180deg);
-    }
-
-    to {
-      transform: rotate(360deg);
-    }
-  }
-
-  .demo-spin-col {
-    height: 100px;
-    position: relative;
-    border: 1px solid #eee;
-  }
-}
-
-.labelInput {
-  border: 1px solid #dcdee2;
-  width: 100%;
-  padding: 0 15px;
-  border-radius: 5px;
-  min-height: 30px;
-  cursor: pointer;
-  font-size: 12px;
-
-  .span {
-    color: #c5c8ce;
-  }
-
-  .iconxiayi {
-    font-size: 12px;
-  }
-}
-
-.el-dropdown-link {
-  cursor: pointer;
-  color: var(--prev-color-primary);
-  font-size: 12px;
-}
-
-.el-icon-arrow-down {
-  font-size: 12px;
-}
-
-.el-dropdown-menu__item {
-  a {
-    color: #606266;
-  }
-}
-
-.label_width {
-  width: 400px;
-}
-</style>
+<template>
+  <div class="article-manager">
+    <el-card :bordered="false" shadow="never" class="ivu-mt mt16" :body-style="{ padding: '0 20px 20px' }">
+      <el-tabs v-model="page.params.type" @tab-click="onClickTab">
+        <el-tab-pane :label="item.name + '(' + item.count + ')'" :name="item.type.toString()" v-for="(item, index) in headeNum" :key="index" />
+      </el-tabs>
+      <div>
+        <el-form ref="artFrom" :model="page" label-width="80px" label-position="right" inline @submit.native.prevent>
+          <el-form-item label="商品搜索：" label-for="store_name">
+            <el-input clearable placeholder="请输入商品名称" v-model="page.params.productName" class="form_content_width" />
+          </el-form-item>
+          <el-form-item label="商品分类：" label-for="pid">
+            <el-cascader
+              v-model="page.params.categorys"
+              size="small"
+              :options="treeSelect"
+              :props="{
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+                children: 'children',
+                label: 'categoryName',
+                value: 'id'
+              }"
+              clearable
+              class="form_content_width"
+            ></el-cascader>
+          </el-form-item>
+          <el-form-item label="商品类型：" prop="productType">
+            <el-select style="width: 100%;" v-model="page.params.productType" placeholder="请选择商品类型">
+              <el-option label="店铺商品" value="2"> </el-option>
+              <el-option label="平台商品" value="1"> </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="油站名称：" label-for="siteName">
+            <el-input clearable placeholder="请输入油站名称：" v-model="page.params.siteName" class="form_content_width" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="userSearchs">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="Button">
+        <el-button type="primary" class="mr14">添加商品</el-button>
+        <el-button type="success" class="mr14" @click="onCopy">商品采集</el-button>
+        <!-- <el-dropdown class="bnt mr14" @command="batchSelect">
+          <el-button>批量修改<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item :command="1">商品分类</el-dropdown-item>
+            <el-dropdown-item :command="2">物流设置</el-dropdown-item>
+            <el-dropdown-item :command="3">购买送积分</el-dropdown-item>
+            <el-dropdown-item :command="4">购买送优惠券</el-dropdown-item>
+            <el-dropdown-item :command="5">关联用户标签</el-dropdown-item>
+            <el-dropdown-item :command="6">活动推荐</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown> -->
+        <el-button @click="onDismount" v-show="artFrom.type === '1'">批量下架</el-button>
+        <el-button @click="onShelves" v-show="artFrom.type === '2'">批量上架</el-button>
+        <el-button class="export" @click="exports">导出</el-button>
+      </div>
+      <el-table
+        ref="table"
+        :data="tableList"
+        class="ivu-mt mt14"
+        v-loading="loading"
+        highlight-current-row
+        :row-key="getRowKey"
+        @selection-change="handleSelectRow"
+        empty-text="暂无数据"
+      >
+        <el-table-column type="selection" width="60" :reserve-selection="true"> </el-table-column>
+        <el-table-column label="编号">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品类型">
+          <template slot-scope="scope">
+            <span>{{ scope.row.productType ? '平台' : '店铺' }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="商品图" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="商品名称" min-width="200"  align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.productName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="价格/货号" min-width="200">
+          <template slot-scope="scope">
+            <span>价格：¥{{ scope.row.price }}</span> <br />
+            <span>货号：{{ scope.row.productNum }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标签" min-width="100">
+          <template slot-scope="scope">
+            <div>
+              上架：
+              <el-switch
+                disabled
+                active-value="1"
+                inactive-value="2"
+                v-model="scope.row.productStatus"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+              >
+              </el-switch>
+            </div>
+            <div>
+              新品：
+              <el-switch disabled active-value="1" inactive-value="2" v-model="scope.row.newMark" active-color="#13ce66" inactive-color="#ff4949">
+              </el-switch>
+            </div>
+            <div>
+              推荐：
+              <el-switch disabled active-value="1" inactive-value="2" v-model="scope.row.recommend" active-color="#13ce66" inactive-color="#ff4949">
+              </el-switch>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="油站" min-width="150" align="center">
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.siteName }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="库存" min-width="80">
+          <template slot-scope="scope">
+            <!-- <span>{{ scope.row.stockList.length }}</span> <br /> -->
+            <!-- <el-button type="text"> {{ scope.row.stockList.length }}</el-button> <br/>  -->
+            <el-button
+              @click="
+                stockList = scope.row
+                isEditorStock = true
+              "
+              type="text"
+            >
+              编辑库存</el-button
+            >
+            <br />
+          </template>
+        </el-table-column>
+        <el-table-column label="更新时间" min-width="150">
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.updateTime }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.auditStatus | auditStatusFilter }}</span> <br />
+            <el-button @click="openAuditingDetail(scope.row.id)" type="text">审核详情</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" minWidth="100">
+          <template slot-scope="scope">
+            <el-button @click="edit(scope.row)" type="text">编辑</el-button>
+
+            <el-button @click="del(scope.row)" type="text">删除</el-button>
+            <el-dropdown v-if="scope.row.auditStatus == 1" size="small">
+              <span class="el-dropdown-link">
+                <el-button type="text">审核</el-button>
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <el-button @click="auditing(scope.row, 2)" type="text">审核通过</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-button @click="auditing(scope.row, 3)" type="text">审核驳回</el-button>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+            <!-- <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <el-dropdown size="small">
+              <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  查看评论
+                </el-dropdown-item>
+                <el-dropdown-item v-if="artFrom.type === '6'"
+                  @click.native="del(scope.row, '恢复商品', scope.$index)">恢复商品</el-dropdown-item>
+                <el-dropdown-item v-else @click.native="del(scope.row, '移入回收站', scope.$index)">移到回收站</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown> -->
+          </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>
+      <attribute :attrTemplate="attrTemplate" v-on:changeTemplate="changeTemplate"></attribute>
+    </el-card>
+    <!-- 生成淘宝京东表单
+    <el-dialog
+      :visible.sync="modals"
+      class="Box"
+      title="复制淘宝、天猫、京东、苏宁、1688"
+      :close-on-click-modal="false"
+      width="720px"
+    >
+      <tao-bao ref="taobaos" v-if="modals" @on-close="onClose"></tao-bao>
+    </el-dialog> -->
+    <el-dialog :visible.sync="batchModal" class="batch-box" title="批量设置" :show-close="true" :close-on-click-modal="false" width="540px">
+      <el-form
+        class="batchFormData"
+        ref="batchFormData"
+        :rules="ruleBatch"
+        :model="batchFormData"
+        label-width="90px"
+        label-position="right"
+        @submit.native.prevent
+      >
+        <el-row :gutter="24">
+          <el-col :span="24" v-if="batchType == 1">
+            <el-form-item label="商品分类：" prop="cate_id">
+              <el-cascader
+                v-model="batchFormData.cate_id"
+                size="small"
+                :options="treeSelect"
+                :props="{ multiple: true, emitPath: false, checkStrictly: true }"
+                clearable
+                style="width: 400px"
+              ></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="batchType == 2">
+            <el-form-item label="物流方式：" prop="logistics">
+              <el-checkbox-group v-model="batchFormData.logistics" @change="logisticsBtn">
+                <el-checkbox label="1">快递</el-checkbox>
+                <el-checkbox label="2">到店核销</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+            <el-form-item label="运费设置：">
+              <el-radio-group v-model="batchFormData.freight">
+                <!-- <el-radio :label="1">包邮</el-radio> -->
+                <el-radio :label="2">固定邮费</el-radio>
+                <el-radio :label="3">运费模板</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="" v-if="batchFormData.freight == 2">
+              <div class="acea-row">
+                <el-input-number :controls="false" :min="0" v-model="batchFormData.postage" placeholder="请输入金额" class="perW20 maxW" />
+              </div>
+            </el-form-item>
+            <el-form-item label="" v-if="batchFormData.freight == 3" prop="temp_id">
+              <div class="acea-row">
+                <el-select v-model="batchFormData.temp_id" clearable placeholder="请选择运费模板" style="width: 414px">
+                  <el-option v-for="(item, index) in templateList" :value="item.id" :key="index" :label="item.name"></el-option>
+                </el-select>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="[3, 4, 5, 6].includes(batchType)">
+            <el-form-item label="赠送积分：" prop="give_integral" v-if="batchType == 3">
+              <el-input-number
+                :controls="false"
+                v-model="batchFormData.give_integral"
+                :min="0"
+                :max="9999999999"
+                placeholder="请输入积分"
+                style="width: 100%"
+              />
+            </el-form-item>
+            <el-form-item label="赠送优惠券：" v-if="batchType == 4">
+              <div v-if="couponName.length" class="mb20">
+                <el-tag closable v-for="(item, index) in couponName" :key="index" @close="handleClose(item)">{{ item.title }}</el-tag>
+              </div>
+              <el-button type="primary" @click="addCoupon">添加优惠券</el-button>
+            </el-form-item>
+            <el-form-item label="关联标签：" prop="label_id" v-if="batchType == 5">
+              <div class="acea-row label_width">
+                <div class="labelInput acea-row row-between-wrapper" @click="openLabel">
+                  <div style="width: 90%">
+                    <div v-if="dataLabel.length">
+                      <el-tag closable v-for="(item, index) in dataLabel" @close="closeLabel(item)" :key="index">{{ item.label_name }}</el-tag>
+                    </div>
+                    <span class="span" v-else>选择用户关联标签</span>
+                  </div>
+                  <div class="iconfont iconxiayi"></div>
+                </div>
+              </div>
+            </el-form-item>
+            <el-form-item label="商品推荐：" v-if="batchType == 6">
+              <el-checkbox-group v-model="batchFormData.recommend">
+                <el-checkbox label="is_hot">热卖单品</el-checkbox>
+                <el-checkbox label="is_benefit">促销单品</el-checkbox>
+                <el-checkbox label="is_best">精品推荐</el-checkbox>
+                <el-checkbox label="is_new">首发新品</el-checkbox>
+                <el-checkbox label="is_good">优品推荐</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="clearBatchData">取 消</el-button>
+        <el-button type="primary" @click="batchSub">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 用户标签 -->
+    <el-dialog :visible.sync="labelShow" title="请选择用户标签" width="540px" :show-close="true" :close-on-click-modal="false">
+      <userLabel ref="userLabel" @activeData="activeData" @close="labelClose"></userLabel>
+    </el-dialog>
+    <!-- 商品弹窗 -->
+    <div v-if="isProductBox">
+      <div class="bg" @click="isProductBox = false"></div>
+      <goodsDetail :goodsId="goodsId"></goodsDetail>
+    </div>
+    <coupon-list ref="couponTemplates" @nameId="nameId" :couponids="batchFormData.coupon_ids"></coupon-list>
+    <el-dialog title="库存编辑" :visible.sync="isEditorStock">
+      <EditorStock v-if="isEditorStock" @editorStockSubmit="editorStockSubmit" :stockList="stockList"></EditorStock>
+    </el-dialog>
+    <el-dialog title="审核详情" :visible.sync="isAuditingDetail">
+      <AuditingDetail ref="AuditingDetail" v-if="isAuditingDetail"></AuditingDetail>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import expandRow from './tableExpand.vue'
+import attribute from './attribute'
+import taoBao from './taoBao'
+import goodsDetail from './components/goodsDetail.vue'
+import couponList from '@/components/couponList'
+import userLabel from '@/components/labelList'
+import productApi from '@/api/product/productAttr.js'
+import { loadingFn } from '@/utils/validate'
+import EditorStock from './components/EditorStock.vue'
+import AuditingDetail from './components/AuditingDetail.vue'
+
+export default {
+  filters: {
+    auditStatusFilter(e) {
+      switch (e) {
+        case '1':
+          return '待审核'
+        case '2':
+          return '通过'
+        case '3':
+          return '不通过'
+        default:
+          return '暂无数据'
+      }
+    }
+  },
+  name: 'product_productList',
+  components: { expandRow, attribute, taoBao, goodsDetail, userLabel, couponList, EditorStock, AuditingDetail },
+  data() {
+    return {
+      isAuditingDetail: false,
+      stockList: {},
+      isEditorStock: false,
+      template: false,
+      modals: false,
+      batchModal: false,
+      labelShow: false,
+      batchType: 1, // 批量设置类型
+      batchFormData: {
+        cate_id: [],
+        logistics: [],
+        freight: 2,
+        postage: 0,
+        temp_id: null,
+        give_integral: 0,
+        label_id: [],
+        coupon_ids: [],
+        recommend: []
+      },
+      ruleBatch: {},
+      couponName: [], // 优惠券
+      dataLabel: [], // 标签
+      templateList: [], // 运费模版
+      grid: {
+        xl: 6,
+        lg: 8,
+        md: 12,
+        sm: 24,
+        xs: 24
+      },
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        params: {
+          brandName: '',
+          type: '0'
+        },
+        totalCount: 0
+      },
+      artFrom: {
+        page: 1,
+        limit: 15,
+        cate_id: '',
+        type: '1',
+        store_name: ''
+      },
+      list: [],
+      tableList: [],
+      headeNum: [
+        {
+          count: '',
+          name: '全部商品',
+          type: 0,
+          params: {}
+        },
+        {
+          count: '',
+          name: '已上架',
+          type: 1,
+          params: {
+            productStatus: '1'
+          }
+        },
+        {
+          count: '',
+          name: '未上架',
+          type: 2,
+          params: {
+            productStatus: '2'
+          }
+        },
+        {
+          count: '',
+          name: '待审核',
+          type: 3,
+          params: {
+            auditStatus: '1'
+          }
+        }
+      ],
+      loading: false,
+      data: [],
+      total: 0,
+      attrTemplate: false,
+      ids: [],
+      goodsId: '',
+      isProductBox: false,
+      treeSelect: [],
+      multipleSelection: []
+    }
+  },
+  created() {
+    this.init()
+  },
+  activated() {},
+  methods: {
+    auditing(row, auditStatus) {
+      this.$prompt('审核', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPlaceholder: '请输入审核说明',
+        inputPattern: /^.+$/,
+        inputErrorMessage: '审核说明不能为空'
+      })
+        .then(({ value }) => {
+          productApi.productListAuditProduct(Object.assign(row, { auditRemark: value, auditStatus })).then(res => {
+            if (res.code == 20000) {
+              this.$message.success('操作成功!')
+              this.handleCurrentChange()
+            }
+          })
+        })
+        .catch(e => {
+          console.log(e)
+        })
+    },
+    openAuditingDetail(id) {
+      this.isAuditingDetail = true
+      this.$nextTick(() => {
+        this.$refs.AuditingDetail.getByPage(id)
+      })
+    },
+    editorStockSubmit(stockList) {
+      let { id: productId } = this.stockList
+      productApi
+        .productListUpdateBatchList({
+          productId,
+          stockList: stockList.map(item => {
+            return {
+              ...item,
+              attributeJson: JSON.stringify(item.attributeJson)
+            }
+          })
+        })
+        .then(res => {
+          if (res.code == 20000) {
+            this.isEditorStock = false
+            this.$message.success('操作成功!')
+            this.handleCurrentChange()
+          }
+        })
+    },
+    init() {
+      this.getCategorySelect()
+      this.getDataList()
+    },
+    handleCurrentChange(val) {
+      this.page.currentPage = val
+      this.getDataList()
+    },
+    handleSizeChange(val) {
+      this.page.pageSize = val
+      this.getDataList()
+    },
+    // 商品分类；
+    getCategorySelect() {
+      productApi.getClassificationTree().then(res => {
+        if (res.code == 20000) {
+          this.treeSelect = res.data
+        }
+      })
+    },
+    getList() {},
+
+    batchSub() {},
+    clearBatchData(status) {},
+    // 批量设置商品
+    batchSelect(type) {},
+    activeData(dataLabel) {},
+    nameId(id, names) {},
+    handleClose(name) {},
+    //对象数组去重；
+    unique(arr) {
+      const res = new Map()
+      return arr.filter(arr => !res.has(arr.id) && res.set(arr.id, 1))
+    },
+    // 获取运费模板；
+    productGetTemplate() {},
+    // 标签弹窗关闭
+    labelClose() {},
+    look(row) {
+      this.goodsId = row.id
+      this.isProductBox = true
+    },
+    // 物流方式
+    logisticsBtn(e) {
+      this.batchFormData.logistics = e
+    },
+    // 关联用户标签
+    openLabel() {
+      this.labelShow = true
+    },
+    closeLabel(label) {
+      let index = this.dataLabel.indexOf(this.dataLabel.filter(d => d.id == label.id)[0])
+      this.dataLabel.splice(index, 1)
+    },
+    // 添加优惠券
+    addCoupon() {},
+    getPath() {},
+    // 导出
+    async exports() {
+      let [th, filekey, data, fileName] = [[], [], [], '']
+      let excelData = JSON.parse(JSON.stringify(this.artFrom))
+      excelData.page = 1
+      excelData.limit = 50
+      excelData.ids = this.ids
+      for (let i = 0; i < excelData.page + 1; i++) {
+        let lebData = await this.getExcelData(excelData)
+        if (!fileName) fileName = lebData.filename
+        if (!filekey.length) {
+          filekey = lebData.fileKey
+        }
+        if (!th.length) th = lebData.header
+        if (lebData.export.length) {
+          data = data.concat(lebData.export)
+          excelData.page++
+        } else {
+          this.$exportExcel(th, filekey, fileName, data)
+          return
+        }
+      }
+    },
+    getExcelData(excelData) {},
+    freight() {},
+    // 批量上架
+    onShelves() {},
+    // 批量下架
+    onDismount() {},
+    getRowKey(row) {
+      return row.id
+    },
+    //  选中某一行
+    handleSelectRow(selection) {
+      const uniqueArr = []
+      const ids = []
+      for (let i = 0; i < selection.length; i++) {
+        const item = selection[i]
+        if (!ids.includes(item.id)) {
+          uniqueArr.push(item)
+          ids.push(item.id)
+        }
+      }
+      this.ids = ids
+      this.multipleSelection = uniqueArr
+    },
+    // 添加淘宝商品成功
+    onClose() {
+      this.modals = false
+    },
+    // 复制淘宝
+    onCopy() {
+      // this.$router.push({
+      //   path: this.$routeProStr + '/product/add_product',
+      //   query: { type: -1 },
+      // });
+    },
+    // tab选择
+    onClickTab() {
+      console.log(this.page.params.type, 'params')
+      this.page.currentPage = 1
+      this.multipleSelection = []
+      this.$refs.table.clearSelection()
+      this.page.params = { type: this.page.params.type }
+      this.getDataList(Object.assign({}, this.page, { params: this.headeNum[this.page.params.type].params }))
+    },
+    // 下拉树
+    handleCheckChange(data) {
+      let value = ''
+      let title = ''
+      this.list = []
+      this.artFrom.cate_id = 0
+      data.forEach((item, index) => {
+        value += `${item.id},`
+        title += `${item.title},`
+      })
+      value = value.substring(0, value.length - 1)
+      title = title.substring(0, title.length - 1)
+      this.list.push({
+        value,
+        title
+      })
+      this.artFrom.cate_id = value
+      this.getDataList()
+    },
+    // 获取商品表单头数量
+    goodHeade() {},
+    // 商品分类；
+    goodsCategory() {},
+    // 商品列表；
+    getDataList(page) {
+      loadingFn.call(
+        this,
+        'loading',
+        productApi.productListGetByPage(page ? page : this.page).then(res => {
+          if ((res.code = 20000)) ({ list: this.tableList = [], totalCount: this.page.totalCount = 0 } = res.data)
+          this.headeNum[0].count = res.data.allCount
+          this.headeNum[1].count = res.data.upCount
+          this.headeNum[2].count = res.data.downCount
+          this.headeNum[3].count = res.data.auditCount
+        })
+      )
+    },
+    showSelectData() {},
+    // 表格搜索
+    userSearchs() {
+      this.handleCurrentChange()
+      // this.artFrom.page = 1;
+    },
+    // 上下架
+    changeSwitch(row) {},
+    // 数据导出；
+    exportData: function() {
+      // let th = ['商品名称', '商品简介', '商品分类', '价格', '库存', '销量', '收藏人数'];
+      // let filterVal = ['store_name', 'store_info', 'cate_name', 'price', 'stock', 'sales', 'collect'];
+      // this.where.page = 'nopage';
+      // getGoods(this.where).then((res) => {
+      //   let data = res.data.map((v) => filterVal.map((k) => v[k]));
+      //   let fileTime = Date.parse(new Date());
+      //   let [fileName, fileType, sheetName] = ['商户数据_' + fileTime, 'xlsx', '商户数据'];
+      //   // toExcel({ th, data, fileName, fileType, sheetName });
+      // });
+    },
+    // 属性弹出；
+    attrTap() {
+      this.attrTemplate = true
+    },
+    changeTemplate(msg) {
+      this.attrTemplate = msg
+    },
+    // 编辑
+    edit(row) {
+      console.log(row)
+      this.$router.push({
+        name: 'productAdd',
+        params: {
+          id: row.id
+        }
+      })
+      // this.$router.push({ path: this.$routeProStr + '/product/add_product/' + row.id });
+    },
+    // 确认
+    del(row, tit, num) {
+      this.$alert('请确定删除！', '提示', {
+        confirmButtonText: '确定',
+        callback: action => {
+          if (action == 'confirm') {
+            productApi.productListDelete(row).then(res => {
+              if (res.code == 20000) {
+                this.$message.success('操作成功！')
+                this.handleCurrentChange()
+              }
+            })
+          }
+        }
+      })
+      // let delfromData = {
+      //   title: tit,
+      //   num: num,
+      //   url: `product/product/${row.id}`,
+      //   method: 'DELETE',
+      //   ids: '',
+      //   un: 1,
+      // };
+      // this.$modalSure(delfromData)
+      //   .then((res) => {
+      //     this.$message.success(res.msg);
+      //     this.tableList.splice(num, 1);
+      //     this.goodHeade();
+      //     this.getDataList();
+      //   })
+      //   .catch((res) => {
+      //     this.$message.error(res.msg);
+      //   });
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .el-tabs__item {
+  height: 54px !important;
+  line-height: 54px !important;
+}
+
+::v-deep .ivu-modal-mask {
+  z-index: 999 !important;
+}
+
+::v-deep .ivu-modal-wrap {
+  z-index: 999 !important;
+}
+
+.Box {
+  ::v-deep .ivu-modal-body {
+    height: 700px;
+    overflow: auto;
+  }
+}
+
+.batch-box {
+  ::v-deep .ivu-modal-body {
+    overflow: auto;
+    min-height: 350px;
+  }
+}
+
+.tabBox_img {
+  width: 36px;
+  height: 36px;
+  border-radius: 4px;
+  cursor: pointer;
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.bg {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 11;
+}
+
+::v-deep .happy-scroll-content {
+  width: 100%;
+
+  .demo-spin-icon-load {
+    animation: ani-demo-spin 1s linear infinite;
+  }
+
+  @keyframes ani-demo-spin {
+    from {
+      transform: rotate(0deg);
+    }
+
+    50% {
+      transform: rotate(180deg);
+    }
+
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .demo-spin-col {
+    height: 100px;
+    position: relative;
+    border: 1px solid #eee;
+  }
+}
+
+.labelInput {
+  border: 1px solid #dcdee2;
+  width: 100%;
+  padding: 0 15px;
+  border-radius: 5px;
+  min-height: 30px;
+  cursor: pointer;
+  font-size: 12px;
+
+  .span {
+    color: #c5c8ce;
+  }
+
+  .iconxiayi {
+    font-size: 12px;
+  }
+}
+
+.el-dropdown-link {
+  cursor: pointer;
+  color: var(--prev-color-primary);
+  font-size: 12px;
+}
+
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+
+.el-dropdown-menu__item {
+  a {
+    color: #606266;
+  }
+}
+
+.label_width {
+  width: 400px;
+}
+</style>