diff --git a/src/api/goods/index.js b/src/api/goods/index.js
index ceca30d..007d2f7 100644
--- a/src/api/goods/index.js
+++ b/src/api/goods/index.js
@@ -16,8 +16,15 @@ const api = {
   exportData:'/goods/import',
   jingPin:'/goods/jingpin',
   batchAddPrice:'/goods/batchAddPrice',
+  collector:'/goods/collector',
+}
+export function getCollector (params) {
+  return axios({
+    url: api.collector,
+    method: 'get',
+    params
+  })
 }
-
 // 列表记录
 export function list (params) {
   return axios({
diff --git a/src/components/SelectImage/SelectImage.vue b/src/components/SelectImage/SelectImage.vue
index 8033bef..7e17aff 100644
--- a/src/components/SelectImage/SelectImage.vue
+++ b/src/components/SelectImage/SelectImage.vue
@@ -12,7 +12,7 @@
       <transition-group class="draggable-item" type="transition" :name="'flip-list'">
         <div
           v-for="(item, index) in selectedItems"
-          :key="item.file_id"
+          :key="item.file_id>0?item.file_id:index"
           class="file-item"
           :style="{ width: `${width}px`, height: `${width}px` }"
         >
@@ -77,7 +77,8 @@ export default {
     // 默认选中的文件
     defaultList: PropTypes.array.def([]),
     // 元素的尺寸(宽)
-    width: PropTypes.integer.def(80)
+    width: PropTypes.integer.def(80),
+    source: PropTypes.any.def(0)
   },
   data () {
     return {
@@ -94,6 +95,7 @@ export default {
       immediate: true,
       handler (val) {
         const { selectedItems, allowProps } = this
+        console.log(selectedItems)
         if (val.length && !selectedItems.length && allowProps) {
           this.selectedItems = cloneDeep(val)
           this.onChange()
@@ -140,10 +142,18 @@ export default {
       if (selectedItems.length <= 0) {
         return this.$emit('change', multiple ? [] : 0)
       }
-      // 生成fileId
-      const fileId = multiple ? selectedItems.map(item => item.file_id) : selectedItems[0].file_id
-      // 触发change事件
-      return this.$emit('change', fileId, selectedItems)
+     	// 生成fileId
+			if (this.source == 1) {
+				let fileId = []
+				const list = multiple ? selectedItems.map(item => item) : selectedItems[0].file_id
+				list.forEach(function (item) {
+					fileId.push({ file_id: item.file_id, preview_url: item.preview_url })
+				})
+				return this.$emit('change', fileId, selectedItems)
+			} else {
+				const fileId = multiple ? selectedItems.map(item => item.file_id) : selectedItems[0].file_id
+				return this.$emit('change', fileId, selectedItems)
+			}
     }
 
   }
diff --git a/src/views/dataCenter/goods/Create.vue b/src/views/dataCenter/goods/Create.vue
index e1b12bc..66eada6 100644
--- a/src/views/dataCenter/goods/Create.vue
+++ b/src/views/dataCenter/goods/Create.vue
@@ -1,63 +1,46 @@
 <template>
-  <a-card :bordered="false">
-    <div class="card-title">{{ $route.meta.title }}</div>
-    <a-spin :spinning="isLoading">
-      <a-form :form="form" @submit="handleSubmit" :selfUpdate="true">
-        <a-tabs :activeKey="tabKey" :tabBarStyle="{ marginBottom: '30px' }" @change="handleTabs">
-          <a-tab-pane :key="0" tab="基本信息"></a-tab-pane>
-          <a-tab-pane :key="1" tab="规格/库存"></a-tab-pane>
-          <a-tab-pane :key="2" tab="商品详情"></a-tab-pane>
-          <a-tab-pane :key="3" tab="更多设置"></a-tab-pane>
-        </a-tabs>
-        <div class="tabs-content">
-          <!-- 基本信息 -->
-          <div class="tab-pane" v-show="tabKey == 0">
-            <a-form-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <GoodsType
-                v-decorator="['goods_type', { initialValue: 10, rules: [{ required: true }] }]"
-                @change="onForceUpdate(true)"
-              />
-            </a-form-item>
-            <a-form-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input
-                placeholder="请输入商品名称"
-                v-decorator="['goods_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
-              />
-            </a-form-item>
-            <a-form-item label="商品型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input
-                placeholder="请输入商品型号"
-                v-decorator="['cmmdty_model', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
-              />
-            </a-form-item>
-            <a-form-item label="商品分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-tree-select
-                placeholder="请选择商品分类"
-                :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }"
-                :treeData="formData.categoryList"
-                treeCheckable
-                treeCheckStrictly
-                allowClear
-                v-decorator="['categorys', { rules: [{ required: true, message: '请至少选择1个商品分类' }] }]"
-              ></a-tree-select>
-              <div class="form-item-help">
-                <router-link target="_blank" :to="{ path: '/goods/category/index' }">去新增</router-link>
-                <a href="javascript:;" @click="onReloadCategoryList">刷新</a>
-              </div>
-            </a-form-item>
-            <a-form-item
-              label="商品图片"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              extra="建议尺寸：750*750像素, 最多上传10张, 可拖拽图片调整顺序, 第1张将作为商品首图"
-            >
-              <SelectImage
-                multiple
-                :maxNum="10"
-                v-decorator="['imagesIds', { rules: [{ required: true, message: '请至少上传1张商品图片' }] }]"
-              />
-            </a-form-item>
-            <!-- <a-form-item label="是否大牌正品" :labelCol="labelCol" :wrapperCol="wrapperCol">
+	<a-card :bordered="false">
+		<div class="card-title">{{ $route.meta.title }}</div>
+		<a-spin :spinning="isLoading">
+			<a-form :form="form" @submit="handleSubmit" :selfUpdate="true">
+				<a-tabs :activeKey="tabKey" :tabBarStyle="{ marginBottom: '30px' }" @change="handleTabs">
+					<a-tab-pane :key="0" tab="基本信息"></a-tab-pane>
+					<a-tab-pane :key="1" tab="规格/库存"></a-tab-pane>
+					<a-tab-pane :key="2" tab="商品详情"></a-tab-pane>
+					<a-tab-pane :key="3" tab="更多设置"></a-tab-pane>
+				</a-tabs>
+				<div class="tabs-content">
+					<!-- 基本信息 -->
+					<div class="tab-pane" v-show="tabKey == 0">
+						<a-form-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<GoodsType v-decorator="['goods_type', { initialValue: 10, rules: [{ required: true }] }]" @change="onForceUpdate(true)" />
+						</a-form-item>
+						<a-form-item label="商品SKU" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<div style=" display: flex;align-items: center;width:100%">
+								<a-input style="width:242px" placeholder="输入商品SKU" v-decorator="['goods_no', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]" />
+								<div class="action-item" style="margin-left:15px">
+									<a-button type="primary" @click="handInfo">一键获取</a-button>
+								</div>
+							</div>
+						</a-form-item>
+						<a-form-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-input placeholder="请输入商品名称" v-decorator="['goods_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]" />
+						</a-form-item>
+						<a-form-item label="商品型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-input placeholder="请输入商品型号" v-decorator="['cmmdty_model', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]" />
+						</a-form-item>
+						<a-form-item label="商品分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-tree-select placeholder="请选择商品分类" :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }" :treeData="formData.categoryList" treeCheckable treeCheckStrictly allowClear
+								v-decorator="['categorys', { rules: [{ required: true, message: '请至少选择1个商品分类' }] }]"></a-tree-select>
+							<div class="form-item-help">
+								<router-link target="_blank" :to="{ path: '/goods/category/index' }">去新增</router-link>
+								<a href="javascript:;" @click="onReloadCategoryList">刷新</a>
+							</div>
+						</a-form-item>
+						<a-form-item label="商品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="建议尺寸：750*750像素, 最多上传10张, 可拖拽图片调整顺序, 第1张将作为商品首图">
+							<SelectImage ref="childComponent" :source='1' multiple :maxNum="10" v-decorator="['imagesIds', { rules: [{ required: true, message: '请至少上传1张商品图片' }] }]" />
+						</a-form-item>
+						<!-- <a-form-item label="是否大牌正品" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group
                 v-decorator="['is_brand', { initialValue: 0, rules: [{ required: true }] }]"
               >
@@ -82,20 +65,15 @@
                 <a-radio :value="1">是</a-radio>
               </a-radio-group>
             </a-form-item> -->
-
-            <a-form-item label="商品编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入商品编码" v-decorator="['goods_no']" />
-            </a-form-item>
-
-            <!-- <a-form-item label="所属分类排行(0表示不参加排行)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+						<!-- <a-form-item label="所属分类排行(0表示不参加排行)" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="所属分类排行" v-decorator="['paihang']" />
             </a-form-item> -->
 
-            <a-form-item label="热卖指数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="热卖指数" v-decorator="['remaizhishu']" />
-            </a-form-item>
+						<a-form-item label="热卖指数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-input placeholder="热卖指数" v-decorator="['remaizhishu']" />
+						</a-form-item>
 
-            <!-- <a-form-item
+						<!-- <a-form-item
               v-if="form.getFieldValue('goods_type') == 10"
               label="配送方式"
               :labelCol="labelCol"
@@ -117,7 +95,7 @@
                 </a-form-item>
               </div>
             </a-form-item> -->
-            <!-- <a-form-item
+						<!-- <a-form-item
               v-if="form.getFieldValue('goods_type') == 10"
               label="运费模板"
               :labelCol="labelCol"
@@ -142,130 +120,101 @@
                 <a href="javascript:;" @click="onReloadDeliveryList">刷新</a>
               </div>
             </a-form-item> -->
-            <a-form-item label="商品来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group v-decorator="['goods_source', { initialValue: 0, rules: [{ required: true }] }]">
-                <!-- <a-radio value="JD">京东</a-radio>
+						<a-form-item label="商品来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-radio-group v-decorator="['goods_source', { initialValue: 0, rules: [{ required: true }] }]">
+								<!-- <a-radio value="JD">京东</a-radio>
                 <a-radio value="SN">苏宁</a-radio> -->
-                <a-radio value="GC">工厂</a-radio>
-                <a-radio value="CC">仓储</a-radio>
-                <a-radio value="ZC">自采</a-radio>
-              </a-radio-group>
-            </a-form-item>
-            <a-form-item label="发货时效" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group v-decorator="['delivery_time', { initialValue: 0, rules: [{ required: true }] }]">
-                <a-radio :value="0">24小时</a-radio>
-                <a-radio :value="1">48小时</a-radio>
-                <a-radio :value="2">72小时</a-radio>
-                <a-radio :value="3">7天内</a-radio>
-                <a-radio :value="4">15天内</a-radio>
-                <a-radio :value="5">30天内</a-radio>
-                <a-radio :value="6">45天内</a-radio>
-              </a-radio-group>
-            </a-form-item>
-            <a-form-item label="是否审单" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group v-decorator="['is_check', { initialValue: 0, rules: [{ required: true }] }]">
-                <a-radio :value="0">否</a-radio>
-                <a-radio :value="1">是</a-radio>
-              </a-radio-group>
-            </a-form-item>
-            <a-form-item label="商品池" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group v-decorator="['is_pool', { initialValue: 0, rules: [{ required: true }] }]">
-                <a-radio :value="0">待处理</a-radio>
-                <a-radio :value="1">已入池</a-radio>
-                <a-radio :value="2">未入池</a-radio>
-              </a-radio-group>
-            </a-form-item>
-            <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group v-decorator="['is_sale', { initialValue: 0, rules: [{ required: true }] }]">
-                <a-radio :value="0">停售</a-radio>
-                <a-radio :value="1">在售</a-radio>
-                <a-radio :value="2">无货</a-radio>
-              </a-radio-group>
-            </a-form-item>
-            <a-form-item label="是否精品" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group v-decorator="['is_jingpin', { initialValue: 0, rules: [{ required: true }] }]">
-                <a-radio :value="0">否</a-radio>
-                <a-radio :value="1">是</a-radio>
-              </a-radio-group>
-            </a-form-item>
-            <a-form-item label="商品排序" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="数字越小越靠前">
-              <a-input-number :min="0" v-decorator="['sort', { initialValue: 100, rules: [{ required: true }] }]" />
-            </a-form-item>
-          </div>
+								<a-radio value="GC">工厂</a-radio>
+								<a-radio value="CC">仓储</a-radio>
+								<a-radio value="ZC">自采</a-radio>
+							</a-radio-group>
+						</a-form-item>
+						<a-form-item label="发货时效" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-radio-group v-decorator="['delivery_time', { initialValue: 0, rules: [{ required: true }] }]">
+								<a-radio :value="0">24小时</a-radio>
+								<a-radio :value="1">48小时</a-radio>
+								<a-radio :value="2">72小时</a-radio>
+								<a-radio :value="3">7天内</a-radio>
+								<a-radio :value="4">15天内</a-radio>
+								<a-radio :value="5">30天内</a-radio>
+								<a-radio :value="6">45天内</a-radio>
+							</a-radio-group>
+						</a-form-item>
+						<a-form-item label="是否审单" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-radio-group v-decorator="['is_check', { initialValue: 0, rules: [{ required: true }] }]">
+								<a-radio :value="0">否</a-radio>
+								<a-radio :value="1">是</a-radio>
+							</a-radio-group>
+						</a-form-item>
+						<a-form-item label="商品池" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-radio-group v-decorator="['is_pool', { initialValue: 0, rules: [{ required: true }] }]">
+								<a-radio :value="0">待处理</a-radio>
+								<a-radio :value="1">已入池</a-radio>
+								<a-radio :value="2">未入池</a-radio>
+							</a-radio-group>
+						</a-form-item>
+						<a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-radio-group v-decorator="['is_sale', { initialValue: 0, rules: [{ required: true }] }]">
+								<a-radio :value="0">停售</a-radio>
+								<a-radio :value="1">在售</a-radio>
+								<a-radio :value="2">无货</a-radio>
+							</a-radio-group>
+						</a-form-item>
+						<a-form-item label="是否精品" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-radio-group v-decorator="['is_jingpin', { initialValue: 0, rules: [{ required: true }] }]">
+								<a-radio :value="0">否</a-radio>
+								<a-radio :value="1">是</a-radio>
+							</a-radio-group>
+						</a-form-item>
+						<a-form-item label="商品排序" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="数字越小越靠前">
+							<a-input-number :min="0" v-decorator="['sort', { initialValue: 100, rules: [{ required: true }] }]" />
+						</a-form-item>
+					</div>
 
-          <!-- 规格/库存 -->
-          <div class="tab-pane" v-show="tabKey == 1">
-            <a-form-item label="规格类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group
-                v-decorator="['spec_type', { initialValue: 10, rules: [{ required: true }] }]"
-                @change="onForceUpdate()"
-              >
-                <a-radio :value="10">单规格</a-radio>
-                <!-- <a-radio :value="20" :disabled="true">多规格</a-radio> -->
-              </a-radio-group>
-            </a-form-item>
-            <a-form-item label="规格值" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="多个规格值，以英文分号分隔" v-decorator="['specific_value']" />
-            </a-form-item>
-            <!-- 多规格的表单内容 -->
-            <div v-show="form.getFieldValue('spec_type') == 20">
-              <MultiSpec ref="MultiSpec" />
-            </div>
-            <!-- 单规格的表单内容 -->
-            <div v-show="form.getFieldValue('spec_type') == 10">
-              <a-form-item
-                label="商品价格"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="商品的实际购买金额，最低0.01"
-              >
-                <a-input-number
-                  :min="0.01"
-                  :precision="2"
-                  v-decorator="[
+					<!-- 规格/库存 -->
+					<div class="tab-pane" v-show="tabKey == 1">
+						<a-form-item label="规格类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-radio-group v-decorator="['spec_type', { initialValue: 10, rules: [{ required: true }] }]" @change="onForceUpdate()">
+								<a-radio :value="10">单规格</a-radio>
+								<!-- <a-radio :value="20" :disabled="true">多规格</a-radio> -->
+							</a-radio-group>
+						</a-form-item>
+						<a-form-item label="规格值" :labelCol="labelCol" :wrapperCol="wrapperCol">
+							<a-input placeholder="多个规格值，以英文分号分隔" v-decorator="['specific_value']" />
+						</a-form-item>
+						<!-- 多规格的表单内容 -->
+						<div v-show="form.getFieldValue('spec_type') == 20">
+							<MultiSpec ref="MultiSpec" />
+						</div>
+						<!-- 单规格的表单内容 -->
+						<div v-show="form.getFieldValue('spec_type') == 10">
+							<a-form-item label="商品价格" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="商品的实际购买金额，最低0.01">
+								<a-input-number :min="0.01" :precision="2" v-decorator="[
                     'goods_price',
                     { initialValue: 1, rules: [{ required: true, message: '请输入商品价格' }] },
-                  ]"
-                />
-                <span class="ml-10">元</span>
-              </a-form-item>
-              <a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="成本价仅用于商品页展示">
-                <a-input-number :min="0" :precision="2" v-decorator="['cost_price']" />
-                <span class="ml-10">元</span>
-              </a-form-item>
-              <a-form-item
-                label="当前库存数量"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="商品的实际库存数量，为0时用户无法下单"
-              >
-                <a-input-number
-                  :min="0"
-                  :precision="0"
-                  v-decorator="[
+                  ]" />
+								<span class="ml-10">元</span>
+							</a-form-item>
+							<a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="成本价仅用于商品页展示">
+								<a-input-number :min="0" :precision="2" v-decorator="['cost_price']" />
+								<span class="ml-10">元</span>
+							</a-form-item>
+							<a-form-item label="当前库存数量" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="商品的实际库存数量，为0时用户无法下单">
+								<a-input-number :min="0" :precision="0" v-decorator="[
                     'stock_num',
                     { initialValue: 100, rules: [{ required: true, message: '请输入库存数量' }] },
-                  ]"
-                />
-                <span class="ml-10">件</span>
-              </a-form-item>
-              <a-form-item
-                label="商品重量"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="商品的实际重量，用于计算运费"
-              >
-                <a-input-number
-                  :min="0"
-                  v-decorator="[
+                  ]" />
+								<span class="ml-10">件</span>
+							</a-form-item>
+							<a-form-item label="商品重量" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="商品的实际重量，用于计算运费">
+								<a-input-number :min="0" v-decorator="[
                     'goods_weight',
                     { initialValue: 0, rules: [{ required: true, message: '请输入库存数量' }] },
-                  ]"
-                />
-                <span class="ml-10">千克 (Kg)</span>
-              </a-form-item>
-            </div>
-            <!-- <a-form-item label="库存计算方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  ]" />
+								<span class="ml-10">千克 (Kg)</span>
+							</a-form-item>
+						</div>
+						<!-- <a-form-item label="库存计算方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group
                 v-decorator="['deduct_stock_type', { initialValue: 10, rules: [{ required: true }] }]"
               >
@@ -273,7 +222,7 @@
                 <a-radio :value="20">付款减库存</a-radio>
               </a-radio-group>
             </a-form-item> -->
-            <!-- <a-form-item
+						<!-- <a-form-item
               label="商品限购"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -307,231 +256,151 @@
                 </a-form-item>
               </div>
             </a-form-item> -->
-          </div>
+					</div>
 
-          <!-- 商品详情 -->
-          <div class="tab-pane" v-show="tabKey == 2">
-            <a-form-item label="商品详情" :labelCol="labelCol" :wrapperCol="{ span: 16 }">
-              <Ueditor v-decorator="['content', { rules: [{ required: true, message: '商品详情不能为空' }] }]" />
-            </a-form-item>
-          </div>
+					<!-- 商品详情 -->
+					<div class="tab-pane" v-show="tabKey == 2">
+						<a-form-item label="商品详情" :labelCol="labelCol" :wrapperCol="{ span: 16 }">
+							<Ueditor v-decorator="['content', { rules: [{ required: true, message: '商品详情不能为空' }] }]" />
+						</a-form-item>
+					</div>
 
-          <!-- 更多设置 -->
-          <div class="tab-pane" v-show="tabKey == 3">
-            <a-form-item
-              label="主图视频"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              extra="建议视频宽高比19:9，建议时长8-45秒"
-            >
-              <SelectVideo :multiple="false" v-decorator="['video_id']" />
-            </a-form-item>
-            <a-form-item
-              label="视频封面"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              extra="建议尺寸：750像素*750像素"
-            >
-              <SelectImage :multiple="false" v-decorator="['video_cover_id']" />
-            </a-form-item>
-            <a-form-item
-              label="商品卖点"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              extra="一句话简述，例如：此款商品美观大方 性价比较高 不容错过"
-            >
-              <a-input placeholder="请输入商品卖点" v-decorator="['selling_point']" />
-            </a-form-item>
-            <a-form-item label="服务与承诺" :labelCol="labelCol" :wrapperCol="wrapperCol" style="display: none">
-              <a-select
-                v-if="formData.serviceList"
-                mode="multiple"
-                v-decorator="['serviceIds', { initialValue: formData.defaultServiceIds }]"
-                placeholder="请选择服务与承诺"
-              >
-                <a-select-option v-for="(item, index) in formData.serviceList" :key="index" :value="item.service_id">{{
+					<!-- 更多设置 -->
+					<div class="tab-pane" v-show="tabKey == 3">
+						<a-form-item label="主图视频" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="建议视频宽高比19:9，建议时长8-45秒">
+							<SelectVideo :multiple="false" v-decorator="['video_id']" />
+						</a-form-item>
+						<a-form-item label="视频封面" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="建议尺寸：750像素*750像素">
+							<SelectImage :multiple="false" v-decorator="['video_cover_id']" />
+						</a-form-item>
+						<a-form-item label="商品卖点" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="一句话简述，例如：此款商品美观大方 性价比较高 不容错过">
+							<a-input placeholder="请输入商品卖点" v-decorator="['selling_point']" />
+						</a-form-item>
+						<a-form-item label="服务与承诺" :labelCol="labelCol" :wrapperCol="wrapperCol" style="display: none">
+							<a-select v-if="formData.serviceList" mode="multiple" v-decorator="['serviceIds', { initialValue: formData.defaultServiceIds }]" placeholder="请选择服务与承诺">
+								<a-select-option v-for="(item, index) in formData.serviceList" :key="index" :value="item.service_id">{{
                   item.name
                 }}</a-select-option>
-              </a-select>
-              <div class="form-item-help">
-                <router-link target="_blank" :to="{ path: '/goods/service/index' }">去新增</router-link>
-                <a href="javascript:;" @click="onReloadServiceList">刷新</a>
-              </div>
-            </a-form-item>
-            <a-form-item
-              label="初始销量"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              extra="用户端展示的销量 = 初始销量 + 实际销量"
-            >
-              <a-input-number v-decorator="['sales_initial', { initialValue: 0 }]" />
-            </a-form-item>
+							</a-select>
+							<div class="form-item-help">
+								<router-link target="_blank" :to="{ path: '/goods/service/index' }">去新增</router-link>
+								<a href="javascript:;" @click="onReloadServiceList">刷新</a>
+							</div>
+						</a-form-item>
+						<a-form-item label="初始销量" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="用户端展示的销量 = 初始销量 + 实际销量">
+							<a-input-number v-decorator="['sales_initial', { initialValue: 0 }]" />
+						</a-form-item>
 
-            <div>
-              <a-divider orientation="left">销售区域</a-divider>
-              <a-form-item label="销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
-                <a-table
-                  v-show="ruleList.length"
-                  class="table-rules"
-                  :columns="columns"
-                  :dataSource="ruleList"
-                  :pagination="false"
-                  bordered
-                >
-                  <!-- 销售区域 -->
-                  <template slot="region_text" slot-scope="text, item, index">
-                    <p class="content">
-                      <span v-for="(province, pidx) in text" :key="pidx">
-                        <span>{{ province.name }}</span>
-                        <template v-if="province.citys.length">
-                          <span>(</span>
-                          <span class="city-name" v-for="(city, cidx) in province.citys" :key="cidx"
-                            >{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span
-                          >
-                          <span>)</span>
-                        </template>
-                        <span>{{ ' ' }}</span>
-                      </span>
-                    </p>
-                    <p class="operation">
-                      <a href="javascript:void(0);" class="edit" @click="handleEdit(index, item)">编辑</a>
-                      <a href="javascript:void(0);" class="delete" @click="handleDelete(index)">删除</a>
-                    </p>
-                  </template>
-                </a-table>
-                <a-button icon="environment" v-if="ruleList.length == 0" @click="handleAdd">点击添加销售区域</a-button>
-              </a-form-item>
-            </div>
+						<div>
+							<a-divider orientation="left">销售区域</a-divider>
+							<a-form-item label="销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
+								<a-table v-show="ruleList.length" class="table-rules" :columns="columns" :dataSource="ruleList" :pagination="false" bordered>
+									<!-- 销售区域 -->
+									<template slot="region_text" slot-scope="text, item, index">
+										<p class="content">
+											<span v-for="(province, pidx) in text" :key="pidx">
+												<span>{{ province.name }}</span>
+												<template v-if="province.citys.length">
+													<span>(</span>
+													<span class="city-name" v-for="(city, cidx) in province.citys" :key="cidx">{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span>
+													<span>)</span>
+												</template>
+												<span>{{ ' ' }}</span>
+											</span>
+										</p>
+										<p class="operation">
+											<a href="javascript:void(0);" class="edit" @click="handleEdit(index, item)">编辑</a>
+											<a href="javascript:void(0);" class="delete" @click="handleDelete(index)">删除</a>
+										</p>
+									</template>
+								</a-table>
+								<a-button icon="environment" v-if="ruleList.length == 0" @click="handleAdd">点击添加销售区域</a-button>
+							</a-form-item>
+						</div>
 
-            <div style="display: none">
-              <a-divider orientation="left">积分设置</a-divider>
-              <a-form-item
-                label="积分赠送"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="开启后用户购买此商品将获得积分"
-              >
-                <a-radio-group v-decorator="['is_points_gift', { initialValue: 1, rules: [{ required: true }] }]">
-                  <a-radio :value="1">开启</a-radio>
-                  <a-radio :value="0">关闭</a-radio>
-                </a-radio-group>
-              </a-form-item>
-              <a-form-item
-                label="积分抵扣"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="开启后用户购买此商品可以使用积分进行抵扣"
-              >
-                <a-radio-group v-decorator="['is_points_discount', { initialValue: 1, rules: [{ required: true }] }]">
-                  <a-radio :value="1">开启</a-radio>
-                  <a-radio :value="0">关闭</a-radio>
-                </a-radio-group>
-              </a-form-item>
-            </div>
+						<div style="display: none">
+							<a-divider orientation="left">积分设置</a-divider>
+							<a-form-item label="积分赠送" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="开启后用户购买此商品将获得积分">
+								<a-radio-group v-decorator="['is_points_gift', { initialValue: 1, rules: [{ required: true }] }]">
+									<a-radio :value="1">开启</a-radio>
+									<a-radio :value="0">关闭</a-radio>
+								</a-radio-group>
+							</a-form-item>
+							<a-form-item label="积分抵扣" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="开启后用户购买此商品可以使用积分进行抵扣">
+								<a-radio-group v-decorator="['is_points_discount', { initialValue: 1, rules: [{ required: true }] }]">
+									<a-radio :value="1">开启</a-radio>
+									<a-radio :value="0">关闭</a-radio>
+								</a-radio-group>
+							</a-form-item>
+						</div>
 
-            <div style="display: none">
-              <a-divider orientation="left">会员折扣设置</a-divider>
-              <a-form-item
-                label="会员折扣"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="开启后会员折扣，会员购买此商品可以享受会员等级折扣价"
-              >
-                <a-radio-group
-                  v-decorator="['is_enable_grade', { initialValue: 1, rules: [{ required: true }] }]"
-                  @change="onForceUpdate(true)"
-                >
-                  <a-radio :value="1">开启</a-radio>
-                  <a-radio :value="0">关闭</a-radio>
-                </a-radio-group>
-              </a-form-item>
-              <a-form-item
-                v-if="form.getFieldValue('is_enable_grade')"
-                label="会员折扣设置"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-              >
-                <a-radio-group
-                  v-decorator="['is_alone_grade', { initialValue: 0, rules: [{ required: true }] }]"
-                  @change="onForceUpdate(true)"
-                >
-                  <a-radio :value="0">默认等级折扣</a-radio>
-                  <a-radio :value="1">单独设置折扣</a-radio>
-                </a-radio-group>
-                <!-- 会员等级列表 -->
-                <div v-if="form.getFieldValue('is_alone_grade')">
-                  <a-form-item v-for="item in formData.userGradeList" :key="item.grade_id">
-                    <InputNumberGroup
-                      :addonBefore="item.name"
-                      addonAfter="折"
-                      :inputProps="{ min: 0, max: 9.9 }"
-                      v-decorator="[
+						<div style="display: none">
+							<a-divider orientation="left">会员折扣设置</a-divider>
+							<a-form-item label="会员折扣" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="开启后会员折扣，会员购买此商品可以享受会员等级折扣价">
+								<a-radio-group v-decorator="['is_enable_grade', { initialValue: 1, rules: [{ required: true }] }]" @change="onForceUpdate(true)">
+									<a-radio :value="1">开启</a-radio>
+									<a-radio :value="0">关闭</a-radio>
+								</a-radio-group>
+							</a-form-item>
+							<a-form-item v-if="form.getFieldValue('is_enable_grade')" label="会员折扣设置" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['is_alone_grade', { initialValue: 0, rules: [{ required: true }] }]" @change="onForceUpdate(true)">
+									<a-radio :value="0">默认等级折扣</a-radio>
+									<a-radio :value="1">单独设置折扣</a-radio>
+								</a-radio-group>
+								<!-- 会员等级列表 -->
+								<div v-if="form.getFieldValue('is_alone_grade')">
+									<a-form-item v-for="item in formData.userGradeList" :key="item.grade_id">
+										<InputNumberGroup :addonBefore="item.name" addonAfter="折" :inputProps="{ min: 0, max: 9.9 }" v-decorator="[
                         `alone_grade_equity[grade_id:${item.grade_id}]`,
                         {
                           initialValue: formData.defaultUserGradeValue[item.grade_id],
                           rules: [{ required: true, message: '折扣率不能为空' }],
                         },
-                      ]"
-                    />
-                  </a-form-item>
-                </div>
-                <div class="form-item-help">
-                  <p class="extra" v-if="form.getFieldValue('is_alone_grade')">
-                    单独折扣：折扣率范围0.0-9.9，例如: 9.8代表98折，0代表不折扣
-                  </p>
-                  <p class="extra" v-else>默认折扣：默认为用户所属会员等级的折扣率</p>
-                </div>
-              </a-form-item>
-            </div>
+                      ]" />
+									</a-form-item>
+								</div>
+								<div class="form-item-help">
+									<p class="extra" v-if="form.getFieldValue('is_alone_grade')">
+										单独折扣：折扣率范围0.0-9.9，例如: 9.8代表98折，0代表不折扣
+									</p>
+									<p class="extra" v-else>默认折扣：默认为用户所属会员等级的折扣率</p>
+								</div>
+							</a-form-item>
+						</div>
 
-            <div style="display: none">
-              <a-divider orientation="left">分销设置</a-divider>
-              <a-form-item label="分销佣金" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-radio-group
-                  v-decorator="['is_ind_dealer', { initialValue: 0, rules: [{ required: true }] }]"
-                  @change="onForceUpdate(true)"
-                >
-                  <a-radio :value="0">系统默认</a-radio>
-                  <a-radio :value="1">单独设置</a-radio>
-                </a-radio-group>
-                <div class="form-item-help">
-                  <p class="extra">若使用分销功能必须在 [分销中心 - 分销设置] 中开启</p>
-                </div>
-              </a-form-item>
-              <a-form-item
-                v-if="form.getFieldValue('is_ind_dealer')"
-                label="分销佣金类型"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-              >
-                <a-radio-group
-                  v-decorator="['dealer_money_type', { initialValue: 10, rules: [{ required: true }] }]"
-                  @change="onForceUpdate(true)"
-                >
-                  <a-radio :value="10">百分比</a-radio>
-                  <a-radio :value="20">固定金额</a-radio>
-                </a-radio-group>
-                <!-- 分销等级列表 -->
-                <a-form-item v-for="(item, index) in formData.dealer.levelList" :key="index">
-                  <InputNumberGroup
-                    :addonBefore="item.name"
-                    :addonAfter="form.getFieldValue('dealer_money_type') == 10 ? '%' : '元'"
-                    :inputProps="{ min: 0, precision: 2 }"
-                    v-decorator="[item.value, { rules: [{ required: true, message: '佣金不能为空' }] }]"
-                  />
-                </a-form-item>
-              </a-form-item>
-            </div>
-          </div>
-        </div>
-        <a-form-item class="mt-20" :wrapperCol="{ span: wrapperCol.span, offset: labelCol.span }">
-          <a-button type="primary" html-type="submit" :loading="isBtnLoading">提交</a-button>
-        </a-form-item>
-      </a-form>
+						<div style="display: none">
+							<a-divider orientation="left">分销设置</a-divider>
+							<a-form-item label="分销佣金" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['is_ind_dealer', { initialValue: 0, rules: [{ required: true }] }]" @change="onForceUpdate(true)">
+									<a-radio :value="0">系统默认</a-radio>
+									<a-radio :value="1">单独设置</a-radio>
+								</a-radio-group>
+								<div class="form-item-help">
+									<p class="extra">若使用分销功能必须在 [分销中心 - 分销设置] 中开启</p>
+								</div>
+							</a-form-item>
+							<a-form-item v-if="form.getFieldValue('is_ind_dealer')" label="分销佣金类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['dealer_money_type', { initialValue: 10, rules: [{ required: true }] }]" @change="onForceUpdate(true)">
+									<a-radio :value="10">百分比</a-radio>
+									<a-radio :value="20">固定金额</a-radio>
+								</a-radio-group>
+								<!-- 分销等级列表 -->
+								<a-form-item v-for="(item, index) in formData.dealer.levelList" :key="index">
+									<InputNumberGroup :addonBefore="item.name" :addonAfter="form.getFieldValue('dealer_money_type') == 10 ? '%' : '元'" :inputProps="{ min: 0, precision: 2 }"
+										v-decorator="[item.value, { rules: [{ required: true, message: '佣金不能为空' }] }]" />
+								</a-form-item>
+							</a-form-item>
+						</div>
+					</div>
+				</div>
+				<a-form-item class="mt-20" :wrapperCol="{ span: wrapperCol.span, offset: labelCol.span }">
+					<a-button type="primary" html-type="submit" :loading="isBtnLoading">提交</a-button>
+				</a-form-item>
+			</a-form>
 
-      <AreasModal ref="AreasModal" @handleSubmit="handleAreaSubmit" />
-    </a-spin>
-  </a-card>
+			<AreasModal ref="AreasModal" @handleSubmit="handleAreaSubmit" />
+		</a-spin>
+	</a-card>
 </template>
 
 <script>
@@ -543,284 +412,312 @@ import { AreasModal } from '@/components/Modal'
 import Region from '@/common/model/Region'
 
 const defaultItem = {
-  key: 0,
-  // first: 1,
-  // first_fee: 0,
-  // additional: 0,
-  // additional_fee: 0,
-  region: [],
-  region_text: [],
+	key: 0,
+	// first: 1,
+	// first_fee: 0,
+	// additional: 0,
+	// additional_fee: 0,
+	region: [],
+	region_text: [],
 }
 
 export default {
-  components: {
-    GoodsType,
-    SelectImage,
-    SelectVideo,
-    Ueditor,
-    InputNumberGroup,
-    MultiSpec,
-    AreasModal,
-  },
-  data() {
-    return {
-      // 默认的标签索引
-      tabKey: 0,
-      // 标签布局属性
-      labelCol: { span: 3 },
-      // 输入框布局属性
-      wrapperCol: { span: 10 },
-      // loading状态
-      isLoading: false,
-      isBtnLoading: false,
-      // 当前表单元素
-      form: this.$form.createForm(this),
-      // 表单数据
-      formData: GoodsModel.formData,
+	components: {
+		GoodsType,
+		SelectImage,
+		SelectVideo,
+		Ueditor,
+		InputNumberGroup,
+		MultiSpec,
+		AreasModal,
+	},
+	data() {
+		return {
+			// 默认的标签索引
+			tabKey: 0,
+			// 标签布局属性
+			labelCol: { span: 3 },
+			// 输入框布局属性
+			wrapperCol: { span: 10 },
+			// loading状态
+			isLoading: false,
+			isBtnLoading: false,
+			// 当前表单元素
+			form: this.$form.createForm(this),
+			// 表单数据
+			formData: GoodsModel.formData,
 
-      columns: [
-        {
-          title: '销售区域',
-          dataIndex: 'region_text',
-          width: '400px',
-          scopedSlots: { customRender: 'region_text' },
-        },
-        // {
-        //   title: '首件 (个)',
-        //   dataIndex: 'first',
-        //   scopedSlots: { customRender: 'first' }
-        // },
-        // {
-        //   title: '运费(元)',
-        //   dataIndex: 'first_fee',
-        //   scopedSlots: { customRender: 'first_fee' }
-        // },
-        // {
-        //   title: '续件 (个)',
-        //   dataIndex: 'additional',
-        //   scopedSlots: { customRender: 'additional' }
-        // },
-        // {
-        //   title: '续费(元)',
-        //   dataIndex: 'additional_fee',
-        //   scopedSlots: { customRender: 'additional_fee' }
-        // }
-      ],
-      // table内容
-      ruleList: [],
-      // 计费方式
-      method: 10,
-      // 城市总数
-      citysCount: null,
-    }
-  },
-  // 初始化数据
-  created() {
-    this.isLoading = true
-    // 获取form所需的数据
-    GoodsModel.getFromData().then(() => {
-      this.isLoading = false
-    })
+			columns: [
+				{
+					title: '销售区域',
+					dataIndex: 'region_text',
+					width: '400px',
+					scopedSlots: { customRender: 'region_text' },
+				},
+				// {
+				//   title: '首件 (个)',
+				//   dataIndex: 'first',
+				//   scopedSlots: { customRender: 'first' }
+				// },
+				// {
+				//   title: '运费(元)',
+				//   dataIndex: 'first_fee',
+				//   scopedSlots: { customRender: 'first_fee' }
+				// },
+				// {
+				//   title: '续件 (个)',
+				//   dataIndex: 'additional',
+				//   scopedSlots: { customRender: 'additional' }
+				// },
+				// {
+				//   title: '续费(元)',
+				//   dataIndex: 'additional_fee',
+				//   scopedSlots: { customRender: 'additional_fee' }
+				// }
+			],
+			// table内容
+			ruleList: [],
+			// 计费方式
+			method: 10,
+			// 城市总数
+			citysCount: null,
+		}
+	},
+	// 初始化数据
+	created() {
+		this.isLoading = true
+		// 获取form所需的数据
+		GoodsModel.getFromData().then(() => {
+			this.isLoading = false
+		})
 
-    // 城市总数
-    Region.getCitysCount().then((count) => {
-      this.citysCount = count
-    })
-  },
-  methods: {
-    // 手动强制更新页面
-    onForceUpdate(bool = false) {
-      this.$forceUpdate()
-      // bool为true时再执行一次 $forceUpdate, 特殊情况下需执行两次，原因如下：
-      // 第一次执行 $forceUpdate时, 新元素绑定v-decorator无法获取到form.getFieldValue
-      bool &&
-        setTimeout(() => {
-          this.$forceUpdate()
-        }, 10)
-    },
+		// 城市总数
+		Region.getCitysCount().then((count) => {
+			this.citysCount = count
+		})
+	},
+	methods: {
+		handInfo() {
+			const { form } = this
+			const goods_no = form.getFieldValue('goods_no')
+			if (goods_no) {
+				let param = {
+					sku: goods_no
+				}
+				this.isLoading = true
+				GoodsApi.getCollector(param).then((result) => {
+					this.$refs.childComponent.selectedItems = result.data.goods_images
+					let obj = {
+						goods_name: result.data.name,
+						content: result.data.content,
+						goods_price: result.data.proxyPrice,
+            imagesIds:result.data.goods_images,
+            goods_images:result.data.goods_images,
+					}
+					this.form.setFieldsValue(obj)
+					this.isLoading = false
+				})
+					.catch(() => {
+						this.isLoading = false
+					})
+					.finally(() => (this.isLoading = false))
+			} else {
+				this.$message.warning('请输入商品SKU', 1.5)
+			}
+		},
+		// 手动强制更新页面
+		onForceUpdate(bool = false) {
+			this.$forceUpdate()
+			// bool为true时再执行一次 $forceUpdate, 特殊情况下需执行两次，原因如下：
+			// 第一次执行 $forceUpdate时, 新元素绑定v-decorator无法获取到form.getFieldValue
+			bool &&
+				setTimeout(() => {
+					this.$forceUpdate()
+				}, 10)
+		},
 
-    // 切换tab选项卡
-    handleTabs(key) {
-      this.tabKey = key
-    },
+		// 切换tab选项卡
+		handleTabs(key) {
+			this.tabKey = key
+		},
 
-    // 刷新分类列表
-    onReloadCategoryList() {
-      this.isLoading = true
-      GoodsModel.getCategoryList().then(() => {
-        this.isLoading = false
-      })
-    },
+		// 刷新分类列表
+		onReloadCategoryList() {
+			this.isLoading = true
+			GoodsModel.getCategoryList().then(() => {
+				this.isLoading = false
+			})
+		},
 
-    // 刷新服务与承诺列表
-    onReloadServiceList() {
-      this.isLoading = true
-      GoodsModel.getServiceList().then(() => {
-        this.isLoading = false
-      })
-    },
+		// 刷新服务与承诺列表
+		onReloadServiceList() {
+			this.isLoading = true
+			GoodsModel.getServiceList().then(() => {
+				this.isLoading = false
+			})
+		},
 
-    // 刷新配送模板列表
-    onReloadDeliveryList() {
-      this.isLoading = true
-      GoodsModel.getDeliveryList().then(() => {
-        this.isLoading = false
-      })
-    },
+		// 刷新配送模板列表
+		onReloadDeliveryList() {
+			this.isLoading = true
+			GoodsModel.getDeliveryList().then(() => {
+				this.isLoading = false
+			})
+		},
 
-    // 确认按钮
-    handleSubmit(e) {
-      e.preventDefault()
-      // 表单验证
-      const {
-        form: { validateFields },
-        ruleList,
-      } = this
-      validateFields((errors, values) => {
-        // 定位到错误的tab选项卡
-        if (errors) {
-          this.onTargetTabError(errors)
-          return false
-        }
-        // 验证多规格
-        if (values.spec_type === 20) {
-          const MultiSpec = this.$refs.MultiSpec
-          if (!MultiSpec.verifyForm()) {
-            this.tabKey = 1
-            return false
-          }
-          // 记录多规格数据
-          values.specData = MultiSpec.getFromSpecData()
-        }
-        // 整理商品分类ID集
-        values.categoryIds = values.categorys.map((item) => item.value)
-        delete values.categorys
-        // 提交到后端api
-        values.rules = ruleList
-        this.onFormSubmit(values)
-        return true
-      })
-    },
+		// 确认按钮
+		handleSubmit(e) {
+			e.preventDefault()
+			// 表单验证
+			const {
+				form: { validateFields },
+				ruleList,
+			} = this
+			validateFields((errors, values) => {
+				// 定位到错误的tab选项卡
+				if (errors) {
+					this.onTargetTabError(errors)
+					return false
+				}
+				// 验证多规格
+				if (values.spec_type === 20) {
+					const MultiSpec = this.$refs.MultiSpec
+					if (!MultiSpec.verifyForm()) {
+						this.tabKey = 1
+						return false
+					}
+					// 记录多规格数据
+					values.specData = MultiSpec.getFromSpecData()
+				}
+				// 整理商品分类ID集
+				values.categoryIds = values.categorys.map((item) => item.value)
+				delete values.categorys
+				// 提交到后端api
+				values.rules = ruleList
+				this.onFormSubmit(values)
+				return true
+			})
+		},
 
-    // 定位到错误的tab选项卡
-    onTargetTabError(errors) {
-      // 表单字段与tabKey对应关系
-      // 只需要必填字段就可
-      const tabsFieldsMap = [
-        ['goods_type', 'goods_name', 'categorys', 'imagesIds', 'delivery_id', 'is_ind_delivery_type', 'delivery_type'],
-        ['spec_type', 'goods_price', 'is_restrict', 'restrict_total', 'restrict_single'],
-        ['content'],
-        ['alone_grade_equity', 'first_money', 'second_money', 'third_money'],
-      ]
-      const field = Object.keys(errors).shift()
-      for (const key in tabsFieldsMap) {
-        if (tabsFieldsMap[key].indexOf(field) > -1) {
-          this.tabKey = parseInt(key)
-          break
-        }
-      }
-    },
+		// 定位到错误的tab选项卡
+		onTargetTabError(errors) {
+			// 表单字段与tabKey对应关系
+			// 只需要必填字段就可
+			const tabsFieldsMap = [
+				['goods_type', 'goods_name', 'categorys', 'imagesIds', 'delivery_id', 'is_ind_delivery_type', 'delivery_type'],
+				['spec_type', 'goods_price', 'is_restrict', 'restrict_total', 'restrict_single'],
+				['content'],
+				['alone_grade_equity', 'first_money', 'second_money', 'third_money'],
+			]
+			const field = Object.keys(errors).shift()
+			for (const key in tabsFieldsMap) {
+				if (tabsFieldsMap[key].indexOf(field) > -1) {
+					this.tabKey = parseInt(key)
+					break
+				}
+			}
+		},
 
-    // 提交到后端api
-    onFormSubmit(values) {
-      this.isLoading = true
-      this.isBtnLoading = true
-      GoodsApi.add({ form: values })
-        .then((result) => {
-          // 显示提示信息
-          this.$message.success(result.message, 1.5)
-          // 跳转到列表页
-          setTimeout(() => {
-            this.$router.push('./index')
-          }, 1500)
-        })
-        .catch(() => {
-          this.isBtnLoading = false
-        })
-        .finally(() => (this.isLoading = false))
-    },
+		// 提交到后端api
+		onFormSubmit(values) {
+			this.isLoading = true
+			this.isBtnLoading = true
+			GoodsApi.add({ form: values })
+				.then((result) => {
+					// 显示提示信息
+					this.$message.success(result.message, 1.5)
+					// 跳转到列表页
+					setTimeout(() => {
+						this.$router.push('./index')
+					}, 1500)
+				})
+				.catch(() => {
+					this.isBtnLoading = false
+				})
+				.finally(() => (this.isLoading = false))
+		},
 
-    // 新增记录
-    handleAdd() {
-      const index = this.ruleList.length
-      const newItem = { ...defaultItem, key: index }
-      // 排除的城市id集(已存在的城市id集)
-      const excludedCityIds = this.getExcludedCityIds()
-      if (excludedCityIds.length === this.citysCount) {
-        this.$message.error('已选择了所有的区域', 0.8)
-        return false
-      }
-      // 显示选择地区对话框
-      this.handleAreasModal('add', index, newItem, excludedCityIds)
-    },
+		// 新增记录
+		handleAdd() {
+			const index = this.ruleList.length
+			const newItem = { ...defaultItem, key: index }
+			// 排除的城市id集(已存在的城市id集)
+			const excludedCityIds = this.getExcludedCityIds()
+			if (excludedCityIds.length === this.citysCount) {
+				this.$message.error('已选择了所有的区域', 0.8)
+				return false
+			}
+			// 显示选择地区对话框
+			this.handleAreasModal('add', index, newItem, excludedCityIds)
+		},
 
-    // 编辑记录
-    handleEdit(index, item) {
-      // 排除的城市id集(已存在的城市id集)
-      const excludedCityIds = this.getExcludedCityIds()
-      // 显示选择地区对话框
-      this.handleAreasModal('edit', index, item, excludedCityIds)
-    },
+		// 编辑记录
+		handleEdit(index, item) {
+			// 排除的城市id集(已存在的城市id集)
+			const excludedCityIds = this.getExcludedCityIds()
+			// 显示选择地区对话框
+			this.handleAreasModal('edit', index, item, excludedCityIds)
+		},
 
-    // 选择地区后的回调
-    handleAreaSubmit(result) {
-      const {
-        custom: { scene, item },
-      } = result
-      item.region = result.selectedCityIds
-      item.region_text = result.selectedText
-      if (scene === 'add') {
-        this.ruleList.push(item)
-      }
-    },
+		// 选择地区后的回调
+		handleAreaSubmit(result) {
+			const {
+				custom: { scene, item },
+			} = result
+			item.region = result.selectedCityIds
+			item.region_text = result.selectedText
+			if (scene === 'add') {
+				this.ruleList.push(item)
+			}
+		},
 
-    // 排除的城市id集(已存在的城市id集)
-    getExcludedCityIds() {
-      const excludedCityIds = []
-      this.ruleList.forEach((item) => {
-        item.region.forEach((cityId) => {
-          excludedCityIds.push(cityId)
-        })
-      })
-      return excludedCityIds
-    },
+		// 排除的城市id集(已存在的城市id集)
+		getExcludedCityIds() {
+			const excludedCityIds = []
+			this.ruleList.forEach((item) => {
+				item.region.forEach((cityId) => {
+					excludedCityIds.push(cityId)
+				})
+			})
+			return excludedCityIds
+		},
 
-    // 显示选择地区对话框
-    handleAreasModal(scene, index, item, excludedCityIds) {
-      this.$refs.AreasModal.handle({ scene, index, item }, item.region, excludedCityIds)
-    },
+		// 显示选择地区对话框
+		handleAreasModal(scene, index, item, excludedCityIds) {
+			this.$refs.AreasModal.handle({ scene, index, item }, item.region, excludedCityIds)
+		},
 
-    // 删除记录
-    handleDelete(index) {
-      const app = this
-      const modal = this.$confirm({
-        title: '您确定要删除该记录吗?',
-        onOk() {
-          app.ruleList.splice(index, 1)
-          modal.destroy()
-        },
-      })
-    },
-  },
+		// 删除记录
+		handleDelete(index) {
+			const app = this
+			const modal = this.$confirm({
+				title: '您确定要删除该记录吗?',
+				onOk() {
+					app.ruleList.splice(index, 1)
+					modal.destroy()
+				},
+			})
+		},
+	},
 }
 </script>
 <style lang="less" scoped>
 @import './style.less';
 .table-rules {
-  .operation {
-    text-align: right;
-    a {
-      font-size: @font-size-base;
-      margin-left: 6px;
-    }
-  }
-  .content {
-    color: #505050;
-    white-space: normal;
-    .city-name {
-      font-size: 12.5px;
-      color: #7b7b7b;
-    }
-  }
+	.operation {
+		text-align: right;
+		a {
+			font-size: @font-size-base;
+			margin-left: 6px;
+		}
+	}
+	.content {
+		color: #505050;
+		white-space: normal;
+		.city-name {
+			font-size: 12.5px;
+			color: #7b7b7b;
+		}
+	}
 }
 </style>
diff --git a/src/views/dataCenter/goods/modules/Update.vue b/src/views/dataCenter/goods/modules/Update.vue
index 62d69e1..8b05f8d 100644
--- a/src/views/dataCenter/goods/modules/Update.vue
+++ b/src/views/dataCenter/goods/modules/Update.vue
@@ -1,436 +1,279 @@
 <template>
-  <a-modal
-    title="编辑商品"
-    width="90%"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    :maskClosable="false"
-    :destroyOnClose="true"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
-    <a-card :bordered="false">
-      <div class="card-title">商品编辑</div>
-      <a-spin :spinning="isLoading">
-        <a-form :form="form" @submit="handleSubmit" :selfUpdate="true">
-          <a-tabs :activeKey="tabKey" :tabBarStyle="{ marginBottom: '30px' }" @change="handleTabs">
-            <a-tab-pane :key="0" tab="基本信息"></a-tab-pane>
-            <a-tab-pane :key="1" tab="规格/库存"></a-tab-pane>
-            <a-tab-pane :key="2" tab="商品详情"></a-tab-pane>
-            <a-tab-pane :key="3" tab="更多设置"></a-tab-pane>
-          </a-tabs>
-          <div class="tabs-content">
-            <!-- 基本信息 -->
-            <div class="tab-pane" v-show="tabKey == 0">
-              <a-form-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <GoodsType
-                  :onlyShowChecked="true"
-                  v-decorator="['goods_type', { rules: [{ required: true }] }]"
-                  @change="onForceUpdate(true)"
-                />
-              </a-form-item>
-              <a-form-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input
-                  placeholder="请输入商品名称"
-                  v-decorator="['goods_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
-                />
-              </a-form-item>
-              <a-form-item label="商品型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input
-                  placeholder="请输入商品型号"
-                  v-decorator="['cmmdty_model', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
-                />
-              </a-form-item>
-              <a-form-item label="商品分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-tree-select
-                  placeholder="请选择商品分类"
-                  :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }"
-                  :treeData="formData.categoryList"
-                  treeCheckable
-                  treeCheckStrictly
-                  allowClear
-                  v-decorator="['categorys', { rules: [{ required: true, message: '请至少选择1个商品分类' }] }]"
-                ></a-tree-select>
-                <div class="form-item-help">
-                  <router-link target="_blank" :to="{ path: '/goods/category/index' }">去新增</router-link>
-                  <a href="javascript:;" @click="onReloadCategoryList">刷新</a>
-                </div>
-              </a-form-item>
-              <a-form-item
-                label="商品图片"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="建议尺寸：750*750像素, 最多上传10张, 可拖拽图片调整顺序, 第1张将作为商品首图"
-              >
-                <SelectImage
-                  multiple
-                  :maxNum="10"
-                  :defaultList="formData.goods.goods_images"
-                  v-decorator="['imagesIds', { rules: [{ required: true, message: '请至少上传1张商品图片' }] }]"
-                />
-              </a-form-item>
-              <a-form-item label="商品编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入商品编码" v-decorator="['goods_no']" />
-              </a-form-item>
+	<a-modal title="编辑商品" width="90%" :visible="visible" :confirmLoading="confirmLoading" :maskClosable="false" :destroyOnClose="true" @ok="handleSubmit" @cancel="handleCancel">
+		<a-card :bordered="false">
+			<div class="card-title">商品编辑</div>
+			<a-spin :spinning="isLoading">
+				<a-form :form="form" @submit="handleSubmit" :selfUpdate="true">
+					<a-tabs :activeKey="tabKey" :tabBarStyle="{ marginBottom: '30px' }" @change="handleTabs">
+						<a-tab-pane :key="0" tab="基本信息"></a-tab-pane>
+						<a-tab-pane :key="1" tab="规格/库存"></a-tab-pane>
+						<a-tab-pane :key="2" tab="商品详情"></a-tab-pane>
+						<a-tab-pane :key="3" tab="更多设置"></a-tab-pane>
+					</a-tabs>
+					<div class="tabs-content">
+						<!-- 基本信息 -->
+						<div class="tab-pane" v-show="tabKey == 0">
+							<a-form-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<GoodsType :onlyShowChecked="true" v-decorator="['goods_type', { rules: [{ required: true }] }]" @change="onForceUpdate(true)" />
+							</a-form-item>
+							<a-form-item label="商品SKU" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<div style=" display: flex;align-items: center;width:100%">
+									<a-input style="width:242px" placeholder="输入商品SKU" v-decorator="['goods_no', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]" />
+									<div class="action-item" style="margin-left:15px">
+										<a-button type="primary" @click="handInfo">一键获取</a-button>
+									</div>
+								</div>
+							</a-form-item>
+							<a-form-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-input placeholder="请输入商品名称" v-decorator="['goods_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]" />
+							</a-form-item>
+							<a-form-item label="商品型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-input placeholder="请输入商品型号" v-decorator="['cmmdty_model', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]" />
+							</a-form-item>
+							<a-form-item label="商品分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-tree-select placeholder="请选择商品分类" :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }" :treeData="formData.categoryList" treeCheckable treeCheckStrictly allowClear
+									v-decorator="['categorys', { rules: [{ required: true, message: '请至少选择1个商品分类' }] }]"></a-tree-select>
+								<div class="form-item-help">
+									<router-link target="_blank" :to="{ path: '/goods/category/index' }">去新增</router-link>
+									<a href="javascript:;" @click="onReloadCategoryList">刷新</a>
+								</div>
+							</a-form-item>
+        
+							<a-form-item label="商品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="建议尺寸：750*750像素, 最多上传10张, 可拖拽图片调整顺序, 第1张将作为商品首图">
+								<SelectImage ref="childComponent" :source='1' multiple :maxNum="10" :defaultList="formData.goods.goods_images" v-decorator="['imagesIds', { rules: [{ required: true, message: '请至少上传1张商品图片' }] }]" />
+							</a-form-item>
+							<a-form-item label="热卖指数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-input placeholder="热卖指数" v-decorator="['remaizhishu']" />
+							</a-form-item>
 
-              <a-form-item label="热卖指数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="热卖指数" v-decorator="['remaizhishu']" />
-              </a-form-item>
-
-              <a-form-item label="商品来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-radio-group v-decorator="['goods_source', { initialValue: 0, rules: [{ required: true }] }]">
-                  <!-- <a-radio value="JD">京东</a-radio>
+							<a-form-item label="商品来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['goods_source', { initialValue: 0, rules: [{ required: true }] }]">
+									<!-- <a-radio value="JD">京东</a-radio>
                   <a-radio value="SN">苏宁</a-radio> -->
-                  <a-radio value="GC">工厂</a-radio>
-                  <a-radio value="CC">仓储</a-radio>
-                  <a-radio value="ZC">自采</a-radio>
-                </a-radio-group>
-              </a-form-item>
-              <a-form-item label="发货时效" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-radio-group v-decorator="['delivery_time', { initialValue: 0, rules: [{ required: true }] }]">
-                  <a-radio :value="0">24小时</a-radio>
-                  <a-radio :value="1">48小时</a-radio>
-                  <a-radio :value="2">72小时</a-radio>
-                  <a-radio :value="3">7天内</a-radio>
-                  <a-radio :value="4">15天内</a-radio>
-                  <a-radio :value="5">30天内</a-radio>
-                  <a-radio :value="6">45天内</a-radio>
-                </a-radio-group>
-              </a-form-item>
-              <a-form-item label="是否审单" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-radio-group v-decorator="['is_check', { initialValue: 0, rules: [{ required: true }] }]">
-                  <a-radio :value="0">否</a-radio>
-                  <a-radio :value="1">是</a-radio>
-                </a-radio-group>
-              </a-form-item>
-              <a-form-item label="商品池" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-radio-group v-decorator="['is_pool', { initialValue: 0, rules: [{ required: true }] }]">
-                  <a-radio :value="0">待处理</a-radio>
-                  <a-radio :value="1">已入池</a-radio>
-                  <a-radio :value="2">未入池</a-radio>
-                </a-radio-group>
-              </a-form-item>
-              <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-radio-group v-decorator="['is_sale', { initialValue: 0, rules: [{ required: true }] }]">
-                  <a-radio :value="0">停售</a-radio>
-                  <a-radio :value="1">在售</a-radio>
-                  <a-radio :value="2">无货</a-radio>
-                </a-radio-group>
-              </a-form-item>
-              <a-form-item label="是否精品" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-radio-group v-decorator="['is_jingpin', { initialValue: 0, rules: [{ required: true }] }]">
-                  <a-radio :value="0">否</a-radio>
-                  <a-radio :value="1">是</a-radio>
-                </a-radio-group>
-              </a-form-item>
-              <a-form-item label="商品排序" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="数字越小越靠前">
-                <a-input-number :min="0" v-decorator="['sort', { initialValue: 100, rules: [{ required: true }] }]" />
-              </a-form-item>
-            </div>
+									<a-radio value="GC">工厂</a-radio>
+									<a-radio value="CC">仓储</a-radio>
+									<a-radio value="ZC">自采</a-radio>
+								</a-radio-group>
+							</a-form-item>
+							<a-form-item label="发货时效" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['delivery_time', { initialValue: 0, rules: [{ required: true }] }]">
+									<a-radio :value="0">24小时</a-radio>
+									<a-radio :value="1">48小时</a-radio>
+									<a-radio :value="2">72小时</a-radio>
+									<a-radio :value="3">7天内</a-radio>
+									<a-radio :value="4">15天内</a-radio>
+									<a-radio :value="5">30天内</a-radio>
+									<a-radio :value="6">45天内</a-radio>
+								</a-radio-group>
+							</a-form-item>
+							<a-form-item label="是否审单" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['is_check', { initialValue: 0, rules: [{ required: true }] }]">
+									<a-radio :value="0">否</a-radio>
+									<a-radio :value="1">是</a-radio>
+								</a-radio-group>
+							</a-form-item>
+							<a-form-item label="商品池" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['is_pool', { initialValue: 0, rules: [{ required: true }] }]">
+									<a-radio :value="0">待处理</a-radio>
+									<a-radio :value="1">已入池</a-radio>
+									<a-radio :value="2">未入池</a-radio>
+								</a-radio-group>
+							</a-form-item>
+							<a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['is_sale', { initialValue: 0, rules: [{ required: true }] }]">
+									<a-radio :value="0">停售</a-radio>
+									<a-radio :value="1">在售</a-radio>
+									<a-radio :value="2">无货</a-radio>
+								</a-radio-group>
+							</a-form-item>
+							<a-form-item label="是否精品" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['is_jingpin', { initialValue: 0, rules: [{ required: true }] }]">
+									<a-radio :value="0">否</a-radio>
+									<a-radio :value="1">是</a-radio>
+								</a-radio-group>
+							</a-form-item>
+							<a-form-item label="商品排序" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="数字越小越靠前">
+								<a-input-number :min="0" v-decorator="['sort', { initialValue: 100, rules: [{ required: true }] }]" />
+							</a-form-item>
+						</div>
 
-            <!-- 规格/库存 -->
-            <div class="tab-pane" v-show="tabKey == 1">
-              <a-form-item label="规格类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-radio-group
-                  v-decorator="['spec_type', { initialValue: 10, rules: [{ required: true }] }]"
-                  @change="onForceUpdate()"
-                >
-                  <a-radio :value="10" :disabled="formData.goods.isSpecLocked">单规格</a-radio>
-                  <a-radio :value="20" :disabled="formData.goods.isSpecLocked">多规格</a-radio>
-                </a-radio-group>
-                <p v-if="formData.goods.isSpecLocked" class="form-item-help">
-                  <small class="c-red">注：该商品当前正在参与其他活动，商品规格不允许更改</small>
-                </p>
-              </a-form-item>
-              <a-form-item label="规格值" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="多个规格值，以英文分号分隔" v-decorator="['specific_value']" />
-              </a-form-item>
-              <!-- 多规格的表单内容 -->
-              <div v-if="form.getFieldValue('spec_type') == 20">
-                <MultiSpec
-                  ref="MultiSpec"
-                  :isSpecLocked="formData.goods.isSpecLocked"
-                  :defaultSpecList="formData.goods.specList"
-                  :defaultSkuList="formData.goods.skuList"
-                  :channel="formData.goods.channel"
-                  :checkList="checkList"
-                  :source="1"
-                />
-              </div>
-              <!-- 单规格的表单内容 -->
-              <div v-if="form.getFieldValue('spec_type') == 10">
-                <a-form-item
-                  label="商品价格"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  extra="商品的实际购买金额，最低0.01"
-                >
-                  <a-input-number
-                    :min="0.01"
-                    :precision="2"
-                    v-decorator="['goods_price', { rules: [{ required: true, message: '请输入商品价格' }] }]"
-                  />
-                  <span class="ml-10">元</span>
-                </a-form-item>
-                <a-form-item
-                  label="成本价"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  extra="成本价仅用于商品页展示"
-                >
-                  <a-input-number :min="0" :precision="2" v-decorator="['cost_price']" />
-                  <span class="ml-10">元</span>
-                </a-form-item>
-                <a-form-item
-                  label="当前库存数量"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  extra="商品的实际库存数量，为0时用户无法下单"
-                >
-                  <a-input-number
-                    :min="0"
-                    :precision="0"
-                    v-decorator="[
+						<!-- 规格/库存 -->
+						<div class="tab-pane" v-show="tabKey == 1">
+							<a-form-item label="规格类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-radio-group v-decorator="['spec_type', { initialValue: 10, rules: [{ required: true }] }]" @change="onForceUpdate()">
+									<a-radio :value="10" :disabled="formData.goods.isSpecLocked">单规格</a-radio>
+									<a-radio :value="20" :disabled="formData.goods.isSpecLocked">多规格</a-radio>
+								</a-radio-group>
+								<p v-if="formData.goods.isSpecLocked" class="form-item-help">
+									<small class="c-red">注：该商品当前正在参与其他活动，商品规格不允许更改</small>
+								</p>
+							</a-form-item>
+							<a-form-item label="规格值" :labelCol="labelCol" :wrapperCol="wrapperCol">
+								<a-input placeholder="多个规格值，以英文分号分隔" v-decorator="['specific_value']" />
+							</a-form-item>
+							<!-- 多规格的表单内容 -->
+							<div v-if="form.getFieldValue('spec_type') == 20">
+								<MultiSpec ref="MultiSpec" :isSpecLocked="formData.goods.isSpecLocked" :defaultSpecList="formData.goods.specList" :defaultSkuList="formData.goods.skuList" :channel="formData.goods.channel" :checkList="checkList"
+									:source="1" />
+							</div>
+							<!-- 单规格的表单内容 -->
+							<div v-if="form.getFieldValue('spec_type') == 10">
+								<a-form-item label="商品价格" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="商品的实际购买金额，最低0.01">
+									<a-input-number :min="0.01" :precision="2" v-decorator="['goods_price', { rules: [{ required: true, message: '请输入商品价格' }] }]" />
+									<span class="ml-10">元</span>
+								</a-form-item>
+								<a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="成本价仅用于商品页展示">
+									<a-input-number :min="0" :precision="2" v-decorator="['cost_price']" />
+									<span class="ml-10">元</span>
+								</a-form-item>
+								<a-form-item label="当前库存数量" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="商品的实际库存数量，为0时用户无法下单">
+									<a-input-number :min="0" :precision="0" v-decorator="[
                       'stock_num',
                       { initialValue: 100, rules: [{ required: true, message: '请输入库存数量' }] },
-                    ]"
-                  />
-                  <span class="ml-10">件</span>
-                </a-form-item>
-                <a-form-item
-                  label="商品重量"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  extra="商品的实际重量，用于计算运费"
-                >
-                  <a-input-number
-                    :min="0"
-                    v-decorator="[
+                    ]" />
+									<span class="ml-10">件</span>
+								</a-form-item>
+								<a-form-item label="商品重量" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="商品的实际重量，用于计算运费">
+									<a-input-number :min="0" v-decorator="[
                       'goods_weight',
                       { initialValue: 0, rules: [{ required: true, message: '请输入库存数量' }] },
-                    ]"
-                  />
-                  <span class="ml-10">千克 (Kg)</span>
-                </a-form-item>
-              </div>
-            </div>
-            <!-- 商品详情 -->
-            <div class="tab-pane" v-show="tabKey == 2">
-              <a-form-item label="商品详情" :labelCol="labelCol" :wrapperCol="{ span: 16 }">
-                <Ueditor v-decorator="['content', { rules: [{ required: true, message: '商品详情不能为空' }] }]" />
-              </a-form-item>
-            </div>
+                    ]" />
+									<span class="ml-10">千克 (Kg)</span>
+								</a-form-item>
+							</div>
+						</div>
+						<!-- 商品详情 -->
+						<div class="tab-pane" v-show="tabKey == 2">
+							<a-form-item label="商品详情" :labelCol="labelCol" :wrapperCol="{ span: 16 }">
+								<Ueditor v-decorator="['content', { rules: [{ required: true, message: '商品详情不能为空' }] }]" />
+							</a-form-item>
+						</div>
 
-            <!-- 更多设置 -->
-            <div class="tab-pane" v-show="tabKey == 3">
-              <a-form-item
-                label="主图视频"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="建议视频宽高比19:9，建议时长8-45秒"
-              >
-                <SelectVideo
-                  :multiple="false"
-                  :defaultList="formData.goods.video ? [formData.goods.video] : []"
-                  v-decorator="['video_id']"
-                />
-              </a-form-item>
-              <a-form-item
-                label="视频封面"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="建议尺寸：750像素*750像素"
-              >
-                <SelectImage
-                  :multiple="false"
-                  :defaultList="formData.goods.videoCover ? [formData.goods.videoCover] : []"
-                  v-decorator="['video_cover_id']"
-                />
-              </a-form-item>
-              <a-form-item
-                label="商品卖点"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="一句话简述，例如：此款商品美观大方 性价比较高 不容错过"
-              >
-                <a-input placeholder="请输入商品卖点" v-decorator="['selling_point']" />
-              </a-form-item>
-              <a-form-item
-                label="初始销量"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                extra="用户端展示的销量 = 初始销量 + 实际销量"
-              >
-                <a-input-number v-decorator="['sales_initial', { initialValue: 0 }]" />
-              </a-form-item>
+						<!-- 更多设置 -->
+						<div class="tab-pane" v-show="tabKey == 3">
+							<a-form-item label="主图视频" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="建议视频宽高比19:9，建议时长8-45秒">
+								<SelectVideo :multiple="false" :defaultList="formData.goods.video ? [formData.goods.video] : []" v-decorator="['video_id']" />
+							</a-form-item>
+							<a-form-item label="视频封面" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="建议尺寸：750像素*750像素">
+								<SelectImage :multiple="false" :defaultList="formData.goods.videoCover ? [formData.goods.videoCover] : []" v-decorator="['video_cover_id']" />
+							</a-form-item>
+							<a-form-item label="商品卖点" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="一句话简述，例如：此款商品美观大方 性价比较高 不容错过">
+								<a-input placeholder="请输入商品卖点" v-decorator="['selling_point']" />
+							</a-form-item>
+							<a-form-item label="初始销量" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="用户端展示的销量 = 初始销量 + 实际销量">
+								<a-input-number v-decorator="['sales_initial', { initialValue: 0 }]" />
+							</a-form-item>
 
-              <div>
-                <a-divider orientation="left">销售区域</a-divider>
-                <a-form-item label="销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
-                  <a-table
-                    v-show="ruleList.length"
-                    class="table-rules"
-                    :columns="columns"
-                    :dataSource="ruleList"
-                    :pagination="false"
-                    bordered
-                  >
-                    <!-- 销售区域 -->
-                    <template slot="region_text" slot-scope="text, item, index">
-                      <p class="content">
-                        <span v-for="(province, pidx) in text" :key="pidx">
-                          <span>{{ province.name }}</span>
-                          <template v-if="province.citys.length">
-                            <span>(</span>
-                            <span class="city-name" v-for="(city, cidx) in province.citys" :key="cidx"
-                              >{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span
-                            >
-                            <span>)</span>
-                          </template>
-                          <span>{{ ' ' }}</span>
-                        </span>
-                      </p>
-                      <p class="operation">
-                        <a href="javascript:void(0);" class="edit" @click="handleEdit(index, item)">编辑</a>
-                        <a href="javascript:void(0);" class="delete" @click="handleDelete(index)">删除</a>
-                      </p>
-                    </template>
-                  </a-table>
-                  <a-button icon="environment" v-if="ruleList.length == 0" @click="handleAdd"
-                    >点击添加销售区域</a-button
-                  >
-                </a-form-item>
-              </div>
+							<div>
+								<a-divider orientation="left">销售区域</a-divider>
+								<a-form-item label="销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
+									<a-table v-show="ruleList.length" class="table-rules" :columns="columns" :dataSource="ruleList" :pagination="false" bordered>
+										<!-- 销售区域 -->
+										<template slot="region_text" slot-scope="text, item, index">
+											<p class="content">
+												<span v-for="(province, pidx) in text" :key="pidx">
+													<span>{{ province.name }}</span>
+													<template v-if="province.citys.length">
+														<span>(</span>
+														<span class="city-name" v-for="(city, cidx) in province.citys" :key="cidx">{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span>
+														<span>)</span>
+													</template>
+													<span>{{ ' ' }}</span>
+												</span>
+											</p>
+											<p class="operation">
+												<a href="javascript:void(0);" class="edit" @click="handleEdit(index, item)">编辑</a>
+												<a href="javascript:void(0);" class="delete" @click="handleDelete(index)">删除</a>
+											</p>
+										</template>
+									</a-table>
+									<a-button icon="environment" v-if="ruleList.length == 0" @click="handleAdd">点击添加销售区域</a-button>
+								</a-form-item>
+							</div>
 
-              <div style="display: none">
-                <a-divider orientation="left">积分设置</a-divider>
-                <a-form-item
-                  label="积分赠送"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  extra="开启后用户购买此商品将获得积分"
-                >
-                  <a-radio-group v-decorator="['is_points_gift', { initialValue: 1, rules: [{ required: true }] }]">
-                    <a-radio :value="1">开启</a-radio>
-                    <a-radio :value="0">关闭</a-radio>
-                  </a-radio-group>
-                </a-form-item>
-                <a-form-item
-                  label="积分抵扣"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  extra="开启后用户购买此商品可以使用积分进行抵扣"
-                >
-                  <a-radio-group v-decorator="['is_points_discount', { initialValue: 1, rules: [{ required: true }] }]">
-                    <a-radio :value="1">开启</a-radio>
-                    <a-radio :value="0">关闭</a-radio>
-                  </a-radio-group>
-                </a-form-item>
-              </div>
+							<div style="display: none">
+								<a-divider orientation="left">积分设置</a-divider>
+								<a-form-item label="积分赠送" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="开启后用户购买此商品将获得积分">
+									<a-radio-group v-decorator="['is_points_gift', { initialValue: 1, rules: [{ required: true }] }]">
+										<a-radio :value="1">开启</a-radio>
+										<a-radio :value="0">关闭</a-radio>
+									</a-radio-group>
+								</a-form-item>
+								<a-form-item label="积分抵扣" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="开启后用户购买此商品可以使用积分进行抵扣">
+									<a-radio-group v-decorator="['is_points_discount', { initialValue: 1, rules: [{ required: true }] }]">
+										<a-radio :value="1">开启</a-radio>
+										<a-radio :value="0">关闭</a-radio>
+									</a-radio-group>
+								</a-form-item>
+							</div>
 
-              <div style="display: none">
-                <a-divider orientation="left">会员折扣设置</a-divider>
-                <a-form-item
-                  label="会员折扣"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  extra="开启后会员折扣，会员购买此商品可以享受会员等级折扣价"
-                >
-                  <a-radio-group
-                    v-decorator="['is_enable_grade', { initialValue: 1, rules: [{ required: true }] }]"
-                    @change="onForceUpdate(true)"
-                  >
-                    <a-radio :value="1">开启</a-radio>
-                    <a-radio :value="0">关闭</a-radio>
-                  </a-radio-group>
-                </a-form-item>
-                <a-form-item
-                  v-show="form.getFieldValue('is_enable_grade')"
-                  label="会员折扣设置"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                >
-                  <a-radio-group
-                    v-decorator="['is_alone_grade', { initialValue: 0, rules: [{ required: true }] }]"
-                    @change="onForceUpdate(true)"
-                  >
-                    <a-radio :value="0">默认等级折扣</a-radio>
-                    <a-radio :value="1">单独设置折扣</a-radio>
-                  </a-radio-group>
-                  <!-- 会员等级列表 -->
-                  <div v-show="form.getFieldValue('is_alone_grade')">
-                    <a-form-item v-for="item in formData.userGradeList" :key="item.grade_id">
-                      <InputNumberGroup
-                        :addonBefore="item.name"
-                        addonAfter="折"
-                        :inputProps="{ min: 0, max: 9.9 }"
-                        v-decorator="[
+							<div style="display: none">
+								<a-divider orientation="left">会员折扣设置</a-divider>
+								<a-form-item label="会员折扣" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="开启后会员折扣，会员购买此商品可以享受会员等级折扣价">
+									<a-radio-group v-decorator="['is_enable_grade', { initialValue: 1, rules: [{ required: true }] }]" @change="onForceUpdate(true)">
+										<a-radio :value="1">开启</a-radio>
+										<a-radio :value="0">关闭</a-radio>
+									</a-radio-group>
+								</a-form-item>
+								<a-form-item v-show="form.getFieldValue('is_enable_grade')" label="会员折扣设置" :labelCol="labelCol" :wrapperCol="wrapperCol">
+									<a-radio-group v-decorator="['is_alone_grade', { initialValue: 0, rules: [{ required: true }] }]" @change="onForceUpdate(true)">
+										<a-radio :value="0">默认等级折扣</a-radio>
+										<a-radio :value="1">单独设置折扣</a-radio>
+									</a-radio-group>
+									<!-- 会员等级列表 -->
+									<div v-show="form.getFieldValue('is_alone_grade')">
+										<a-form-item v-for="item in formData.userGradeList" :key="item.grade_id">
+											<InputNumberGroup :addonBefore="item.name" addonAfter="折" :inputProps="{ min: 0, max: 9.9 }" v-decorator="[
                           `alone_grade_equity[grade_id:${item.grade_id}]`,
                           {
                             initialValue: formData.defaultUserGradeValue[item.grade_id],
                             rules: [{ required: true, message: '折扣率不能为空' }],
                           },
-                        ]"
-                      />
-                    </a-form-item>
-                  </div>
-                  <div class="form-item-help">
-                    <p class="extra" v-if="form.getFieldValue('is_alone_grade')">
-                      单独折扣：折扣率范围0.0-9.9，例如: 9.8代表98折，0代表不折扣
-                    </p>
-                    <p class="extra" v-else>默认折扣：默认为用户所属会员等级的折扣率</p>
-                  </div>
-                </a-form-item>
-              </div>
+                        ]" />
+										</a-form-item>
+									</div>
+									<div class="form-item-help">
+										<p class="extra" v-if="form.getFieldValue('is_alone_grade')">
+											单独折扣：折扣率范围0.0-9.9，例如: 9.8代表98折，0代表不折扣
+										</p>
+										<p class="extra" v-else>默认折扣：默认为用户所属会员等级的折扣率</p>
+									</div>
+								</a-form-item>
+							</div>
 
-              <div style="display: none">
-                <a-divider orientation="left">分销设置</a-divider>
-                <a-form-item label="分销佣金" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-radio-group
-                    v-decorator="['is_ind_dealer', { initialValue: 0, rules: [{ required: true }] }]"
-                    @change="onForceUpdate(true)"
-                  >
-                    <a-radio :value="0">系统默认</a-radio>
-                    <a-radio :value="1">单独设置</a-radio>
-                  </a-radio-group>
-                  <div class="form-item-help">
-                    <p class="extra">若使用分销功能必须在 [分销中心 - 分销设置] 中开启</p>
-                  </div>
-                </a-form-item>
-                <a-form-item
-                  v-show="form.getFieldValue('is_ind_dealer')"
-                  label="分销佣金类型"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                >
-                  <a-radio-group
-                    v-decorator="['dealer_money_type', { initialValue: 10, rules: [{ required: true }] }]"
-                    @change="onForceUpdate(true)"
-                  >
-                    <a-radio :value="10">百分比</a-radio>
-                    <a-radio :value="20">固定金额</a-radio>
-                  </a-radio-group>
-                  <!-- 分销等级列表 -->
-                  <a-form-item v-for="(item, index) in formData.dealer.levelList" :key="index">
-                    <InputNumberGroup
-                      :addonBefore="item.name"
-                      :addonAfter="form.getFieldValue('dealer_money_type') == 10 ? '%' : '元'"
-                      :inputProps="{ min: 0, precision: 2 }"
-                      v-decorator="[item.value, { rules: [{ required: true, message: '佣金不能为空' }] }]"
-                    />
-                  </a-form-item>
-                </a-form-item>
-              </div>
-            </div>
-          </div>
-          <!-- <a-form-item class="mt-20" :wrapperCol="{ span: wrapperCol.span, offset: labelCol.span }">
+							<div style="display: none">
+								<a-divider orientation="left">分销设置</a-divider>
+								<a-form-item label="分销佣金" :labelCol="labelCol" :wrapperCol="wrapperCol">
+									<a-radio-group v-decorator="['is_ind_dealer', { initialValue: 0, rules: [{ required: true }] }]" @change="onForceUpdate(true)">
+										<a-radio :value="0">系统默认</a-radio>
+										<a-radio :value="1">单独设置</a-radio>
+									</a-radio-group>
+									<div class="form-item-help">
+										<p class="extra">若使用分销功能必须在 [分销中心 - 分销设置] 中开启</p>
+									</div>
+								</a-form-item>
+								<a-form-item v-show="form.getFieldValue('is_ind_dealer')" label="分销佣金类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+									<a-radio-group v-decorator="['dealer_money_type', { initialValue: 10, rules: [{ required: true }] }]" @change="onForceUpdate(true)">
+										<a-radio :value="10">百分比</a-radio>
+										<a-radio :value="20">固定金额</a-radio>
+									</a-radio-group>
+									<!-- 分销等级列表 -->
+									<a-form-item v-for="(item, index) in formData.dealer.levelList" :key="index">
+										<InputNumberGroup :addonBefore="item.name" :addonAfter="form.getFieldValue('dealer_money_type') == 10 ? '%' : '元'" :inputProps="{ min: 0, precision: 2 }"
+											v-decorator="[item.value, { rules: [{ required: true, message: '佣金不能为空' }] }]" />
+									</a-form-item>
+								</a-form-item>
+							</div>
+						</div>
+					</div>
+					<!-- <a-form-item class="mt-20" :wrapperCol="{ span: wrapperCol.span, offset: labelCol.span }">
             <a-button type="primary" html-type="submit" :loading="isBtnLoading">提交</a-button>
           </a-form-item> -->
-        </a-form>
-        <AreasModal ref="AreasModal" @handleSubmit="handleAreaSubmit" />
-      </a-spin>
-    </a-card>
-  </a-modal>
+				</a-form>
+				<AreasModal ref="AreasModal" @handleSubmit="handleAreaSubmit" />
+			</a-spin>
+		</a-card>
+	</a-modal>
 </template>
 <script>
 import * as GoodsApi from '@/api/goods'
@@ -442,316 +285,346 @@ import { AreasModal } from '@/components/Modal'
 import Region from '@/common/model/Region'
 
 const defaultItem = {
-  key: 0,
-  region: [],
-  region_text: [],
+	key: 0,
+	region: [],
+	region_text: [],
 }
 export default {
-  name: 'Update',
-  components: {
-    GoodsType,
-    SelectImage,
-    SelectVideo,
-    Ueditor,
-    InputNumberGroup,
-    MultiSpec,
-    AreasModal,
-    Region,
-  },
-  data() {
-    return {
-      // 默认的标签索引
-      tabKey: 0,
-      title: '',
-      // modal(对话框)是否可见
-      visible: false,
-      // modal(对话框)确定按钮 loading
-      confirmLoading: false,
-      // 标签布局属性
-      labelCol: { span: 3 },
-      // 输入框布局属性
-      wrapperCol: { span: 10 },
-      // loading状态
-      isLoading: false,
-      isBtnLoading: false,
-      // 当前表单元素
-      form: this.$form.createForm(this),
-      // 商品ID
-      goodsId: null,
-      // 表单数据
-      formData: GoodsModel.formData,
-      checkList: [],
-      // 销售区域
-      ruleList: [],
-      // 销售区域表头
-      columns: [
-        {
-          title: '销售区域',
-          dataIndex: 'region_text',
-          width: '400px',
-          scopedSlots: { customRender: 'region_text' },
-        },
-      ],
-      // 城市总数
-      citysCount: null,
-    }
-  },
+	name: 'Update',
+	components: {
+		GoodsType,
+		SelectImage,
+		SelectVideo,
+		Ueditor,
+		InputNumberGroup,
+		MultiSpec,
+		AreasModal,
+		Region,
+	},
+	data() {
+		return {
+			// 默认的标签索引
+			tabKey: 0,
+			title: '',
+			// modal(对话框)是否可见
+			visible: false,
+			// modal(对话框)确定按钮 loading
+			confirmLoading: false,
+			// 标签布局属性
+			labelCol: { span: 3 },
+			// 输入框布局属性
+			wrapperCol: { span: 10 },
+			// loading状态
+			isLoading: false,
+			isBtnLoading: false,
+			// 当前表单元素
+			form: this.$form.createForm(this),
+			// 商品ID
+			goodsId: null,
+			// 表单数据
+			formData: GoodsModel.formData,
+			checkList: [],
+			// 销售区域
+			ruleList: [],
+			// 销售区域表头
+			columns: [
+				{
+					title: '销售区域',
+					dataIndex: 'region_text',
+					width: '400px',
+					scopedSlots: { customRender: 'region_text' },
+				},
+			],
+			// 城市总数
+			citysCount: null,
+		}
+	},
 
-  beforeDestroy() {
-    // 销毁商品详情
-    GoodsModel.formData.goods = {}
-  },
-  methods: {
-    showEdit(goodsId) {
-      // 记录商品ID
-      this.visible = true
-      this.goodsId = goodsId
-      this.initData()
-      this.getDataList()
-      // 城市总数
-      Region.getCitysCount().then((count) => {
-        this.citysCount = count
-      })
-    },
-    // 关闭对话框事件
-    handleCancel() {
-      this.visible = false
-      this.form.resetFields()
-    },
-    // 初始化数据
-    initData(goodsId) {
-      // 获取form所需的数据
-      GoodsModel.formData.goods = {}
-      this.isLoading = true
-      GoodsModel.getFromData(this.goodsId).then(() => {
-        this.formData.goods.goods_images=[]
-        // 商品表单数据
-        if (!isEmptyObject(this.form.getFieldsValue())) {
-          // 第一次赋值
-          this.form.setFieldsValue(GoodsModel.getFieldsValue())
-          // 第二次赋值 (适用于动态渲染的form-item)
-          this.$nextTick(() => {
-            this.form.setFieldsValue(GoodsModel.getFieldsValue2())
+	beforeDestroy() {
+		// 销毁商品详情
+		GoodsModel.formData.goods = {}
+	},
+	methods: {
+		handInfo() {
+			const { form } = this
+			const goods_no = form.getFieldValue('goods_no')
+			this.formData.goods.goods_no = goods_no
+			if (goods_no) {
+				let param = {
+					sku: goods_no
+				}
+				this.isLoading = true
+				GoodsApi.getCollector(param).then((result) => {
+          this.formData.goods.imagesIds=result.data.goods_images
+					this.formData.goods.goods_images = result.data.goods_images
+					this.$refs.childComponent.selectedItems = result.data.goods_images
+					this.formData.goods.goods_name = result.data.name
+					this.formData.goods.content = result.data.content
+					this.formData.goods.goods_price = result.data.proxyPrice
+					this.form.setFieldsValue(this.formData.goods)
+          this.onForceUpdate()
+					this.$forceUpdate()
+					this.isLoading = false
+				})
+					.catch(() => {
+						this.isLoading = false
+					})
+					.finally(() => (this.isLoading = false))
+			} else {
+				this.$message.warning('请输入商品SKU', 1.5)
+			}
+		},
+		showEdit(goodsId) {
+			// 记录商品ID
+			this.visible = true
+			this.goodsId = goodsId
+			this.initData()
+			this.getDataList()
+			// 城市总数
+			Region.getCitysCount().then((count) => {
+				this.citysCount = count
+			})
+		},
+		// 关闭对话框事件
+		handleCancel() {
+			this.visible = false
+			this.form.resetFields()
+		},
+		// 初始化数据
+		initData(goodsId) {
+			// 获取form所需的数据
+			GoodsModel.formData.goods = {}
+			this.isLoading = true
+			GoodsModel.getFromData(this.goodsId).then(() => {
+				this.formData.goods.goods_images = []
+				// 商品表单数据
+				if (!isEmptyObject(this.form.getFieldsValue())) {
+					// 第一次赋值
+					this.form.setFieldsValue(GoodsModel.getFieldsValue())
+					// 第二次赋值 (适用于动态渲染的form-item)
+					this.$nextTick(() => {
+						this.form.setFieldsValue(GoodsModel.getFieldsValue2())
 
-            this.ruleList = this.formData.goods.rules ? this.formData.goods.rules : []
-            this.onForceUpdate()
-            this.$forceUpdate()
-          })
-        }
-        // this.ruleList = record.rule.map((item, index) => { return { ...item, key: index } })
-        this.isLoading = false
-      })
-    },
+						this.ruleList = this.formData.goods.rules ? this.formData.goods.rules : []
+						this.onForceUpdate()
+						this.$forceUpdate()
+					})
+				}
+				// this.ruleList = record.rule.map((item, index) => { return { ...item, key: index } })
+				this.isLoading = false
+			})
+		},
 
-    // 手动强制更新页面
-    onForceUpdate(bool = false) {
-      this.$forceUpdate()
-      // bool为true时再执行一次 $forceUpdate, 特殊情况下需执行两次，原因如下：
-      // 第一次执行 $forceUpdate时, 新元素绑定v-decorator无法获取到form.getFieldValue
-      bool &&
-        setTimeout(() => {
-          this.$forceUpdate()
-        }, 10)
-    },
+		// 手动强制更新页面
+		onForceUpdate(bool = false) {
+			this.$forceUpdate()
+			// bool为true时再执行一次 $forceUpdate, 特殊情况下需执行两次，原因如下：
+			// 第一次执行 $forceUpdate时, 新元素绑定v-decorator无法获取到form.getFieldValue
+			bool &&
+				setTimeout(() => {
+					this.$forceUpdate()
+				}, 10)
+		},
 
-    // 切换tab选项卡
-    handleTabs(key) {
-      this.tabKey = key
-    },
+		// 切换tab选项卡
+		handleTabs(key) {
+			this.tabKey = key
+		},
 
-    // 刷新分类列表
-    onReloadCategoryList() {
-      this.isLoading = true
-      GoodsModel.getCategoryList().then(() => {
-        this.isLoading = false
-      })
-    },
+		// 刷新分类列表
+		onReloadCategoryList() {
+			this.isLoading = true
+			GoodsModel.getCategoryList().then(() => {
+				this.isLoading = false
+			})
+		},
 
-    // 刷新服务与承诺列表
-    onReloadServiceList() {
-      this.isLoading = true
-      GoodsModel.getServiceList().then(() => {
-        this.isLoading = false
-      })
-    },
+		// 刷新服务与承诺列表
+		onReloadServiceList() {
+			this.isLoading = true
+			GoodsModel.getServiceList().then(() => {
+				this.isLoading = false
+			})
+		},
 
-    // 刷新配送模板列表
-    onReloadDeliveryList() {
-      this.isLoading = true
-      GoodsModel.getDeliveryList().then(() => {
-        this.isLoading = false
-      })
-    },
-    // 获取商品列表
-    getDataList() {
-      return GoodsApi.list().then((result) => {
-        this.checkList = result.data.list.data
-      })
-    },
-    // 确认按钮
-    handleSubmit(e) {
-      e.preventDefault()
-      // 表单验证
-      const {
-        form: { validateFields },
-        ruleList,
-      } = this
-      validateFields((errors, values) => {
-        // 定位到错误的tab选项卡
-        if (errors) {
-          this.onTargetTabError(errors)
-          return false
-        }
-        // 验证多规格
-        if (values.spec_type === 20) {
-          const MultiSpec = this.$refs.MultiSpec
-          if (!MultiSpec.verifyForm()) {
-            this.tabKey = 1
-            return false
-          }
-          // 记录多规格数据
-          values.specData = MultiSpec.getFromSpecData()
-        }
-        // 整理商品分类ID集
-        values.categoryIds = values.categorys.map((item) => item.value)
-        delete values.categorys
-        // 提交到后端api
-        values.rules = ruleList
-        this.onFormSubmit(values)
-        return true
-      })
-    },
+		// 刷新配送模板列表
+		onReloadDeliveryList() {
+			this.isLoading = true
+			GoodsModel.getDeliveryList().then(() => {
+				this.isLoading = false
+			})
+		},
+		// 获取商品列表
+		getDataList() {
+			return GoodsApi.list().then((result) => {
+				this.checkList = result.data.list.data
+			})
+		},
+		// 确认按钮
+		handleSubmit(e) {
+			e.preventDefault()
+			// 表单验证
+			const {
+				form: { validateFields },
+				ruleList,
+			} = this
+			validateFields((errors, values) => {
+				// 定位到错误的tab选项卡
+				if (errors) {
+					this.onTargetTabError(errors)
+					return false
+				}
+				// 验证多规格
+				if (values.spec_type === 20) {
+					const MultiSpec = this.$refs.MultiSpec
+					if (!MultiSpec.verifyForm()) {
+						this.tabKey = 1
+						return false
+					}
+					// 记录多规格数据
+					values.specData = MultiSpec.getFromSpecData()
+				}
+				// 整理商品分类ID集
+				values.categoryIds = values.categorys.map((item) => item.value)
+				delete values.categorys
+				// 提交到后端api
+				values.rules = ruleList
+				this.onFormSubmit(values)
+				return true
+			})
+		},
 
-    // 定位到错误的tab选项卡
-    onTargetTabError(errors) {
-      // 表单字段与tabKey对应关系
-      // 只需要必填字段就可
-      const tabsFieldsMap = [
-        [
-          'goods_type',
-          'goods_name',
-          'categorys',
-          'imagesIds',
-          'delivery_id',
-          'is_ind_delivery_type',
-          'delivery_type',
-          'is_brand',
-          'is_in_store',
-        ],
-        ['spec_type', 'goods_price', 'is_restrict', 'restrict_total', 'restrict_single', 'cost_price'],
-        ['content'],
-        ['alone_grade_equity', 'first_money', 'second_money', 'third_money'],
-      ]
-      const field = Object.keys(errors).shift()
-      for (const key in tabsFieldsMap) {
-        if (tabsFieldsMap[key].indexOf(field) > -1) {
-          this.tabKey = parseInt(key)
-          break
-        }
-      }
-    },
+		// 定位到错误的tab选项卡
+		onTargetTabError(errors) {
+			// 表单字段与tabKey对应关系
+			// 只需要必填字段就可
+			const tabsFieldsMap = [
+				[
+					'goods_type',
+					'goods_name',
+					'categorys',
+					'imagesIds',
+					'delivery_id',
+					'is_ind_delivery_type',
+					'delivery_type',
+					'is_brand',
+					'is_in_store',
+				],
+				['spec_type', 'goods_price', 'is_restrict', 'restrict_total', 'restrict_single', 'cost_price'],
+				['content'],
+				['alone_grade_equity', 'first_money', 'second_money', 'third_money'],
+			]
+			const field = Object.keys(errors).shift()
+			for (const key in tabsFieldsMap) {
+				if (tabsFieldsMap[key].indexOf(field) > -1) {
+					this.tabKey = parseInt(key)
+					break
+				}
+			}
+		},
 
-    // 提交到后端api
-    onFormSubmit(values) {
-      this.isLoading = true
-      this.isBtnLoading = true
-      GoodsApi.edit({ goodsId: this.goodsId, form: values })
-        .then((result) => {
-          // 显示提示信息
-          this.$message.success(result.message, 1.5)
-          this.$emit('refresh')
-          setTimeout(() => {
-            this.handleCancel()
-          }, 500)
-        })
-        .catch(() => {
-          this.isBtnLoading = false
-        })
-        .finally(() => (this.isLoading = false))
-    },
+		// 提交到后端api
+		onFormSubmit(values) {
+      console.log(values)
+			this.isLoading = true
+			this.isBtnLoading = true
+			GoodsApi.edit({ goodsId: this.goodsId, form: values })
+				.then((result) => {
+					// 显示提示信息
+					this.$message.success(result.message, 1.5)
+					this.$emit('refresh')
+					setTimeout(() => {
+						this.handleCancel()
+					}, 500)
+				})
+				.catch(() => {
+					this.isBtnLoading = false
+				})
+				.finally(() => (this.isLoading = false))
+		},
 
-    // 新增记录
-    handleAdd() {
-      const index = this.ruleList.length
-      const newItem = { ...defaultItem, key: index }
-      // 排除的城市id集(已存在的城市id集)
-      const excludedCityIds = this.getExcludedCityIds()
-      if (excludedCityIds.length === this.citysCount) {
-        this.$message.error('已选择了所有的区域', 0.8)
-        return false
-      }
-      // 显示选择地区对话框
-      this.handleAreasModal('add', index, newItem, excludedCityIds)
-    },
+		// 新增记录
+		handleAdd() {
+			const index = this.ruleList.length
+			const newItem = { ...defaultItem, key: index }
+			// 排除的城市id集(已存在的城市id集)
+			const excludedCityIds = this.getExcludedCityIds()
+			if (excludedCityIds.length === this.citysCount) {
+				this.$message.error('已选择了所有的区域', 0.8)
+				return false
+			}
+			// 显示选择地区对话框
+			this.handleAreasModal('add', index, newItem, excludedCityIds)
+		},
 
-    // 编辑记录
-    handleEdit(index, item) {
-      // 排除的城市id集(已存在的城市id集)
-      const excludedCityIds = this.getExcludedCityIds()
-      // 显示选择地区对话框
-      this.handleAreasModal('edit', index, item, excludedCityIds)
-    },
+		// 编辑记录
+		handleEdit(index, item) {
+			// 排除的城市id集(已存在的城市id集)
+			const excludedCityIds = this.getExcludedCityIds()
+			// 显示选择地区对话框
+			this.handleAreasModal('edit', index, item, excludedCityIds)
+		},
 
-    // 选择地区后的回调
-    handleAreaSubmit(result) {
-      const {
-        custom: { scene, item },
-      } = result
-      item.region = result.selectedCityIds
-      item.region_text = result.selectedText
-      if (scene === 'add') {
-        this.ruleList.push(item)
-      }
-    },
+		// 选择地区后的回调
+		handleAreaSubmit(result) {
+			const {
+				custom: { scene, item },
+			} = result
+			item.region = result.selectedCityIds
+			item.region_text = result.selectedText
+			if (scene === 'add') {
+				this.ruleList.push(item)
+			}
+		},
 
-    // 排除的城市id集(已存在的城市id集)
-    getExcludedCityIds() {
-      const excludedCityIds = []
-      this.ruleList.forEach((item) => {
-        item.region.forEach((cityId) => {
-          excludedCityIds.push(cityId)
-        })
-      })
-      console.log(excludedCityIds)
-      return excludedCityIds
-    },
+		// 排除的城市id集(已存在的城市id集)
+		getExcludedCityIds() {
+			const excludedCityIds = []
+			this.ruleList.forEach((item) => {
+				item.region.forEach((cityId) => {
+					excludedCityIds.push(cityId)
+				})
+			})
+			console.log(excludedCityIds)
+			return excludedCityIds
+		},
 
-    // 显示选择地区对话框
-    handleAreasModal(scene, index, item, excludedCityIds) {
-      this.$refs.AreasModal.handle({ scene, index, item }, item.region, excludedCityIds)
-    },
+		// 显示选择地区对话框
+		handleAreasModal(scene, index, item, excludedCityIds) {
+			this.$refs.AreasModal.handle({ scene, index, item }, item.region, excludedCityIds)
+		},
 
-    // 删除记录
-    handleDelete(index) {
-      const app = this
-      const modal = this.$confirm({
-        title: '您确定要删除该记录吗?',
-        onOk() {
-          app.ruleList.splice(index, 1)
-          modal.destroy()
-        },
-      })
-    },
-  },
+		// 删除记录
+		handleDelete(index) {
+			const app = this
+			const modal = this.$confirm({
+				title: '您确定要删除该记录吗?',
+				onOk() {
+					app.ruleList.splice(index, 1)
+					modal.destroy()
+				},
+			})
+		},
+	},
 }
 </script>
 <style lang="less" scoped>
 @import '../style.less';
 .table-rules {
-  .operation {
-    text-align: right;
-    a {
-      font-size: @font-size-base;
-      margin-left: 6px;
-    }
-  }
-  .content {
-    color: #505050;
-    white-space: normal;
-    .city-name {
-      font-size: 12.5px;
-      color: #7b7b7b;
-    }
-  }
+	.operation {
+		text-align: right;
+		a {
+			font-size: @font-size-base;
+			margin-left: 6px;
+		}
+	}
+	.content {
+		color: #505050;
+		white-space: normal;
+		.city-name {
+			font-size: 12.5px;
+			color: #7b7b7b;
+		}
+	}
 }
 </style>