From 46b6d92a360bc2160d33e4caf90a413628511c15 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 3 Apr 2024 17:50:54 +0800
Subject: [PATCH] 1

---
 src/views/product/addProduct/index.vue  | 1536 ++++++++---------------
 src/views/product/cloud/index.vue       |    2 +-
 src/views/product/productList/index.vue |   10 +-
 3 files changed, 525 insertions(+), 1023 deletions(-)

diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index 6441ce4..033faa0 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("基本信息-商品名称不能为空");
@@ -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
index f8f9c8e..7399a15 100644
--- a/src/views/product/cloud/index.vue
+++ b/src/views/product/cloud/index.vue
@@ -23,7 +23,7 @@
         </el-table-column>
       </el-table>
       <div class="block">
-        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page" background
+        <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>
diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue
index d27af46..e009e76 100644
--- a/src/views/product/productList/index.vue
+++ b/src/views/product/productList/index.vue
@@ -83,7 +83,7 @@
           @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>
+        <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
@@ -219,7 +219,7 @@
         </el-table-column>
       </el-table>
       <div class="block">
-        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page" background
+        <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>
@@ -443,8 +443,7 @@
     <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-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;">
@@ -622,6 +621,7 @@ export default {
         this.$message.success("加入成功!");
         this.checkedIds = [];
         this.selectedCategoryIds = [];
+        this.showShow = false;
       }).catch(err => {
         this.$message.success(err.message)
       })
@@ -629,7 +629,7 @@ export default {
 
     // 加入云仓
     joinCloud() {
-      if (this.checkedIds.length == 0) return this.$message.error("请至少选择一条数据!");
+      if (this.checkedIds.length == 0) return this.$message.error("请至少选择一个商品!");
       this.showShow = true;
     },