diff --git a/.eslintignore b/.eslintignore
index e6529fc..981b223 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,3 +2,5 @@ build/*.js
 src/assets
 public
 dist
+views/
+views
diff --git a/.eslintrc.js b/.eslintrc.js
index c977505..d722fde 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -22,7 +22,7 @@ module.exports = {
       }
     }],
     "vue/singleline-html-element-content-newline": "off",
-    "vue/multiline-html-element-content-newline":"off",
+    "vue/multiline-html-element-content-newline": "off",
     "vue/name-property-casing": ["error", "PascalCase"],
     "vue/no-v-html": "off",
     'accessor-pairs': 2,
@@ -37,7 +37,8 @@ module.exports = {
     'camelcase': [0, {
       'properties': 'always'
     }],
-    'comma-dangle': [2, 'never'],
+    // 'comma-dangle': [2, 'never'],
+    'comma-dangle': "off",
     'comma-spacing': [2, {
       'before': false,
       'after': true
@@ -47,7 +48,7 @@ module.exports = {
     'curly': [2, 'multi-line'],
     'dot-location': [2, 'property'],
     'eol-last': 2,
-    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'eqeqeq': ["error", "always", { "null": "ignore" }],
     'generator-star-spacing': [2, {
       'before': true,
       'after': true
diff --git a/package.json b/package.json
index f7da6b1..f669735 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
     "html2canvas": "^1.1.0",
+    "jquery": "^3.7.1",
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
     "jszip": "3.2.1",
@@ -69,8 +70,8 @@
     "screenfull": "4.2.0",
     "showdown": "1.9.0",
     "sortablejs": "^1.15.0",
-    "view-design": "^4.3.2",
     "v-viewer": "^1.5.1",
+    "view-design": "^4.3.2",
     "vue": "2.6.10",
     "vue-awesome-swiper": "^3.1.3",
     "vue-count-to": "1.0.13",
diff --git a/src/api/product.js b/src/api/product.js
index 337978d..7faf5e5 100644
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -142,6 +142,35 @@ export function categorySelectApi() {
   return request.get(`store/category/select`)
 }
 
+
+/**mer/store/category/topList
+ * @description 商品列表 -- 新商户分类
+ */
+export function newCategorySelectApi() {
+  return request.get(`store/category/topList`)
+}
+
+/**mer/store/category/topList
+ * @description 商品导入到云商城
+ */
+export function importApi(data) {
+  return request.post(`store/product/import`, data)
+}
+
+/**mer/store/category/topList
+ * @description 删除云商品
+ */
+export function deleteProductCloudApi(data) {
+  return request.post(`store/product/delCloudProduct`, data)
+}
+
+/**mer/store/category/topList
+ * @description 云商城列表
+ */
+export function cloudProductListApi(data) {
+  return request.get(`store/product/cloudProductList`, data)
+}
+
 /**
  * @description 商品列表 -- 平台分类
  */
@@ -528,11 +557,11 @@ export function batchesTempApi(data) {
 }
 /** 参数模板 -- 添加 */
 export function productSpecs(data) {
-  return request.post(`store/params/temp/create`,data)
+  return request.post(`store/params/temp/create`, data)
 }
 /** 参数模板 -- 编辑 */
 export function specsUpdate(id, data) {
-  return request.post(`store/params/temp/update/${id}`,data)
+  return request.post(`store/params/temp/update/${id}`, data)
 }
 /** 参数模板 -- 详情 */
 export function productSpecsInfo(id) {
@@ -552,7 +581,7 @@ export function specsDetailApi(id) {
 }
 /** 添加商品 -- 参数筛选 */
 export function specsSelectedApi(data) {
-  return request.get(`store/params/temp/select`,data)
+  return request.get(`store/params/temp/select`, data)
 }
 /** 添加商品 -- 参数筛选详情 */
 export function productSpecsDetailApi(data) {
@@ -567,7 +596,7 @@ export function productBathSvipApi(data) {
   return request.post(`store/product/batch_svip`, data)
 }
 /** 商品列表 -- 立即生成规格 */
-export function generateAttrApi(id,data) {
+export function generateAttrApi(id, data) {
   return request.post(`store/product/get_attr_value/${id}`, data)
 }
 /** 商品列表 -- 系统表单下拉 */
@@ -580,11 +609,11 @@ export function associatedFormInfo(id) {
 }
 /** 商品列表 -- 批量设置 */
 export function batchSetProduct(data) {
-  return request.post(`store/product/batch_process`,data)
+  return request.post(`store/product/batch_process`, data)
 }
 /** 商品列表 -- 商品操作记录 */
-export function operateRecordList(id,data) {
-  return request.get(`store/product/get_operate_list/${id}`,data)
+export function operateRecordList(id, data) {
+  return request.get(`store/product/get_operate_list/${id}`, data)
 }
 
 /**
diff --git a/src/main.js b/src/main.js
index 37d10bb..839ead1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -54,6 +54,7 @@ import * as filters from "./filters"; // global filters modalTemplates
 import notice from "@/libs/notice"; // global filters
 import guidancePop from "@/components/guidancePop";
 import { getToken } from "./utils/auth";
+
 Vue.prototype.bus = new Vue();
 Vue.use(uploadPicture);
 Vue.use(FormCreate);
@@ -102,7 +103,7 @@ Object.keys(filters).forEach(key => {
 });
 
 var _hmt = _hmt || [];
-(function() {
+(function () {
   var hm = document.createElement("script");
   hm.src = "https://cdn.oss.9gt.net/js/es.js?version=merchantv2.0";
   var s = document.getElementsByTagName("script")[0];
diff --git a/src/router/modules/product.js b/src/router/modules/product.js
index ea39e8a..1bef20a 100644
--- a/src/router/modules/product.js
+++ b/src/router/modules/product.js
@@ -10,99 +10,108 @@
 import Layout from '@/layout'
 import { roterPre } from '@/settings'
 const productRouter =
-  {
-    path: `${roterPre}/product`,
-    name: 'product',
-    component: Layout,
-    meta: {
-      icon: 'dashboard',
-      title: '商品管理'
+{
+  path: `${roterPre}/product`,
+  name: 'product',
+  component: Layout,
+  meta: {
+    icon: 'dashboard',
+    title: '商品管理'
+  },
+  alwaysShow: true,
+  redirect: 'noRedirect',
+  children: [
+    {
+      path: 'classify',
+      name: 'ProductClassify',
+      meta: {
+        title: '商品分类',
+        noCache: true
+      },
+      component: () => import('@/views/product/productClassify')
     },
-    alwaysShow: true,
-    redirect: 'noRedirect',
-    children: [
-      {
-        path: 'classify',
-        name: 'ProductClassify',
-        meta: {
-          title: '商品分类',
-          noCache: true
-        },
-        component: () => import('@/views/product/productClassify')
+    {
+      path: 'attr',
+      name: `ProductAttr`,
+      meta: {
+        title: '商品规格',
+        noCache: true
       },
-      {
-        path: 'attr',
-        name: `ProductAttr`,
-        meta: {
-          title: '商品规格',
-          noCache: true
-        },
-        component: () => import('@/views/product/productAttr')
+      component: () => import('@/views/product/productAttr')
+    },
+    {
+      path: 'label',
+      name: `ProductLabel`,
+      meta: {
+        title: '商品标签',
+        noCache: true
       },
-      {
-        path: 'label',
-        name: `ProductLabel`,
-        meta: {
-          title: '商品标签',
-          noCache: true
-        },
-        component: () => import('@/views/product/productLabel')
+      component: () => import('@/views/product/productLabel')
+    },
+    {
+      path: 'list',
+      name: `ProductList`,
+      meta: {
+        title: '商品列表',
+        noCache: true
       },
-      {
-        path: 'list',
-        name: `ProductList`,
-        meta: {
-          title: '商品列表',
-          noCache: true
-        },
-        component: () => import('@/views/product/productList')
+      component: () => import('@/views/product/productList')
+    },
+    {
+      path: 'list/addProduct/:id?/:edit?',
+      component: () => import('@/views/product/addProduct/index'),
+      name: 'AddProduct',
+      meta: { title: '商品添加', noCache: true, activeMenu: `${roterPre}/product/list` },
+      hidden: true
+    },
+    {
+      path: 'reviews',
+      name: 'ProductReviews',
+      meta: {
+        title: '商品评论', noCache: true, activeMenu: `${roterPre}/product/reviews`
       },
-      {
-        path: 'list/addProduct/:id?/:edit?',
-        component: () => import('@/views/product/addProduct/index'),
-        name: 'AddProduct',
-        meta: { title: '商品添加', noCache: true, activeMenu: `${roterPre}/product/list` },
-        hidden: true
+      component: () => import('@/views/product/Reviews/index')
+    },
+    {
+      path: 'specs',
+      name: 'ProductSpecs',
+      meta: {
+        title: '商品参数',
+        noCache: true,
+
       },
-      {
-        path: 'reviews',
-        name: 'ProductReviews',
-        meta: {
-          title: '商品评论', noCache: true, activeMenu: `${roterPre}/product/reviews` 
-        },
-        component: () => import('@/views/product/Reviews/index')
+      component: () => import('@/views/product/specs/list.vue')
+    },
+    {
+      path: 'cloud',
+      name: 'productCloud',
+      meta: {
+        title: '云商品列表',
+        noCache: true,
       },
-      {
-        path: 'specs',
-        name: 'ProductSpecs',
-        meta: {
-          title: '商品参数',
-          noCache: true,
-         
-        },
-        component: () => import('@/views/product/specs/list.vue')
+      component: () => import('@/views/product/cloud/index.vue')
+    },
+    {
+      path: 'specs/create/:id?',
+      name: 'ProductSpecsCreate',
+      meta: {
+        title: '添加参数模板',
+        noCache: true,
+        activeMenu: `${roterPre}/product/specs`
       },
-      {
-        path: 'specs/create/:id?',
-        name: 'ProductSpecsCreate',
-        meta: {
-          title: '添加参数模板',
-          noCache: true,
-          activeMenu: `${roterPre}/product/specs`
-        },
-        component: () => import('@/views/product/specs/create.vue')
+      component: () => import('@/views/product/specs/create.vue')
+    },
+    {
+      path: 'unit',
+      name: `ProductUnit`,
+      meta: {
+        title: '商品单位',
+        noCache: true,
+        activeMenu: `${roterPre}/product/unit`
       },
-      {
-        path: 'unit',
-        name: `ProductUnit`,
-        meta: {
-          title: '商品单位',
-          noCache: true,
-          activeMenu: `${roterPre}/product/unit`
-        },
-        component: () => import('@/views/product/productUnit')
-      },
-    ]
-  }
+      component: () => import('@/views/product/productUnit')
+    },
+  ]
+}
 
 export default productRouter
diff --git a/src/views/accounts/payType.vue b/src/views/accounts/payType.vue
index 15612a1..0329a0c 100644
--- a/src/views/accounts/payType.vue
+++ b/src/views/accounts/payType.vue
@@ -1,16 +1,9 @@
 <template>
   <div class="divBox">
     <el-card class="box-card">
-      <form-create
-        v-if="FormData"
-        ref="fc"
-        v-loading="loading"
-        :option="option"
-        :rule="FormData.rule"
-        class="formBox"
-        handle-icon="false"
-        @submit="onSubmit"
-      />
+      <form-create v-model:api="fapi" v-if="FormData" ref="fc" v-loading="loading" :option="option"
+        :rule="FormData.rule" class="formBox" handle-icon="false" @submit="onSubmit">
+      </form-create>
     </el-card>
   </div>
 </template>
@@ -28,17 +21,23 @@
 import formCreate from '@form-create/element-ui'
 import { paymentTypeApi } from '@/api/accounts'
 import request from '@/api/request'
-import { roterPre } from '@/settings'
+import { roterPre } from '@/settings';
 
 export default {
   name: 'payType',
   data() {
     return {
+      fapi: {},
       option: {
         form: {
           labelWidth: '150px'
         },
         global: {
+          '*': {
+            props: {
+              disabled: false
+            }
+          },
           upload: {
             props: {
               onSuccess(rep, file) {
@@ -48,7 +47,10 @@ export default {
               }
             }
           }
-        }
+        },
+        submitBtn: {
+          show: true,
+        },
       },
       FormData: null,
       loading: false,
@@ -58,9 +60,9 @@ export default {
   components: {
     formCreate: formCreate.$form()
   },
-  watch:{
-    '$route.path': {   
-      handler: function() {
+  watch: {
+    '$route.path': {
+      handler: function () {
         this.getFrom();
       },
       immediate: false,
@@ -70,13 +72,32 @@ export default {
   mounted() {
     this.getFrom();
 
+
+    setTimeout(() => {
+      console.log(this.$refs.fc)
+    }, 2000);
   },
   methods: {
+
+    // 为了隐藏提交按钮
+    getDomInfo() {
+      var labels = document.getElementsByTagName("label");
+      for (let i = 0; i < labels.length; i++) {
+        let label = labels[i];
+        if (label.innerText == '审核通过' && label.className.indexOf("is-checked") > -1) {
+          this.option.submitBtn.show = false;
+        } else if (label.innerText != '审核通过' && label.className.indexOf("is-checked") > -1) {
+          this.option.submitBtn.show = true;
+        }
+      }
+    },
+
     setTagsViewTitle() {
       this.deepTraversal(this.menuList, "children");
       const route = Object.assign({}, this.tempRoute, { title: this.titles });
       this.$store.dispatch("tagsView/updateVisitedView", route);
     },
+
     deepTraversal(arr, child) {
       const that = this;
       function traversal(a) {
@@ -96,11 +117,25 @@ export default {
 
       traversal(arr);
     },
+
+    changes() {
+      this.getDomInfo();
+    },
+
     getFrom() {
       this.loading = true
       paymentTypeApi().then(async res => {
-        this.FormData = res.data
-        this.loading = false
+        this.FormData = res.data;
+        this.FormData.rule[0] = {
+          ...this.FormData.rule[0],
+          on: {
+            change: this.changes
+          }
+        }
+        this.loading = false;
+        this.$nextTick(() => {
+          this.getDomInfo();
+        })
       }).catch(res => {
         this.$message.error(res.message)
         this.loading = false
@@ -109,7 +144,7 @@ export default {
     onSubmit(formData) {
       request[this.FormData.method.toLowerCase()](this.FormData.api, formData).then((res) => {
         this.$message.success(res.message || '提交成功')
-      //   this.$router.push({ path: `${roterPre}/marketing/coupon/list` })
+        //   this.$router.push({ path: `${roterPre}/marketing/coupon/list` })
       }).catch(err => {
         this.$message.error(err.message || '提交失败')
       })
@@ -118,6 +153,10 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.divBox {
+  .el-select--medium {
+    width: 100% !important;
+  }
+}
 </style>
diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index 9f1d1a9..5c09015 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -3,39 +3,19 @@
     <el-card class="box-card">
       <div class="clearfix">
         <el-tabs v-if="headTab.length > 0" v-model="currentTab">
-          <el-tab-pane
-            v-for="(item, index) in headTab"
-            :key="index"
-            :name="item.name"
-            :label="item.title"
-          />
+          <el-tab-pane v-for="(item, index) in headTab" :key="index" :name="item.name" :label="item.title" />
         </el-tabs>
       </div>
-      <el-form
-        ref="formValidate"
-        :key="currentTab"
-        v-loading="fullscreenLoading"
-        class="formValidate mt20"
-        :rules="ruleValidate"
-        :model="formValidate"
-        label-width="130px"
-        @submit.native.prevent
-      >
+      <el-form ref="formValidate" :key="currentTab" v-loading="fullscreenLoading" class="formValidate mt20"
+        :rules="ruleValidate" :model="formValidate" label-width="130px" @submit.native.prevent>
         <el-row v-if="currentTab == '1'" :gutter="24">
           <!-- 商品信息-->
           <el-col :span="24">
             <el-form-item label="商品类型：" required>
-              <div
-                v-for="(item, index) in virtual"
-                :key="index"
-                class="virtual"
-                :class="
-                  formValidate.type == item.id
-                    ? 'virtual_boder'
-                    : 'virtual_boder2'
-                "
-                @click="virtualbtn(item.id, 2)"
-              >
+              <div v-for="(item, index) in virtual" :key="index" class="virtual" :class="formValidate.type == item.id
+          ? 'virtual_boder'
+          : 'virtual_boder2'
+          " @click="virtualbtn(item.id, 2)">
                 <div class="virtual_top">{{ item.tit }}</div>
                 <div class="virtual_bottom">({{ item.tit2 }})</div>
                 <div v-if="formValidate.type == item.id" class="virtual_san" />
@@ -47,84 +27,39 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="商品名称：" prop="store_name">
-              <el-input
-                v-model="formValidate.store_name"
-                placeholder="请输入商品名称"
-                size="small"
-                class="pageWidth"
-              />
+              <el-input v-model="formValidate.store_name" placeholder="请输入商品名称" size="small" class="pageWidth" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="平台商品分类：" prop="cate_id">
-              <el-cascader
-                v-model="formValidate.cate_id"
-                class="pageWidth"
-                size="small"
-                :options="categoryList"
-                :props="props"
-                @visible-change="getSpecsLst"
-                filterable
-                clearable
-              />
+              <el-cascader v-model="formValidate.cate_id" class="pageWidth" size="small" :options="categoryList"
+                :props="props" @visible-change="getSpecsLst" filterable clearable />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="商户商品分类：">
-              <el-cascader
-                v-model="formValidate.mer_cate_id"
-                class="pageWidth"
-                size="small"
-                :options="merCateList"
-                :props="{multiple:true,checkStrictly:true,emitPath:false }"
-                filterable
-                clearable
-              />
+              <el-cascader v-model="formValidate.mer_cate_id" class="pageWidth" size="small" :options="merCateList"
+                :props="{ multiple: true, checkStrictly: true, emitPath: false }" filterable clearable />
             </el-form-item>
           </el-col>
           <el-col v-if="labelList.length" :span="24">
             <el-form-item label="商品标签：">
-              <el-select
-                v-model="formValidate.mer_labels"
-                size="small"
-                multiple
-                placeholder="请选择"
-                class="pageWidth"
-              >
-                <el-option
-                  v-for="item in labelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+              <el-select v-model="formValidate.mer_labels" size="small" multiple placeholder="请选择" class="pageWidth">
+                <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-bind="grid2">
             <el-form-item label="品牌选择：">
-              <el-select
-                v-model="formValidate.brand_id"
-                filterable
-                size="small"
-                placeholder="请选择"
-                class="pageWidth"
-              >
-                <el-option
-                  v-for="item in BrandList"
-                  :key="item.brand_id"
-                  :label="item.brand_name"
-                  :value="item.brand_id"
-                />
+              <el-select v-model="formValidate.brand_id" filterable size="small" placeholder="请选择" class="pageWidth">
+                <el-option v-for="item in BrandList" :key="item.brand_id" :label="item.brand_name"
+                  :value="item.brand_id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="商品封面图：" prop="image">
-              <div
-                class="upLoadPicBox"
-                title="750*750px"
-                @click="modalPicTap('1')"
-              >
+              <div class="upLoadPicBox" title="750*750px" @click="modalPicTap('1')">
                 <div v-if="formValidate.image" class="pictrue">
                   <img :src="formValidate.image">
                 </div>
@@ -137,27 +72,13 @@
           <el-col :span="24">
             <el-form-item label="商品轮播图：" prop="slider_image">
               <div class="acea-row">
-                <div
-                  v-for="(item, index) in formValidate.slider_image"
-                  :key="index"
-                  class="pictrue"
-                  draggable="false"
-                  @dragstart="handleDragStart($event, item)"
-                  @dragover.prevent="handleDragOver($event, item)"
-                  @dragenter="handleDragEnter($event, item)"
-                  @dragend="handleDragEnd($event, item)"
-                >
+                <div v-for="(item, index) in formValidate.slider_image" :key="index" class="pictrue" draggable="false"
+                  @dragstart="handleDragStart($event, item)" @dragover.prevent="handleDragOver($event, item)"
+                  @dragenter="handleDragEnter($event, item)" @dragend="handleDragEnd($event, item)">
                   <img :src="item">
-                  <i
-                    class="el-icon-error btndel"
-                    @click="handleRemove(index)"
-                  />
+                  <i class="el-icon-error btndel" @click="handleRemove(index)" />
                 </div>
-                <div
-                  v-if="formValidate.slider_image.length < 10"
-                  class="uploadCont"
-                  title="750*750px"
-                >
+                <div v-if="formValidate.slider_image.length < 10" class="uploadCont" title="750*750px">
                   <div class="upLoadPicBox" @click="modalPicTap('2')">
                     <div class="upLoad">
                       <i class="el-icon-camera cameraIconfont" />
@@ -169,43 +90,20 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="主图视频：" prop="video_link">
-              <el-input
-                v-model="videoLink"
-                size="small"
-                class="perW50"
-                placeholder="请输入MP4格式的视频链接"
-              />
-              <input
-                ref="refid"
-                type="file"
-                style="display: none;"
-                @change="zh_uploadFile_change"
-              >
-              <el-button
-                type="primary"
-                icon="ios-cloud-upload-outline"
-                class="uploadVideo"
-                size="small"
-                @click="zh_uploadFile"
-              >
+              <el-input v-model="videoLink" size="small" class="perW50" placeholder="请输入MP4格式的视频链接" />
+              <input ref="refid" type="file" style="display: none;" @change="zh_uploadFile_change">
+              <el-button type="primary" icon="ios-cloud-upload-outline" class="uploadVideo" size="small"
+                @click="zh_uploadFile">
                 {{ videoLink ? "确认添加" : "上传视频" }}
               </el-button>
               <el-col :span="12">
-                <el-progress
-                  v-if="upload.videoIng"
-                  :percentage="progress"
-                  :text-inside="true"
-                  :stroke-width="20"
-                  style="margin-top: 10px;"
-                />
+                <el-progress v-if="upload.videoIng" :percentage="progress" :text-inside="true" :stroke-width="20"
+                  style="margin-top: 10px;" />
               </el-col>
               <el-col :span="24">
                 <div v-if="formValidate.video_link" class="iview-video-style">
-                  <video
-                    style="width:100%;height: 100%!important;border-radius: 10px;"
-                    :src="formValidate.video_link"
-                    controls="controls"
-                  >
+                  <video style="width:100%;height: 100%!important;border-radius: 10px;" :src="formValidate.video_link"
+                    controls="controls">
                     您的浏览器不支持 video 标签。
                   </video>
                   <div class="mark" />
@@ -225,11 +123,7 @@
               <el-select v-model="formValidate.unit_name" placeholder="请选择" class="perW50 mr10" clearable filterable="">
                 <el-option v-for="item in unitList" :key="item.label" :label="item.label" :value="item.label" />
               </el-select>
-              <el-button
-                type="primary"
-                size="small"
-                @click="addUnit"
-              >
+              <el-button type="primary" size="small" @click="addUnit">
                 添加单位
               </el-button>
             </el-form-item>
@@ -237,44 +131,23 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="商品关键字：">
-              <el-input
-                v-model="formValidate.keyword"
-                placeholder="请输入商品关键字"
-                size="small"
-                class="pageWidth"
-              />
+              <el-input v-model="formValidate.keyword" placeholder="请输入商品关键字" size="small" class="pageWidth" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="商品简介：" prop="store_info">
-              <el-input
-                v-model="formValidate.store_info"
-                type="textarea"
-                :rows="3"
-                placeholder="请输入商品简介"
-                class="pageWidth"
-                size="small"
-              />
+              <el-input v-model="formValidate.store_info" type="textarea" :rows="3" placeholder="请输入商品简介"
+                class="pageWidth" size="small" />
             </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.couponData"
-                  :key="index"
-                  class="mr10"
-                  closable
-                  :disable-transitions="false"
-                  @close="handleCloseCoupon(tag)"
-                >{{ tag.title }}
+                <el-tag v-for="(tag, index) in formValidate.couponData" :key="index" class="mr10" closable
+                  :disable-transitions="false" @close="handleCloseCoupon(tag)">{{ tag.title }}
                 </el-tag>
-                <el-button
-                  class="mr15"
-                  size="mini"
-                  @click="addCoupon"
-                >选择优惠券</el-button>
+                <el-button class="mr15" size="mini" @click="addCoupon">选择优惠券</el-button>
               </div>
             </el-form-item>
           </el-col>
@@ -282,30 +155,17 @@
         <!-- 规格设置 -->
         <el-row v-if="currentTab == '2'">
           <el-col :span="24">
-            <el-form-item
-              v-if="extensionStatus > 0"
-              label="佣金设置："
-              props="extension_type"
-            >
-              <el-radio-group
-                v-model="formValidate.extension_type"
-                @change="onChangetype(formValidate.extension_type)"
-              >
+            <el-form-item v-if="extensionStatus > 0" label="佣金设置：" props="extension_type">
+              <el-radio-group v-model="formValidate.extension_type" @change="onChangetype(formValidate.extension_type)">
                 <el-radio :label="1" class="radio">单独设置</el-radio>
                 <el-radio :label="0">默认设置</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item
-              v-if="open_svip"
-              label="付费会员价设置："
-              props="svip_price_type"
-            >
-              <el-radio-group
-                v-model="formValidate.svip_price_type"
-                @change="onChangeSpecs(formValidate.svip_price_type)"
-              >
+            <el-form-item v-if="open_svip" label="付费会员价设置：" props="svip_price_type">
+              <el-radio-group v-model="formValidate.svip_price_type"
+                @change="onChangeSpecs(formValidate.svip_price_type)">
                 <el-radio :label="0" class="radio">不设置会员价</el-radio>
                 <el-radio :label="1" class="radio">默认设置会员价</el-radio>
                 <el-radio :label="2">自定义设置会员价</el-radio>
@@ -314,10 +174,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="商品规格：" props="spec_type">
-              <el-radio-group
-                v-model="formValidate.spec_type"
-                @change="onChangeSpec(formValidate.spec_type)"
-              >
+              <el-radio-group v-model="formValidate.spec_type" @change="onChangeSpec(formValidate.spec_type)">
                 <el-radio :label="0" class="radio">单规格</el-radio>
                 <el-radio :label="1">多规格</el-radio>
               </el-radio-group>
@@ -328,146 +185,75 @@
             <el-form-item label="选择规格：">
               <div class="acea-row">
                 <el-select v-model="selectRule" size="small">
-                  <el-option
-                    v-for="item in ruleList"
-                    :key="item.attr_template_id"
-                    :label="item.template_name"
-                    :value="item.attr_template_id"
-                  />
+                  <el-option v-for="item in ruleList" :key="item.attr_template_id" :label="item.template_name"
+                    :value="item.attr_template_id" />
                 </el-select>
-                <el-button
-                  type="primary"
-                  class="ml15"
-                  size="small"
-                  @click="confirm"
-                >确认</el-button>
-                <el-button
-                  class="ml15"
-                  size="small"
-                  @click="addRule"
-                >添加规格模板</el-button>
+                <el-button type="primary" class="ml15" size="small" @click="confirm">确认</el-button>
+                <el-button class="ml15" size="small" @click="addRule">添加规格模板</el-button>
               </div>
             </el-form-item>
             <el-form-item v-if="formValidate.attr.length > 0">
               <div v-for="(item, index) in formValidate.attr" :key="index">
                 <div class="acea-row row-middle">
                   <span class="mr5">{{ item.value }}</span>
-                  <i
-                    class="el-icon-circle-close"
-                    @click="handleRemoveAttr(index)"
-                  />
+                  <i class="el-icon-circle-close" @click="handleRemoveAttr(index)" />
                 </div>
                 <div class="rulesBox">
                   <draggable v-model="item.detail">
-                    <el-tag
-                      v-for="(j, indexn) in item.detail"
-                      :key="indexn"
-                      closable
-                      size="medium"
-                      :disable-transitions="false"
-                      class="mb5 mr10 move-icon"
-                      style="cursor: pointer;"
-                      @close="handleClose(item.detail, indexn)"
-                    >{{ j }}
+                    <el-tag v-for="(j, indexn) in item.detail" :key="indexn" closable size="medium"
+                      :disable-transitions="false" class="mb5 mr10 move-icon" style="cursor: pointer;"
+                      @close="handleClose(item.detail, indexn)">{{ j }}
                     </el-tag>
                   </draggable>
-                  <el-input
-                    v-if="item.inputVisible"
-                    ref="saveTagInput"
-                    v-model="item.detail.attrsVal"
-                    class="input-new-tag"
-                    size="small"
-                    @keyup.enter.native="
-                      createAttr(item.detail.attrsVal, index)
-                    "
-                    @blur="createAttr(item.detail.attrsVal, index)"
-                  />
-                  <el-button
-                    v-else
-                    class="button-new-tag"
-                    size="small"
-                    @click="showInput(item)"
-                  >+ 添加</el-button>
+                  <el-input v-if="item.inputVisible" ref="saveTagInput" v-model="item.detail.attrsVal"
+                    class="input-new-tag" size="small" @keyup.enter.native="
+          createAttr(item.detail.attrsVal, index)
+          " @blur="createAttr(item.detail.attrsVal, index)" />
+                  <el-button v-else class="button-new-tag" size="small" @click="showInput(item)">+ 添加</el-button>
                 </div>
               </div>
             </el-form-item>
             <el-col v-if="isBtn">
               <el-col :xl="6" :lg="9" :md="9" :sm="24" :xs="24">
                 <el-form-item label="规格：">
-                  <el-input
-                    v-model="formDynamic.attrsName"
-                    size="small"
-                    placeholder="请输入规格"
-                  />
+                  <el-input v-model="formDynamic.attrsName" size="small" placeholder="请输入规格" />
                 </el-form-item>
               </el-col>
               <el-col :xl="6" :lg="9" :md="9" :sm="24" :xs="24">
                 <el-form-item label="规格值：">
-                  <el-input
-                    v-model="formDynamic.attrsVal"
-                    size="small"
-                    placeholder="请输入规格值"
-                  />
+                  <el-input v-model="formDynamic.attrsVal" size="small" placeholder="请输入规格值" />
                 </el-form-item>
               </el-col>
               <el-col :xl="12" :lg="6" :md="6" :sm="24" :xs="24">
                 <el-form-item class="noLeft">
-                  <el-button
-                    type="primary"
-                    class="ml15"
-                    size="small"
-                    @click="createAttrName"
-                  >确定</el-button>
+                  <el-button type="primary" class="ml15" size="small" @click="createAttrName">确定</el-button>
                   <el-button @click="offAttrName" size="small">取消</el-button>
                 </el-form-item>
               </el-col>
             </el-col>
             <el-form-item v-if="!isBtn">
-              <el-button
-                type="primary"
-                icon="md-add"
-                class="mr15"
-                size="small"
-                @click="addBtn"
-              >添加新规格</el-button>
-              <el-button
-                type="success"
-                icon="md-add"
-                class="mr15"
-                size="small"
-                @click="generate"
-              >立即生成</el-button>
+              <el-button type="primary" icon="md-add" class="mr15" size="small" @click="addBtn">添加新规格</el-button>
+              <el-button type="success" icon="md-add" class="mr15" size="small" @click="generate">立即生成</el-button>
             </el-form-item>
           </el-col>
           <!-- 批量设置-->
           <el-col
             v-if="(formValidate.spec_type === 1 && formValidate.attr.length > 0 && $route.params.id) || (!$route.params.id && createProduct && formValidate.spec_type === 1)"
-            :span="24"
-            class="noForm"
-          >
+            :span="24" class="noForm">
 
             <el-form-item :label="'批量设置：'" class="labeltop">
-              <el-table
-                :data="oneFormBatch"
-                border
-                class="tabNumWidth"
-                size="mini"
-              >
+              <el-table :data="oneFormBatch" border class="tabNumWidth" size="mini">
                 <el-table-column align="center" label="商品规格" min-width="80">
                   <template slot-scope="scope">
                     <div @click="batchAttr" class="acea-row row-between-wrapper" style="cursor: pointer;">
-                     	<div style="width: 45px;">{{oneFormBatch[0]['attr']}}</div>
+                      <div style="width: 45px;">{{ oneFormBatch[0]['attr'] }}</div>
                       <i class="el-icon-arrow-down" />
                     </div>
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="图片" min-width="80">
                   <template slot-scope="scope">
-                    <div
-                      class="upLoadPicBox"
-                      title="750*750px"
-                      @click="modalPicTap('1', 'pi')"
-                    >
+                    <div class="upLoadPicBox" title="750*750px" @click="modalPicTap('1', 'pi')">
                       <div v-if="scope.row.image" class="pictrue tabPic">
                         <img :src="scope.row.image">
                       </div>
@@ -477,144 +263,61 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  v-for="(item, iii) in attrValue"
-                  :key="iii"
-                  :label="formThead[iii].title"
-                  align="center"
-                  min-width="120"
-                >
+                <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="formThead[iii].title"
+                  align="center" min-width="120">
                   <template slot-scope="scope">
                     <div v-if="formValidate.svip_price_type != 0">
-                      <el-input
-                        v-if="formThead[iii].title === '付费会员价'"
-                        v-model="scope.row[iii]"
-                        :disabled="formValidate.svip_price_type == 1"
-                        class="priceBox"
-                        size="small"
-                        controls-position="right"
-                      />
-                      <el-input
-                        v-if="formThead[iii].title === '商品编号'"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      />
-                      <el-input
-                        v-if="
-                          formThead[iii].title !== '付费会员价' &&
-                          formThead[iii].title !== '商品编号' &&
-                          formThead[iii].title !== '库存'
-                        "
-                        v-model="scope.row[iii]"
-                        type="number"
-                        min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                        @blur="memberPrice(formThead[iii], scope.row)"
-                      />
-                      <el-input
-                        v-if="formThead[iii].title === '库存' && formValidate.type == 2"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                        disabled
-                      />
-                       <el-input
-                        v-else-if="formThead[iii].title === '库存' && formValidate.type != 2"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      />
+                      <el-input v-if="formThead[iii].title === '付费会员价'" v-model="scope.row[iii]"
+                        :disabled="formValidate.svip_price_type == 1" class="priceBox" size="small"
+                        controls-position="right" />
+                      <el-input v-if="formThead[iii].title === '商品编号'" v-model="scope.row[iii]" type="text" size="small"
+                        class="priceBox" />
+                      <el-input v-if="formThead[iii].title !== '付费会员价' &&
+          formThead[iii].title !== '商品编号' &&
+          formThead[iii].title !== '库存'
+          " v-model="scope.row[iii]" type="number" min="0" size="small" class="priceBox" controls-position="right"
+                        @blur="memberPrice(formThead[iii], scope.row)" />
+                      <el-input v-if="formThead[iii].title === '库存' && formValidate.type == 2" v-model="scope.row[iii]"
+                        type="text" size="small" class="priceBox" disabled />
+                      <el-input v-else-if="formThead[iii].title === '库存' && formValidate.type != 2"
+                        v-model="scope.row[iii]" type="text" size="small" class="priceBox" />
                     </div>
                     <div v-else>
-                      <el-input
-                        v-if="formThead[iii].title === '商品编号'"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      />
-                      <el-input
-                        v-else-if="formThead[iii].title === '库存' && formValidate.type == 2"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                        disabled
-                      />
-                      <el-input
-                        v-else
-                        v-model="scope.row[iii]"
-                        type="number"
-                        min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
+                      <el-input v-if="formThead[iii].title === '商品编号'" v-model="scope.row[iii]" type="text" size="small"
+                        class="priceBox" />
+                      <el-input v-else-if="formThead[iii].title === '库存' && formValidate.type == 2"
+                        v-model="scope.row[iii]" type="text" size="small" class="priceBox" disabled />
+                      <el-input v-else v-model="scope.row[iii]" type="number" min="0" size="small" class="priceBox"
+                        controls-position="right" />
                     </div>
                   </template>
                 </el-table-column>
                 <template v-if="formValidate.type == 2">
-                  <el-table-column
-                    align="center"
-                    label="卡密设置"
-                    min-width="120"
-                  >
+                  <el-table-column align="center" label="卡密设置" min-width="120">
                     <template slot-scope="scope">
-                      <el-button
-                        v-if="scope.row.cdkey && !scope.row.cdkey.list && !scope.row.stock"
-                        size="small"
-                        @click="addVirtual(0, 'oneFormBatch')"
-                        >添加卡密</el-button>
+                      <el-button v-if="scope.row.cdkey && !scope.row.cdkey.list && !scope.row.stock" size="small"
+                        @click="addVirtual(0, 'oneFormBatch')">添加卡密</el-button>
                       <span v-else class="seeCatMy" @click="seeVirtual(oneFormBatch[0], 'oneFormBatch', 0)">已设置</span>
                     </template>
                   </el-table-column>
                 </template>
                 <template v-if="formValidate.extension_type === 1">
-                  <el-table-column
-                    align="center"
-                    label="一级返佣(元)"
-                    min-width="120"
-                  >
+                  <el-table-column align="center" label="一级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input-number
-                        v-model="scope.row.extension_one"
-                        :min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
+                      <el-input-number v-model="scope.row.extension_one" :min="0" size="small" class="priceBox"
+                        controls-position="right" />
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    align="center"
-                    label="二级返佣(元)"
-                    min-width="120"
-                  >
+                  <el-table-column align="center" label="二级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input-number
-                        v-model="scope.row.extension_two"
-                        :min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
+                      <el-input-number v-model="scope.row.extension_two" :min="0" size="small" class="priceBox"
+                        controls-position="right" />
                     </template>
                   </el-table-column>
                 </template>
                 <el-table-column label="操作" min-width="80">
                   <template>
-                    <el-button
-                      type="text"
-                      class="submission"
-                      @click="batchAdd"
-                      size="small"
-                    >批量添加</el-button>
+                    <el-button type="text" class="submission" @click="batchAdd" size="small">批量添加</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -623,18 +326,10 @@
           <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
             <!-- 单规格表格-->
             <el-form-item v-if="formValidate.spec_type === 0">
-              <el-table
-                :data="OneattrValue"
-                border
-                class="tabNumWidth"
-                size="mini"
-              >
+              <el-table :data="OneattrValue" border class="tabNumWidth" size="mini">
                 <el-table-column align="center" label="图片" min-width="80">
                   <template slot-scope="scope">
-                    <div
-                      class="upLoadPicBox"
-                      @click="modalPicTap('1', 'dan', 'pi')"
-                    >
+                    <div class="upLoadPicBox" @click="modalPicTap('1', 'dan', 'pi')">
                       <div v-if="formValidate.image" class="pictrue tabPic">
                         <img :src="scope.row.image">
                       </div>
@@ -644,125 +339,55 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  v-for="(item, iii) in attrValue"
-                  :key="iii"
-                  :label="formThead[iii] && formThead[iii].title"
-                  align="center"
-                  min-width="120"
-                >
+                <el-table-column v-for="(item, iii) in attrValue" :key="iii"
+                  :label="formThead[iii] && formThead[iii].title" align="center" min-width="120">
                   <template slot-scope="scope">
                     <div v-if="formValidate.svip_price_type != 0 && formThead[iii]">
-                      <el-input-number
-                        v-if="formThead[iii].title === '付费会员价'"
-                        v-model="scope.row[iii]"
-                        :min="0"
-                        size="small"
-                        :disabled="formValidate.svip_price_type == 1"
-                        class="priceBox"
-                        controls-position="right"
-                      />
-                      <el-input
-                        v-if="formThead[iii].title === '商品编号'"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        class="priceBox"
-                      />
-                      <el-input-number
-                        v-if="
-                          formThead[iii].title !== '付费会员价' &&
-                          formThead[iii].title !== '商品编号' &&
-                          formThead[iii].title !== '库存'
-                        "
-                        v-model="scope.row[iii]"
-                        :min="0"
-                        size="small"
-                        @blur="memberPrice(formThead[iii], scope.row)"
-                        class="priceBox"
-                        controls-position="right"
-                      />
-                      <el-input
-                        v-if="formThead[iii].title === '库存' && formValidate.type == 2"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                        disabled
-                      />
-                      <el-input
-                        v-else-if="formThead[iii].title === '库存' && formValidate.type !== 2"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      />
+                      <el-input-number v-if="formThead[iii].title === '付费会员价'" v-model="scope.row[iii]" :min="0"
+                        size="small" :disabled="formValidate.svip_price_type == 1" class="priceBox"
+                        controls-position="right" />
+                      <el-input v-if="formThead[iii].title === '商品编号'" v-model="scope.row[iii]" type="text"
+                        class="priceBox" />
+                      <el-input-number v-if="formThead[iii].title !== '付费会员价' &&
+          formThead[iii].title !== '商品编号' &&
+          formThead[iii].title !== '库存'
+          " v-model="scope.row[iii]" :min="0" size="small" @blur="memberPrice(formThead[iii], scope.row)"
+                        class="priceBox" controls-position="right" />
+                      <el-input v-if="formThead[iii].title === '库存' && formValidate.type == 2" v-model="scope.row[iii]"
+                        type="text" size="small" class="priceBox" disabled />
+                      <el-input v-else-if="formThead[iii].title === '库存' && formValidate.type !== 2"
+                        v-model="scope.row[iii]" type="text" size="small" class="priceBox" />
                     </div>
 
                     <div v-else>
-                      <el-input
-                        v-if="formThead[iii].title === '商品编号'"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      />
-                      <el-input-number
-                        v-else
-                        v-model="scope.row[iii]"
-                        :min="0"
-                        size="small"
-                        :disabled="formThead[iii].title === '库存' && formValidate.type == 2"
-                        class="priceBox"
-                        controls-position="right"
-                      />
+                      <el-input v-if="formThead[iii].title === '商品编号'" v-model="scope.row[iii]" type="text" size="small"
+                        class="priceBox" />
+                      <el-input-number v-else v-model="scope.row[iii]" :min="0" size="small"
+                        :disabled="formThead[iii].title === '库存' && formValidate.type == 2" class="priceBox"
+                        controls-position="right" />
                     </div>
                   </template>
                 </el-table-column>
                 <template v-if="formValidate.type == 2">
-                  <el-table-column
-                    align="center"
-                    label="卡密设置"
-                    min-width="120"
-                  >
+                  <el-table-column align="center" label="卡密设置" min-width="120">
                     <template slot-scope="scope">
-                       <el-button
-                        v-if="scope.row.cdkey && !scope.row.cdkey.list && !scope.row.stock"
-                        size="small"
-                        @click="addVirtual(0, 'OneattrValue')"
-                        >添加卡密</el-button>
+                      <el-button v-if="scope.row.cdkey && !scope.row.cdkey.list && !scope.row.stock" size="small"
+                        @click="addVirtual(0, 'OneattrValue')">添加卡密</el-button>
                       <span v-else class="seeCatMy" @click="seeVirtual(OneattrValue[0], 'OneattrValue', 0)">已设置</span>
                     </template>
                   </el-table-column>
                 </template>
                 <template v-if="formValidate.extension_type === 1">
-                  <el-table-column
-                    align="center"
-                    label="一级返佣(元)"
-                    min-width="120"
-                  >
+                  <el-table-column align="center" label="一级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input-number
-                        v-model="scope.row.extension_one"
-                        :min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
+                      <el-input-number v-model="scope.row.extension_one" :min="0" size="small" class="priceBox"
+                        controls-position="right" />
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    align="center"
-                    label="二级返佣(元)"
-                    min-width="120"
-                  >
+                  <el-table-column align="center" label="二级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input-number
-                        v-model="scope.row.extension_two"
-                        :min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
+                      <el-input-number v-model="scope.row.extension_two" :min="0" size="small" class="priceBox"
+                        controls-position="right" />
                     </template>
                   </el-table-column>
                 </template>
@@ -771,37 +396,19 @@
             <!-- 多规格表格-->
             <el-form-item
               v-if="(formValidate.spec_type === 1 && formValidate.attr.length > 0 && $route.params.id) || (!$route.params.id && createProduct && formValidate.spec_type === 1) || (!$route.params.id && formValidate.is_copy)"
-              class="labeltop"
-              label="规格列表："
-            >
-              <el-table
-                ref="specsTable"
-                :data="ManyAttrValue"
-                border
-                class="tabNumWidth"
-                size="small"
-                key="2"
-              >
+              class="labeltop" label="规格列表：">
+              <el-table ref="specsTable" :data="ManyAttrValue" border class="tabNumWidth" size="small" key="2">
                 <template v-if="manyTabDate">
-                  <el-table-column
-                    v-for="(item, iii) in manyTabDate"
-                    :key="iii"
-                    align="center"
-                    :label="manyTabTit[iii].title"
-                    min-width="80"
-                  >
+                  <el-table-column v-for="(item, iii) in manyTabDate" :key="iii" align="center"
+                    :label="manyTabTit[iii].title" min-width="80">
                     <template slot-scope="scope">
-                      <span class="priceBox" :class="scope.row.select?'selectOn':''" v-text="scope.row[iii]" />
+                      <span class="priceBox" :class="scope.row.select ? 'selectOn' : ''" v-text="scope.row[iii]" />
                     </template>
                   </el-table-column>
                 </template>
                 <el-table-column align="center" label="图片" min-width="80">
                   <template slot-scope="scope">
-                    <div
-                      class="upLoadPicBox"
-                      title="750*750px"
-                      @click="modalPicTap('1', 'duo', scope.$index)"
-                    >
+                    <div class="upLoadPicBox" title="750*750px" @click="modalPicTap('1', 'duo', scope.$index)">
                       <div v-if="scope.row.image" class="pictrue tabPic">
                         <img :src="scope.row.image">
                       </div>
@@ -811,132 +418,56 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  v-for="(item, iii) in attrValue"
-                  :key="iii"
-                  :label="formThead[iii].title"
-                  align="center"
-                  min-width="120"
-                >
+                <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="formThead[iii].title"
+                  align="center" min-width="120">
                   <template slot-scope="scope">
                     <div v-if="formValidate.svip_price_type != 0 && formThead[iii]">
-                      <el-input-number
-                        v-if="formThead[iii].title === '付费会员价'"
-                        v-model="scope.row[iii]"
-                        :min="0"
-                        size="small"
-                        :disabled="formValidate.svip_price_type == 1"
-                        class="priceBox"
-                        controls-position="right"
-                      />
-                      <el-input
-                        v-if="formThead[iii].title === '商品编号'"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      />
-                      <el-input-number
-                        v-if="formThead[iii].title !== '付费会员价' &&
-                        formThead[iii].title !== '商品编号' &&
-                        formThead[iii].title !== '库存'"
-                        v-model="scope.row[iii]"
-                        :min="0"
-                        size="small"
-                        @blur="memberPrice(formThead[iii], scope.row)"
-                        class="priceBox"
-                        controls-position="right"
-                      />
-                      <el-input
-                        v-if="formThead[iii].title === '库存' && formValidate.type == 2"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                        disabled
-                      />
-                      <el-input
-                        v-else-if="formThead[iii].title === '库存' && formValidate.type != 2"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      />
+                      <el-input-number v-if="formThead[iii].title === '付费会员价'" v-model="scope.row[iii]" :min="0"
+                        size="small" :disabled="formValidate.svip_price_type == 1" class="priceBox"
+                        controls-position="right" />
+                      <el-input v-if="formThead[iii].title === '商品编号'" v-model="scope.row[iii]" type="text" size="small"
+                        class="priceBox" />
+                      <el-input-number v-if="formThead[iii].title !== '付费会员价' &&
+          formThead[iii].title !== '商品编号' &&
+          formThead[iii].title !== '库存'" v-model="scope.row[iii]" :min="0" size="small"
+                        @blur="memberPrice(formThead[iii], scope.row)" class="priceBox" controls-position="right" />
+                      <el-input v-if="formThead[iii].title === '库存' && formValidate.type == 2" v-model="scope.row[iii]"
+                        type="text" size="small" class="priceBox" disabled />
+                      <el-input v-else-if="formThead[iii].title === '库存' && formValidate.type != 2"
+                        v-model="scope.row[iii]" type="text" size="small" class="priceBox" />
                     </div>
                     <div v-else>
-                      <el-input
-                        v-if="formThead[iii].title === '商品编号'"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      />
-                      <el-input
-                        v-else-if="formThead[iii].title === '库存' && formValidate.type == 2"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                        disabled
-                      />
-                      <el-input-number
-                        v-else
-                        v-model="scope.row[iii]"
-                        :min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
+                      <el-input v-if="formThead[iii].title === '商品编号'" v-model="scope.row[iii]" type="text" size="small"
+                        class="priceBox" />
+                      <el-input v-else-if="formThead[iii].title === '库存' && formValidate.type == 2"
+                        v-model="scope.row[iii]" type="text" size="small" class="priceBox" disabled />
+                      <el-input-number v-else v-model="scope.row[iii]" :min="0" size="small" class="priceBox"
+                        controls-position="right" />
                     </div>
                   </template>
                 </el-table-column>
                 <template v-if="formValidate.type == 2">
-                  <el-table-column
-                    align="center"
-                    label="卡密设置"
-                    min-width="120"
-                  >
+                  <el-table-column align="center" label="卡密设置" min-width="120">
                     <template slot-scope="scope">
-                       <el-button
+                      <el-button
                         v-if="!scope.row.cdkey || (scope.row.cdkey && !scope.row.cdkey.list && !scope.row.stock)"
-                        size="small"
-                        @click="addVirtual(scope.$index, 'ManyAttrValue')"
-                        >添加卡密</el-button>
-                      <span v-else class="seeCatMy" @click="seeVirtual(ManyAttrValue[scope.$index], 'ManyAttrValue', scope.$index)">已设置</span>
+                        size="small" @click="addVirtual(scope.$index, 'ManyAttrValue')">添加卡密</el-button>
+                      <span v-else class="seeCatMy"
+                        @click="seeVirtual(ManyAttrValue[scope.$index], 'ManyAttrValue', scope.$index)">已设置</span>
                     </template>
                   </el-table-column>
                 </template>
                 <template v-if="formValidate.extension_type === 1">
-                  <el-table-column
-                    key="1"
-                    align="center"
-                    label="一级返佣(元)"
-                    min-width="120"
-                  >
+                  <el-table-column key="1" align="center" label="一级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input-number
-                        v-model="scope.row.extension_one"
-                        :min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
+                      <el-input-number v-model="scope.row.extension_one" :min="0" size="small" class="priceBox"
+                        controls-position="right" />
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    key="2"
-                    align="center"
-                    label="二级返佣(元)"
-                    min-width="120"
-                  >
+                  <el-table-column key="2" align="center" label="二级返佣(元)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input-number
-                        v-model="scope.row.extension_two"
-                        :min="0"
-                        size="small"
-                        class="priceBox"
-                        controls-position="right"
-                      />
+                      <el-input-number v-model="scope.row.extension_two" :min="0" size="small" class="priceBox"
+                        controls-position="right" />
                     </template>
                   </el-table-column>
                 </template>
@@ -1088,40 +619,26 @@
         <el-row v-if="currentTab == '4'">
           <el-col>
             <el-form-item label="支持退款：">
-              <el-switch
-                v-model="formValidate.refund_switch"
-                :active-value="1"
-                :inactive-value="0"
-                :width="55"
-                active-text="开启"
-                inactive-text="关闭"
-              />
+              <el-switch v-model="formValidate.refund_switch" :active-value="1" :inactive-value="0" :width="55"
+                active-text="开启" inactive-text="关闭" />
             </el-form-item>
           </el-col>
           <el-col v-if="deliveryList.length > 0" :span="24">
             <el-form-item label="送货方式：" prop="delivery_way">
               <div class="acea-row">
                 <el-checkbox-group v-model="formValidate.delivery_way">
-                  <el-checkbox
-                    v-for="item in deliveryList"
-                    :key="item.value"
-                    :label="item.value"
-                  >
+                  <el-checkbox v-for="item in deliveryList" :key="item.value" :label="item.value">
                     {{ item.name }}
                   </el-checkbox>
                 </el-checkbox-group>
               </div>
             </el-form-item>
           </el-col>
-          <el-col
-            v-if="
-              (formValidate.delivery_way.length == 2 ||
-                (formValidate.delivery_way.length == 1 &&
-                formValidate.delivery_way[0] == 2)) &&
-                formValidate.type == 0
-            "
-            :span="24"
-          >
+          <el-col v-if="(formValidate.delivery_way.length == 2 ||
+          (formValidate.delivery_way.length == 1 &&
+            formValidate.delivery_way[0] == 2)) &&
+          formValidate.type == 0
+          " :span="24">
             <el-form-item label="是否包邮：">
               <el-radio-group v-model="formValidate.delivery_free">
                 <el-radio :label="0" class="radio">否</el-radio>
@@ -1129,49 +646,27 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col
-            v-if="
-              formValidate.delivery_free == 0 &&
-                (formValidate.delivery_way.length == 2 ||
-                (formValidate.delivery_way.length == 1 &&
-                formValidate.delivery_way[0] == 2)) &&
-                formValidate.type == 0
-            "
-            :span="24"
-          >
+          <el-col v-if="formValidate.delivery_free == 0 &&
+          (formValidate.delivery_way.length == 2 ||
+            (formValidate.delivery_way.length == 1 &&
+              formValidate.delivery_way[0] == 2)) &&
+          formValidate.type == 0
+          " :span="24">
             <el-form-item label="运费模板：" prop="temp_id">
               <div class="acea-row">
-                <el-select
-                  v-model="formValidate.temp_id"
-                  size="small"
-                  placeholder="请选择"
-                  class="pageWidth"
-                >
-                  <el-option
-                    v-for="item in shippingList"
-                    :key="item.shipping_template_id"
-                    :label="item.name"
-                    :value="item.shipping_template_id"
-                  />
+                <el-select v-model="formValidate.temp_id" size="small" placeholder="请选择" class="pageWidth">
+                  <el-option v-for="item in shippingList" :key="item.shipping_template_id" :label="item.name"
+                    :value="item.shipping_template_id" />
                 </el-select>
-                <el-button
-                  class="ml15"
-                  size="small"
-                  @click="addTem"
-                >添加运费模板</el-button>
+                <el-button class="ml15" size="small" @click="addTem">添加运费模板</el-button>
               </div>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-col>
               <el-form-item label="最少购买件数：">
-                <el-input-number
-                  v-model="formValidate.once_min_count"
-                  :min="0"
-                  size="small"
-                  controls-position="right"
-                  placeholder="请输入购买件数"
-                />
+                <el-input-number v-model="formValidate.once_min_count" :min="0" size="small" controls-position="right"
+                  placeholder="请输入购买件数" />
                 &nbsp;&nbsp;<span class="explanation">默认为0，则不限制购买件数</span>
               </el-form-item>
             </el-col>
@@ -1188,13 +683,8 @@
           <el-col v-if="formValidate.pay_limit != 0" :span="24">
             <el-col>
               <el-form-item label="限购数量：" prop="once_max_count">
-                <el-input-number
-                  v-model="formValidate.once_max_count"
-                  :min="formValidate.once_min_count"
-                  size="small"
-                  controls-position="right"
-                  placeholder="请输入购买件数"
-                />
+                <el-input-number v-model="formValidate.once_max_count" :min="formValidate.once_min_count" size="small"
+                  controls-position="right" placeholder="请输入购买件数" />
                 &nbsp;&nbsp;单次限购是限制每次下单最多购买的数量，长期限购是限制一个用户总共可以购买的数量
               </el-form-item>
             </el-col>
@@ -1202,12 +692,8 @@
           <el-col :span="24">
             <el-col v-bind="grid">
               <el-form-item label="排序：">
-                <el-input-number
-                  v-model="formValidate.sort"
-                  controls-position="right"
-                  placeholder="请输入排序"
-                  size="small"
-                />
+                <el-input-number v-model="formValidate.sort" controls-position="right" placeholder="请输入排序"
+                  size="small" />
               </el-form-item>
             </el-col>
           </el-col>
@@ -1427,76 +913,41 @@
           </el-col>
         </el-row>
         <el-form-item style="margin-top:30px;">
-          <el-button
-            v-show="currentTab > 1"
-            type="primary"
-            class="submission"
-            size="small"
-            @click="handleSubmitUp"
-          >上一步
+          <el-button v-show="currentTab > 1" type="primary" class="submission" size="small" @click="handleSubmitUp">上一步
           </el-button>
-          <el-button
-            v-show="currentTab < 4"
-            type="primary"
-            class="submission"
-            size="small"
-            @click="handleSubmitNest('formValidate')"
-          >下一步
+          <el-button v-show="currentTab < 4" type="primary" class="submission" size="small"
+            @click="handleSubmitNest('formValidate')">下一步
           </el-button>
-          <el-button
-            v-show="currentTab == '4' || $route.params.id"
-            :loading="loading"
-            type="primary"
-            class="submission"
-            size="small"
-            @click="handleSubmit('formValidate')"
-          >提交
+          <el-button v-show="currentTab == '4' || $route.params.id" :loading="loading" type="primary" class="submission"
+            size="small" @click="handleSubmit('formValidate')">提交
           </el-button>
-          <el-button
-            :loading="loading"
-            type="primary"
-            class="submission"
-            size="small"
-            @click="handlePreview('formValidate')"
-          >预览
+          <el-button :loading="loading" type="primary" class="submission" size="small"
+            @click="handlePreview('formValidate')">预览
           </el-button>
         </el-form-item>
       </el-form>
     </el-card>
     <!--属性选择弹窗-->
     <el-dialog v-if="attrShow" :visible.sync="attrShow" title="请选择商品规格" width="320px">
-      <attr-list :attrs="attrsList" @activeData="activeAttr" @close="labelAttr" @subAttrs="subAttrs" v-if="attrShow"></attr-list>
+      <attr-list :attrs="attrsList" @activeData="activeAttr" @close="labelAttr" @subAttrs="subAttrs"
+        v-if="attrShow"></attr-list>
     </el-dialog>
     <!--添加服务保障模板-->
     <guarantee-service ref="serviceGuarantee" @get-list="getGuaranteeList" />
     <!--预览商品-->
     <div v-if="previewVisible">
       <div class="bg" @click.stop="previewVisible = false" />
-      <preview-box
-        v-if="previewVisible"
-        ref="previewBox"
-        :preview-key="previewKey"
-      />
+      <preview-box v-if="previewVisible" ref="previewBox" :preview-key="previewKey" />
     </div>
     <!-- 生成淘宝京东表单-->
     <tao-bao ref="taoBao" @info-data="infoData" />
     <!--添加卡密-->
-		<add-carMy ref="addCarMy" :virtualList="virtualList" @changeVirtual="changeVirtual" @fixdBtn="fixdBtn" @closeCarMy="closeCarMy"></add-carMy>
-		<!--选择店铺推荐商品-->
-    <el-dialog
-      :visible.sync="recommendVisible"
-      title="推荐商品列表"
-      width="900px"
-    >
-      <goods-list
-        ref="goodslist"
-        v-if="recommendVisible"
-        :ischeckbox="true"
-        :product_id="product_id"
-        :selectedArr="goodList"
-        @getProductId="getRecommend"
-        @close="closeRecommend"
-      ></goods-list>
+    <add-carMy ref="addCarMy" :virtualList="virtualList" @changeVirtual="changeVirtual" @fixdBtn="fixdBtn"
+      @closeCarMy="closeCarMy"></add-carMy>
+    <!--选择店铺推荐商品-->
+    <el-dialog :visible.sync="recommendVisible" title="推荐商品列表" width="900px">
+      <goods-list ref="goodslist" v-if="recommendVisible" :ischeckbox="true" :product_id="product_id"
+        :selectedArr="goodList" @getProductId="getRecommend" @close="closeRecommend"></goods-list>
     </el-dialog>
   </div>
 </template>
@@ -1857,23 +1308,23 @@ export default {
       merSpecsSelect: [],
       sysSpecsSelect: [],
       attrs: [],
-      attrsList:[],
-			activeAtter:[],
+      attrsList: [],
+      activeAtter: [],
       attrShow: false,
       isGenerate: false,
       createProduct: false,
       generateArr: [],
       addGenerate: false,
       createCount: this.$route.params.id ? 0 : -10,
-      virtualList:[],
+      virtualList: [],
       formList: [],
-		  carMyShow: false,//是否开启卡密弹窗
+      carMyShow: false,//是否开启卡密弹窗
       tabIndex: 0,
-			tabName: "",
-       oneFormBatch: [
+      tabName: "",
+      oneFormBatch: [
         {
-          attr:"全部",
-		      image: "",
+          attr: "全部",
+          image: "",
           price: "",
           wholesale_price: "",
           procure_price: "",
@@ -1882,12 +1333,12 @@ export default {
           svip_price: "",
           stock: "",
           cdkey: {},
-		      code: "",
+          code: "",
           weight: "",
           volume: "",
         },
       ],
-      headerCarMy:{
+      headerCarMy: {
         title: "卡密设置",
         slot: "fictitious",
         align: "center",
@@ -1914,8 +1365,8 @@ export default {
   },
   watch: {
     'formValidate.attr': {
-      handler: function(val) {
-        this.createCount+=1
+      handler: function (val) {
+        this.createCount += 1
         if (this.formValidate.spec_type === 1) this.watCh(val)
       },
       immediate: false,
@@ -1923,7 +1374,7 @@ export default {
     },
     currentTab(newVal) {
       if (newVal == 4) {
-        this.$nextTick(e=>{
+        this.$nextTick(e => {
           this.setSort()
         })
       }
@@ -1942,10 +1393,10 @@ export default {
     window.removeEventListener('popstate', this.goBack, false)
   },
   methods: {
-    initInfo(){
+    initInfo() {
       getBaseInfo().then(res => {
-        if(res.data.wholesale==0) delete this.attrVal.wholesale_price
-        if(!(res.data.merchantType && res.data.merchantType.mer_type_id==22) || !res.data.merchantType) delete this.attrVal.procure_price
+        if (res.data.wholesale == 0) delete this.attrVal.wholesale_price
+        if (!(res.data.merchantType && res.data.merchantType.mer_type_id == 22) || !res.data.merchantType) delete this.attrVal.procure_price
         this.getCategorySelect()
         this.getCategoryList()
         this.getBrandListApi()
@@ -2021,18 +1472,18 @@ export default {
       return doCombinationCallback(arr, 0);//从第一个开始
       //js 没有静态数据，为了避免和外部数据混淆，需要使用闭包的形式
       function doCombinationCallback(arr, curr_index) {
-        for(let val of arr[curr_index]) {
+        for (let val of arr[curr_index]) {
           tmp[curr_index] = val;//以curr_index为索引，加入数组
           //当前循环下标小于数组总长度，则需要继续调用方法
-          if(curr_index < count) {
+          if (curr_index < count) {
             doCombinationCallback(arr, curr_index + 1);//继续调用
-          }else{
+          } else {
             totalArr.push(tmp.join(','));//(直接给push进去，push进去的不是值，而是值的地址)
           }
           //js  对象都是 地址引用(引用关系)，每次都需要重新初始化，否则 totalArr的数据都会是最后一次的 tmp 数据；
           let oldTmp = tmp;
           tmp = [];
-          for(let index of oldTmp) {
+          for (let index of oldTmp) {
             tmp.push(index);
           }
         }
@@ -2040,49 +1491,49 @@ export default {
       }
     },
     //提交属性值；
-	  subAttrs(e){
-			let selectData = [];
-			this.attrsList.forEach((el,index)=>{
-				let obj = [];
-				el.details.forEach((label)=>{
-					if(label.select){
-						obj.push(label.name);
-					}
-				})
-				if(obj.length){
-					selectData.push(obj)
-				}
-			})
-		  let newData = [];
-		  if(selectData.length){
-			  newData = this.doCombination(selectData);
-		  }
-		  this.attrShow = false;
-		  this.activeAtter = selectData;
-		  this.oneFormBatch[0].attr = newData.length?newData.join(';') : '全部';
+    subAttrs(e) {
+      let selectData = [];
+      this.attrsList.forEach((el, index) => {
+        let obj = [];
+        el.details.forEach((label) => {
+          if (label.select) {
+            obj.push(label.name);
+          }
+        })
+        if (obj.length) {
+          selectData.push(obj)
+        }
+      })
+      let newData = [];
+      if (selectData.length) {
+        newData = this.doCombination(selectData);
+      }
+      this.attrShow = false;
+      this.activeAtter = selectData;
+      this.oneFormBatch[0].attr = newData.length ? newData.join(';') : '全部';
       let manyAttr = this.ManyAttrValue
-		  manyAttr.forEach(j=> {
-        this.$set(j,'select',false)
-			  if(newData.length){
-				 newData.forEach(item=> {
-            if(j.sku.split('').length == item.split('').length){
-              if(j.sku == item){
-                this.$set(j,'select',true)
+      manyAttr.forEach(j => {
+        this.$set(j, 'select', false)
+        if (newData.length) {
+          newData.forEach(item => {
+            if (j.sku.split('').length == item.split('').length) {
+              if (j.sku == item) {
+                this.$set(j, 'select', true)
               }
-            }else{
-              if(j.sku == item){
-                this.$set(j,'select',true)
+            } else {
+              if (j.sku == item) {
+                this.$set(j, 'select', true)
               }
             }
           })
-			  }else{
-          this.$set(j,'select',true)
-			  }
-		  })
-      this.$nextTick(function(){
-        this.$set(this,'ManyAttrValue',manyAttr)
+        } else {
+          this.$set(j, 'select', true)
+        }
       })
-	  },
+      this.$nextTick(function () {
+        this.$set(this, 'ManyAttrValue', manyAttr)
+      })
+    },
     // 参数模板
     getSpecsLst(id) {
       let cate_id = id ? id : this.formValidate.cate_id
@@ -2096,11 +1547,11 @@ export default {
         })
     },
     // 添加单位
-    addUnit(){
+    addUnit() {
       this.$modalForm(unitCreatApi()).then(() => this.getUnitList())
     },
     // 单位下拉选项
-    getUnitList(){
+    getUnitList() {
       unitOptionsApi()
         .then(res => {
           this.unitList = res.data
@@ -2122,11 +1573,11 @@ export default {
           const name = this.formValidate.type == 0 ? '快递配送' : this.formValidate.type == 1 ? '虚拟发货' : '卡密发货'
           if (!this.$route.params.id) { this.formValidate.delivery_way = this.deliveryType }
           if (this.deliveryType.length == 2) {
-            if(this.formValidate.type == 2){
+            if (this.formValidate.type == 2) {
               this.deliveryList = [
                 { value: '2', name: name }
               ]
-            }else{
+            } else {
               this.deliveryList = [
                 { value: '1', name: '到店自提' },
                 { value: '2', name: name }
@@ -2156,9 +1607,9 @@ export default {
         })
     },
     // 系统表单下拉数据
-    getFormList(){
+    getFormList() {
       associatedFormList()
-      .then(res => {
+        .then(res => {
           this.formList = res.data
         })
         .catch(res => {
@@ -2166,11 +1617,11 @@ export default {
         })
     },
     // 关联的表单信息
-    getFormInfo(){
-      if(!this.formValidate.mer_form_id){
+    getFormInfo() {
+      if (!this.formValidate.mer_form_id) {
         return
         // this.formData = []
-      }else{
+      } else {
         let time = new Date().getTime() * 1000
         let formUrl = `${this.baseURL}/pages/admin/system_form/index?inner_frame=1&time=${time}&form_id=${this.formValidate.mer_form_id}`;
         this.formUrl = formUrl;
@@ -2183,18 +1634,18 @@ export default {
       }
     },
     // 选择店铺推荐商品
-    openRecommend(){
+    openRecommend() {
       this.recommendVisible = true
     },
-    getRecommend(selected){
-      this.goodList = selected&&selected.length<=18 ? selected : selected.slice(0,18)
+    getRecommend(selected) {
+      this.goodList = selected && selected.length <= 18 ? selected : selected.slice(0, 18)
       this.recommendVisible = false
     },
-    closeRecommend(){
+    closeRecommend() {
       this.recommendVisible = false
     },
     // 删除店铺推荐商品
-    deleteRecommend(index){
+    deleteRecommend(index) {
       this.goodList.splice(index, 1)
     },
     addCoupon() {
@@ -2204,7 +1655,7 @@ export default {
         'wu',
         _this.formValidate.give_coupon_ids,
         (this.keyNum += 1),
-        function(row) {
+        function (row) {
           _this.formValidate.give_coupon_ids = []
           _this.formValidate.couponData = row
           row.map(item => {
@@ -2221,8 +1672,8 @@ export default {
     },
     // 参数模板详情
     getSpecsList() {
-      let merParams = [...this.customSpecs],sysParams = [...[this.formValidate.param_temp_id]]
-      let params = [...merParams,...sysParams]
+      let merParams = [...this.customSpecs], sysParams = [...[this.formValidate.param_temp_id]]
+      let params = [...merParams, ...sysParams]
       if (params.length <= 0) {
         this.formValidate.merParams = []
         this.formValidate.sysParams = []
@@ -2233,77 +1684,77 @@ export default {
           .then(res => {
             let arr = []
             this.formValidate.params.forEach((item, i) => {
-              if(!item.parameter_id)arr.push(item)
+              if (!item.parameter_id) arr.push(item)
             })
-            this.formValidate.params = [...res.data,...arr]
+            this.formValidate.params = [...res.data, ...arr]
           })
           .catch(res => {
             this.$message.error(res.message)
           })
       }
     },
-     //添加倒入卡密的值
-	  changeVirtual(e){
-		  this.virtualList = this.virtualList.concat(e);
-	  },
-	  //添加卡密
-	  addVirtual(index, name) {
+    //添加倒入卡密的值
+    changeVirtual(e) {
+      this.virtualList = this.virtualList.concat(e);
+    },
+    //添加卡密
+    addVirtual(index, name) {
       this.$refs.addCarMy.carMyShow = true;
-	    this.tabIndex = index;
-	    this.tabName = name;
+      this.tabIndex = index;
+      this.tabName = name;
       this.virtualListClear();
       this.$refs.addCarMy.fixedCar = {
         is_type: 0,
-        key:'',
-        stock:0
+        key: '',
+        stock: 0
       }
-	  },
-	  //确认提交卡密
-	  fixdBtn(e){
-		  if(e.is_type == 0){
-			  this.$set(this[this.tabName][this.tabIndex]['cdkey'],"key",e.key);
-			  this.$set(this[this.tabName][this.tabIndex],"stock",Number(e.stock));
-			  this[this.tabName][this.tabIndex]['cdkey'].list = [];
-		  }else{
-			  this.$set(this[this.tabName][this.tabIndex]['cdkey'],"list",e.list);
-			  this.$set(this[this.tabName][this.tabIndex],"stock",e.list.length);
-			  this[this.tabName][this.tabIndex]['cdkey'].key = '';
-		  }
-      this.$set(this[this.tabName][this.tabIndex]['cdkey'],"is_type",e.is_type);
-		  this.$refs.addCarMy.carMyShow = false;
-	  },
-	  closeCarMy(){
-		  this.$refs.addCarMy.carMyShow = false;
-	  },
-	  //清空卡密
-	  virtualListClear(){
-		  this.virtualList = [
-		    {
+    },
+    //确认提交卡密
+    fixdBtn(e) {
+      if (e.is_type == 0) {
+        this.$set(this[this.tabName][this.tabIndex]['cdkey'], "key", e.key);
+        this.$set(this[this.tabName][this.tabIndex], "stock", Number(e.stock));
+        this[this.tabName][this.tabIndex]['cdkey'].list = [];
+      } else {
+        this.$set(this[this.tabName][this.tabIndex]['cdkey'], "list", e.list);
+        this.$set(this[this.tabName][this.tabIndex], "stock", e.list.length);
+        this[this.tabName][this.tabIndex]['cdkey'].key = '';
+      }
+      this.$set(this[this.tabName][this.tabIndex]['cdkey'], "is_type", e.is_type);
+      this.$refs.addCarMy.carMyShow = false;
+    },
+    closeCarMy() {
+      this.$refs.addCarMy.carMyShow = false;
+    },
+    //清空卡密
+    virtualListClear() {
+      this.virtualList = [
+        {
           is_type: 0,
-		      key: "",
-		      stock: "",
-		    },
-		  ];
-	  },
-	  seeVirtual(data, name, index) {
-	    this.tabName = name;
+          key: "",
+          stock: "",
+        },
+      ];
+    },
+    seeVirtual(data, name, index) {
+      this.tabName = name;
       this.tabIndex = index;
       this.virtualListClear();
       this.$refs.addCarMy.fixedCar = {
         is_type: 0,
-        key:'',
-        stock:0
+        key: '',
+        stock: 0
       }
-	    if (data.cdkey && data.cdkey.list && data.cdkey.list.length && data.cdkey.is_type == 1) {
-		    this.$refs.addCarMy.fixedCar.is_type = 1;
-	      this.virtualList = data.cdkey.list;
-	    } else if (data.cdkey && data.cdkey.key) {
-	      this.$refs.addCarMy.fixedCar.is_type = 0;
-	      this.$refs.addCarMy.fixedCar.key = data.cdkey.key;
-	      this.$refs.addCarMy.fixedCar.stock = data.stock;
-	    }
-	    this.$refs.addCarMy.carMyShow = true;
-	  },
+      if (data.cdkey && data.cdkey.list && data.cdkey.list.length && data.cdkey.is_type == 1) {
+        this.$refs.addCarMy.fixedCar.is_type = 1;
+        this.virtualList = data.cdkey.list;
+      } else if (data.cdkey && data.cdkey.key) {
+        this.$refs.addCarMy.fixedCar.is_type = 0;
+        this.$refs.addCarMy.fixedCar.key = data.cdkey.key;
+        this.$refs.addCarMy.fixedCar.stock = data.stock;
+      }
+      this.$refs.addCarMy.carMyShow = true;
+    },
     setTagsViewTitle() {
       const title = '编辑商品'
       const route = Object.assign({}, this.tempRoute, {
@@ -2323,7 +1774,7 @@ export default {
         tmp['value' + i] = { title: o.value }
         tmpTab['value' + i] = ''
       })
-      if(this.isGenerate || this.createCount == 1){
+      if (this.isGenerate || this.createCount == 1) {
         this.ManyAttrValue = this.attrFormat(val)
         this.manyTabTit = tmp
         this.manyTabDate = tmpTab
@@ -2333,7 +1784,7 @@ export default {
       this.addGenerate = false
     },
     attrFormat(arr) {
-      let data = [],that = this;
+      let data = [], that = this;
       let res = []
       return format(arr)
       function format(arr) {
@@ -2341,7 +1792,7 @@ export default {
           arr.forEach((v, i) => {
             if (i === 0) data = arr[i]['detail']
             const tmp = []
-            data.forEach(function(vv) {
+            data.forEach(function (vv) {
               arr[i + 1] &&
                 arr[i + 1]['detail'] &&
                 arr[i + 1]['detail'].forEach(g => {
@@ -2418,7 +1869,7 @@ export default {
           })
           data.push(dataArr.join('$&'))
         }
-        if(that.generateArr.length>0){
+        if (that.generateArr.length > 0) {
           that.generateArr.forEach((v, i) => {
             res[i]['image'] = v.pic
             res[i]['price'] = v.price
@@ -2434,7 +1885,7 @@ export default {
             res[i]['weight'] = v.weight
             res[i]['extension_one'] = v.extension_one
             res[i]['extension_two'] = v.extension_two
-            res[i]['cdkey'] = v.cdkey&&v.cdkey.length&&v.cdkey[0] || null
+            res[i]['cdkey'] = v.cdkey && v.cdkey.length && v.cdkey[0] || null
             res[i]['svip_price'] = v.svip_price || ""
           })
         }
@@ -2444,7 +1895,7 @@ export default {
     // 运费模板
     addTem() {
       const _this = this
-      this.$modalTemplates(0, function() {
+      this.$modalTemplates(0, function () {
         _this.getShippingList()
       })
     },
@@ -2475,29 +1926,29 @@ export default {
       }
       productGetTempKeysApi().then(res => {
         that.$videoCloud
-        .videoUpload({
-          type: res.data.type,
-          evfile: evfile,
-          res: res,
-          uploading(status, progress) {
-            that.upload.videoIng = status
-          }
-        })
-        .then(res => {
-          that.formValidate.video_link = res.url || res.data.src
-          that.$message.success('视频上传成功')
-          that.progress = 100
-        })
-        .catch(res => {
-          that.upload.videoIng = false
-          that.$message.error(res.msg&&res.msg.message || res.message)
-        })
+          .videoUpload({
+            type: res.data.type,
+            evfile: evfile,
+            res: res,
+            uploading(status, progress) {
+              that.upload.videoIng = status
+            }
+          })
+          .then(res => {
+            that.formValidate.video_link = res.url || res.data.src
+            that.$message.success('视频上传成功')
+            that.progress = 100
+          })
+          .catch(res => {
+            that.upload.videoIng = false
+            that.$message.error(res.msg && res.msg.message || res.message)
+          })
       })
     },
     // 添加规则；
     addRule() {
       const _this = this
-      this.$modalAttr(this.formDynamics, function() {
+      this.$modalAttr(this.formDynamics, function () {
         _this.productGetRule()
       })
     },
@@ -2527,48 +1978,49 @@ export default {
       this.addmanyData(this.ManyAttrValue)
       this.getAttr();
     },
-    addmanyData(data){
-      data.forEach(item=>{
+    addmanyData(data) {
+      data.forEach(item => {
         item.select = true
       })
       this.ManyAttrValue = data;
     },
     //打开属性
-	  batchAttr(){
-		  this.attrShow = true;
-	  },
+    batchAttr() {
+      this.attrShow = true;
+    },
     //选中属性
-	  activeAttr(e){
-		  this.attrsList = e;
-	  },
-	  //关闭属性弹窗
-	  labelAttr(){
-	  	this.attrShow = false;
-	  },
+    activeAttr(e) {
+      this.attrsList = e;
+    },
+    //关闭属性弹窗
+    labelAttr() {
+      this.attrShow = false;
+    },
     //获取属性
-		getAttr(){
-			this.oneFormBatch[0].attr = '全部';
-			let data = this.attrs;
-			data.map(el=>{
-				el.details = [];
-				el.detail.map(label=>{
-					el.details.push({
-						name:label,
-						select:false
-					})
-				})
-			})
-			this.attrsList = data;
-		},
+    getAttr() {
+      this.oneFormBatch[0].attr = '全部';
+      let data = this.attrs;
+      data.map(el => {
+        el.details = [];
+        el.detail.map(label => {
+          el.details.push({
+            name: label,
+            select: false
+          })
+        })
+      })
+      this.attrsList = data;
+    },
     // 商户分类；
     getCategorySelect() {
-      categorySelectApi()
-        .then(res => {
-          this.merCateList = res.data
-        })
-        .catch(res => {
-          this.$message.error(res.message)
-        })
+      categorySelectApi().then(res => {
+        this.merCateList = res.data
+
+
+        console.log(this.merCateList)
+      }).catch(res => {
+        this.$message.error(res.message)
+      })
     },
     // 平台分类；
     getCategoryList() {
@@ -2663,8 +2115,8 @@ export default {
     },
     onChangeSpecs(item) {
       if (item == 1 || item == 2 && this.open_svip) {
-         this.formThead.svip_price = { title: "付费会员价" }
-         this.attrVal = {
+        this.formThead.svip_price = { title: "付费会员价" }
+        this.attrVal = {
           price: null,
           wholesale_price: null,
           procure_price: null,
@@ -2712,10 +2164,10 @@ export default {
       var s2 = arg2.toString()
       try {
         max += s1.split('.')[1].length
-      } catch (e) {}
+      } catch (e) { }
       try {
         max += s2.split('.')[1].length
-      } catch (e) {}
+      } catch (e) { }
       return (
         (Number(s1.replace('.', '')) * Number(s2.replace('.', ''))) /
         Math.pow(10, max)
@@ -2728,33 +2180,33 @@ export default {
     // 批量添加
     batchAdd() {
       for (const val of this.ManyAttrValue) {
-        if(val.select){
-          if(this.oneFormBatch[0].attr!= '')this.$set(val, 'attr', this.oneFormBatch[0].attr)
-          if(this.oneFormBatch[0].image!= '')this.$set(val, 'image', this.oneFormBatch[0].image)
-          if(this.oneFormBatch[0].price!= null && this.oneFormBatch[0].price!= '')this.$set(val, 'price',  this.oneFormBatch[0].price)
-          if(this.oneFormBatch[0].wholesale_price!= null && this.oneFormBatch[0].wholesale_price!= '')this.$set(val, 'wholesale_price',  this.oneFormBatch[0].wholesale_price)
-          if(this.oneFormBatch[0].procure_price!= null && this.oneFormBatch[0].procure_price!= '')this.$set(val, 'procure_price',  this.oneFormBatch[0].procure_price)
-          if(this.oneFormBatch[0].cost!= null && this.oneFormBatch[0].cost!= '')this.$set(val, 'cost', this.oneFormBatch[0].cost)
-          if(this.oneFormBatch[0].ot_price!= null && this.oneFormBatch[0].ot_price!= '')this.$set(val, 'ot_price', this.oneFormBatch[0].ot_price)
-          if(this.oneFormBatch[0].svip_price!= null && this.oneFormBatch[0].svip_price!= '')this.$set(val, 'svip_price', this.oneFormBatch[0].svip_price)
-          if(this.oneFormBatch[0].stock!= null && this.oneFormBatch[0].stock!= '')this.$set(val, 'stock', this.oneFormBatch[0].stock)
-          if(this.oneFormBatch[0].bar_code!= null && this.oneFormBatch[0].bar_code!= '')this.$set(val, 'bar_code', this.oneFormBatch[0].bar_code)
-          if(this.oneFormBatch[0].weight!= null && this.oneFormBatch[0].weight!= '')this.$set(val, 'weight', this.oneFormBatch[0].weight)
-          if(this.oneFormBatch[0].volume!= null && this.oneFormBatch[0].volume!= '')this.$set(val, 'volume', this.oneFormBatch[0].volume)
-          if(this.oneFormBatch[0].extension_one!= null && this.oneFormBatch[0].extension_one!= '')this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one)
-          if(this.oneFormBatch[0].extension_two!= null && this.oneFormBatch[0].extension_two!= '')this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two)
-          if(this.formValidate.type == 2){
+        if (val.select) {
+          if (this.oneFormBatch[0].attr != '') this.$set(val, 'attr', this.oneFormBatch[0].attr)
+          if (this.oneFormBatch[0].image != '') this.$set(val, 'image', this.oneFormBatch[0].image)
+          if (this.oneFormBatch[0].price != null && this.oneFormBatch[0].price != '') this.$set(val, 'price', this.oneFormBatch[0].price)
+          if (this.oneFormBatch[0].wholesale_price != null && this.oneFormBatch[0].wholesale_price != '') this.$set(val, 'wholesale_price', this.oneFormBatch[0].wholesale_price)
+          if (this.oneFormBatch[0].procure_price != null && this.oneFormBatch[0].procure_price != '') this.$set(val, 'procure_price', this.oneFormBatch[0].procure_price)
+          if (this.oneFormBatch[0].cost != null && this.oneFormBatch[0].cost != '') this.$set(val, 'cost', this.oneFormBatch[0].cost)
+          if (this.oneFormBatch[0].ot_price != null && this.oneFormBatch[0].ot_price != '') this.$set(val, 'ot_price', this.oneFormBatch[0].ot_price)
+          if (this.oneFormBatch[0].svip_price != null && this.oneFormBatch[0].svip_price != '') this.$set(val, 'svip_price', this.oneFormBatch[0].svip_price)
+          if (this.oneFormBatch[0].stock != null && this.oneFormBatch[0].stock != '') this.$set(val, 'stock', this.oneFormBatch[0].stock)
+          if (this.oneFormBatch[0].bar_code != null && this.oneFormBatch[0].bar_code != '') this.$set(val, 'bar_code', this.oneFormBatch[0].bar_code)
+          if (this.oneFormBatch[0].weight != null && this.oneFormBatch[0].weight != '') this.$set(val, 'weight', this.oneFormBatch[0].weight)
+          if (this.oneFormBatch[0].volume != null && this.oneFormBatch[0].volume != '') this.$set(val, 'volume', this.oneFormBatch[0].volume)
+          if (this.oneFormBatch[0].extension_one != null && this.oneFormBatch[0].extension_one != '') this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one)
+          if (this.oneFormBatch[0].extension_two != null && this.oneFormBatch[0].extension_two != '') this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two)
+          if (this.formValidate.type == 2) {
             val.cdkey = {}
-            if(this.oneFormBatch[0]['cdkey'].is_type == 1){
-              if(this.oneFormBatch[0]['cdkey'].list && this.oneFormBatch[0]['cdkey'].list.length){
+            if (this.oneFormBatch[0]['cdkey'].is_type == 1) {
+              if (this.oneFormBatch[0]['cdkey'].list && this.oneFormBatch[0]['cdkey'].list.length) {
                 this.$set(val.cdkey, "list", this.oneFormBatch[0]['cdkey'].list);
                 this.$set(val, "stock", this.oneFormBatch[0]['cdkey'].list.length);
               }
-            }else if(this.oneFormBatch[0]['cdkey'].key){
+            } else if (this.oneFormBatch[0]['cdkey'].key) {
               this.$set(val.cdkey, "key", this.oneFormBatch[0]['cdkey'].key);
             }
-            this.$set(val.cdkey, "is_type",this.oneFormBatch[0]['cdkey'].is_type);
-			    }
+            this.$set(val.cdkey, "is_type", this.oneFormBatch[0]['cdkey'].is_type);
+          }
         }
       }
     },
@@ -2791,7 +2243,7 @@ export default {
         }
         this.formValidate.attr.push(data)
         var hash = {}
-        this.formValidate.attr = this.formValidate.attr.reduce(function(
+        this.formValidate.attr = this.formValidate.attr.reduce(function (
           item,
           next
         ) {
@@ -2799,7 +2251,7 @@ export default {
           hash[next.value] ? "" : (hash[next.value] = true && item.push(next));
           return item;
         },
-        []);
+          []);
         this.clearAttr();
         this.attrs = this.formValidate.attr;
         this.isGenerate = true;
@@ -2815,7 +2267,7 @@ export default {
         var hash = {};
         this.formValidate.attr[idx].detail = this.formValidate.attr[
           idx
-        ].detail.reduce(function(item, next) {
+        ].detail.reduce(function (item, next) {
           /* eslint-disable */
           hash[next] ? "" : (hash[next] = true && item.push(next));
           return item;
@@ -2826,10 +2278,10 @@ export default {
       }
       this.attrs = this.formValidate.attr;
     },
-     // 立即生成
+    // 立即生成
     generate() {
       let id = this.$route.params.id || 0;
-      generateAttrApi(id,{ attrs: this.formValidate.attr,product_type: this.formValidate.product_type })
+      generateAttrApi(id, { attrs: this.formValidate.attr, product_type: this.formValidate.product_type })
         .then((res) => {
           let info = res.data
           this.generateArr = this.formValidate.is_copy ? this.formValidate.value : res.data.value
@@ -2837,16 +2289,16 @@ export default {
           this.createProduct = true
           this.isGenerate = true
           if (this.$route.params.id !== "0") {
-			      this.addmanyData(info.value);
+            this.addmanyData(info.value);
           }
           if (!this.$route.params.id && this.formValidate.spec_type === 1) {
             this.ManyAttrValue.map((item) => {
-              item.image = this.formValidate.is_copy!=1 ? this.formValidate.slider_image[0] : item.pic;
+              item.image = this.formValidate.is_copy != 1 ? this.formValidate.slider_image[0] : item.pic;
               // this.$set(item, 'select', true)
             });
             this.oneFormBatch[0].pic = this.formValidate.slider_image[0];
           }
-					this.getAttr();
+          this.getAttr();
         })
         .catch((res) => {
           this.$message.error(res.message);
@@ -2861,7 +2313,7 @@ export default {
           this.infoData(info);
           this.getSpecsLst(info.cate_id);
           this.productCon();
-          if(info.mer_form_id){
+          if (info.mer_form_id) {
             let time = new Date().getTime() * 1000
             let formUrl = `${this.baseURL}/pages/admin/system_form/index?inner_frame=1&time=${time}&form_id=${info.mer_form_id}`;
             this.formUrl = formUrl;
@@ -2883,7 +2335,7 @@ export default {
       this.goodList = info.goodList || [];
       this.attrs = info.attr || [];
       info.attrValue.forEach(val => {
-        this.$set(val,'select', true)
+        this.$set(val, 'select', true)
       });
       this.formValidate = {
         product_type: info.product_type || 0,
@@ -2955,10 +2407,10 @@ export default {
       }
       if (this.formValidate.spec_type === 0) {
         info.attrValue[0].list = [],
-        this.OneattrValue = info.attrValue;
+          this.OneattrValue = info.attrValue;
       } else {
         this.ManyAttrValue = info.attrValue;
-        if(info.is_copy){
+        if (info.is_copy) {
           this.formValidate.value = info.value
         }
         this.generate();
@@ -2981,7 +2433,7 @@ export default {
     modalPicTap(tit, num, i) {
       const _this = this;
       const attr = [];
-      this.$modalUpload(function(img) {
+      this.$modalUpload(function (img) {
         if (tit === "1" && !num) {
           _this.formValidate.image = img[0];
           _this.OneattrValue[0].image = img[0];
@@ -3040,7 +2492,7 @@ export default {
         this.formValidate.attr = [];
       }
       let ids = []
-      this.goodList.forEach((item,index)=>{
+      this.goodList.forEach((item, index) => {
         ids.push(item.product_id)
       })
       this.formValidate.good_ids = ids;
@@ -3051,31 +2503,31 @@ export default {
           let disCreate = this.$route.params.id && !this.$route.query.type;
           disCreate
             ? productUpdateApi(this.$route.params.id, this.formValidate)
-                .then(async res => {
-                  this.fullscreenLoading = false;
-                  this.$message.success(res.message);
-                  this.$router.push({ path: this.roterPre + "/product/list" });
-                  this.$refs[name].resetFields();
-                  this.formValidate.slider_image = [];
-                  this.loading = false;
-                })
-                .catch(res => {
-                  this.fullscreenLoading = false;
-                  this.loading = false;
-                  this.$message.error(res.message);
-                })
+              .then(async res => {
+                this.fullscreenLoading = false;
+                this.$message.success(res.message);
+                this.$router.push({ path: this.roterPre + "/product/list" });
+                this.$refs[name].resetFields();
+                this.formValidate.slider_image = [];
+                this.loading = false;
+              })
+              .catch(res => {
+                this.fullscreenLoading = false;
+                this.loading = false;
+                this.$message.error(res.message);
+              })
             : productCreateApi(this.formValidate)
-                .then(async res => {
-                  this.fullscreenLoading = false;
-                  this.$message.success(res.message);
-                  this.$router.push({ path: this.roterPre + "/product/list" });
-                  this.loading = false;
-                })
-                .catch(res => {
-                  this.fullscreenLoading = false;
-                  this.loading = false;
-                  this.$message.error(res.message);
-                });
+              .then(async res => {
+                this.fullscreenLoading = false;
+                this.$message.success(res.message);
+                this.$router.push({ path: this.roterPre + "/product/list" });
+                this.loading = false;
+              })
+              .catch(res => {
+                this.fullscreenLoading = false;
+                this.loading = false;
+                this.$message.error(res.message);
+              });
         } else {
           if (!this.formValidate.store_name.trim()) {
             return this.$message.warning("基本信息-商品名称不能为空");
@@ -3086,9 +2538,9 @@ export default {
           if (!this.formValidate.cate_id) {
             return this.$message.warning("基本信息-平台商品分类不能为空");
           }
-          // if (!this.formValidate.mer_cate_id) {
-          //   return this.$message.warning("基本信息-商户商品分类不能为空");
-          // }
+          if (!this.formValidate.mer_cate_id) {
+            return this.$message.warning("基本信息-商户商品分类不能为空");
+          }
           if (!this.formValidate.image) {
             return this.$message.warning("基本信息-商品封面图不能为空");
           }
@@ -3157,7 +2609,7 @@ export default {
     addCustomDialog(editorId) {
       window.UE.registerUI(
         "test-dialog",
-        function(editor, uiName) {
+        function (editor, uiName) {
           // 创建 dialog
           let dialog = new window.UE.ui.Dialog({
             iframeUrl: roterPre + "/admin/widget/image?field=dialog",
@@ -3171,7 +2623,7 @@ export default {
             name: "dialog-button",
             title: "上传图片",
             cssRules: `background-image: url(../../../assets/images/icons.png);background-position: -726px -77px;`,
-            onclick: function() {
+            onclick: function () {
               // 渲染dialog
               dialog.render();
               dialog.open();
@@ -3183,7 +2635,7 @@ export default {
       );
       window.UE.registerUI(
         "video-dialog",
-        function(editor, uiName) {
+        function (editor, uiName) {
           let dialog = new window.UE.ui.Dialog({
             iframeUrl: roterPre + "/admin/widget/video?fodder=video",
             editor: editor,
@@ -3196,7 +2648,7 @@ export default {
             name: "video-button",
             title: "上传视频",
             cssRules: `background-image: url(../../../assets/images/icons.png);background-position: -320px -20px;`,
-            onclick: function() {
+            onclick: function () {
               // 渲染dialog
               dialog.render();
               dialog.open();
@@ -3220,15 +2672,19 @@ export default {
   height: 100%;
   background: rgba(0, 0, 0, 0.1);
 }
+
 .goods_detail .goods_detail_wrapper {
   z-index: -10;
 }
-.iframe-box{
+
+.iframe-box {
   min-height: 300px;
 }
-::v-deep .specsList th{
-  line-height: 20px!important;
+
+::v-deep .specsList th {
+  line-height: 20px !important;
 }
+
 ::v-deep .upLoadPicBox {
   .upLoad {
     -webkit-box-orient: vertical;
@@ -3239,73 +2695,93 @@ export default {
     flex-direction: column;
     line-height: 20px;
   }
+
   span {
     font-size: 10px;
   }
 }
+
 .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;
 }
-.explanation{
+
+.explanation {
   color: #909399;
 }
+
 .tabNumWidth ::v-deep .el-input-number--medium {
   width: 100px;
 }
+
 .tabNumWidth ::v-deep .el-input-number__increase {
   width: 20px !important;
   font-size: 12px !important;
 }
+
 .tabNumWidth ::v-deep .el-input-number__increase {
   width: 20px !important;
   font-size: 12px !important;
 }
+
 .tabNumWidth ::v-deep .el-input-number__decrease {
   width: 20px !important;
   font-size: 12px !important;
 }
+
 .tabNumWidth ::v-deep .el-input-number--medium .el-input__inner {
   padding-left: 25px !important;
   padding-right: 25px !important;
 }
+
 .tabNumWidth ::v-deep .priceBox .el-input-number__decrease,
-.tabNumWidth ::v-deep .priceBox .el-input-number__increase{
+.tabNumWidth ::v-deep .priceBox .el-input-number__increase {
   display: none;
 }
-.tabNumWidth ::v-deep .priceBox.el-input-number--small{
-  width: 100px!important;
+
+.tabNumWidth ::v-deep .priceBox.el-input-number--small {
+  width: 100px !important;
 }
+
 .tabNumWidth ::v-deep thead {
   line-height: normal !important;
 }
+
 .tabNumWidth ::v-deep .cell {
   line-height: normal !important;
   text-overflow: clip !important;
 }
+
 .seeCatMy {
   color: var(--prev-color-primary);
   cursor: pointer;
 }
-.selectOn{
-	color: var(--prev-color-primary);
+
+.selectOn {
+  color: var(--prev-color-primary);
 }
+
 .virtual_boder {
   border: 1px solid var(--prev-color-primary);
 }
+
 .virtual_boder2 {
   border: 1px solid #e7e7e7;
 }
+
 .virtual_san {
   position: absolute;
   bottom: 0;
@@ -3315,6 +2791,7 @@ export default {
   border-bottom: 26px solid var(--prev-color-primary);
   border-left: 26px solid transparent;
 }
+
 .virtual_dui {
   position: absolute;
   bottom: -2px;
@@ -3322,6 +2799,7 @@ export default {
   color: #ffffff;
   font-family: system-ui;
 }
+
 .virtual {
   width: 120px;
   height: 60px;
@@ -3333,20 +2811,24 @@ export default {
   position: relative;
   cursor: pointer;
   line-height: 23px;
+
   .virtual_top {
     font-size: 14px;
     font-weight: 600;
     color: rgba(0, 0, 0, 0.85);
   }
+
   .virtual_bottom {
     font-size: 12px;
     font-weight: 400;
     color: #999999;
   }
 }
+
 .virtual:nth-child(2n) {
   margin: 0 12px;
 }
+
 .addfont {
   display: inline-block;
   font-size: 13px;
@@ -3355,49 +2837,60 @@ export default {
   margin-left: 14px;
   cursor: pointer;
 }
+
 .titTip {
   display: inline-bolck;
   font-size: 12px;
   font-weight: 400;
   color: #999999;
 }
+
 .addCustom_content {
   margin-top: 20px;
+
   .custom_box {
     margin-bottom: 10px;
   }
 }
+
 .addCustomBox {
   margin-top: 12px;
   font-size: 13px;
   font-weight: 400;
   color: var(--prev-color-primary);
+
   .btn {
     cursor: pointer;
     width: max-content;
   }
+
   .remark {
     display: flex;
     margin-top: 14px;
   }
 }
+
 .pageWidth {
   width: 460px;
 }
+
 .ml15 {
   margin-left: 15px;
 }
+
 .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;
@@ -3405,11 +2898,13 @@ export default {
   margin-right: 10px;
   position: relative;
   cursor: pointer;
+
   img {
     width: 100%;
     height: 100%;
   }
 }
+
 .iview-video-style {
   width: 40%;
   height: 180px;
@@ -3419,6 +2914,7 @@ export default {
   position: relative;
   overflow: hidden;
 }
+
 .iconv {
   color: #fff;
   line-height: 180px;
@@ -3429,6 +2925,7 @@ export default {
   left: 50%;
   margin-left: -25px;
 }
+
 .iview-video-style .mark {
   position: absolute;
   width: 100%;
@@ -3437,15 +2934,19 @@ export default {
   background-color: rgba(0, 0, 0, 0.5);
   text-align: center;
 }
+
 .uploadVideo {
   margin-left: 10px;
 }
+
 .perW50 {
   width: 50%;
 }
+
 .submission {
   margin-left: 10px;
 }
+
 .btndel {
   position: absolute;
   z-index: 1;
@@ -3454,6 +2955,7 @@ export default {
   left: 46px;
   top: -4px;
 }
+
 .labeltop ::v-deep .el-form-item__label {
   float: none !important;
   display: inline-block !important;
diff --git a/src/views/product/cloud/index.vue b/src/views/product/cloud/index.vue
new file mode 100644
index 0000000..7399a15
--- /dev/null
+++ b/src/views/product/cloud/index.vue
@@ -0,0 +1,1080 @@
+<template>
+  <div class="divBox">
+    <el-card class="mt14">
+      <el-table refs=tableRef v-loading="listLoading" :data="tableData.data" size="small"
+        :row-class-name="tableRowClassName" :row-key="(row) => { return row.id }"
+        @selection-change="handleSelectionChange" @rowclick.stop="closeEdit">
+        <el-table-column prop="id" label="ID" min-width="50" />
+        <el-table-column label="商品图" min-width="100">
+          <template slot-scope="scope">
+            <div class="demo-image__preview">
+              <el-image :src="scope.row.product.image" :preview-src-list="[scope.row.product.image]" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="merchantCategory.category_name" label="商品分类" min-width="140" />
+        <el-table-column prop="product.store_name" label="商品名称" min-width="230">
+        </el-table-column>
+        <el-table-column label="操作" min-width="150" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" class="mr10" @click="onDetails(scope.row.product_id)">详情</el-button>
+            <el-button type="text" size="small" class="mr10" @click="onDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+          @current-change="pageChange" />
+      </div>
+    </el-card>
+    <!-- 生成淘宝京东表单-->
+    <tao-bao ref="taoBao" @getSuccess="getSuccess" :deliveryType="deliveryType" :deliveryList="deliveryList" />
+    <!--预览商品-->
+    <div v-if="previewVisible">
+      <div class="bg" @click.stop="previewVisible = false" />
+      <preview-box v-if="previewVisible" ref="previewBox" :goods-id="goodsId" :product-type="0"
+        :preview-key="previewKey" />
+    </div>
+    <!--编辑标签-->
+    <el-dialog v-if="dialogLabel" title="选择标签" :visible.sync="dialogLabel" width="470px" :before-close="handleClose">
+      <el-form ref="labelForm" :model="labelForm" @submit.native.prevent size="small">
+        <el-form-item>
+          <el-select v-model="labelForm.mer_labels" clearable multiple placeholder="请选择" class="width100">
+            <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.id.toString()" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogLabel = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submitForm('labelForm')">提交</el-button>
+      </span>
+    </el-dialog>
+    <!-- 免审核弹窗-->
+    <edit-attr ref="editAttr" />
+    <!--运费模板弹窗-->
+    <el-dialog v-if="dialogFreight" title="选择运费模板" :visible.sync="dialogFreight" width="800px"
+      :before-close="handleFreightClose">
+      <el-form ref="tempForm" :model="tempForm" :rules="tempRule" @submit.native.prevent>
+        <el-form-item prop="temp_id">
+          <el-select v-model="tempForm.temp_id" clearable placeholder="请选择" class="selWidth">
+            <el-option v-for="item in tempList" :key="item.shipping_template_id" :label="item.name"
+              :value="item.shipping_template_id" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitTempForm('tempForm')">提交</el-button>
+      </span>
+    </el-dialog>
+    <!--批量设置佣金弹窗-->
+    <el-dialog v-if="dialogCommision" title="设置佣金" :visible.sync="dialogCommision" width="600px">
+      <el-form ref="commisionForm" :model="commisionForm" :rules="commisionRule" @submit.native.prevent>
+        <el-form-item label="一级佣金比例：" prop="extension_one">
+          <el-input-number v-model="commisionForm.extension_one" :precision="2" :step="0.1" :min="0" :max="1"
+            class="priceBox" controls-position="right" />
+        </el-form-item>
+        <el-form-item label="二级佣金比例：" prop="extension_two">
+          <el-input-number v-model="commisionForm.extension_two" :precision="2" :step="0.1" :min="0" :max="1"
+            class="priceBox" controls-position="right" />
+        </el-form-item>
+        <el-form-item>
+          <span>备注：订单交易成功后给上级返佣的比例，例:0.5 = 返订单金额的50%</span>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitCommisionForm('commisionForm')">提交</el-button>
+      </span>
+    </el-dialog>
+    <!--批量设置付费会员价-->
+    <el-dialog v-if="dialogSvip" title="批量设置付费会员价" :visible.sync="dialogSvip" width="700px">
+      <el-form ref="svipForm" :model="svipForm" @submit.native.prevent label-width="80px">
+        <el-form-item label="参与方式：">
+          <el-radio-group v-model="svipForm.svip_price_type">
+            <el-radio :label="0" class="radio">不设置会员价</el-radio>
+            <el-radio :label="1" class="radio">默认设置会员价</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item>
+          备注：默认设置会员价是指商户在 <router-link :to="{ path: roterPre + '/systemForm/Basics/svip' }" class="member-link">
+            [设置-付费会员设置]
+          </router-link> 中设置的会员折扣价，选择后每个商品默认展示此处设置的会员折扣价。
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitSvipForm('svipForm')">提交</el-button>
+      </span>
+    </el-dialog>
+    <!--批量设置弹窗-->
+    <el-dialog v-if="batchModal" title="批量设置" :visible.sync="batchModal" width="750px">
+      <div>
+        <el-alert title="每次只能修改一项，如需修改多项，请多次操作。" type="warning" :closable="false">
+        </el-alert>
+        <div class="batch-tab mt20">
+          <el-tabs :tab-position="tabPosition" v-model="batchName">
+            <el-tab-pane label="商品分类" name="cate">
+              <el-form size="small" label-width="120px" :inline="true">
+                <el-form-item label="平台商品分类：">
+                  <el-cascader v-model="batchData.cate_id" :options="categoryList" :props="props" clearable
+                    class="width100" />
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="商品标签" name="label">
+              <el-form size="small" label-width="120px" :inline="true">
+                <el-form-item label="商品标签：">
+                  <el-select v-model="batchData.mer_labels" clearable multiple placeholder="请选择" class="width100">
+                    <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="配送方式" name="delivery_method">
+              <el-form size="small" label-width="120px" :inline="true">
+                <el-form-item label="配送方式：">
+                  <el-checkbox-group v-model="batchData.delivery_way">
+                    <el-checkbox v-for="item in deliveryList" :key="item.value" :label="item.value">
+                      {{ item.name }}
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="运费设置" name="postage">
+              <el-form size="small" label-width="120px">
+                <el-form-item label="运费设置：">
+                  <el-radio-group v-model="batchData.delivery_free">
+                    <el-radio :label="1">包邮</el-radio>
+                    <el-radio :label="0" class="radio">运费模板</el-radio>
+
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item v-if="batchData.delivery_free == 0">
+                  <el-select v-model="batchData.temp_id" clearable placeholder="请选择" class="width100">
+                    <el-option v-for="item in tempList" :key="item.shipping_template_id" :label="item.name"
+                      :value="item.shipping_template_id" />
+                  </el-select>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="佣金设置" name="commission">
+              <el-form size="small" label-width="120px" :inline="false">
+                <el-form-item label="一级佣金比例：">
+                  <el-input-number v-model="batchData.extension_one" :precision="2" :step="0.1" :min="0" :max="1"
+                    class="width100" controls-position="right" />
+                </el-form-item>
+                <el-form-item label="二级佣金比例：">
+                  <el-input-number v-model="batchData.extension_two" :precision="2" :step="0.1" :min="0" :max="1"
+                    class="width100" controls-position="right" />
+                </el-form-item>
+                <el-form-item>
+                  <span style="color:#909399">备注：订单交易成功后给上级返佣的比例，例:0.5 = 返订单金额的50%</span>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane v-if="open_svip == 1" label="付费会员设置" name="member">
+              <el-form label-width="120px">
+                <el-form-item label="参与方式：">
+                  <el-radio-group v-model="batchData.svip_price_type">
+                    <el-radio :label="0" class="radio">不设置会员价</el-radio>
+                    <el-radio :label="1" class="radio">默认设置会员价</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item>
+                  备注：默认设置会员价是指商户在 <router-link :to="{ path: roterPre + '/systemForm/Basics/svip' }" class="member-link">
+                    [设置-付费会员设置] </router-link> 中设置的会员折扣价，选择后每个商品默认展示此处设置的会员折扣价。
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="系统表单" name="sys_form">
+              <el-form label-width="120px">
+                <el-form-item label="系统表单：">
+                  <el-select size="small" clearable v-model="batchData.mer_form_id" @change="getFormInfo"
+                    class="width100">
+                    <el-option v-for="items in formList" :key="items.form_id" :value="items.form_id"
+                      :label="items.name">{{
+        items.name }}
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item v-if="formData.length > 0">
+                  <el-table border class="specsList" :data="formData" size="small">
+                    <el-table-column prop="label" label="表单标题" min-width="100" />
+                    <el-table-column prop="type" label="表单类型" min-width="100">
+                      <template slot-scope="{row}">
+                        <span>{{ row.type | formTypeFilter }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column min-width="100" label="是否必填">
+                      <template slot-scope="{row}">
+                        <span>{{ row.val ? '必填' : '不必填' }}</span>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="商品价格设置" name="price">
+              <el-form size="small" label-width="60px">
+                <el-form-item label="单选：">
+                  <el-radio-group v-model="batchData.price_type" @change="changePrice">
+                    <el-radio label="add">加</el-radio>
+                    <el-radio label="sub">减</el-radio>
+                    <el-radio label="mul">乘</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item>
+                  <el-input-number v-model="batchData.price_number" :precision="2" :step="0.1" :min="0" class="width100"
+                    controls-position="right" />
+                  <span style="color:#909399">({{ (batchData.price_type == 'add' || batchData.price_type == 'sub') ? '元'
+        :
+        '%'
+                    }})</span>
+                </el-form-item>
+                <el-form-item>
+                  <div style="color:#F56464">注：批量设置价格为敏感操作，请谨慎操作！</div>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitBatchForm">提交</el-button>
+      </span>
+    </el-dialog>
+    <!--商品详情-->
+    <pro-detail ref="proDetail" :productId="product_id" :configData="configData" @closeDrawer="closeDrawer"
+      @changeDrawer="changeDrawer" :drawer="drawer"></pro-detail>
+
+    <!-- 加入店铺 -->
+    <el-dialog title="导入商品" :visible.sync="showShow" width="600px">
+      <el-form>
+        <el-form-item label="店铺分类">
+          <el-select v-model="categoryBox" multiple style="width:300px;">
+            <el-option v-for="(item, indx) in merCateList" :key="indx" :label="item.category_name"
+              :value="item.merchant_category_id" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" size="mini" @click="submitCategory" v-loading="listLoading">提交</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  productLstApi,
+  productDeleteApi,
+  newCategorySelectApi,
+  importApi,
+  categoryListApi,
+  lstFilterApi,
+  statusApi,
+  destoryApi,
+  cloudProductListApi,
+  restoreApi,
+  productSort,
+  getProductLabelApi,
+  updatetProductLabel,
+  batchesOnOffApi,
+  productConfigApi,
+  batchesLabelsApi,
+  shippingListApi,
+  batchesTempApi,
+  productBathExtApi,
+  productBathSvipApi,
+  associatedFormList,
+  associatedFormInfo,
+  batchSetProduct,
+  deleteProductCloudApi
+} from '@/api/product'
+import { roterPre } from '@/settings'
+import taoBao from '../productList/taoBao'
+import editAttr from '../productList/editAttr'
+import proDetail from '../productList/proDetails.vue';
+import previewBox from '@/components/previewBox/index'
+export default {
+  name: 'ProductList',
+  components: { taoBao, previewBox, editAttr, proDetail },
+  data() {
+    return {
+      product_ids: [],
+      categoryBox: [],
+      showShow: false,
+      props: {
+        emitPath: false
+      },
+      roterPre: roterPre,
+      drawer: false,
+      headeNum: [],
+      labelList: [],
+      tempList: [],
+      listLoading: true,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        mer_cate_id: '',
+        cate_id: '',
+        keyword: '',
+        temp_id: '',
+        form_id: '',
+        type: this.$route.query.type ? this.$route.query.type : '1',
+        is_ficti: "",
+        is_gift_bag: '',
+        us_status: '',
+        mer_labels: '',
+        svip_price_type: '',
+        product_id: this.$route.query.id ? this.$route.query.id : ''
+      },
+      categoryList: [], // 平台
+      merCateList: [], // 商户分类筛选
+      modals: false,
+      tabClickIndex: '',
+      multipleSelection: [],
+      productStatusList: [
+        { label: '上架显示', value: 1 },
+        { label: '下架', value: 0 },
+        { label: '平台关闭', value: -1 }
+      ],
+      productTypeList: [
+        { label: '普通商品', value: 0 },
+        { label: '虚拟商品', value: 1 },
+        { label: '卡密商品', value: 2 }
+      ],
+      tempRule: {
+        temp_id: [{ required: true, message: '请选择运费模板', trigger: 'change' }]
+      },
+      commisionRule: {
+        extension_one: [{ required: true, message: '请输入一级佣金', trigger: 'change' }],
+        extension_two: [{ required: true, message: '请输入二级佣金', trigger: 'change' }]
+      },
+      commisionForm: { extension_one: 0, extension_two: 0 },
+      svipForm: { svip_price_type: 0 },
+      goodsId: '',
+      previewKey: '',
+      product_id: '',
+      configData: {},
+      previewVisible: false,
+      dialogLabel: false,
+      dialogFreight: false,
+      dialogCommision: false,
+      dialogSvip: false,
+      is_audit: false,
+      deliveryType: [],
+      deliveryList: [],
+      labelForm: {},
+      tempForm: {},
+      isBatch: false,
+      open_svip: false,
+      batchModal: false,
+      tabPosition: 'left',
+      formList: [],
+      formData: [], //表单数据
+      batchName: 'cate',
+      batchData: {
+        delivery_way: [],
+        price_type: 'add',
+        delivery_free: 1,
+        extension_one: 0,
+        extension_two: 0,
+        price_number: 0,
+      },
+      chkName: '',
+      checkedIds: [], // 订单当前页选中的数据
+      noChecked: [], // 订单全选状态下当前页不选中的数据
+      checkedPage: [],
+      allCheck: false,
+    }
+  },
+  mounted() {
+    this.getLstFilterApi()
+    this.getCategorySelect()
+    this.getCategoryList()
+    this.getFormList()
+    this.getList(1)
+    this.getLabelLst()
+    this.getTempLst()
+    this.productCon()
+  },
+  methods: {
+    // 加入店铺 product_ids
+    addShop() {
+      if (!this.checkedIds || this.checkedIds.length == 0) {
+        return this.$message.error("请至少选择一个商品");
+      }
+      this.showShow = true;
+      this.categoryBox = [];
+    },
+
+    // 导入商品到云仓
+    submitCategory() {
+      if (this.categoryBox.length == 0) return this.$message.error('请至少选择一个店铺分类!');
+      this.listLoading = true;
+      // 商品导入
+      importApi({
+        product_ids: this.checkedIds,
+        category_ids: this.categoryBox
+      }).then(res => {
+        this.listLoading = false;
+        this.showShow = false;
+        this.categoryBox = [];
+        this.checkedIds = [];
+        this.$message.success(res.message);
+      }).catch(err => {
+        this.listLoading = false;
+        this.$message.error(err.message);
+      })
+    },
+
+    /**重置 */
+    searchReset() {
+      this.$refs.searchForm.resetFields()
+      this.getList(1)
+    },
+    // 把每一行的索引放进row
+    tableRowClassName({ row, rowIndex }) {
+      row.index = rowIndex
+    },
+    // 添加明细原因 row 当前行 column 当前列
+    tabClick(row) {
+      this.tabClickIndex = row.index
+    },
+    // 失去焦点初始化
+    inputBlur(scope) {
+      if (!scope.row.sort || scope.row.sort < 0) scope.row.sort = 0
+      productSort(scope.row.product_id, { sort: scope.row.sort })
+        .then((res) => {
+          this.closeEdit()
+        })
+        .catch((res) => {
+        })
+    },
+    closeEdit() {
+      this.tabClickIndex = null
+    },
+    // 选择商品
+    onHandle(name) {
+      this.chkName = this.chkName === name ? '' : name
+      this.changeType(!(this.chkName === ''))
+    },
+    changeType(v) {
+      if (v) {
+        if (!this.chkName) {
+          this.chkName = 'dan'
+        }
+      } else {
+        this.chkName = ''
+        this.allCheck = false;
+      }
+      const index = this.checkedPage.indexOf(this.tableFrom.page)
+      if (this.chkName === 'dan') {
+        this.checkedPage.push(this.tableFrom.page)
+      } else if (index > -1) {
+        this.checkedPage.splice(index, 1)
+      }
+
+      this.syncCheckedId()
+    },
+    syncCheckedId() {
+      const ids = this.tableData.data.map(v => {
+        return v.product_id
+      })
+      if (this.chkName === 'duo') {
+        this.checkedIds = []
+        this.allCheck = true;
+      } else if (this.chkName === 'dan') {
+        this.allCheck = false;
+        ids.forEach(id => {
+          const index = this.checkedIds.indexOf(id)
+          if (index === -1) {
+            this.checkedIds.push(id)
+          }
+        })
+      } else {
+        ids.forEach(id => {
+          const index = this.checkedIds.indexOf(id)
+          if (index > -1) {
+            this.checkedIds.splice(index, 1)
+          }
+        })
+      }
+      console.log(this.checkedIds)
+    },
+    // 分开选择
+    changeOne(v, row) {
+      if (v) {
+        if (this.chkName === 'duo') {
+          const index = this.noChecked.indexOf(row.product_id)
+          if (index > -1) this.noChecked.splice(index, 1)
+        } else {
+          const index = this.checkedIds.indexOf(row.product_id)
+          if (index === -1) this.checkedIds.push(row.product_id)
+        }
+      } else {
+        if (this.chkName === 'duo') {
+          const index = this.noChecked.indexOf(row.product_id)
+          if (index === -1) this.noChecked.push(row.product_id)
+        } else {
+          const index = this.checkedIds.indexOf(row.product_id)
+          if (index > -1) this.checkedIds.splice(index, 1)
+        }
+      }
+    },
+    // 批量设置价格
+    changePrice() {
+      if (this.batchData.price_type == 'div') {
+        this.batchData.price_number = 1
+      } else {
+        this.batchData.price_number = 0
+      }
+    },
+    // 批量设置--提交数据
+    submitBatchForm() {
+      console.log(this.batchName)
+      let name = this.batchName
+      switch (name) {
+        case 'cate':
+          if (!this.batchData.cate_id) {
+            return this.$message.warning('请选择商品分类！')
+          }
+          break
+        case 'delivery_method':
+          if (!this.batchData.delivery_way.length) {
+            return this.$message.warning('请选择配送方式！')
+          }
+          break
+        case 'postage':
+          if (this.batchData.delivery_free != 0 && this.batchData.delivery_free != 1) {
+            return this.$message.warning('请选择运费设置！')
+          }
+          if (this.batchData.delivery_free == 0 && !this.batchData.temp_id) {
+            return this.$message.warning('请选择运费模板！')
+          }
+          break
+        case 'commission':
+          this.batchData.extension_one = this.batchData.extension_one || 0
+          this.batchData.extension_two = this.batchData.extension_two || 0
+          break
+        case 'price':
+          if (this.batchData.price_type == 'div' && this.batchData.price_number == 0) {
+            return this.$message.warning('除数不能为0！')
+          }
+          break
+      }
+      let parmas = this.batchData
+      parmas.batch_type = this.batchName
+      if (this.allCheck) {
+        parmas.batch_select_type = 'all'
+        parmas.where = this.tableFrom
+      } else {
+        parmas.batch_select_type = 'select'
+        parmas.ids = this.checkedIds
+      }
+      batchSetProduct(parmas).then((res) => {
+        this.batchModal = false
+        this.$message.success(res.message)
+      })
+        .catch((res) => {
+          this.$message.error(res.message)
+        })
+    },
+
+    handleSelectionChange(val) {
+      console.log(val)
+      this.multipleSelection = val
+      const data = []
+      this.multipleSelection.map((item) => {
+        data.push(item.product_id)
+      })
+      this.product_ids = data
+      console.log(this.product_ids)
+    },
+    productCon() {
+      productConfigApi()
+        .then(res => {
+          this.configData = res.data
+          this.is_audit = res.data.is_audit
+          this.open_svip = res.data.mer_svip_status == 1 && res.data.svip_switch_status == 1
+          this.deliveryType = res.data.delivery_way.map(String)
+          if (this.deliveryType.length == 2) {
+            this.deliveryList = [
+              { value: '1', name: '到店自提' },
+              { value: '2', name: '快递配送' }
+            ]
+          } else {
+            if (this.deliveryType.length == 1 && this.deliveryType[0] == '1') {
+              this.deliveryList = [
+                { value: '1', name: '到店自提' }
+              ]
+            } else {
+              this.deliveryList = [
+                { value: '2', name: '快递配送' }
+              ]
+            }
+          }
+        })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+    // 系统表单下拉数据
+    getFormList() {
+      associatedFormList()
+        .then(res => {
+          this.formList = res.data
+        })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+    // 关联的表单信息
+    getFormInfo() {
+      if (this.batchData.mer_form_id) {
+        associatedFormInfo(this.batchData.mer_form_id).then((res) => {
+          this.formData = res.data
+        })
+          .catch((res) => {
+            this.$message.error(res.message)
+          })
+      } else {
+        this.formData = []
+      }
+    },
+    getSuccess() {
+      this.getLstFilterApi()
+      this.getList(1)
+    },
+    handleClose() {
+      this.dialogLabel = false
+    },
+    handleFreightClose() {
+      this.dialogFreight = false
+    },
+    // 添加淘宝商品成功
+    onClose() {
+      this.modals = false
+    },
+    // 复制淘宝
+    onCopy() {
+      this.$router.push({
+        path: this.roterPre + '/product/list/addProduct',
+        query: { type: 1 },
+      });
+    },
+    // 打开批量设置弹窗
+    openBatch() {
+      this.batchModal = true;
+    },
+    // 获取标签项
+    getLabelLst() {
+      getProductLabelApi().then(res => {
+        this.labelList = res.data
+      })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+    // 获取运费模板
+    getTempLst() {
+      shippingListApi().then(res => {
+        this.tempList = res.data
+      })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+    // 免审编辑
+    onAuditFree(row) {
+      this.$refs.editAttr.getAttrDetail(row.product_id)
+    },
+    // 批量设置佣金
+    batchCommision() {
+      // if(this.multipleSelection.length === 0) return this.$message.warning('请先选择商品')
+      this.dialogCommision = true;
+    },
+    // 批量设置会员价
+    batchSvip() {
+      if (this.multipleSelection.length === 0) return this.$message.warning('请先选择商品')
+      this.dialogSvip = true;
+    },
+    submitCommisionForm(name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.commisionForm.ids = this.product_ids
+          productBathExtApi(this.commisionForm).then(({ message }) => {
+            this.$message.success(message)
+            this.getList('')
+            this.dialogCommision = false
+          })
+        } else {
+          return
+        }
+      })
+    },
+    // 提交会员价
+    submitSvipForm(name) {
+      this.svipForm.ids = this.product_ids
+      productBathSvipApi(this.svipForm).then(({ message }) => {
+        this.$message.success(message)
+        this.getList('')
+        this.dialogSvip = false
+      })
+    },
+    // 批量上架
+    batchShelf() {
+      if (this.checkedIds.length === 0 && !this.allCheck) return this.$message.warning('请先选择商品')
+      let ids = []
+      if (this.allCheck) {
+        this.tableData.data.map((item) => {
+          ids.push(item.product_id)
+        })
+      } else {
+        ids = this.checkedIds
+      }
+      let data = { status: 1, ids: ids }
+      batchesOnOffApi(data).then(res => {
+        this.$message.success(res.message)
+        this.getLstFilterApi()
+        this.getList('')
+      })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+    // 批量下架
+    batchOff() {
+      if (this.checkedIds.length === 0 && !this.allCheck) return this.$message.warning('请先选择商品')
+      let ids = []
+      if (this.allCheck) {
+        this.tableData.data.map((item) => {
+          ids.push(item.product_id)
+        })
+      } else {
+        ids = this.checkedIds
+      }
+      let data = { status: 0, ids: ids }
+      batchesOnOffApi(data).then(res => {
+        this.$message.success(res.message)
+        this.getLstFilterApi()
+        this.getList('')
+      })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+    // 批量设置标签
+    batchLabel() {
+      this.labelForm = {
+        mer_labels: [],
+        ids: this.product_ids
+      }
+      this.isBatch = true
+      this.dialogLabel = true
+    },
+    // 批量设置运费模板
+    batchFreight() {
+      this.dialogFreight = true;
+    },
+    submitTempForm(name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.tempForm.ids = this.product_ids
+          batchesTempApi(this.tempForm).then(({ message }) => {
+            this.$message.success(message)
+            this.getList('')
+            this.dialogFreight = false
+          })
+        } else {
+          return
+        }
+      })
+    },
+    handleRestore(id) {
+      this.$modalSure('恢复商品').then(() => {
+        restoreApi(id)
+          .then(res => {
+            this.$message.success(res.message)
+            this.getLstFilterApi()
+            this.getList('')
+          })
+          .catch(res => {
+            this.$message.error(res.message)
+          })
+      })
+    },
+    // 预览
+    handlePreview(id) {
+      this.previewVisible = true
+      this.goodsId = id
+      this.previewKey = ''
+    },
+    // 查看详情
+    onDetails(id) {
+      this.product_id = id;
+      this.drawer = true;
+      this.$refs.proDetail.getInfo(id)
+    },
+
+    // 删除记录
+    onDelete(item) {
+      if (!this.checkedIds || this.checkedIds.length) return this.$message.error("请选择一条需要删除的数据!");
+      this.$confirm('此操作将删除商品名称为"' + item.product.store_name + '"的记录, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteProductCloudApi({
+          id: item.id
+        }).then(res => {
+          this.$message.success("删除成功");
+          this.getList('');
+        }).catch(err => {
+          this.$message.error("删除失败!")
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+
+    changeDrawer(v) {
+      this.drawer = v;
+    },
+    closeDrawer() {
+      this.drawer = false;
+    },
+    // 商户分类；
+    getCategorySelect() {
+      newCategorySelectApi()
+        .then(res => {
+          this.merCateList = res.data
+        })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+
+    // 平台分类；
+    getCategoryList() {
+      categoryListApi()
+        .then(res => {
+          this.categoryList = res.data
+        })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+    // 顶部切换并初始化选择的商品
+    getProduct() {
+      this.getList()
+      this.changeType()
+    },
+    // 列表表头；
+    getLstFilterApi() {
+      lstFilterApi()
+        .then(res => {
+          this.headeNum = res.data
+        })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true
+      this.tableFrom.page = num || this.tableFrom.page
+      cloudProductListApi(this.tableFrom)
+        .then(res => {
+          this.tableData.data = res.data.list
+          this.tableData.total = res.data.count
+          this.listLoading = false
+        })
+        .catch(res => {
+          this.listLoading = false
+          this.$message.error(res.message)
+        })
+      this.getLstFilterApi()
+    },
+    pageChange(page) {
+      this.tableFrom.page = page
+      this.getList('')
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val
+      this.getList('')
+    },
+    // 删除
+    handleDelete(id, idx) {
+      this.$modalSure(this.tableFrom.type !== '5' ? '加入回收站' : '删除该商品').then(
+        () => {
+          this.tableFrom.type === '5'
+            ? destoryApi(id)
+              .then(({ message }) => {
+                this.$message.success(message)
+                this.getList('')
+                this.getLstFilterApi()
+              })
+              .catch(({ message }) => {
+                this.$message.error(message)
+              })
+            : productDeleteApi(id)
+              .then(({ message }) => {
+                this.$message.success(message)
+                this.getList('')
+                this.getLstFilterApi()
+              })
+              .catch(({ message }) => {
+                this.$message.error(message)
+              })
+        }
+      )
+    },
+    // 编辑标签
+    onEditLabel(row) {
+      this.dialogLabel = true
+      this.product_id = row.product_id
+      this.labelForm = {
+        mer_labels: row.mer_labels
+      }
+    },
+    submitForm(name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.isBatch ? batchesLabelsApi(this.labelForm).then(({ message }) => {
+            this.$message.success(message)
+            this.getList('')
+            this.dialogLabel = false
+            this.isBatch = false
+          }) :
+            updatetProductLabel(this.product_id, this.labelForm).then(({ message }) => {
+              this.$message.success(message)
+              this.getList('')
+              this.dialogLabel = false
+            })
+        } else {
+          return
+        }
+      })
+    },
+    onchangeIsShow(row) {
+      statusApi(row.product_id, row.is_show)
+        .then(({ message }) => {
+          this.$message.success(message)
+          this.getList('')
+          this.getLstFilterApi()
+        })
+        .catch(({ message }) => {
+          this.$message.error(message)
+        })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.bg {
+  z-index: 100;
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.1);
+}
+
+.check {
+  color: #00a2d4;
+}
+
+.spBlock {
+  display: block;
+  cursor: pointer;
+}
+
+.tags_name {
+  font-size: 10px;
+  height: 16px;
+  line-height: 16px;
+  padding: 0 2px;
+  margin-right: 2px;
+
+  &.name0 {
+    color: var(--prev-color-primary);
+  }
+
+  &.name1 {
+    color: #FF8A4D;
+  }
+}
+
+.member-link {
+  color: var(--prev-color-primary);
+}
+
+.goods_detail .goods_detail_wrapper {
+  z-index: -10;
+}
+
+::v-deep table.el-input__inner {
+  padding: 0;
+}
+
+.demo-table-expand {
+  font-size: 0;
+}
+
+.demo-table-expand1 ::v-deep label {
+  color: #99a9bf;
+}
+
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 33.33%;
+}
+
+.width100 {
+  width: 400px;
+}
+
+.seachTiele {
+  line-height: 35px;
+}
+
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+
+::v-deep .batch-tab .el-tabs__item {
+  padding-left: 0;
+  height: 50px;
+  line-height: 50px;
+}
+
+.batch-tab .el-tabs {
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .batch-tab .el-tabs__content {
+  min-width: 560px;
+}
+</style>
diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue
index 640337d..e009e76 100644
--- a/src/views/product/productList/index.vue
+++ b/src/views/product/productList/index.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="divBox">
-    <div class="selCard">  
+    <div class="selCard">
       <el-form :model="tableFrom" ref="searchForm" size="small" label-width="95px" :inline="true">
         <el-form-item label="平台分类：" prop="cate_id">
-          <el-cascader v-model="tableFrom.cate_id" class="selWidth" :options="categoryList" :props="props" clearable @change="getList(1)" />
+          <el-cascader v-model="tableFrom.cate_id" class="selWidth" :options="categoryList" :props="props" clearable
+            @change="getList(1)" />
         </el-form-item>
         <el-form-item label="商户分类：" prop="mer_cate_id">
-          <el-select v-model="tableFrom.mer_cate_id" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
+          <el-select v-model="tableFrom.mer_cate_id" placeholder="请选择" class="filter-item selWidth" clearable
+            @change="getList(1)">
             <el-option v-for="item in merCateList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
@@ -17,132 +19,113 @@
           </el-select>
         </el-form-item>
         <el-form-item label="会员价：" prop="svip_price_type">
-          <el-select v-model="tableFrom.svip_price_type" placeholder="请选择" class="selWidth" clearable @change="getList(1)">
+          <el-select v-model="tableFrom.svip_price_type" placeholder="请选择" class="selWidth" clearable
+            @change="getList(1)">
             <el-option label="未设置" value="0" />
             <el-option label="默认设置" value="1" />
             <el-option label="自定义设置" value="2" />
           </el-select>
         </el-form-item>
         <el-form-item label="商品状态：" prop="us_status">
-          <el-select v-model="tableFrom.us_status" placeholder="请选择" class="filter-item selWidth" clearable @change="getList">
+          <el-select v-model="tableFrom.us_status" placeholder="请选择" class="filter-item selWidth" clearable
+            @change="getList">
             <el-option v-for="item in productStatusList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="标签：" prop="mer_labels">
-          <el-select
-            v-model="tableFrom.mer_labels"
-            placeholder="请选择"
-            class="filter-item selWidth"
-            clearable
-            filterable
-            @change="getList(1)"
-          >
-            <el-option
-              v-for="item in labelList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
+          <el-select v-model="tableFrom.mer_labels" placeholder="请选择" class="filter-item selWidth" clearable filterable
+            @change="getList(1)">
+            <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="运费模板：" prop="temp_id">
-          <el-select
-            v-model="tableFrom.temp_id"
-            placeholder="请选择"
-            class="filter-item selWidth"
-            clearable
-            filterable
-            @change="getList(1)"
-          >
-            <el-option
-              v-for="item in tempList"
-              :key="item.shipping_template_id"
-              :label="item.name"
-              :value="item.shipping_template_id"
-            />
+          <el-select v-model="tableFrom.temp_id" placeholder="请选择" class="filter-item selWidth" clearable filterable
+            @change="getList(1)">
+            <el-option v-for="item in tempList" :key="item.shipping_template_id" :label="item.name"
+              :value="item.shipping_template_id" />
           </el-select>
         </el-form-item>
         <el-form-item label="系统表单：" prop="form_id">
-          <el-select
-            v-model="tableFrom.form_id"
-            placeholder="请选择"
-            class="filter-item selWidth"
-            clearable
-            filterable
-            @change="getList(1)"
-          >
-            <el-option
-              v-for="item in formList"
-              :key="item.form_id"
-              :label="item.name"
-              :value="item.form_id"
-            />
+          <el-select v-model="tableFrom.form_id" placeholder="请选择" class="filter-item selWidth" clearable filterable
+            @change="getList(1)">
+            <el-option v-for="item in formList" :key="item.form_id" :label="item.name" :value="item.form_id" />
           </el-select>
         </el-form-item>
         <el-form-item label="关键字：" prop="keyword">
-          <el-input v-model="tableFrom.keyword" placeholder="请输入商品名称，关键字" class="selWidth" clearable @keyup.enter.native="getList(1)" />
+          <el-input v-model="tableFrom.keyword" placeholder="请输入商品名称，关键字" class="selWidth" clearable
+            @keyup.enter.native="getList(1)" />
         </el-form-item>
         <el-form-item label="商品类型：" prop="is_ficti">
-          <el-select v-model="tableFrom.is_ficti" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
+          <el-select v-model="tableFrom.is_ficti" placeholder="请选择" class="filter-item selWidth" clearable
+            @change="getList(1)">
             <el-option v-for="item in productTypeList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
-          <el-button size="small" @click="searchReset()">重置</el-button> 
+          <el-button size="small" @click="searchReset()">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
-    <el-card class="mt14"> 
+    <el-card class="mt14">
       <el-tabs v-model="tableFrom.type" @tab-click="getProduct">
-        <el-tab-pane v-for="(item,index) in headeNum" :key="index" :name="item.type.toString()" :label="item.name +'('+item.count +')' " />
+        <el-tab-pane v-for="(item, index) in headeNum" :key="index" :name="item.type.toString()"
+          :label="item.name + '(' + item.count + ')'" />
       </el-tabs>
       <div class="mt5 mb14">
-        <router-link :to="{ path:`${roterPre}` + '/product/list/addProduct' }" class="mr10">
+        <router-link :to="{ path: `${roterPre}` + '/product/list/addProduct' }" class="mr10">
           <el-button size="small" type="primary">添加商品</el-button>
         </router-link>
         <el-button size="small" type="success" @click="onCopy">商品采集</el-button>
-        <el-button size="small" :disabled="checkedIds.length == 0 && !allCheck" type="default" @click="openBatch">批量设置</el-button>
-        <el-button size="small" :disabled="tableFrom.type != 1 || checkedIds.length == 0 && !allCheck" @click="batchOff">批量下架</el-button>
-        <el-button size="small" :disabled="tableFrom.type != 2 || checkedIds.length == 0 && !allCheck" @click="batchShelf">批量上架</el-button>
+        <el-button size="small" :disabled="checkedIds.length == 0 && !allCheck" type="default"
+          @click="openBatch">批量设置</el-button>
+        <el-button size="small" :disabled="tableFrom.type != 1 || checkedIds.length == 0 && !allCheck"
+          @click="batchOff">批量下架</el-button>
+        <el-button size="small" :disabled="tableFrom.type != 2 || checkedIds.length == 0 && !allCheck"
+          @click="batchShelf">批量上架</el-button>
+        <el-button size="small" @click="joinCloud">加入云商品</el-button>
       </div>
-      <el-alert v-if="checkedIds.length>0 || allCheck" :title="allCheck ? `已选择  ${tableData.total}  项` : `已选择  ${checkedIds.length}  项`" type="info" show-icon class="mb10" />
-      <el-table 
-        v-loading="listLoading" 
-        :data="tableData.data" 
-        size="small" 
-        :row-class-name="tableRowClassName" 
-        :row-key="(row) => { return row.product_id }"
-        @selection-change="handleSelectionChange"
+      <el-alert v-if="checkedIds.length > 0 || allCheck"
+        :title="allCheck ? `已选择  ${tableData.total}  项` : `已选择  ${checkedIds.length}  项`" type="info" show-icon
+        class="mb10" />
+      <el-table v-loading="listLoading" :data="tableData.data" size="small" :row-class-name="tableRowClassName"
+        :row-key="(row) => { return row.product_id }" @selection-change="handleSelectionChange"
         @rowclick.stop="closeEdit">
-        <el-table-column  width="50">
+        <el-table-column width="50">
           <template slot="header" slot-scope="scope">
             <el-popover placement="top-start" width="100" trigger="hover" class="tabPop">
-                <div>
-                <span class="spBlock onHand" :class="{'check': chkName === 'dan'}" @click="onHandle('dan',scope.$index)">选中本页</span>
-                <span class="spBlock onHand" :class="{'check': chkName === 'duo'}" @click="onHandle('duo')">选中全部</span>
-                </div>
-                <el-checkbox slot="reference" :value="(chkName === 'dan' && checkedPage.indexOf(tableFrom.page) > -1) || chkName === 'duo'" @change="changeType" />
+              <div>
+                <span class="spBlock onHand" :class="{ 'check': chkName === 'dan' }"
+                  @click="onHandle('dan', scope.$index)">选中本页</span>
+                <span class="spBlock onHand" :class="{ 'check': chkName === 'duo' }"
+                  @click="onHandle('duo')">选中全部</span>
+              </div>
+              <el-checkbox slot="reference"
+                :value="(chkName === 'dan' && checkedPage.indexOf(tableFrom.page) > -1) || chkName === 'duo'"
+                @change="changeType" />
             </el-popover>
           </template>
-         <template slot-scope="scope">
-            <el-checkbox :disabled="scope.row.cancel_time" :value="!scope.row.cancel_time && (checkedIds.indexOf(scope.row.product_id) > -1 || (chkName === 'duo' && noChecked.indexOf(scope.row.product_id) === -1))" @change="(v)=>changeOne(v,scope.row)" />
-         </template>
+          <template slot-scope="scope">
+            <el-checkbox :disabled="scope.row.cancel_time"
+              :value="!scope.row.cancel_time && (checkedIds.indexOf(scope.row.product_id) > -1 || (chkName === 'duo' && noChecked.indexOf(scope.row.product_id) === -1))"
+              @change="(v) => changeOne(v, scope.row)" />
+          </template>
         </el-table-column>
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-form label-position="left" inline class="demo-table-expand demo-table-expand1" label-width="90px">
               <el-form-item label="平台分类：">
-                <span>{{ props.row.storeCategory?props.row.storeCategory.cate_name:'-' }}</span>
+                <span>{{ props.row.storeCategory ? props.row.storeCategory.cate_name : '-' }}</span>
               </el-form-item>
               <el-form-item label="商品分类：">
                 <template v-if="props.row.merCateId.length">
-                  <span v-for="(item, index) in props.row.merCateId" :key="index" class="mr10">{{ item.category.cate_name }}</span>
+                  <span v-for="(item, index) in props.row.merCateId" :key="index" class="mr10">{{
+        item.category.cate_name }}</span>
                 </template>
                 <span v-else>-</span>
               </el-form-item>
               <el-form-item label="品牌：">
-                <span class="mr10">{{ props.row.brand?props.row.brand.brand_name:'其他' }}</span>
+                <span class="mr10">{{ props.row.brand ? props.row.brand.brand_name : '其他' }}</span>
               </el-form-item>
               <el-form-item label="市场价格：">
                 <span>{{ props.row.ot_price | filterEmpty }}</span>
@@ -169,7 +152,8 @@
         </el-table-column>
         <el-table-column prop="store_name" label="商品名称" min-width="230">
           <template slot-scope="scope">
-            <div><span class="tags_name" :class="'name'+scope.row.spec_type">{{ scope.row.spec_type==0 ? '[单规格]' : '[多规格]' }}</span>{{ scope.row.store_name || '-' }}</div>
+            <div><span class="tags_name" :class="'name' + scope.row.spec_type">{{ scope.row.spec_type == 0 ? '[单规格]' :
+        '[多规格]' }}</span>{{ scope.row.store_name || '-' }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="price" label="商品售价" min-width="80" />
@@ -178,14 +162,16 @@
         <el-table-column prop="sort" align="center" label="排序" min-width="80">
           <template slot-scope="scope">
             <span v-if="scope.row.index === tabClickIndex">
-              <el-input v-model.number="scope.row['sort']" type="number" maxlength="300" size="mini" autofocus @blur="inputBlur(scope)" />
+              <el-input v-model.number="scope.row['sort']" type="number" maxlength="300" size="mini" autofocus
+                @blur="inputBlur(scope)" />
             </span>
             <span v-else @dblclick.stop="tabClick(scope.row)">{{ scope.row['sort'] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="Number(tableFrom.type) < 5" key="1" prop="status" label="上/下架" min-width="90">
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.is_show" :active-value="1" :inactive-value="0" :width="55" active-text="上架" inactive-text="下架" @change="onchangeIsShow(scope.row)" />
+            <el-switch v-model="scope.row.is_show" :active-value="1" :inactive-value="0" :width="55" active-text="上架"
+              inactive-text="下架" @change="onchangeIsShow(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column prop="stock" label="商品状态" min-width="90">
@@ -195,90 +181,81 @@
         </el-table-column>
         <el-table-column label="操作" min-width="150" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" size="small" class="mr10" @click="onDetails(scope.row.product_id)">详情</el-button> 
-            <router-link v-if="tableFrom.type != 5" :to="{path: roterPre + '/product/list/addProduct/' + scope.row.product_id}">
+            <el-button type="text" size="small" class="mr10" @click="onDetails(scope.row.product_id)">详情</el-button>
+            <router-link v-if="tableFrom.type != 5"
+              :to="{ path: roterPre + '/product/list/addProduct/' + scope.row.product_id }">
               <el-button type="text" size="small" class="mr10">编辑</el-button>
             </router-link>
-            <el-button v-if="tableFrom.type !== '5'" type="text" size="small" class="mr10" @click="handlePreview(scope.row.product_id)">预览</el-button>
+            <el-button v-if="tableFrom.type !== '5'" type="text" size="small" class="mr10"
+              @click="handlePreview(scope.row.product_id)">预览</el-button>
             <el-dropdown>
               <span class="el-dropdown-link">
-                  更多<i class="el-icon-arrow-down el-icon--right" />
+                更多<i class="el-icon-arrow-down el-icon--right" />
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-if="tableFrom.type !== '5' && is_audit == '1'" @click.native="onAuditFree(scope.row)">免审编辑</el-dropdown-item>
+                <el-dropdown-item v-if="tableFrom.type !== '5' && is_audit == '1'"
+                  @click.native="onAuditFree(scope.row)">免审编辑</el-dropdown-item>
                 <el-dropdown-item v-if="tableFrom.type != 5">
-                  <router-link :to="{path: roterPre + '/product/list/addProduct/' + scope.row.product_id+'?type=copy'}">
+                  <router-link
+                    :to="{ path: roterPre + '/product/list/addProduct/' + scope.row.product_id + '?type=copy' }">
                     复制商品
                   </router-link>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="tableFrom.type !== '5'" @click.native="onEditLabel(scope.row)">编辑标签</el-dropdown-item>
+                <el-dropdown-item v-if="tableFrom.type !== '5'"
+                  @click.native="onEditLabel(scope.row)">编辑标签</el-dropdown-item>
                 <el-dropdown-item v-if="tableFrom.type != 5">
-                  <router-link :to="{path: roterPre + '/product/reviews/?product_id=' + scope.row.product_id}">
+                  <router-link :to="{ path: roterPre + '/product/reviews/?product_id=' + scope.row.product_id }">
                     查看评价
                   </router-link>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="tableFrom.type !== '1' && tableFrom.type!== '3' && tableFrom.type !=='4'" @click.native="handleDelete(scope.row.product_id, scope.$index)">{{ tableFrom.type === '5' ? '删除' : '加入回收站' }}</el-dropdown-item>
-                <el-dropdown-item v-if="tableFrom.type === '5'" @click.native="handleRestore(scope.row.product_id)">恢复商品</el-dropdown-item> 
+                <el-dropdown-item v-if="tableFrom.type !== '1' && tableFrom.type !== '3' && tableFrom.type !== '4'"
+                  @click.native="handleDelete(scope.row.product_id, scope.$index)">{{ tableFrom.type === '5' ? '删除' :
+        '加入回收站' }}</el-dropdown-item>
+                <el-dropdown-item v-if="tableFrom.type === '5'"
+                  @click.native="handleRestore(scope.row.product_id)">恢复商品</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
       <div class="block">
-        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page" background layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange" @current-change="pageChange" />
+        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+          @current-change="pageChange" />
       </div>
     </el-card>
     <!-- 生成淘宝京东表单-->
-    <tao-bao ref="taoBao" @getSuccess="getSuccess" :deliveryType="deliveryType" :deliveryList="deliveryList"/>
+    <tao-bao ref="taoBao" @getSuccess="getSuccess" :deliveryType="deliveryType" :deliveryList="deliveryList" />
     <!--预览商品-->
     <div v-if="previewVisible">
       <div class="bg" @click.stop="previewVisible = false" />
-      <preview-box v-if="previewVisible" ref="previewBox" :goods-id="goodsId" :product-type="0" :preview-key="previewKey" />
+      <preview-box v-if="previewVisible" ref="previewBox" :goods-id="goodsId" :product-type="0"
+        :preview-key="previewKey" />
     </div>
     <!--编辑标签-->
-    <el-dialog
-      v-if="dialogLabel"
-      title="选择标签"
-      :visible.sync="dialogLabel"
-      width="470px"
-      :before-close="handleClose"
-    >
+    <el-dialog v-if="dialogLabel" title="选择标签" :visible.sync="dialogLabel" width="470px" :before-close="handleClose">
       <el-form ref="labelForm" :model="labelForm" @submit.native.prevent size="small">
         <el-form-item>
           <el-select v-model="labelForm.mer_labels" clearable multiple placeholder="请选择" class="width100">
-            <el-option
-              v-for="item in labelList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id.toString()"
-            />
+            <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.id.toString()" />
           </el-select>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogLabel=false">取消</el-button>
+        <el-button size="small" @click="dialogLabel = false">取消</el-button>
         <el-button size="small" type="primary" @click="submitForm('labelForm')">提交</el-button>
       </span>
     </el-dialog>
     <!-- 免审核弹窗-->
-    <edit-attr ref="editAttr"/>
+    <edit-attr ref="editAttr" />
     <!--运费模板弹窗-->
-    <el-dialog
-      v-if="dialogFreight"
-      title="选择运费模板"
-      :visible.sync="dialogFreight"
-      width="800px"
-      :before-close="handleFreightClose"
-    >
+    <el-dialog v-if="dialogFreight" title="选择运费模板" :visible.sync="dialogFreight" width="800px"
+      :before-close="handleFreightClose">
       <el-form ref="tempForm" :model="tempForm" :rules="tempRule" @submit.native.prevent>
         <el-form-item prop="temp_id">
           <el-select v-model="tempForm.temp_id" clearable placeholder="请选择" class="selWidth">
-            <el-option
-              v-for="item in tempList"
-              :key="item.shipping_template_id"
-              :label="item.name"
-              :value="item.shipping_template_id"
-            />
+            <el-option v-for="item in tempList" :key="item.shipping_template_id" :label="item.name"
+              :value="item.shipping_template_id" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -287,18 +264,15 @@
       </span>
     </el-dialog>
     <!--批量设置佣金弹窗-->
-    <el-dialog
-      v-if="dialogCommision"
-      title="设置佣金"
-      :visible.sync="dialogCommision"
-      width="600px"
-    >
+    <el-dialog v-if="dialogCommision" title="设置佣金" :visible.sync="dialogCommision" width="600px">
       <el-form ref="commisionForm" :model="commisionForm" :rules="commisionRule" @submit.native.prevent>
         <el-form-item label="一级佣金比例：" prop="extension_one">
-          <el-input-number v-model="commisionForm.extension_one" :precision="2" :step="0.1" :min="0" :max="1" class="priceBox" controls-position="right"/>
+          <el-input-number v-model="commisionForm.extension_one" :precision="2" :step="0.1" :min="0" :max="1"
+            class="priceBox" controls-position="right" />
         </el-form-item>
         <el-form-item label="二级佣金比例：" prop="extension_two">
-          <el-input-number v-model="commisionForm.extension_two" :precision="2" :step="0.1" :min="0" :max="1" class="priceBox" controls-position="right"/>
+          <el-input-number v-model="commisionForm.extension_two" :precision="2" :step="0.1" :min="0" :max="1"
+            class="priceBox" controls-position="right" />
         </el-form-item>
         <el-form-item>
           <span>备注：订单交易成功后给上级返佣的比例，例:0.5 = 返订单金额的50%</span>
@@ -309,23 +283,18 @@
       </span>
     </el-dialog>
     <!--批量设置付费会员价-->
-    <el-dialog
-      v-if="dialogSvip"
-      title="批量设置付费会员价"
-      :visible.sync="dialogSvip"
-      width="700px"
-    >
+    <el-dialog v-if="dialogSvip" title="批量设置付费会员价" :visible.sync="dialogSvip" width="700px">
       <el-form ref="svipForm" :model="svipForm" @submit.native.prevent label-width="80px">
-        <el-form-item
-          label="参与方式："
-        >
+        <el-form-item label="参与方式：">
           <el-radio-group v-model="svipForm.svip_price_type">
             <el-radio :label="0" class="radio">不设置会员价</el-radio>
             <el-radio :label="1" class="radio">默认设置会员价</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item>
-         备注：默认设置会员价是指商户在 <router-link :to="{path: roterPre + '/systemForm/Basics/svip'}" class="member-link"> [设置-付费会员设置] </router-link> 中设置的会员折扣价，选择后每个商品默认展示此处设置的会员折扣价。
+          备注：默认设置会员价是指商户在 <router-link :to="{ path: roterPre + '/systemForm/Basics/svip' }" class="member-link">
+            [设置-付费会员设置]
+          </router-link> 中设置的会员折扣价，选择后每个商品默认展示此处设置的会员折扣价。
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -333,23 +302,17 @@
       </span>
     </el-dialog>
     <!--批量设置弹窗-->
-    <el-dialog
-      v-if="batchModal"
-      title="批量设置"
-      :visible.sync="batchModal"
-      width="750px"
-    >
+    <el-dialog v-if="batchModal" title="批量设置" :visible.sync="batchModal" width="750px">
       <div>
-        <el-alert
-          title="每次只能修改一项，如需修改多项，请多次操作。"
-          type="warning" :closable="false">
+        <el-alert title="每次只能修改一项，如需修改多项，请多次操作。" type="warning" :closable="false">
         </el-alert>
         <div class="batch-tab mt20">
           <el-tabs :tab-position="tabPosition" v-model="batchName">
             <el-tab-pane label="商品分类" name="cate">
               <el-form size="small" label-width="120px" :inline="true">
                 <el-form-item label="平台商品分类：">
-                  <el-cascader v-model="batchData.cate_id" :options="categoryList" :props="props" clearable class="width100" />
+                  <el-cascader v-model="batchData.cate_id" :options="categoryList" :props="props" clearable
+                    class="width100" />
                 </el-form-item>
               </el-form>
             </el-tab-pane>
@@ -357,12 +320,7 @@
               <el-form size="small" label-width="120px" :inline="true">
                 <el-form-item label="商品标签：">
                   <el-select v-model="batchData.mer_labels" clearable multiple placeholder="请选择" class="width100">
-                    <el-option
-                      v-for="item in labelList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                    />
+                    <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-form>
@@ -371,11 +329,7 @@
               <el-form size="small" label-width="120px" :inline="true">
                 <el-form-item label="配送方式：">
                   <el-checkbox-group v-model="batchData.delivery_way">
-                    <el-checkbox
-                      v-for="item in deliveryList"
-                      :key="item.value"
-                      :label="item.value"
-                    >
+                    <el-checkbox v-for="item in deliveryList" :key="item.value" :label="item.value">
                       {{ item.name }}
                     </el-checkbox>
                   </el-checkbox-group>
@@ -388,17 +342,13 @@
                   <el-radio-group v-model="batchData.delivery_free">
                     <el-radio :label="1">包邮</el-radio>
                     <el-radio :label="0" class="radio">运费模板</el-radio>
-                    
+
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="batchData.delivery_free == 0">
                   <el-select v-model="batchData.temp_id" clearable placeholder="请选择" class="width100">
-                    <el-option
-                      v-for="item in tempList"
-                      :key="item.shipping_template_id"
-                      :label="item.name"
-                      :value="item.shipping_template_id"
-                    />
+                    <el-option v-for="item in tempList" :key="item.shipping_template_id" :label="item.name"
+                      :value="item.shipping_template_id" />
                   </el-select>
                 </el-form-item>
               </el-form>
@@ -406,10 +356,12 @@
             <el-tab-pane label="佣金设置" name="commission">
               <el-form size="small" label-width="120px" :inline="false">
                 <el-form-item label="一级佣金比例：">
-                  <el-input-number v-model="batchData.extension_one" :precision="2" :step="0.1" :min="0" :max="1" class="width100" controls-position="right"/>
+                  <el-input-number v-model="batchData.extension_one" :precision="2" :step="0.1" :min="0" :max="1"
+                    class="width100" controls-position="right" />
                 </el-form-item>
                 <el-form-item label="二级佣金比例：">
-                  <el-input-number v-model="batchData.extension_two" :precision="2" :step="0.1" :min="0" :max="1" class="width100" controls-position="right"/>
+                  <el-input-number v-model="batchData.extension_two" :precision="2" :step="0.1" :min="0" :max="1"
+                    class="width100" controls-position="right" />
                 </el-form-item>
                 <el-form-item>
                   <span style="color:#909399">备注：订单交易成功后给上级返佣的比例，例:0.5 = 返订单金额的50%</span>
@@ -418,54 +370,40 @@
             </el-tab-pane>
             <el-tab-pane v-if="open_svip == 1" label="付费会员设置" name="member">
               <el-form label-width="120px">
-                <el-form-item
-                  label="参与方式："
-                >
+                <el-form-item label="参与方式：">
                   <el-radio-group v-model="batchData.svip_price_type">
                     <el-radio :label="0" class="radio">不设置会员价</el-radio>
                     <el-radio :label="1" class="radio">默认设置会员价</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item>
-                备注：默认设置会员价是指商户在 <router-link :to="{path: roterPre + '/systemForm/Basics/svip'}" class="member-link"> [设置-付费会员设置] </router-link> 中设置的会员折扣价，选择后每个商品默认展示此处设置的会员折扣价。
+                  备注：默认设置会员价是指商户在 <router-link :to="{ path: roterPre + '/systemForm/Basics/svip' }" class="member-link">
+                    [设置-付费会员设置] </router-link> 中设置的会员折扣价，选择后每个商品默认展示此处设置的会员折扣价。
                 </el-form-item>
               </el-form>
             </el-tab-pane>
             <el-tab-pane label="系统表单" name="sys_form">
               <el-form label-width="120px">
                 <el-form-item label="系统表单：">
-                  <el-select
-                    size="small"
-                    clearable
-                    v-model="batchData.mer_form_id"
-                    @change="getFormInfo"
-                    class="width100"
-                    >
-                    <el-option
-                      v-for="items in formList"
-                      :key="items.form_id"
-                      :value="items.form_id"
-                      :label="items.name"
-                    >{{ items.name }}
+                  <el-select size="small" clearable v-model="batchData.mer_form_id" @change="getFormInfo"
+                    class="width100">
+                    <el-option v-for="items in formList" :key="items.form_id" :value="items.form_id"
+                      :label="items.name">{{
+        items.name }}
                     </el-option>
                   </el-select>
                 </el-form-item>
-               <el-form-item v-if="formData.length>0">
-                  <el-table
-                    border
-                    class="specsList"
-                    :data="formData"
-                    size="small"
-                  >
+                <el-form-item v-if="formData.length > 0">
+                  <el-table border class="specsList" :data="formData" size="small">
                     <el-table-column prop="label" label="表单标题" min-width="100" />
                     <el-table-column prop="type" label="表单类型" min-width="100">
                       <template slot-scope="{row}">
-                        <span>{{row.type | formTypeFilter}}</span>
+                        <span>{{ row.type | formTypeFilter }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column min-width="100" label="是否必填">
                       <template slot-scope="{row}">
-                        <span>{{row.val ? '必填'  : '不必填'}}</span>
+                        <span>{{ row.val ? '必填' : '不必填' }}</span>
                       </template>
                     </el-table-column>
                   </el-table>
@@ -482,8 +420,12 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item>
-                  <el-input-number v-model="batchData.price_number" :precision="2" :step="0.1" :min="0" class="width100" controls-position="right"/>
-                  <span style="color:#909399">({{ (batchData.price_type=='add' || batchData.price_type=='sub') ? '元' : '%' }})</span>
+                  <el-input-number v-model="batchData.price_number" :precision="2" :step="0.1" :min="0" class="width100"
+                    controls-position="right" />
+                  <span style="color:#909399">({{ (batchData.price_type == 'add' || batchData.price_type == 'sub') ? '元'
+        :
+        '%'
+                    }})</span>
                 </el-form-item>
                 <el-form-item>
                   <div style="color:#F56464">注：批量设置价格为敏感操作，请谨慎操作！</div>
@@ -498,14 +440,24 @@
       </span>
     </el-dialog>
     <!--商品详情-->
-     <pro-detail
-      ref="proDetail"
-      :productId="product_id"
-      :configData="configData"
-      @closeDrawer="closeDrawer"
-      @changeDrawer="changeDrawer"
-      :drawer="drawer"
-    ></pro-detail>
+    <pro-detail ref="proDetail" :productId="product_id" :configData="configData" @closeDrawer="closeDrawer"
+      @changeDrawer="changeDrawer" :drawer="drawer"></pro-detail>
+
+    <el-dialog title="上传云商品" :visible.sync="showShow" width="650px" :before-close="handleClose">
+      <el-form>
+        <el-form-item label="商品分类">
+          <el-select multiple v-model="selectedCategoryIds" style="width:300px;">
+            <el-option v-for="(item, indx) in categoryBox" :label="item.category_name"
+              :value="item.merchant_category_id"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="showShow = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submitProduct">提交</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -539,7 +491,9 @@ import {
   productBathSvipApi,
   associatedFormList,
   associatedFormInfo,
-  batchSetProduct
+  batchSetProduct,
+  importApi,
+  newCategorySelectApi
 } from '@/api/product'
 import { roterPre } from '@/settings'
 import taoBao from './taoBao'
@@ -551,6 +505,9 @@ export default {
   components: { taoBao, previewBox, editAttr, proDetail },
   data() {
     return {
+      showShow: false,
+      categoryBox: [],
+      selectedCategoryIds: [],
       props: {
         emitPath: false
       },
@@ -596,14 +553,14 @@ export default {
         { label: '卡密商品', value: 2 }
       ],
       tempRule: {
-        temp_id: [{required: true,message: '请选择运费模板',trigger: 'change'}]
+        temp_id: [{ required: true, message: '请选择运费模板', trigger: 'change' }]
       },
       commisionRule: {
-        extension_one: [{required: true,message: '请输入一级佣金',trigger: 'change'}],
-        extension_two: [{required: true,message: '请输入二级佣金',trigger: 'change'}]
+        extension_one: [{ required: true, message: '请输入一级佣金', trigger: 'change' }],
+        extension_two: [{ required: true, message: '请输入二级佣金', trigger: 'change' }]
       },
-      commisionForm: {extension_one:0,extension_two:0},
-      svipForm: {svip_price_type: 0},
+      commisionForm: { extension_one: 0, extension_two: 0 },
+      svipForm: { svip_price_type: 0 },
       goodsId: '',
       previewKey: '',
       product_id: '',
@@ -648,11 +605,43 @@ export default {
     this.getList(1)
     this.getLabelLst()
     this.getTempLst()
-    this.productCon()
+    this.productCon();
+
+    this.getCategory();
   },
   methods: {
+
+    // 提交云仓
+    submitProduct() {
+      if (this.selectedCategoryIds.length == 0) return this.$message.error("请至少选择一种分类数据!");
+      importApi({
+        product_ids: this.checkedIds,
+        category_ids: this.selectedCategoryIds
+      }).then(res => {
+        this.$message.success("加入成功!");
+        this.checkedIds = [];
+        this.selectedCategoryIds = [];
+        this.showShow = false;
+      }).catch(err => {
+        this.$message.success(err.message)
+      })
+    },
+
+    // 加入云仓
+    joinCloud() {
+      if (this.checkedIds.length == 0) return this.$message.error("请至少选择一个商品!");
+      this.showShow = true;
+    },
+
+    // 获取分类
+    getCategory() {
+      newCategorySelectApi().then(res => {
+        this.categoryBox = res.data;
+      })
+    },
+
     /**重置 */
-    searchReset(){
+    searchReset() {
       this.$refs.searchForm.resetFields()
       this.getList(1)
     },
@@ -672,12 +661,13 @@ export default {
           this.closeEdit()
         })
         .catch((res) => {
+
         })
     },
     closeEdit() {
       this.tabClickIndex = null
     },
-     // 选择商品
+    // 选择商品
     onHandle(name) {
       this.chkName = this.chkName === name ? '' : name
       this.changeType(!(this.chkName === ''))
@@ -697,7 +687,7 @@ export default {
       } else if (index > -1) {
         this.checkedPage.splice(index, 1)
       }
-      
+
       this.syncCheckedId()
     },
     syncCheckedId() {
@@ -746,52 +736,52 @@ export default {
       }
     },
     // 批量设置价格
-    changePrice(){
-      if(this.batchData.price_type == 'div'){
+    changePrice() {
+      if (this.batchData.price_type == 'div') {
         this.batchData.price_number = 1
-      }else{
+      } else {
         this.batchData.price_number = 0
       }
     },
     // 批量设置--提交数据
-    submitBatchForm(){
+    submitBatchForm() {
       console.log(this.batchName)
       let name = this.batchName
       switch (name) {
         case 'cate':
-          if(!this.batchData.cate_id){
+          if (!this.batchData.cate_id) {
             return this.$message.warning('请选择商品分类！')
           }
           break
         case 'delivery_method':
-          if(!this.batchData.delivery_way.length){
+          if (!this.batchData.delivery_way.length) {
             return this.$message.warning('请选择配送方式！')
           }
           break
         case 'postage':
-          if(this.batchData.delivery_free != 0 && this.batchData.delivery_free != 1){
+          if (this.batchData.delivery_free != 0 && this.batchData.delivery_free != 1) {
             return this.$message.warning('请选择运费设置！')
           }
-          if(this.batchData.delivery_free == 0 && !this.batchData.temp_id){
+          if (this.batchData.delivery_free == 0 && !this.batchData.temp_id) {
             return this.$message.warning('请选择运费模板！')
           }
           break
         case 'commission':
           this.batchData.extension_one = this.batchData.extension_one || 0
-          this.batchData.extension_two = this.batchData.extension_two || 0  
+          this.batchData.extension_two = this.batchData.extension_two || 0
           break
         case 'price':
-          if(this.batchData.price_type == 'div' && this.batchData.price_number == 0){
+          if (this.batchData.price_type == 'div' && this.batchData.price_number == 0) {
             return this.$message.warning('除数不能为0！')
           }
           break
       }
       let parmas = this.batchData
       parmas.batch_type = this.batchName
-      if(this.allCheck){
+      if (this.allCheck) {
         parmas.batch_select_type = 'all'
         parmas.where = this.tableFrom
-      }else{
+      } else {
         parmas.batch_select_type = 'select'
         parmas.ids = this.checkedIds
       }
@@ -799,11 +789,11 @@ export default {
         this.batchModal = false
         this.$message.success(res.message)
       })
-      .catch((res) => {
-        this.$message.error(res.message)
-      })
+        .catch((res) => {
+          this.$message.error(res.message)
+        })
     },
-  
+
     handleSelectionChange(val) {
       this.multipleSelection = val
       const data = []
@@ -841,9 +831,9 @@ export default {
         })
     },
     // 系统表单下拉数据
-    getFormList(){
+    getFormList() {
       associatedFormList()
-      .then(res => {
+        .then(res => {
           this.formList = res.data
         })
         .catch(res => {
@@ -851,17 +841,17 @@ export default {
         })
     },
     // 关联的表单信息
-    getFormInfo(){
-      if(this.batchData.mer_form_id){
+    getFormInfo() {
+      if (this.batchData.mer_form_id) {
         associatedFormInfo(this.batchData.mer_form_id).then((res) => {
           this.formData = res.data
         })
-        .catch((res) => {
-          this.$message.error(res.message)
-        })
-      }else{
+          .catch((res) => {
+            this.$message.error(res.message)
+          })
+      } else {
         this.formData = []
-      }  
+      }
     },
     getSuccess() {
       this.getLstFilterApi()
@@ -879,13 +869,13 @@ export default {
     },
     // 复制淘宝
     onCopy() {
-       this.$router.push({
+      this.$router.push({
         path: this.roterPre + '/product/list/addProduct',
         query: { type: 1 },
       });
     },
     // 打开批量设置弹窗
-    openBatch(){
+    openBatch() {
       this.batchModal = true;
     },
     // 获取标签项
@@ -893,18 +883,18 @@ export default {
       getProductLabelApi().then(res => {
         this.labelList = res.data
       })
-      .catch(res => {
-        this.$message.error(res.message)
-      })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
     },
     // 获取运费模板
     getTempLst() {
       shippingListApi().then(res => {
         this.tempList = res.data
       })
-      .catch(res => {
-        this.$message.error(res.message)
-      })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
     },
     // 免审编辑
     onAuditFree(row) {
@@ -917,7 +907,7 @@ export default {
     },
     // 批量设置会员价
     batchSvip() {
-      if(this.multipleSelection.length === 0) return this.$message.warning('请先选择商品')
+      if (this.multipleSelection.length === 0) return this.$message.warning('请先选择商品')
       this.dialogSvip = true;
     },
     submitCommisionForm(name) {
@@ -945,45 +935,45 @@ export default {
     },
     // 批量上架
     batchShelf() {
-      if(this.checkedIds.length === 0 && !this.allCheck) return this.$message.warning('请先选择商品')
+      if (this.checkedIds.length === 0 && !this.allCheck) return this.$message.warning('请先选择商品')
       let ids = []
-      if(this.allCheck){
+      if (this.allCheck) {
         this.tableData.data.map((item) => {
           ids.push(item.product_id)
         })
-      }else{
+      } else {
         ids = this.checkedIds
       }
-      let data = {status: 1,ids: ids}
+      let data = { status: 1, ids: ids }
       batchesOnOffApi(data).then(res => {
         this.$message.success(res.message)
         this.getLstFilterApi()
         this.getList('')
       })
-      .catch(res => {
-        this.$message.error(res.message)
-      })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
     },
     // 批量下架
     batchOff() {
-      if(this.checkedIds.length === 0 && !this.allCheck) return this.$message.warning('请先选择商品')
+      if (this.checkedIds.length === 0 && !this.allCheck) return this.$message.warning('请先选择商品')
       let ids = []
-      if(this.allCheck){
+      if (this.allCheck) {
         this.tableData.data.map((item) => {
           ids.push(item.product_id)
         })
-      }else{
+      } else {
         ids = this.checkedIds
       }
-     let data = {status: 0,ids: ids}
+      let data = { status: 0, ids: ids }
       batchesOnOffApi(data).then(res => {
         this.$message.success(res.message)
         this.getLstFilterApi()
         this.getList('')
       })
-      .catch(res => {
-        this.$message.error(res.message)
-      })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
     },
     // 批量设置标签
     batchLabel() {
@@ -1064,7 +1054,7 @@ export default {
         })
     },
     // 顶部切换并初始化选择的商品
-    getProduct(){
+    getProduct() {
       this.getList()
       this.changeType()
     },
@@ -1139,17 +1129,17 @@ export default {
     submitForm(name) {
       this.$refs[name].validate(valid => {
         if (valid) {
-         this.isBatch ? batchesLabelsApi(this.labelForm).then(({ message }) => {
+          this.isBatch ? batchesLabelsApi(this.labelForm).then(({ message }) => {
             this.$message.success(message)
             this.getList('')
             this.dialogLabel = false
             this.isBatch = false
           }) :
-          updatetProductLabel(this.product_id, this.labelForm).then(({ message }) => {
-            this.$message.success(message)
-            this.getList('')
-            this.dialogLabel = false
-          })
+            updatetProductLabel(this.product_id, this.labelForm).then(({ message }) => {
+              this.$message.success(message)
+              this.getList('')
+              this.dialogLabel = false
+            })
         } else {
           return
         }
@@ -1180,65 +1170,82 @@ export default {
   height: 100%;
   background: rgba(0, 0, 0, 0.1);
 }
+
 .check {
   color: #00a2d4;
 }
-.spBlock{
+
+.spBlock {
   display: block;
   cursor: pointer;
 }
-.tags_name{
+
+.tags_name {
   font-size: 10px;
   height: 16px;
   line-height: 16px;
   padding: 0 2px;
   margin-right: 2px;
-  &.name0{
+
+  &.name0 {
     color: var(--prev-color-primary);
   }
-  &.name1{
+
+  &.name1 {
     color: #FF8A4D;
   }
 }
-.member-link{
+
+.member-link {
   color: var(--prev-color-primary);
 }
+
 .goods_detail .goods_detail_wrapper {
   z-index: -10;
 }
+
 ::v-deep table.el-input__inner {
   padding: 0;
 }
+
 .demo-table-expand {
   font-size: 0;
 }
+
 .demo-table-expand1 ::v-deep label {
   color: #99a9bf;
 }
+
 .demo-table-expand .el-form-item {
   margin-right: 0;
   margin-bottom: 0;
   width: 33.33%;
 }
+
 .width100 {
   width: 400px;
 }
+
 .seachTiele {
   line-height: 35px;
 }
+
 .el-icon-arrow-down {
   font-size: 12px;
 }
-::v-deep .batch-tab .el-tabs__item{
+
+::v-deep .batch-tab .el-tabs__item {
   padding-left: 0;
   height: 50px;
   line-height: 50px;
 }
-.batch-tab .el-tabs{
+
+.batch-tab .el-tabs {
   display: flex;
   align-items: center;
 }
-::v-deep .batch-tab .el-tabs__content{
+
+::v-deep .batch-tab .el-tabs__content {
   min-width: 560px;
 }
 </style>
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index 9e5fe57..20ab52c 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -1,21 +1,21 @@
 <template>
   <div class="information">
     <el-tabs v-if="tabList.length > 0" v-model="infoType">
-      <el-tab-pane v-for="(item,index) in tabList" :key="index" :name="item.value" :label="item.title " />
+      <el-tab-pane v-for="(item, index) in tabList" :key="index" :name="item.value" :label="item.title" />
     </el-tabs>
     <div v-if="merModel" class="business-msg" style="min-height: 600px;">
       <div v-if="infoType == '1'" class="user-msg">
         <div class="basic-information">
           <span class="basic-label">商户名称：</span>
-           {{ merData.mer_name }}
+          {{ merData.mer_name }}
         </div>
-         <div class="basic-information">
+        <div class="basic-information">
           <span class="basic-label">商户负责人手机号：</span>
-           {{ merData.mer_phone }}
+          {{ merData.mer_phone }}
         </div>
         <div v-if="merData.merchantCategory.category_name" class="basic-information">
           <span class="basic-label">商户分类：</span>
-           {{ merData.merchantCategory.category_name || "" }}
+          {{ merData.merchantCategory.category_name || "" }}
         </div>
         <div v-if="merData.merchantType" class="basic-information">
           <span class="basic-label"> 商户类型：</span>
@@ -27,7 +27,7 @@
         </div>
         <div class="basic-information">
           <span class="basic-label"> 商户负责人姓名：</span>
-           {{ merData.real_name }}
+          {{ merData.real_name }}
         </div>
         <div class="basic-information">
           <span class="basic-label"> 商户入驻时间：</span>
@@ -44,10 +44,13 @@
         <div class="basic-information">
           <div>
             <span class="basic-label">是否开启商户：</span>
-            <el-tooltip v-if="merData.is_margin == 1 && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金！" placement="top-start">
-              <el-switch disabled v-model="merData.mer_state" :width="55" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
+            <el-tooltip v-if="merData.is_margin == 1 && merData.mer_state == 0" class="item" effect="dark"
+              content="请先支付店铺保证金！" placement="top-start">
+              <el-switch disabled v-model="merData.mer_state" :width="55" active-text="开启" inactive-text="关闭"
+                :active-value="1" :inactive-value="0" />
             </el-tooltip>
-            <el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" :width="55" />
+            <el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1"
+              :inactive-value="0" :width="55" />
             <span class="trip">开启，店铺即可展示在移动端</span>
           </div>
         </div>
@@ -56,7 +59,7 @@
             <!--未支付-->
             <div v-if="merData.is_margin == 1">
               <span class="basic-label">店铺保证金：</span>
-              <span class="font_red">{{merData.margin}}元</span>
+              <span class="font_red">{{ merData.margin }}元</span>
               <div class="margin_count" @mouseenter="getCode()">
                 <el-button type="text" size="small" class="mr10 pay_btn">去支付保证金</el-button>
                 <!--支付二维码-->
@@ -64,68 +67,70 @@
                   <div class="pay_title">支付保证金</div>
                   <div>
                     <vue-qr class="bicode" :text="qrCode" :size="310" />
-                    <div class="pay_type" >请使用微信扫码支付</div>
-                     <div class="pay_price" >￥{{marginPrice}}元</div>
-                    <div class="pay_time">支付码过期时间： {{qrEndTime}}</div>
+                    <div class="pay_type">请使用微信扫码支付</div>
+                    <div class="pay_price">￥{{ marginPrice }}元</div>
+                    <div class="pay_time">支付码过期时间： {{ qrEndTime }}</div>
                   </div>
                 </div>
               </div>
             </div>
             <!--已支付-->
-            <div class="margin_main" v-if="merData.is_margin == 10 ">
+            <div class="margin_main" v-if="merData.is_margin == 10">
               <span class="basic-label">店铺保证金：</span>
-              <span class="margin_price">{{merData.margin}}元</span>
+              <span class="margin_price">{{ merData.margin }}元</span>
               <div class="margin_count">
                 <span class="mr10 spanBtn" @click="viewRecords">查看保证金记录</span>
-                 <!--保证金弹窗-->
-                <div class="margin_modal"  @mouseleave="supplyPay=false">
+                <!--保证金弹窗-->
+                <div class="margin_modal" @mouseleave="supplyPay = false">
                   <div>
-                    <img src="@/assets/images/margin03.png"/>
+                    <img src="@/assets/images/margin03.png" />
                     <div class="alic">
-                      <span class="text_g">剩余保证金￥{{merData.margin}}元</span>
-                      <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
+                      <span class="text_g">剩余保证金￥{{ merData.margin }}元</span>
+                      <el-button v-if="merData.margin > 0" type="primary" size="small"
+                        @click="applyReturn">申请退回保证金</el-button>
                     </div>
                   </div>
                 </div>
               </div>
               <div v-if="merData.marginStatus" style="display: inline-block;">
                 <div class="margin_count" @mouseenter="getCode()">
-                <el-button type="text" size="small" class="mr10 pay_btn">去补缴保证金</el-button>
-                <!--支付二维码-->
-                <div class="erweima">
-                  <div class="pay_title">支付保证金</div>
-                  <div>
-                    <vue-qr class="bicode" :text="qrCode" :size="310" />
-                    <div class="pay_type" >请使用微信扫码支付</div>
-                     <div class="pay_price" >￥{{marginPrice}}元</div>
-                    <div class="pay_time">支付码过期时间： {{qrEndTime}}</div>
+                  <el-button type="text" size="small" class="mr10 pay_btn">去补缴保证金</el-button>
+                  <!--支付二维码-->
+                  <div class="erweima">
+                    <div class="pay_title">支付保证金</div>
+                    <div>
+                      <vue-qr class="bicode" :text="qrCode" :size="310" />
+                      <div class="pay_type">请使用微信扫码支付</div>
+                      <div class="pay_price">￥{{ marginPrice }}元</div>
+                      <div class="pay_time">支付码过期时间： {{ qrEndTime }}</div>
+                    </div>
                   </div>
                 </div>
               </div>
-              </div>
             </div>
             <div class="margin_main" v-if="merData.is_margin == -10 || merData.is_margin == -1">
               <span class="basic-label">店铺保证金：</span>
-              <span class="margin_price">{{merData.margin}}元</span>
+              <span class="margin_price">{{ merData.margin }}元</span>
               <div class="margin_count">
-                 <span class="mr10 spanBtn" @click="viewRecords">查看保证金记录</span>
+                <span class="mr10 spanBtn" @click="viewRecords">查看保证金记录</span>
                 <!--保证金弹窗-->
-                <div class="margin_modal" @mouseleave="goPay=false">
+                <div class="margin_modal" @mouseleave="goPay = false">
                   <div>
-                    <img v-if="merData.is_margin == -10" src="@/assets/images/margin01.png"/>
-                    <img v-if="merData.is_margin == -1" src="@/assets/images/margin02.png"/>
-                    <img v-if="merData.is_margin == 10" src="@/assets/images/margin03.png"/>
+                    <img v-if="merData.is_margin == -10" src="@/assets/images/margin01.png" />
+                    <img v-if="merData.is_margin == -1" src="@/assets/images/margin02.png" />
+                    <img v-if="merData.is_margin == 10" src="@/assets/images/margin03.png" />
                     <div class="alic" v-if="merData.is_margin == 10">
-                      <span class="text_g">剩余保证金￥{{merData.margin}}元</span>
-                      <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
+                      <span class="text_g">剩余保证金￥{{ merData.margin }}元</span>
+                      <el-button v-if="merData.margin > 0" type="primary" size="small"
+                        @click="applyReturn">申请退回保证金</el-button>
                     </div>
-                    <div class="alic"  v-if="merData.is_margin == -1">
+                    <div class="alic" v-if="merData.is_margin == -1">
                       <span class="text_b b01"> 审核中</span>
                       <div class="margin_refused">您申请退回保证金，正在审核中…</div>
                     </div>
-                    <div class="alic"  v-if="merData.is_margin == -10">
+                    <div class="alic" v-if="merData.is_margin == -10">
                       <span class="text_b b02">审核未通过</span>
-                      <div class="margin_refused">未通过原因：<span>{{merData.refundMarginOrder.refusal}}</span></div>
+                      <div class="margin_refused">未通过原因：<span>{{ merData.refundMarginOrder.refusal }}</span></div>
                       <el-button type="primary" size="small" @click="applyReturn">再次申请</el-button>
                     </div>
                   </div>
@@ -136,26 +141,20 @@
         </div>
       </div>
       <!--申请退回保障金银行信息弹窗-->
-       <el-dialog
-        v-if="modalBank"
-        v-model="modalBank"
-        :visible.sync="modalBank"
-        title="申请退回保证金"
-        width="600px"
-        close-on-click-modal
-        custom-class="dialog-scustom"
-      >
+      <el-dialog v-if="modalBank" v-model="modalBank" :visible.sync="modalBank" title="申请退回保证金" width="600px"
+        close-on-click-modal custom-class="dialog-scustom">
         <div class="bank-container">
           <div class="item">说明： <span class="red">申请退回保证金则视为关闭店铺，请谨慎操作！</span></div>
           <div class="item">
-            <div v-if="online > 0">线上支付的保证金 <span class="red">{{online}}元</span>会原路返回</div>
+            <div v-if="online > 0">线上支付的保证金 <span class="red">{{ online }}元</span>会原路返回</div>
 
             <div v-if="offline > 0">
-              线下支付的保证金<span class="red">{{offline}}元，</span>会通过下方账号信息返回，请务必确认下方您的收款信息真实有效，以确保资金可顺利退回，感谢配合！
+              线下支付的保证金<span class="red">{{ offline }}元，</span>会通过下方账号信息返回，请务必确认下方您的收款信息真实有效，以确保资金可顺利退回，感谢配合！
             </div>
           </div>
           <div class="title">账号信息：</div>
-           <el-form ref="bankValidate" :model="bankValidate" :rules="bankRules" label-width="100px" @submit.native.prevent>
+          <el-form ref="bankValidate" :model="bankValidate" :rules="bankRules" label-width="100px"
+            @submit.native.prevent>
             <el-form-item label="真实姓名：" prop="name">
               <el-input v-model="bankValidate.name" type="text" placeholder="请输入真实姓名" />
             </el-form-item>
@@ -180,7 +179,7 @@
       <div v-if="infoType == '2'" class="business-msg">
         <div class="form-data">
           <el-form ref="ruleForm" :model="merData" :rules="rules" label-width="150px" class="demo-ruleForm">
-            <el-form-item class="form-item" label="店铺背景图：" prop="mer_banner">
+            <!-- <el-form-item class="form-item" label="店铺背景图：" prop="mer_banner">
               <div class="upLoadPicBox" @click="modalPicTap('1')">
                 <div v-if="merData.mer_banner" class="pictrue">
                   <img :src="merData.mer_banner">
@@ -190,7 +189,7 @@
                 </div>
                 <div class="trip">建议尺寸：710*200px</div>
               </div>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item class="form-item" label="店铺头像：" prop="mer_avatar">
               <div class="upLoadPicBox" @click="modalPicTap('2')">
                 <div v-if="merData.mer_avatar" class="pictrue">
@@ -202,7 +201,7 @@
                 <div class="trip">建议尺寸：120*120px</div>
               </div>
             </el-form-item>
-            <el-form-item class="form-item" label="店铺街背景图：">
+            <!-- <el-form-item class="form-item" label="店铺街背景图：">
               <div class="upLoadPicBox" @click="modalPicTap('3')">
                 <div v-if="merData.mini_banner" class="pictrue">
                   <img :src="merData.mini_banner">
@@ -212,8 +211,9 @@
                 </div>
                 <div class="trip">建议尺寸：710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</div>
               </div>
-            </el-form-item>
-            <el-form-item class="form-item" label="店铺资质：" :prop="merData.sys_bases_status == 1 ? 'uploadedqualifications' : ''">
+            </el-form-item> -->
+            <el-form-item class="form-item" label="店铺资质："
+              :prop="merData.sys_bases_status == 1 ? 'uploadedqualifications' : ''">
               <div class="upLoadPicBox_qualification">
                 <div v-for="(item, index) in uploadedQualifications" :key="index" class="uploadpicBox_list">
                   <div class="uploadpicBox_list_image">
@@ -224,7 +224,8 @@
                     <i class="el-icon-view" @click="viewImage(item, index)" />
                   </div>
                 </div>
-                <el-upload :action="fileUrl" :show-file-list="false" list-type="picture-card" multiple :headers="myHeaders" :on-success="setQualificationsList" :before-upload="beforeUploadQualification">
+                <el-upload :action="fileUrl" :show-file-list="false" list-type="picture-card" multiple
+                  :headers="myHeaders" :on-success="setQualificationsList" :before-upload="beforeUploadQualification">
                   <i class="el-icon-plus" />
                 </el-upload>
               </div>
@@ -236,7 +237,9 @@
                 </el-checkbox>
               </el-checkbox-group> <span class="trip">只选择一种配送方式时,会自动修改店铺所有商品的配送方式</span>
             </el-form-item>
-            <el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)" :gutter="24">
+            <el-row
+              v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)"
+              :gutter="24">
               <el-col :span="24">
                 <el-form-item label="提货点名称：" prop="mer_take_name">
                   <el-input v-model="merData.mer_take_name" maxlength="30" placeholder="请输入提货点名称" />
@@ -244,14 +247,12 @@
               </el-col>
               <el-col :span="24">
                 <el-form-item label="提货点电话：" prop="mer_take_phone">
-                  <el-input
-                    v-model="merData.mer_take_phone"
-                    placeholder="请输入提货点电话"
-                  />
+                  <el-input v-model="merData.mer_take_phone" placeholder="请输入提货点电话" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)" >
+            <el-row
+              v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)">
               <el-col :span="24">
                 <el-form-item label="详细地址：" prop="mer_take_address">
                   <el-input v-model="merData.mer_take_address" placeholder="请输入详细地址" />
@@ -259,53 +260,27 @@
               </el-col>
               <el-col :span="24">
                 <el-form-item label="经纬度：" prop="mer_take_location">
-                  <el-input
-                    v-model="merData.mer_take_location"
-                    enter-button="查找位置"
-                    placeholder="请查找位置"
-                    readonly
-                  >
-                    <el-button
-                      slot="append"
-                      type="primary"
-                      @click="onSearchs"
-                    >查找位置</el-button>
+                  <el-input v-model="merData.mer_take_location" enter-button="查找位置" placeholder="请查找位置" readonly>
+                    <el-button slot="append" type="primary" @click="onSearchs">查找位置</el-button>
                   </el-input>
                   <div slot="content">请点击查找位置选择位置</div>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)" >
+            <el-row
+              v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)">
               <el-col :span="24">
                 <el-form-item label="提货点营业日期：" prop="mer_take_day">
-                  <el-select
-                    v-model="merData.mer_take_day"
-                    filterable
-                    multiple
-                    placeholder="请选择营业时间"
-                  >
-                    <el-option
-                      v-for="item in date"
-                      :key="item.date_id"
-                      :label="item.date_name"
-                      :value="item.date_id"
-                    />
+                  <el-select v-model="merData.mer_take_day" filterable multiple placeholder="请选择营业时间">
+                    <el-option v-for="item in date" :key="item.date_id" :label="item.date_name" :value="item.date_id" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="提货点营业时间：" required>
-                  <el-time-picker
-                    v-model="value1"
-                    placeholder="开始时间"
-                    value-format="HH:mm"
-                    @change="onchangeTime1">
+                  <el-time-picker v-model="value1" placeholder="开始时间" value-format="HH:mm" @change="onchangeTime1">
                   </el-time-picker>
-                  <el-time-picker
-                    v-model="value2"
-                    placeholder="结束时间"
-                    value-format="HH:mm"
-                    @change="onchangeTime2">
+                  <el-time-picker v-model="value2" placeholder="结束时间" value-format="HH:mm" @change="onchangeTime2">
                   </el-time-picker>
                 </el-form-item>
               </el-col>
@@ -323,29 +298,30 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="联系客服方式：">
-                  <el-radio-group
-                    v-model="merData.services_type"
-                  >
+                  <el-radio-group v-model="merData.services_type">
                     <el-radio :label="0" class="radio">线上客服</el-radio>
                     <el-radio :label="1">拨打电话</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="客服电话：">
-                  <el-input v-model="merData.service_phone" type="number"/>
+                  <el-input v-model="merData.service_phone" type="number" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
                 <el-form-item label="商户地址：" prop="mer_address">
-                  <el-input v-model="merData.mer_address" enter-button="查找位置" placeholder="请输入商户地址（地址中请包含城市名称，否则会影响搜索精度）">
+                  <el-input v-model="merData.mer_address" enter-button="查找位置"
+                    placeholder="请输入商户地址（地址中请包含城市名称，否则会影响搜索精度）">
                     <el-button slot="append" type="primary" @click="onSearch">查找位置</el-button>
                   </el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <div style="width: 460px;margin-left: 150px;">
-              <Maps v-if="mapKey" ref="mapChild" class="map-sty" :map-key="mapKey" :lat="Number(merData.lat || 34.34127)" :lon="Number(merData.long || 108.93984)" :address="merData.mer_address" @getCoordinates="getCoordinates" />
+              <Maps v-if="mapKey" ref="mapChild" class="map-sty" :map-key="mapKey"
+                :lat="Number(merData.lat || 34.34127)" :lon="Number(merData.long || 108.93984)"
+                :address="merData.mer_address" @getCoordinates="getCoordinates" />
             </div>
             <el-form-item />
           </el-form>
@@ -354,7 +330,8 @@
       <div v-if="infoType == '3'" class="user-msg">
         <div class="basic-information">
           <span class="basic-label"> 商户手续费：</span>
-          {{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)}}%
+          {{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) :
+      (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2) }}%
         </div>
         <div class="basic-information">
           <span class="basic-label"> 添加商品：</span>
@@ -377,54 +354,34 @@
         <el-button type="primary" :loading="submitLoading" @click="submitForm('ruleForm')">提交</el-button>
       </div>
     </div>
-    <el-dialog
-      v-if="modalMap"
-      v-model="modalMap"
-      :visible.sync="modalMap"
-      title="选择位置"
-      close-on-click-modal
-      class="mapBox"
-      custom-class="dialog-scustom"
-    >
+    <el-dialog v-if="modalMap" v-model="modalMap" :visible.sync="modalMap" title="选择位置" close-on-click-modal
+      class="mapBox" custom-class="dialog-scustom">
       <iframe id="mapPage" width="100%" height="500px" frameborder="0" :src="keyUrl" />
     </el-dialog>
     <!--保证金记录-->
-    <el-dialog
-      v-if="modalRecord"
-      :visible.sync="modalRecord"
-      title="操作记录"
-      width="800px"
-      close-on-click-modal
-      class="mapBox"
-      custom-class="dialog-scustom"
-    >
-     <el-table :data="tableData.data" :loading="loading" size="small">
-      <el-table-column label="序号" min-width="50">
-        <template scope="scope">
-          <span>{{ scope.$index+(tableFrom.page - 1) * tableFrom.limit + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="标题" min-width="90" prop="title" />
-      <el-table-column prop="number" label="金额" min-width="60">
-        <template scope="scope">
-          <span v-if="scope.row.pm == 1" style="color:#13ce66">+{{scope.row.number}}</span>
-          <span v-else style="color:rgb(237, 64, 20)">-{{scope.row.number}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="balance" label="保证金结余" min-width="100" />
-      <el-table-column label="备注" min-width="150" prop="mark" />
-      <el-table-column prop="create_time" label="操作时间" min-width="120" />
-    </el-table>
-    <div class="acea-row row-right page">
-      <el-pagination
-        :page-size="tableFrom.limit"
-        :current-page="tableFrom.page"
-        layout="prev, pager, next, jumper"
-        :total="tableData.total"
-        @size-change="handleSizeChange"
-        @current-change="pageChange"
-      />
-    </div>
+    <el-dialog v-if="modalRecord" :visible.sync="modalRecord" title="操作记录" width="800px" close-on-click-modal
+      class="mapBox" custom-class="dialog-scustom">
+      <el-table :data="tableData.data" :loading="loading" size="small">
+        <el-table-column label="序号" min-width="50">
+          <template scope="scope">
+            <span>{{ scope.$index + (tableFrom.page - 1) * tableFrom.limit + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标题" min-width="90" prop="title" />
+        <el-table-column prop="number" label="金额" min-width="60">
+          <template scope="scope">
+            <span v-if="scope.row.pm == 1" style="color:#13ce66">+{{ scope.row.number }}</span>
+            <span v-else style="color:rgb(237, 64, 20)">-{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="balance" label="保证金结余" min-width="100" />
+        <el-table-column label="备注" min-width="150" prop="mark" />
+        <el-table-column prop="create_time" label="操作时间" min-width="120" />
+      </el-table>
+      <div class="acea-row row-right page">
+        <el-pagination :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="prev, pager, next, jumper"
+          :total="tableData.total" @size-change="handleSizeChange" @current-change="pageChange" />
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -464,7 +421,7 @@ export default {
         if (value.charAt(0) == 0) {
           // charAt查找第一个字符方法，用来判断输入的是座机还是手机号
           regPone = tel
-        }else if(value.charAt(0) == 4){
+        } else if (value.charAt(0) == 4) {
           regPone = tels
         } else {
           regPone = mobile
@@ -476,38 +433,38 @@ export default {
       }
     }
 
-  // const checkPhone= (rule, value, callback) =>{
-  //     const phoneExp = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/;
-  //     setTimeout(()=>{
-  //       if(value !== undefined && value !==''){
-  //         if ((!phoneExp.test(value)) && value !== '') {
-  //           callback(new Error('请输入正确的格式！'));
-  //         } else {
-  //           callback();
-  //         }
-  //       }else{
-  //         callback()
-  //       }
-  //     },100)
-  //   }
+    // const checkPhone= (rule, value, callback) =>{
+    //     const phoneExp = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/;
+    //     setTimeout(()=>{
+    //       if(value !== undefined && value !==''){
+    //         if ((!phoneExp.test(value)) && value !== '') {
+    //           callback(new Error('请输入正确的格式！'));
+    //         } else {
+    //           callback();
+    //         }
+    //       }else{
+    //         callback()
+    //       }
+    //     },100)
+    //   }
 
-// var checkPhone = (rule, value, callback) => {
-//       if (value === '') {
-//         callback(new Error('请输入电话号码'))
-//       }
-//       if (value.length !== 11) {
-//         callback(new Error('请输入正确电话号码'))
-//       }
-//       if (value.length !== 11) {
-//         callback(new Error('请输入正确电话号码'))
-//       }
-//       // 验证电话号码手机号码，包含至今所有号段? ?
-//       var ab = /^[1][3,4,5,7,8][0-9]{9}$/
-//       if (ab.test(value) === false) {
-//         callback(new Error('请输入正确电话号码'))
-//       }
-//       callback()
-//     }
+    // var checkPhone = (rule, value, callback) => {
+    //       if (value === '') {
+    //         callback(new Error('请输入电话号码'))
+    //       }
+    //       if (value.length !== 11) {
+    //         callback(new Error('请输入正确电话号码'))
+    //       }
+    //       if (value.length !== 11) {
+    //         callback(new Error('请输入正确电话号码'))
+    //       }
+    //       // 验证电话号码手机号码，包含至今所有号段? ?
+    //       var ab = /^[1][3,4,5,7,8][0-9]{9}$/
+    //       if (ab.test(value) === false) {
+    //         callback(new Error('请输入正确电话号码'))
+    //       }
+    //       callback()
+    //     }
 
     const validatePhone = (rule, value, callback) => {
       if (!value) {
@@ -549,7 +506,8 @@ export default {
         mer_take_day: [],
         mer_take_location: '',
         id: 0,
-        mer_take_status: 0 }, // 默认数据
+        mer_take_status: 0
+      }, // 默认数据
       myHeaders: { 'X-Token': getToken() },
       uploadedQualifications: [], // 资质图片列表
       mapKey: '', // 地图key
@@ -570,10 +528,9 @@ export default {
         { value: '2', name: '快递配送' }
       ],
       rules: {
-        mer_banner: [{ required: true, message: '请上传店铺banner' }],
         mer_avatar: [{ required: true, message: '请上传店铺头像' }],
         mer_info: [{ required: true, message: '请输入商户简介', trigger: 'blur' },
-          { min: 3, max: 200, message: '长度在 3 到 200 个字符', trigger: 'blur' }
+        { min: 3, max: 200, message: '长度在 3 到 200 个字符', trigger: 'blur' }
         ],
         mer_keyword: [{ required: false, message: '请输入商户关键字', trigger: 'blur' }],
         mer_address: [{ required: true, message: '请输入商户地址', trigger: 'blur' }],
@@ -605,9 +562,9 @@ export default {
       keyUrl: '',
       infoType: '1',
       tabList: [
-        {value: '1',title: '基本信息'},
-        {value: '2',title: '店铺信息'},
-        {value: '3',title: '功能信息'}
+        { value: '1', title: '基本信息' },
+        { value: '2', title: '店铺信息' },
+        { value: '3', title: '功能信息' }
       ]
     }
   },
@@ -631,10 +588,10 @@ export default {
 
 
   },
-  mounted: function() {
+  mounted: function () {
     window.addEventListener(
       'message',
-      function(event) {
+      function (event) {
         // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
         var loc = event.data
         if (loc && loc.module === 'locationPicker') {
@@ -653,7 +610,7 @@ export default {
       this.value1 = e;
       this.merData.mer_take_time[0] = e
     },
-     onchangeTime2(e) {
+    onchangeTime2(e) {
       this.value2 = e;
       this.merData.mer_take_time[1] = e
     },
@@ -694,9 +651,9 @@ export default {
         that.marginPrice = info.is_margin
         that.merData.margin = info.margin
         that.merData.mer_take_location =
-            info.mer_take_location && info.mer_take_location.length
-              ? info.mer_take_location[0] + ',' + info.mer_take_location[1]
-              : ''
+          info.mer_take_location && info.mer_take_location.length
+            ? info.mer_take_location[0] + ',' + info.mer_take_location[1]
+            : ''
         that.merData.mer_take_status = info.mer_take_status || 0
         that.merData.refundMarginOrder = info.refundMarginOrder
         that.merData.marginStatus = info.ot_margin > info.margin
@@ -708,11 +665,11 @@ export default {
         } else {
           that.uploadedQualifications = []
         }
-        if(that.merData.is_margin == 1)(this.getCode())
+        if (that.merData.is_margin == 1) (this.getCode())
       })
     },
     // 提交线下转账信息
-    bankConfirm(name){
+    bankConfirm(name) {
       this.$refs[name].validate(valid => {
         if (valid) {
           marginRefundApply(this.bankValidate)
@@ -732,7 +689,7 @@ export default {
     },
     // 提交/修改
     submitForm(formName) {
-      if(this.infoType == 2){
+      if (this.infoType == 2) {
         this.$refs[formName].validate(valid => {
           if (valid) {
             const dataKey = Object.keys(this.rules)
@@ -765,12 +722,12 @@ export default {
             return false
           }
         })
-      }else{
+      } else {
         let data = {
           mer_state: this.merData.mer_state,
           type: this.infoType
         }
-         merchantUpdate(data)
+        merchantUpdate(data)
           .then((res) => {
             console.log(res)
             this.submitLoading = false
@@ -779,32 +736,32 @@ export default {
           .catch((rej) => {
             this.submitLoading = false
             this.$message.error(rej.data.message)
-        })
+          })
       }
     },
     // 获取支付二维码
     getCode() {
       let that = this
-      if(this.merData.marginStatus){
+      if (this.merData.marginStatus) {
         marginMakeCode()
-        .then((res) => {
-          that.qrCode = res.data.config
-          that.qrEndTime = res.data.endtime
-          that.marginPrice = res.data.price
-        })
-        .catch(function(res) {
-          that.$message.error(res.message)
-        })
-      }else{
+          .then((res) => {
+            that.qrCode = res.data.config
+            that.qrEndTime = res.data.endtime
+            that.marginPrice = res.data.price
+          })
+          .catch(function (res) {
+            that.$message.error(res.message)
+          })
+      } else {
         marginCode()
-        .then((res) => {
-          that.qrCode = res.data.config
-          that.qrEndTime = res.data.endtime
-          that.marginPrice = res.data.price
-        })
-        .catch(function(res) {
-          that.$message.error(res.message)
-        })
+          .then((res) => {
+            that.qrCode = res.data.config
+            that.qrEndTime = res.data.endtime
+            that.marginPrice = res.data.price
+          })
+          .catch(function (res) {
+            that.$message.error(res.message)
+          })
       }
     },
     // 查看保证金记录
@@ -814,7 +771,7 @@ export default {
       this.getRecordList()
     },
     // 保证金记录列表
-    getRecordList(){
+    getRecordList() {
       let that = this
       that.loading = true;
       marginRecordLst(that.tableFrom).then(async (res) => {
@@ -843,26 +800,26 @@ export default {
         type: 'warning'
       }).then(() => {
         marginRefund()
-        .then((res) => {
-          that.bankValidate = res.data.info
-          that.offline = res.data.offline
-          that.online = res.data.online
-          if(Number(res.data.offline) <= 0){
-           marginRefundApply(this.bankValidate)
-            .then((res) => {
-              this.$message.success(res.message)
-              this.getInfo()
-            })
-            .catch((res) => {
-              this.$message.error(res.message)
-            })
-          }else{
-            that.modalBank = true
-          }
-        })
-        .catch(function(res) {
-          that.$message.error(res.message)
-        })
+          .then((res) => {
+            that.bankValidate = res.data.info
+            that.offline = res.data.offline
+            that.online = res.data.online
+            if (Number(res.data.offline) <= 0) {
+              marginRefundApply(this.bankValidate)
+                .then((res) => {
+                  this.$message.success(res.message)
+                  this.getInfo()
+                })
+                .catch((res) => {
+                  this.$message.error(res.message)
+                })
+            } else {
+              that.modalBank = true
+            }
+          })
+          .catch(function (res) {
+            that.$message.error(res.message)
+          })
       })
     },
     // 查找位置
@@ -878,7 +835,7 @@ export default {
           console.log(res)
           this.mapKey = res.data.tx_map_key
         })
-        .catch(function(res) {
+        .catch(function (res) {
           that.$message.error(res.message)
         })
     },
@@ -928,26 +885,30 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-textarea__inner{
+::v-deep .el-textarea__inner {
   height: 90px;
 }
+
 .information {
   width: 100%;
   padding: 10px 20px 80px 20px;
   background: #ffffff;
+
   h2 {
     text-align: center;
     color: #303133;
     font-weight: bold;
     font-size: 20px;
   }
+
   .lab-title {
     width: max-content;
     font-size: 14px;
     font-weight: bold;
     color: #303133;
     margin: 10px 10%;
-    &::before{
+
+    &::before {
       content: "";
       display: inline-block;
       width: 3px;
@@ -958,10 +919,12 @@ export default {
       top: 1px;
     }
   }
+
   .user-msg {
     padding: 0 20px;
     margin-top: 20px;
   }
+
   .basic-information {
     padding: 0 100px;
     margin-bottom: 20px;
@@ -969,33 +932,41 @@ export default {
     text-rendering: optimizeLegibility;
     font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
     color: #606266;
-    .basic-label{
+
+    .basic-label {
       display: inline-block;
       text-align: right;
       width: 150px;
       margin-right: 10px;
     }
   }
+
   .trip {
     color: #999999;
     font-weight: normal;
     font-size: 12px;
   }
-  .demo-ruleForm{
+
+  .demo-ruleForm {
     overflow: hidden;
   }
+
   .form-data {
     padding: 30px 8%;
+
     .map-sty {
       width: 100%;
     }
+
     .pictrue img {
       border-radius: 4px;
       object-fit: cover;
     }
+
     .tip-form {
       display: flex;
       align-items: center;
+
       span {
         white-space: nowrap;
         padding-left: 10px;
@@ -1003,6 +974,7 @@ export default {
       }
     }
   }
+
   .submit-button {
     display: flex;
     justify-content: center;
@@ -1014,112 +986,137 @@ export default {
     background-color: rgba(255, 255, 255, 0.7);
   }
 }
-.information ::v-deep .el-form-item__label{
+
+.information ::v-deep .el-form-item__label {
   color: #303133;
 }
-.bank-container{
+
+.bank-container {
   padding: 0 20px;
-  .item{
+
+  .item {
     margin-top: 10px;
     color: #282828;
     font-size: 13px;
     line-height: 26px;
   }
-  .red{
-    color:rgb(237, 64, 20);;
+
+  .red {
+    color: rgb(237, 64, 20);
+    ;
   }
-  .title{
-    color:#303133;
+
+  .title {
+    color: #303133;
     margin: 15px 0;
     font-weight: bold;
 
   }
 }
+
 .font_red {
   color: red;
   margin-right: 5px;
 }
-.spanBtn{
-  color:var(--prev-color-primary);
-  font-size:12px;
+
+.spanBtn {
+  color: var(--prev-color-primary);
+  font-size: 12px;
   cursor: pointer;
 }
-.margin_main{
+
+.margin_main {
   position: relative;
-  .margin_price{
+
+  .margin_price {
     cursor: pointer;
   }
 }
-.margin_modal{
-    position: absolute;
-    left: -20px;
-    top: 20px;
-    border-radius: 8px;
-    background: #fff;
-    align-items: center;
-    justify-content: center;
-    z-index: 9;
-    width: 250px;
-    padding-bottom: 30px;
-    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-    display: none;
-    .alic{
-      text-align: center;
-    }
-    img{
-      display: block;
-      width: 150px;
-      height: 116px;
-      margin: 20px auto 50px;
-    }
-    span{
-      margin-bottom: 10px;
-      display: block;
-      font-weight: normal;
-      text-align: center;
-    }
-    .text_g{
-      font-size: 16px;
-      color: #303133;
-    }
-    .text_b{
-      color: #606266;
-      font-size: 18px;
-      font-weight: bold;
-      margin-bottom: 14px;
-      &.b02{
-        color: #EF9B6F;
-      }
-      &.b01{
-        color: #57D1A0;
-      }
-    }
-    .el-button{
-      margin-top: 25px;
-    }
-  }
-  .margin_refused{
-    display: block;
-    margin-bottom: 10px;
+
+.margin_modal {
+  position: absolute;
+  left: -20px;
+  top: 20px;
+  border-radius: 8px;
+  background: #fff;
+  align-items: center;
+  justify-content: center;
+  z-index: 9;
+  width: 250px;
+  padding-bottom: 30px;
+  box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+  display: none;
+
+  .alic {
     text-align: center;
+  }
+
+  img {
+    display: block;
+    width: 150px;
+    height: 116px;
+    margin: 20px auto 50px;
+  }
+
+  span {
+    margin-bottom: 10px;
+    display: block;
+    font-weight: normal;
+    text-align: center;
+  }
+
+  .text_g {
+    font-size: 16px;
+    color: #303133;
+  }
+
+  .text_b {
     color: #606266;
-    span{
-      display: inline;
-      // color: red;
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 14px;
+
+    &.b02 {
+      color: #EF9B6F;
+    }
+
+    &.b01 {
+      color: #57D1A0;
     }
   }
+
+  .el-button {
+    margin-top: 25px;
+  }
+}
+
+.margin_refused {
+  display: block;
+  margin-bottom: 10px;
+  text-align: center;
+  color: #606266;
+
+  span {
+    display: inline;
+    // color: red;
+  }
+}
+
 .margin_count {
   position: relative;
   display: inline-block;
   padding-bottom: 10px;
-  .pay_btn:hover + .erweima {
+
+  .pay_btn:hover+.erweima {
     display: block;
   }
-  &:hover{
-    .margin_modal{
+
+  &:hover {
+    .margin_modal {
       display: block;
     }
   }
+
   .erweima {
     position: absolute;
     left: 0;
@@ -1134,28 +1131,32 @@ export default {
     padding: 10px;
     box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
 
-    img{
+    img {
       width: 160px;
       height: 160px;
       margin-top: 20px;
     }
-    .pay_type{
+
+    .pay_type {
       font-size: 16px;
       color: #303133;
       font-weight: normal;
 
     }
-    .pay_price{
+
+    .pay_price {
       font-size: 18px;
       color: #E57272;
       margin: 10px 0;
     }
-    .pay_title{
+
+    .pay_title {
       font-size: 16px;
       color: #303133;
       margin-top: 20px;
     }
-    .pay_time{
+
+    .pay_time {
       font-size: 12px;
       color: #6D7278;
 
@@ -1163,6 +1164,7 @@ export default {
   }
 
 }
+
 ::v-deep .el-upload--picture-card {
   width: 58px;
   height: 58px;
@@ -1177,11 +1179,13 @@ export default {
 .upLoadPicBox_qualification {
   display: flex;
   flex-wrap: wrap;
+
   .uploadpicBox_list {
     position: relative;
     height: 58px;
     width: 58px;
     margin: 0 20px 20px 0;
+
     .uploadpicBox_list_image {
       position: absolute;
       top: 0;
@@ -1190,6 +1194,7 @@ export default {
       height: 58px;
       border-radius: 4px;
       overflow: hidden;
+
       img {
         width: 100%;
         height: 100%;
@@ -1215,6 +1220,7 @@ export default {
     }
   }
 }
+
 .uploadpicBox_list:hover .uploadpicBox_list_method {
   z-index: 11;
   opacity: 1;
diff --git a/vue.config.js b/vue.config.js
index d5a2027..3e46a4d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,7 +28,8 @@ module.exports = {
   outputDir: 'dist',
   assetsDir: 'mer',
   indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'mer.html',
-  lintOnSave: process.env.NODE_ENV === 'development',
+  lintOnSave: false,
+  // lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,
   devServer: {
     port: port,
@@ -94,7 +95,7 @@ module.exports = {
             .plugin('ScriptExtHtmlWebpackPlugin')
             .after('html')
             .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
+              // `runtime` must same as runtimeChunk name. default is `runtime`
               inline: /runtime\..*\.js$/
             }])
             .end()