diff --git a/components/addInvoicing/index.vue b/components/addInvoicing/index.vue
index 0eeb1b2..511dc88 100644
--- a/components/addInvoicing/index.vue
+++ b/components/addInvoicing/index.vue
@@ -26,7 +26,8 @@
 					</view>
 					<view class="acea-row row-middle">
 						<view>发票抬头</view>
-						<input name="receipt_title" :value="receipt_title" :maxlength="20" placeholder="需要开具发票的企业名称"/>
+						<input v-if="receipt_title_type == 1" name="receipt_title" :value="receipt_title" :maxlength="20" placeholder="需要开具发票的姓名"/>
+						<input v-else name="receipt_title" :value="receipt_title" :maxlength="20" placeholder="需要开具发票的企业名称"/>
 						<text class="iconfont icon-xiangyou" @click="callTitle" ></text>
 					</view>
 					<view v-show="receipt_title_type == '2'" class="acea-row row-middle">
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index c7e7726..f0f7b98 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -103,7 +103,7 @@
           </view>
         </view>
 
-        <!-- <gatherBusiness :userInfoData="userInfoData" /> -->
+        <gatherBusiness :userInfoData="userInfoData" />
       </view>
 
       <!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
@@ -230,7 +230,7 @@
           that.userInfoData = res.data;
           this.mer_id = res.data.service.mer_id
           if (!res.data.mer_info) {
-            that.$set(this, 'jurisdiction', true);
+            that.$set(this, 'jurisdiction', false);
           }
         });
       }
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 2ea1be5..60b59a7 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -894,6 +894,7 @@
         //如果没有属性,赋值给商品默认库存
         if (productSelect === undefined && !this.attr.productAttr.length)
           productSelect = this.attr.productSelect;
+		  console.log(productSelect);
         //无属性值即库存为0；不存在加减；
         if (productSelect === undefined) return;
         let stock = productSelect.stock || 0;
@@ -904,11 +905,11 @@
             this.$set(this.attr.productSelect, "cart_num", stock);
             this.$set(this, "cart_num", stock);
           }
-          if (num.cart_num > this.storeInfo.once_max_count && this.storeInfo.once_max_count != 0) {
+          if (num.cart_num > productSelect.stock) {
             this.$set(this.attr.productSelect, "cart_num", this.storeInfo.once_max_count);
             this.$set(this, "cart_num", this.storeInfo.once_max_count);
             return this.$util.Tips({
-              title: "单次购买件数不能超过" + this.storeInfo.once_max_count + "件！"
+              title: "单次购买件数不能超过" + productSelect.stock + "件！"
             });
           }
         } else {
diff --git a/pages/nongKe/cpns/goodsPopup.vue b/pages/nongKe/cpns/goodsPopup.vue
index b5c5156..c64d8a8 100644
--- a/pages/nongKe/cpns/goodsPopup.vue
+++ b/pages/nongKe/cpns/goodsPopup.vue
@@ -47,12 +47,12 @@
       };
     },
     onLoad() {
-
     },
     methods: {
       addor(item, index) {
         this.info.num += item;
         if (this.info.num <= 0) {
+			console.log(goods_info);
           this.info.num = 1;
         }
       },
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 9e97034..46831df 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -183,7 +183,7 @@
         if (type === 1) {
           if (this.stype == 1) {
             uni.navigateTo({
-              url: '/pages/product/addGoods/index'
+              url: `/pages/product/addGoods/index?mer_id=${this.mer_id}`
             });
             return;
           }
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index 5ba3b6e..40d52a3 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -1,825 +1,869 @@
 <template>
-  <view class="container">
-    <view class="step_one" v-if="step == 1">
-      <view class="input_content">
-        <view class="bar-code" v-if="bar_code_dis">
-          <view>商品编码</view>
-          <!-- <view>{{ singleSpecification.bar_code }}</view> -->
-          <input type="number" placeholder="请手动添加条码" v-model="code" :disabled="bar_code_dis"
-            placeholder-class="inputPlaceHolder" />
-        </view>
-        <view class="input_content_textarea">
-          <textarea v-model="setFormData.store_name" placeholder="请输入商品名称" placeholder-class="placeholderStyle"
-            maxlength="60" />
-          <view>
-            <text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text>
-            <text v-else>0</text>
-            /60
-          </view>
-        </view>
-        <view class="photo_count">
-          <text class="photo_size">建议：图片尺寸为750*750px</text>
-          <view class="input_content_photo">
-            <view class="input_content_photo_adPh" v-for="(item, index) in setFormData.imageList" :key="index">
-              <image :src="item" class="myimg2 photos"></image>
-              <view class="input_content_photo_adPh_jiao" @click="deleteImage(index)">
-                <image src="../static/images/close.png" mode=""></image>
-              </view>
-            </view>
-            <view v-if="setFormData.imageList.length < 9" class="input_content_photo_adPh addBtn" @click="clk">
-              <view>
-                <image src="../static/images/creamer.png" mode="widthFix"></image>
-              </view>
-              <view>添加图片</view>
-            </view>
-          </view>
-        </view>
+	<view class="container">
+		<view class="step_one" v-if="step == 1">
+			<view class="input_content">
+				<view class="bar-code" v-if="bar_code_dis">
+					<view>商品编码</view>
+					<!-- <view>{{ singleSpecification.bar_code }}</view> -->
+					<input type="number" placeholder="请手动添加条码" v-model="code" :disabled="bar_code_dis"
+						placeholder-class="inputPlaceHolder" />
+				</view>
+				<view class="input_content_textarea">
+					<textarea v-model="setFormData.store_name" placeholder="请输入商品名称"
+						placeholder-class="placeholderStyle" maxlength="60" />
+					<view>
+						<text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text>
+						<text v-else>0</text>
+						/60
+					</view>
+				</view>
+				<view class="photo_count">
+					<text class="photo_size">建议：图片尺寸为750*750px</text>
+					<view class="input_content_photo">
+						<view class="input_content_photo_adPh" v-for="(item, index) in setFormData.imageList"
+							:key="index">
+							<image :src="item" class="myimg2 photos"></image>
+							<view class="input_content_photo_adPh_jiao" @click="deleteImage(index)">
+								<image src="../static/images/close.png" mode=""></image>
+							</view>
+						</view>
+						<view v-if="setFormData.imageList.length < 9" class="input_content_photo_adPh addBtn"
+							@click="clk">
+							<view>
+								<image src="../static/images/creamer.png" mode="widthFix"></image>
+							</view>
+							<view>添加图片</view>
+						</view>
+					</view>
+				</view>
 
-        <view class="input_content_describe">
-          <view class="input_content_describe_title">
-            <view class="input_content_describe_title_msg">商品简介</view>
-            <view class="input_content_describe_title_num">
-              <text v-if="setFormData.store_info">{{ setFormData.store_info.length }}</text>
-              <text v-else>0</text>
-              /200
-            </view>
-          </view>
-          <view class="input_content_describe_textarea">
-            <textarea v-model="setFormData.store_info" value="" placeholder="请填写商品简介"
-              placeholderClass="placeholderClass" maxlength="200" />
-          </view>
-        </view>
+				<view class="input_content_describe">
+					<view class="input_content_describe_title">
+						<view class="input_content_describe_title_msg">商品简介</view>
+						<view class="input_content_describe_title_num">
+							<text v-if="setFormData.store_info">{{ setFormData.store_info.length }}</text>
+							<text v-else>0</text>
+							/200
+						</view>
+					</view>
+					<view class="input_content_describe_textarea">
+						<textarea v-model="setFormData.store_info" value="" placeholder="请填写商品简介"
+							placeholderClass="placeholderClass" maxlength="200" />
+					</view>
+				</view>
 
-        <view class="input_content_keyword">
-          <view class="input_content_keyword_label">关键字</view>
-          <view class="input_content_keyword_value"><input v-model="setFormData.keyword" type="text" value=""
-              placeholder="填写关键字" /></view>
-        </view>
-      </view>
+				<view class="input_content_keyword">
+					<view class="input_content_keyword_label">关键字</view>
+					<view class="input_content_keyword_value"><input v-model="setFormData.keyword" type="text" value=""
+							placeholder="填写关键字" /></view>
+				</view>
+			</view>
 
-      <view class="popup_group">
-        <view class="popup_group_item" @click="selectPlatform">
-          <view class="popup_group_item_label">平台分类</view>
-          <view class="popup_group_item_value">
-            <view class="popup_group_item_message">
-              <span v-if="setFormData.cate_name"
-                class="popup_group_item_message_value">{{ setFormData.cate_name }}</span>
-              <span v-else>请选择平台分类</span>
-            </view>
-            <view><span class="iconfont">&#xe6bd;</span></view>
-          </view>
-        </view>
+			<view class="popup_group">
+				<view class="popup_group_item" @click="selectPlatform">
+					<view class="popup_group_item_label">平台分类</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<span v-if="setFormData.cate_name"
+								class="popup_group_item_message_value">{{ setFormData.cate_name }}</span>
+							<span v-else>请选择平台分类</span>
+						</view>
+						<view><span class="iconfont">&#xe6bd;</span></view>
+					</view>
+				</view>
 
-        <view class="popup_group_item" @click="selectStoreClass">
-          <view class="popup_group_item_label">店铺分类</view>
-          <view class="popup_group_item_value">
-            <view class="popup_group_item_message">
-              <span v-if="setFormData.mer_cate_name"
-                class="popup_group_item_message_value">{{ setFormData.mer_cate_name }}</span>
-              <span v-else>请选择店铺分类</span>
-            </view>
-            <view><span class="iconfont">&#xe6bd;</span></view>
-          </view>
-        </view>
+				<view class="popup_group_item" @click="selectStoreClass">
+					<view class="popup_group_item_label">店铺分类</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<span v-if="setFormData.mer_cate_name"
+								class="popup_group_item_message_value">{{ setFormData.mer_cate_name }}</span>
+							<span v-else>请选择店铺分类</span>
+						</view>
+						<view><span class="iconfont">&#xe6bd;</span></view>
+					</view>
+				</view>
 
-        <view class="popup_group_item" @click="selectBrand">
-          <view class="popup_group_item_label">商品品牌</view>
-          <view class="popup_group_item_value">
-            <view class="popup_group_item_message">
-              <text v-if="setFormData.brand_name"
-                class="popup_group_item_message_value line1">{{ setFormData.brand_name }}</text>
-              <text v-else>请选择商品品牌</text>
-            </view>
-            <view><text class="iconfont">&#xe6bd;</text></view>
-          </view>
-        </view>
+				<view class="popup_group_item" @click="selectBrand">
+					<view class="popup_group_item_label">商品品牌</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<text v-if="setFormData.brand_name"
+								class="popup_group_item_message_value line1">{{ setFormData.brand_name }}</text>
+							<text v-else>请选择商品品牌</text>
+						</view>
+						<view><text class="iconfont">&#xe6bd;</text></view>
+					</view>
+				</view>
 
-        <view class="popup_group_item">
-          <view class="popup_group_item_label">商品单位</view>
-          <view class="popup_group_item_value"><input v-model="setFormData.unit_name" type="text"
-              placeholder="请填写商品单位" /></view>
-        </view>
-      </view>
+				<view class="popup_group_item">
+					<view class="popup_group_item_label">商品单位</view>
+					<view class="popup_group_item_value"><input v-model="setFormData.unit_name" type="text"
+							placeholder="请填写商品单位" /></view>
+				</view>
+			</view>
 
-      <view class="popup_group">
-        <view class="radio">
-          <view class="radio_label ">规格选择</view>
-          <radio-group class="select_group flex_start" @change="specificationsRadioChange($event)">
-            <label class="radio_select" v-for="(val, i) in specificationsRadioList" :key="val.value">
-              <view>
-                <radio :value="val.value" :checked="val.value == setFormData.spec_type" />
-              </view>
-              <view>{{ val.name }}</view>
-            </label>
-          </radio-group>
-        </view>
+			<view class="popup_group">
+				<view class="radio">
+					<view class="radio_label ">规格选择</view>
+					<radio-group class="select_group flex_start" @change="specificationsRadioChange($event)">
+						<label class="radio_select" v-for="(val, i) in specificationsRadioList" :key="val.value">
+							<view>
+								<radio :value="val.value" :checked="val.value == setFormData.spec_type" />
+							</view>
+							<view>{{ val.name }}</view>
+						</label>
+					</radio-group>
+				</view>
 
-        <view class="popup_group_item" @click="selectSpecification" v-if="setFormData.spec_type == 1">
-          <view class="popup_group_item_label">选择规格</view>
-          <view class="popup_group_item_value">
-            <view class="popup_group_item_message">
-              <span v-if="setFormData.specifica"
-                class="popup_group_item_message_value">{{ setFormData.specifica }}</span>
-              <span v-else>去选择</span>
-            </view>
-            <view><span class="iconfont">&#xe6bd;</span></view>
-          </view>
-        </view>
+				<view class="popup_group_item" @click="selectSpecification" v-if="setFormData.spec_type == 1">
+					<view class="popup_group_item_label">选择规格</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<span v-if="setFormData.specifica"
+								class="popup_group_item_message_value">{{ setFormData.specifica }}</span>
+							<span v-else>去选择</span>
+						</view>
+						<view><span class="iconfont">&#xe6bd;</span></view>
+					</view>
+				</view>
 
-        <view class="popup_group_item" @click="setSpecifica" v-if="setFormData.spec_type == 0">
-          <view class="popup_group_item_label">价格设置</view>
-          <view class="popup_group_item_value">
-            <view class="popup_group_item_message">
-              <span v-if="setFormData.setSpecificaValue"
-                class="popup_group_item_message_value">{{setFormData.setSpecificaValue}}</span>
-              <span v-else>去设置</span>
-            </view>
-            <view><span class="iconfont">&#xe6bd;</span></view>
-          </view>
-        </view>
-        <view class="popup_group_item" @click="setSpecifica" v-if="setFormData.spec_type == 1 && setFormData.specifica">
-          <view class="popup_group_item_label">价格设置</view>
-          <view class="popup_group_item_value">
-            <view class="popup_group_item_message">
-              <span v-if="setFormData.setSpecificaValue2"
-                class="popup_group_item_message_value">{{setFormData.setSpecificaValue2}}</span>
-              <span v-else>去设置</span>
-            </view>
-            <view><span class="iconfont">&#xe6bd;</span></view>
-          </view>
-        </view>
-      </view>
+				<view class="popup_group_item" @click="setSpecifica" v-if="setFormData.spec_type == 0">
+					<view class="popup_group_item_label">价格设置</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<span v-if="setFormData.setSpecificaValue"
+								class="popup_group_item_message_value">{{setFormData.setSpecificaValue}}</span>
+							<span v-else>去设置</span>
+						</view>
+						<view><span class="iconfont">&#xe6bd;</span></view>
+					</view>
+				</view>
+				<view class="popup_group_item" @click="setSpecifica"
+					v-if="setFormData.spec_type == 1 && setFormData.specifica">
+					<view class="popup_group_item_label">价格设置</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<span v-if="setFormData.setSpecificaValue2"
+								class="popup_group_item_message_value">{{setFormData.setSpecificaValue2}}</span>
+							<span v-else>去设置</span>
+						</view>
+						<view><span class="iconfont">&#xe6bd;</span></view>
+					</view>
+				</view>
+			</view>
 
-      <view class="popup_group">
-        <view class="radio">
-          <view class="radio_label ">送货方式</view>
-          <checkbox-group class="select_group flex_start" @change="deliveryWayChange">
-            <label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
-              <view>
-                <checkbox :value="val.value" :checked="setFormData.delivery_way.includes(val.value)" />
-              </view>
-              <view>{{ val.name }}</view>
-            </label>
-          </checkbox-group>
-        </view>
+			<view class="popup_group">
+				<view class="radio">
+					<view class="radio_label ">送货方式</view>
+					<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
+						<label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
+							<view>
+								<checkbox :value="val.value" :checked="setFormData.delivery_way.includes(val.value)" />
+							</view>
+							<view>{{ val.name }}</view>
+						</label>
+					</checkbox-group>
+				</view>
 
-        <view class="popup_group_item">
-          <view class="popup_group_item_label">是否包邮</view>
-          <view class="popup_group_item_value">
-            <view class="popup_group_item_message">
-              <switch :checked="setFormData.delivery_free == '1'" color="#E93323" style="transform:scale(0.8)"
-                @change="deliveryFreeChange" />
-            </view>
-          </view>
-        </view>
+				<view class="popup_group_item">
+					<view class="popup_group_item_label">是否包邮</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<switch :checked="setFormData.delivery_free == '1'" color="#E93323"
+								style="transform:scale(0.8)" @change="deliveryFreeChange" />
+						</view>
+					</view>
+				</view>
 
-        <view class="popup_group_item" v-if="setFormData.delivery_way.includes('2') && setFormData.delivery_free == 0"
-          @click="tempIdSelect">
-          <view class="popup_group_item_label">运费模板</view>
-          <view class="popup_group_item_value">
-            <view class="popup_group_item_message">
-              <span v-if="setFormData.tempName" class="popup_group_item_message_value">{{ setFormData.tempName }}</span>
-              <span v-else>请选择运费模板</span>
-            </view>
-            <view><span class="iconfont">&#xe6bd;</span></view>
-          </view>
-        </view>
-      </view>
-      <view class="handle">
-        <view class="handle_button" @click="handleNextStep">下一步</view>
-      </view>
-    </view>
+				<view class="popup_group_item"
+					v-if="setFormData.delivery_way.includes('2') && setFormData.delivery_free == 0"
+					@click="tempIdSelect">
+					<view class="popup_group_item_label">运费模板</view>
+					<view class="popup_group_item_value">
+						<view class="popup_group_item_message">
+							<span v-if="setFormData.tempName"
+								class="popup_group_item_message_value">{{ setFormData.tempName }}</span>
+							<span v-else>请选择运费模板</span>
+						</view>
+						<view><span class="iconfont">&#xe6bd;</span></view>
+					</view>
+				</view>
+			</view>
+			<view class="handle">
+				<view class="handle_button" @click="handleNextStep">下一步</view>
+			</view>
+		</view>
 
-    <view class="step_two" v-if="step == 2">
-      <secound :resetKey="secoundModel" :product_id="product_id" :merId="merId" :code="code" @lastStep="lastStep">
-      </secound>
-    </view>
+		<view class="step_two" v-if="step == 2">
+			<secound :resetKey="secoundModel" :product_id="product_id" :merId="merId" :code="code" @lastStep="lastStep">
+			</secound>
+		</view>
 
-    <!-- 选择平台分类弹框 -->
-    <uni-popup ref="select_platform" type="bottom">
-      <platfrom @close="closePlatfrom" :classifiedData="platformClassificationData" @getPlatData="getPlatData">
-      </platfrom>
-    </uni-popup>
+		<!-- 选择平台分类弹框 -->
+		<uni-popup ref="select_platform" type="bottom">
+			<platfrom @close="closePlatfrom" :classifiedData="platformClassificationData" @getPlatData="getPlatData">
+			</platfrom>
+		</uni-popup>
 
-    <!-- 选择店铺分类弹框 -->
-    <uni-popup ref="select_store" type="bottom">
-      <store-classification :classifiedData="merchantClassification" :mer_id="merId"
-        @handleGetSelectArea="handleGetSelectStore" @close="merchantClose"></store-classification>
-    </uni-popup>
+		<!-- 选择店铺分类弹框 -->
+		<uni-popup ref="select_store" type="bottom">
+			<store-classification :classifiedData="merchantClassification" :mer_id="merId"
+				@handleGetSelectArea="handleGetSelectStore" @close="merchantClose"></store-classification>
+		</uni-popup>
 
-    <uni-popup ref="select_popup" type="bottom">
-      <linkage-assembly selectProductTitle="选择品牌" :form="setFormData" :classifiedData="brand"
-        :selectProductItem="productItem" @getLinkageData="getLinkageData" @multipleList="multipleList"
-        @close="handleClose"></linkage-assembly>
-    </uni-popup>
+		<uni-popup ref="select_popup" type="bottom">
+			<linkage-assembly selectProductTitle="选择品牌" :form="setFormData" :classifiedData="brand"
+				:selectProductItem="productItem" @getLinkageData="getLinkageData" @multipleList="multipleList"
+				@close="handleClose"></linkage-assembly>
+		</uni-popup>
 
-    <uni-popup ref="tempId" type="bottom">
-      <linkage-assembly selectProductTitle="选择运费模板" :form="setFormData" :classifiedData="classified['temp_id']"
-        :selectProductItem="productItem" :mer_id="merId" @getLinkageData="getTempIdData" @multipleList="multipleList"
-        @close="$refs.tempId.close()" @scrolltolower="scrolltolower"></linkage-assembly>
-    </uni-popup>
-    <uni-popup ref="attr" type="bottom">
-      <attr @close="$refs.attr.close()" :mer_id="merId" :attrList="classified['attr']" @selectAttr="selectAttr"></attr>
-    </uni-popup>
-    <avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
-    </avatar>
-  </view>
+		<uni-popup ref="tempId" type="bottom">
+			<linkage-assembly selectProductTitle="选择运费模板" :form="setFormData" :classifiedData="classified['temp_id']"
+				:selectProductItem="productItem" :mer_id="merId" @getLinkageData="getTempIdData"
+				@multipleList="multipleList" @close="$refs.tempId.close()"
+				@scrolltolower="scrolltolower"></linkage-assembly>
+		</uni-popup>
+		<uni-popup ref="attr" type="bottom">
+			<attr @close="$refs.attr.close()" :mer_id="merId" :attrList="classified['attr']" @selectAttr="selectAttr">
+			</attr>
+		</uni-popup>
+		<avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
+		</avatar>
+	</view>
 </template>
 
 <script>
-  import inputGoodsDetils from '../components/inputGoodsDetils.vue';
-  import linkageAssembly from '../components/linkageAssembly.vue';
-  import {
-    navigateTo,
-    serialize,
-    setStorage,
-    getStorage,
-    Toast,
-    removeStorage,
-    Loading,
-    hideLoading
-  } from '../../../libs/uniApi.js';
-  import {
-    categoryBrandlist,
-    categorySelect,
-    storeClassifyLst,
-    categoryList,
-    attrList,
-    templateList,
-    productDetail,
-    getDeliveryType
-  } from '@/api/product.js';
-  import attr from '../components/attr.vue';
-  import platfrom from '../components/platform.vue';
-  import storeClassification from '../components/store_classification.vue';
-  import secound from './secound.vue';
-  import avatar from "@/components/yq-avatar/yq-avatar.vue";
-  import { TOKENNAME, HTTP_REQUEST_URL } from '@/config/app.js';
-  import store from '@/store';
-  export default {
-    components: {
-      inputGoodsDetils,
-      linkageAssembly,
-      attr,
-      platfrom, // 选择平台分类组件
-      storeClassification,
-      secound,
-      avatar
-    },
-    data() {
-      return {
-        step: 1,
-        bar_code: '',
-        bar_code_dis: false,
-        setFormData: {
-          imageList: [],
-          specification: '',
-          image: '', //主图
-          slider_image: '', // 轮播图
-          store_name: '', // 商品名
-          store_info: '', // 简介
-          keyword: '', // 关键字
-          brand_id: '', // 品牌id
-          brand_name: '', // 品牌名称
-          cate_id: '', // 平台分类
-          cate_name: '', // 平台名称
-          mer_cate_id: '', // 店铺分类
-          mer_cate_name: '', // 店铺分类名称
-          unit_name: '', // 商品单位
-          spec_type: '0', // 0.单规格 1：多规格
-          attr: [], // 商品规格
-          specifica: '', // 商品规格名称
-          setSpecificaValue: '', // 价格设置提示
-          setSpecificaValue2: '',
-          delivery_way: [], // 配送方式 1 到店核销 2 快递配送
-          delivery_free: '1', // 是否包邮 0不包邮 1包邮
-          temp_id: '', // 运费模板ID
-          tempName: '' // 运费模板名称
-        },
-        popupContainerKey: false,
-        productItem: {} || [],
-        selectProductTitle: '选择平台分类',
-        specificationsRadioList: [{
-            value: '0',
-            name: '单规格'
-          },
-          {
-            value: '1',
-            name: '多规格'
-          }
-        ],
-        specifications: [{
-            id: 5,
-            label: '规格选择',
-            type: 'radio',
-            model: 'spec_type',
-            inforValue: '0',
-            radioList: [{
-                value: '0',
-                name: '单规格'
-              },
-              {
-                value: '1',
-                name: '多规格'
-              }
-            ]
-          },
-          {
-            id: 7,
-            label: '选择规格',
-            type: 'select',
-            model: 'attr',
-            singleColumn: true,
-            value: '',
-            DoNotShow: true,
-            holder: '去选择',
-            jumpLogic: true // 是否为需要特数处理，执行跳转逻辑
-          },
-          {
-            id: 6,
-            label: '商品规格',
-            type: 'select',
-            value: '',
-            holder: '去设置',
-            jumpLogic: true, // 是否为需要特数处理，执行跳转逻辑
-            DoNotShow: true
-          }
-        ],
-        deliveryType: [],
-        deliveryFreeList: [{
-            value: '1',
-            name: '到店核销'
-          },
-          {
-            value: '2',
-            name: '快递配送'
-          }
-        ],
-        merId: '',
-        product_id: '', // 商品Id
-        isUpload: true,
-        templateListPage: {
-          page: 1,
-          limit: 10000
-        },
-        // 分类数据容器
-        classified: {
-          cate_id: [],
-          mer_cate_id: [],
-          brand_id: [],
-          attr: [],
-          temp_id: []
-        },
-        platformClassificationData: [], // 平台分类数据
-        merchantClassification: [], // 店铺分类
-        brand: [], // 品牌分类
-        specificationClassification: [], // 规格分类
-        selectEdAttr: [], // 当前选择的多规格选项规格
-        canChange: true,
-        secoundModel: false,
-        resetKey: false,
-        imgName: "",
-        code: ''
-      };
-    },
-    onLoad(opt) {
-      this.merId = Number(opt.mer_id);
-      this.product_id = opt.product_id;
-      if (opt.code) {
-        this.code = opt.code;
-        this.bar_code_dis = true
-      }
-      this.initData();
-      this.getDeliveryType();
-      if (this.product_id) {
-        this.initDataEditData();
-      }
-    },
-    onShow() {
-      this.setFormData.setSpecificaValue = '';
-      this.setFormData.setSpecificaValue2 = '';
-      if (getStorage('singleSpecification')) {
-        this.setFormData.setSpecificaValue = '点击修改价格';
-      } else {
-        this.setFormData.setSpecificaValue = '';
-      }
-      if (getStorage('attrValue')) {
-        this.setFormData.setSpecificaValue2 = '点击修改价格';
-      } else {
-        this.setFormData.setSpecificaValue2 = '';
-      }
-      if (this.step == 2) {
-        this.secoundModel = !this.secoundModel;
-      }
-      this.initClasiffy();
-    },
+	import inputGoodsDetils from '../components/inputGoodsDetils.vue';
+	import linkageAssembly from '../components/linkageAssembly.vue';
+	import {
+		navigateTo,
+		serialize,
+		setStorage,
+		getStorage,
+		Toast,
+		removeStorage,
+		Loading,
+		hideLoading
+	} from '../../../libs/uniApi.js';
+	import {
+		categoryBrandlist,
+		categorySelect,
+		storeClassifyLst,
+		categoryList,
+		attrList,
+		templateList,
+		productDetail,
+		getDeliveryType
+	} from '@/api/product.js';
+	import attr from '../components/attr.vue';
+	import platfrom from '../components/platform.vue';
+	import storeClassification from '../components/store_classification.vue';
+	import secound from './secound.vue';
+	import avatar from "@/components/yq-avatar/yq-avatar.vue";
+	import {
+		TOKENNAME,
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	import store from '@/store';
+	export default {
+		components: {
+			inputGoodsDetils,
+			linkageAssembly,
+			attr,
+			platfrom, // 选择平台分类组件
+			storeClassification,
+			secound,
+			avatar
+		},
+		data() {
+			return {
+				step: 1,
+				bar_code: '',
+				bar_code_dis: false,
+				setFormData: {
+					imageList: [],
+					specification: '',
+					image: '', //主图
+					slider_image: '', // 轮播图
+					store_name: '', // 商品名
+					store_info: '', // 简介
+					keyword: '', // 关键字
+					brand_id: '', // 品牌id
+					brand_name: '', // 品牌名称
+					cate_id: '', // 平台分类
+					cate_name: '', // 平台名称
+					mer_cate_id: '', // 店铺分类
+					mer_cate_name: '', // 店铺分类名称
+					unit_name: '', // 商品单位
+					spec_type: '0', // 0.单规格 1：多规格
+					attr: [], // 商品规格
+					specifica: '', // 商品规格名称
+					setSpecificaValue: '', // 价格设置提示
+					setSpecificaValue2: '',
+					delivery_way: [], // 配送方式 1 到店核销 2 快递配送
+					delivery_free: '1', // 是否包邮 0不包邮 1包邮
+					temp_id: '', // 运费模板ID
+					tempName: '' // 运费模板名称
+				},
+				popupContainerKey: false,
+				productItem: {} || [],
+				selectProductTitle: '选择平台分类',
+				specificationsRadioList: [{
+						value: '0',
+						name: '单规格'
+					},
+					{
+						value: '1',
+						name: '多规格'
+					}
+				],
+				specifications: [{
+						id: 5,
+						label: '规格选择',
+						type: 'radio',
+						model: 'spec_type',
+						inforValue: '0',
+						radioList: [{
+								value: '0',
+								name: '单规格'
+							},
+							{
+								value: '1',
+								name: '多规格'
+							}
+						]
+					},
+					{
+						id: 7,
+						label: '选择规格',
+						type: 'select',
+						model: 'attr',
+						singleColumn: true,
+						value: '',
+						DoNotShow: true,
+						holder: '去选择',
+						jumpLogic: true // 是否为需要特数处理，执行跳转逻辑
+					},
+					{
+						id: 6,
+						label: '商品规格',
+						type: 'select',
+						value: '',
+						holder: '去设置',
+						jumpLogic: true, // 是否为需要特数处理，执行跳转逻辑
+						DoNotShow: true
+					}
+				],
+				deliveryType: [],
+				deliveryFreeList: [{
+						value: '1',
+						name: '到店核销'
+					},
+					{
+						value: '2',
+						name: '快递配送'
+					}
+				],
+				merId: '',
+				product_id: '', // 商品Id
+				isUpload: true,
+				templateListPage: {
+					page: 1,
+					limit: 10000
+				},
+				// 分类数据容器
+				classified: {
+					cate_id: [],
+					mer_cate_id: [],
+					brand_id: [],
+					attr: [],
+					temp_id: []
+				},
+				platformClassificationData: [], // 平台分类数据
+				merchantClassification: [], // 店铺分类
+				brand: [], // 品牌分类
+				specificationClassification: [], // 规格分类
+				selectEdAttr: [], // 当前选择的多规格选项规格
+				canChange: true,
+				secoundModel: false,
+				resetKey: false,
+				imgName: "",
+				code: ''
+			};
+		},
+		onLoad(opt) {
+			console.log(opt);
+			this.merId = Number(opt.mer_id);
+			this.product_id = opt.product_id;
+			if (opt.code) {
+				this.code = opt.code;
+				this.bar_code_dis = true
+			}
+			this.initData();
+			this.getDeliveryType();
+			if (this.product_id) {
+				this.initDataEditData();
+			}
+		},
+		onShow() {
+			this.setFormData.store_name = ''
+			this.setFormData.setSpecificaValue = '';
+			this.setFormData.setSpecificaValue2 = '';
+			if (getStorage('singleSpecification')) {
+				this.setFormData.setSpecificaValue = '点击修改价格';
+			} else {
+				this.setFormData.setSpecificaValue = '';
+			}
+			if (getStorage('attrValue')) {
+				this.setFormData.setSpecificaValue2 = '点击修改价格';
+			} else {
+				this.setFormData.setSpecificaValue2 = '';
+			}
+			if (this.step == 2) {
+				this.secoundModel = !this.secoundModel;
+			}
+			this.initClasiffy();
+		},
+		beforeDestroy() {
+			console.log('123');
+			uni.removeStorage({
+				key: 'addGoodsFormData'
+			});
+		},
+		watch: {
+			setFormData: {
+				handler(val) {
+					console.log(val);
+					setTimeout(() => {
+						setStorage('addGoodsFormData', this.setFormData);
+					});
 
-    watch: {
-      setFormData: {
-        handler(val) {
-          console.log(val);
-          setTimeout(() => {
-            setStorage('addGoodsFormData', this.setFormData);
-          });
+				},
+				deep: true
+			},
+			'setFormData.imageList'(val) {
+				this.setFormData.image = val.length ? val[0] : '';
+				this.setFormData.slider_image = val.length ? serialize(val).splice(1) : [];
+			}
+		},
+		methods: {
+			// 获取数据
+			async initClasiffy() {
+				//获取商户分类
+				this.merchantClassification = (await storeClassifyLst(this.merId)).data;
+			},
+			async initData() {
+				if (getStorage('addGoodsFormData')) {
+					this.setFormData = getStorage('addGoodsFormData');
+					this.selectEdAttr = getStorage('modifyPriceData');
+				}
+				// 获取品牌
+				this.brand = (await categoryBrandlist(this.merId)).data;
+				// 获取平台分类
+				this.platformClassificationData = (await categoryList(this.merId)).data;
+				// 数据回显
+			},
+			//获取送货方式信息
+			getDeliveryType() {
+				let that = this
+				getDeliveryType(that.merId).then(
+					res => {
+						that.deliveryType = res.data.delivery_way.map(String);
+						if (!that.product_id) that.setFormData.delivery_way = that.deliveryType;
+						if (that.deliveryType.length == 2) {
+							that.deliveryFreeList = [{
+									value: '1',
+									name: '到店核销'
+								},
+								{
+									value: '2',
+									name: '快递配送'
+								}
+							]
+						} else {
+							if (that.deliveryType.length == 1 && that.deliveryType[0] == '1') {
+								that.deliveryFreeList = [{
+									value: '1',
+									name: '到店核销'
+								}]
+							} else {
+								that.deliveryFreeList = [{
+									value: '2',
+									name: '快递配送'
+								}]
+							}
+						}
+					},
+					error => {
+						that.$util.Tips({
+							title: error.msg
+						})
+					}
+				);
+			},
 
-        },
-        deep: true
-      },
-      'setFormData.imageList'(val) {
-        this.setFormData.image = val.length ? val[0] : '';
-        this.setFormData.slider_image = val.length ? serialize(val).splice(1) : [];
-      }
-    },
-    methods: {
-      // 获取数据
-      async initClasiffy() {
-        //获取商户分类
-        this.merchantClassification = (await storeClassifyLst(this.merId)).data;
-      },
-      async initData() {
-        if (getStorage('addGoodsFormData')) {
-          this.setFormData = getStorage('addGoodsFormData');
-          this.selectEdAttr = getStorage('modifyPriceData');
-        }
-        // 获取品牌
-        this.brand = (await categoryBrandlist(this.merId)).data;
-        // 获取平台分类
-        this.platformClassificationData = (await categoryList(this.merId)).data;
-        // 数据回显
-      },
-      //获取送货方式信息
-      getDeliveryType() {
-        let that = this
-        getDeliveryType(that.merId).then(
-          res => {
-            that.deliveryType = res.data.delivery_way.map(String);
-            if (!that.product_id) that.setFormData.delivery_way = that.deliveryType;
-            if (that.deliveryType.length == 2) {
-              that.deliveryFreeList = [
-                { value: '1', name: '到店核销' },
-                { value: '2', name: '快递配送' }
-              ]
-            } else {
-              if (that.deliveryType.length == 1 && that.deliveryType[0] == '1') {
-                that.deliveryFreeList = [{ value: '1', name: '到店核销' }]
-              } else {
-                that.deliveryFreeList = [{ value: '2', name: '快递配送' }]
-              }
-            }
-          },
-          error => {
-            that.$util.Tips({
-              title: error.msg
-            })
-          }
-        );
-      },
+			// 查询详情数据
+			initDataEditData() {
+				Loading();
+				this.setFormData = {
+					imageList: [],
+					specification: '',
+					image: '', //主图
+					slider_image: '', // 轮播图
+					store_name: '', // 商品名
+					store_info: '', // 简介
+					keyword: '', // 关键字
+					brand_id: '', // 品牌id
+					brand_name: '', // 品牌名称
+					cate_id: '', // 平台分类
+					cate_name: '', // 平台名称
+					mer_cate_id: '', // 店铺分类
+					mer_cate_name: '', // 店铺分类名称
+					unit_name: '', // 商品单位
+					spec_type: '0', // 0.单规格 1：多规格
+					attr: [], // 商品规格
+					specifica: '', // 商品规格名称
+					setSpecificaValue: '', // 价格设置提示
+					setSpecificaValue2: '', // 价格设置提示
+					delivery_way: [], // 配送方式 1 到店核销 2 快递配送
+					delivery_free: '0', // 是否包邮 0不包邮 1包邮
+					temp_id: '', // 运费模板ID
+					tempName: '' // 运费模板名称
+				};
+				if (getStorage('editGoodsDetils')) {
+					removeStorage('editGoodsDetils');
+				}
+				productDetail(this.merId, this.product_id).then(res => {
+					setStorage('editGoodsDetils', res.data);
+					let editGoodsDetils = res.data;
+					Object.keys(this.setFormData).forEach(item => {
+						this.setFormData[item] = editGoodsDetils[item];
+					});
+					this.setFormData.product_id = this.product_id;
+					this.setFormData.imageList = [...(this.setFormData.image ? [this.setFormData.image] : []), ...
+						this
+						.setFormData.slider_image
+					];
+					this.setFormData.cate_name = editGoodsDetils.storeCategory.cate_name; // 平台分类回显
+					this.setFormData.mer_cate_name = editGoodsDetils.merCateId ? editGoodsDetils.merCateId.map(
+						item => item
+						.category && item.category.cate_name).join(',') : '';
+					this.setFormData.brand_name = editGoodsDetils.brand ? editGoodsDetils.brand.brand_name : '';
+					// 多规格
+					if (this.setFormData.spec_type == 1) {
+						if (editGoodsDetils.attr.length) {
+							this.setFormData.specifica = '点击修改规格'
+						}
+						if (editGoodsDetils.attrValue.length) {
+							this.setFormData.setSpecificaValue2 = '点击修改价格'
+						}
+					}
+					if (editGoodsDetils.spec_type == 0) {
+						setStorage('singleSpecification', editGoodsDetils.attrValue[0]);
+						if (editGoodsDetils.attrValue.length) {
+							this.setFormData.setSpecificaValue = '点击修改价格'
+						}
+					}
+					setStorage('attrValue', editGoodsDetils.attrValue);
+					editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
+					setStorage('canChange', true);
+					hideLoading();
+				});
+			},
+			// 选择图片
+			handleChooseImage() {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					that.setFormData.imageList.push(res.data.path);
 
-      // 查询详情数据
-      initDataEditData() {
-        Loading();
-        this.setFormData = {
-          imageList: [],
-          specification: '',
-          image: '', //主图
-          slider_image: '', // 轮播图
-          store_name: '', // 商品名
-          store_info: '', // 简介
-          keyword: '', // 关键字
-          brand_id: '', // 品牌id
-          brand_name: '', // 品牌名称
-          cate_id: '', // 平台分类
-          cate_name: '', // 平台名称
-          mer_cate_id: '', // 店铺分类
-          mer_cate_name: '', // 店铺分类名称
-          unit_name: '', // 商品单位
-          spec_type: '0', // 0.单规格 1：多规格
-          attr: [], // 商品规格
-          specifica: '', // 商品规格名称
-          setSpecificaValue: '', // 价格设置提示
-          setSpecificaValue2: '', // 价格设置提示
-          delivery_way: [], // 配送方式 1 到店核销 2 快递配送
-          delivery_free: '0', // 是否包邮 0不包邮 1包邮
-          temp_id: '', // 运费模板ID
-          tempName: '' // 运费模板名称
-        };
-        if (getStorage('editGoodsDetils')) {
-          removeStorage('editGoodsDetils');
-        }
-        productDetail(this.merId, this.product_id).then(res => {
-          setStorage('editGoodsDetils', res.data);
-          let editGoodsDetils = res.data;
-          Object.keys(this.setFormData).forEach(item => {
-            this.setFormData[item] = editGoodsDetils[item];
-          });
-          this.setFormData.product_id = this.product_id;
-          this.setFormData.imageList = [...(this.setFormData.image ? [this.setFormData.image] : []), ...this
-            .setFormData.slider_image
-          ];
-          this.setFormData.cate_name = editGoodsDetils.storeCategory.cate_name; // 平台分类回显
-          this.setFormData.mer_cate_name = editGoodsDetils.merCateId ? editGoodsDetils.merCateId.map(item => item
-            .category && item.category.cate_name).join(',') : '';
-          this.setFormData.brand_name = editGoodsDetils.brand ? editGoodsDetils.brand.brand_name : '';
-          // 多规格
-          if (this.setFormData.spec_type == 1) {
-            if (editGoodsDetils.attr.length) {
-              this.setFormData.specifica = '点击修改规格'
-            }
-            if (editGoodsDetils.attrValue.length) {
-              this.setFormData.setSpecificaValue2 = '点击修改价格'
-            }
-          }
-          if (editGoodsDetils.spec_type == 0) {
-            setStorage('singleSpecification', editGoodsDetils.attrValue[0]);
-            if (editGoodsDetils.attrValue.length) {
-              this.setFormData.setSpecificaValue = '点击修改价格'
-            }
-          }
-          setStorage('attrValue', editGoodsDetils.attrValue);
-          editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
-          setStorage('canChange', true);
-          hideLoading();
-        });
-      },
-      // 选择图片
-      handleChooseImage() {
-        let that = this;
-        that.$util.uploadImageOne('upload/image', function(res) {
-          that.setFormData.imageList.push(res.data.path);
+				});
+			},
+			clk() {
+				let avatar = this.$refs.avatar;
+				avatar.fChooseImg(1, {
+					selWidth: '350upx',
+					selHeight: '350upx',
+					inner: true
+				});
+			},
+			doUpload(rsp) {
+				let that = this
+				console.log(rsp);
+				uni.uploadFile({
+					url: HTTP_REQUEST_URL + '/api/upload/image/field',
+					filePath: rsp.path,
+					name: 'field',
+					formData: {
+						'filename': rsp.path,
+						'name': that.imgName
+					},
+					header: {
+						// #ifdef MP
+						"Content-Type": "multipart/form-data",
+						// #endif
+						[TOKENNAME]: 'Bearer ' + store.state.app.token
+					},
+					success: (uploadFileRes) => {
+						console.log(uploadFileRes.data);
+						let imgData = JSON.parse(uploadFileRes.data)
+						that.setFormData.imageList.push(imgData.data.path)
+					},
+					complete(res) {
+						console.log(res)
+					}
+				});
+			},
+			getImgName(name) {
+				this.imgName = name
+			},
+			// 删除图片
+			deleteImage(index) {
+				this.setFormData.imageList.splice(index, 1);
+			},
+			// 选择平台分类
+			selectPlatform() {
+				this.$refs.select_platform.open();
+			},
+			// 关闭频台分类
+			closePlatfrom() {
+				this.$refs.select_platform.close();
+			},
+			// 获取平台类数据
+			getPlatData(item, taplist) {
+				this.setFormData.cate_id = item.value;
+				this.setFormData.cate_name = item.label;
+				this.$refs.select_platform.close();
+			},
+			// 选择店铺分类
+			selectStoreClass() {
+				this.$refs.select_store.open();
+			},
+			// 关闭店铺分类
+			merchantClose() {
+				this.$refs.select_store.close();
+			},
 
-        });
-      },
-      clk() {
-        let avatar = this.$refs.avatar;
-        avatar.fChooseImg(1, { selWidth: '350upx', selHeight: '350upx', inner: true });
-      },
-      doUpload(rsp) {
-        let that = this
-        console.log(rsp);
-        uni.uploadFile({
-          url: HTTP_REQUEST_URL + '/api/upload/image/field',
-          filePath: rsp.path,
-          name: 'field',
-          formData: {
-            'filename': rsp.path,
-            'name': that.imgName
-          },
-          header: {
-            // #ifdef MP
-            "Content-Type": "multipart/form-data",
-            // #endif
-            [TOKENNAME]: 'Bearer ' + store.state.app.token
-          },
-          success: (uploadFileRes) => {
-            console.log(uploadFileRes.data);
-            let imgData = JSON.parse(uploadFileRes.data)
-            that.setFormData.imageList.push(imgData.data.path)
-          },
-          complete(res) {
-            console.log(res)
-          }
-        });
-      },
-      getImgName(name) {
-        this.imgName = name
-      },
-      // 删除图片
-      deleteImage(index) {
-        this.setFormData.imageList.splice(index, 1);
-      },
-      // 选择平台分类
-      selectPlatform() {
-        this.$refs.select_platform.open();
-      },
-      // 关闭频台分类
-      closePlatfrom() {
-        this.$refs.select_platform.close();
-      },
-      // 获取平台类数据
-      getPlatData(item, taplist) {
-        this.setFormData.cate_id = item.value;
-        this.setFormData.cate_name = item.label;
-        this.$refs.select_platform.close();
-      },
-      // 选择店铺分类
-      selectStoreClass() {
-        this.$refs.select_store.open();
-      },
-      // 关闭店铺分类
-      merchantClose() {
-        this.$refs.select_store.close();
-      },
+			// 获取已选择得店铺数据
+			handleGetSelectStore(item) {
+				this.setFormData.mer_cate_id = item.map(val => val.store_category_id);
+				this.setFormData.mer_cate_name = item.map(val => val.cate_name).join(',');
+				this.$refs.select_store.close();
+			},
 
-      // 获取已选择得店铺数据
-      handleGetSelectStore(item) {
-        this.setFormData.mer_cate_id = item.map(val => val.store_category_id);
-        this.setFormData.mer_cate_name = item.map(val => val.cate_name).join(',');
-        this.$refs.select_store.close();
-      },
+			// 获取品牌分类弹框
+			selectBrand() {
+				this.$refs.select_popup.open();
+			},
+			// 获取品牌分类数据
+			getLinkageData(item) {
+				this.setFormData.brand_id = item[0].value;
+				this.setFormData.brand_name = item[0].cate_name;
+				this.$refs.select_popup.close();
+			},
+			// 获取多选数据
+			multipleList(data, model) {
+				if (model == 'mer_cate_id') {
+					this.platformClassification[1].value = data.map(item => item.label).join('，');
+					this.platformClassification[1].allreadySelect = data;
+					this.setFormData.mer_cate_id = data.map(item => item.value);
+				}
+			},
+			// popup弹框中返回数据结束
+			// 关闭弹框
+			close() {
+				this.$refs.select_popup.close();
+			},
+			// 拼接字符串
+			getLinkDataOfRecursion(arr, child = 'children', key = 'value') {
+				let str = '';
+				let id = '';
+				arr.forEach(item => {
+					str = item.label;
+					id = item.value;
+				});
+				// str = str.slice(0, str.length - 1);
+				return {
+					str,
+					id
+				};
+			},
 
-      // 获取品牌分类弹框
-      selectBrand() {
-        this.$refs.select_popup.open();
-      },
-      // 获取品牌分类数据
-      getLinkageData(item) {
-        this.setFormData.brand_id = item[0].value;
-        this.setFormData.brand_name = item[0].cate_name;
-        this.$refs.select_popup.close();
-      },
-      // 获取多选数据
-      multipleList(data, model) {
-        if (model == 'mer_cate_id') {
-          this.platformClassification[1].value = data.map(item => item.label).join('，');
-          this.platformClassification[1].allreadySelect = data;
-          this.setFormData.mer_cate_id = data.map(item => item.value);
-        }
-      },
-      // popup弹框中返回数据结束
-      // 关闭弹框
-      close() {
-        this.$refs.select_popup.close();
-      },
-      // 拼接字符串
-      getLinkDataOfRecursion(arr, child = 'children', key = 'value') {
-        let str = '';
-        let id = '';
-        arr.forEach(item => {
-          str = item.label;
-          id = item.value;
-        });
-        // str = str.slice(0, str.length - 1);
-        return { str, id };
-      },
+			// 获取默认值，给表单对象赋值
+			formInitData(value, model) {
+				this.setFormData[model] = value;
+			},
+			// 选项的单选框change事件触发
+			// model 为表单数据
+			handleRadioChange(value, item) {
+				this.setFormData[item.model] = value;
+			},
+			// 选择规格部分（新）
+			// 选择规格radio
+			specificationsRadioChange(e) {
+				this.setFormData.spec_type = e.detail.value;
+			},
+			// 选择规格弹窗
+			selectSpecification() {
+				attrList(this.merId, {
+					page: 1,
+					limit: 10000
+				}).then(res => {
+					if (res.data.list.length < 1) return Toast('暂无规格可选');
+					this.specificationClassification = res.data.list;
+					this.classified['attr'] = this.specificationClassification;
+					this.specificationClassification.forEach(item => {
+						this.$set(item, 'value', item.attr_template_id);
+						this.$set(item, 'label', item.template_name);
+						this.$refs.attr.open();
+					});
+				});
+			},
+			// 多规格时，选择属性
+			selectAttr(item) {
+				if (getStorage('attrValue')) {
+					removeStorage('attrValue');
+				}
+				this.setFormData.specifica = item.template_name;
+				this.setFormData.attr = [];
+				this.setFormData.attr = this.setFormData.attr.concat(item.template_value);
+				this.selectEdAttr = item; // 存储选择的数据，跳转时使用
+				this.$refs.attr.close();
+			},
+			// 前往设置多规格界面
+			setSpecifica() {
+				// specification 为规格 0为单规格 1为多规格
+				if (this.setFormData.spec_type == 0) {
+					navigateTo(1, '/pages/product/addGoods/singleSpecification');
+					return;
+				}
+				if (this.setFormData.spec_type == 1) {
+					let queryData = serialize(this.selectEdAttr);
+					setStorage('modifyPriceData', queryData);
+					navigateTo(1, '/pages/product/addGoods/modifyPrice');
+					return;
+				}
+			},
+			// 选择规格部分（新）结束
+			// switch切换
+			switchChange(value, item) {
+				if (item.model == 'delivery_free') {
+					if (value) {
+						this.setFormData[item.model] = '1';
+					} else {
+						this.setFormData[item.model] = '0';
+					}
+				}
+			},
+			// 多选切换
+			checkChange(value, item) {
+				this.setFormData[item.model] = value;
+				if (item.model == 'delivery_way') {
+					if (value.includes('2')) {
+						this.transport[1].DoNotShow = false;
+					} else {
+						this.transport[1].DoNotShow = true;
+					}
+					console.log(this.transport[1]);
+				}
+			},
 
-      // 获取默认值，给表单对象赋值
-      formInitData(value, model) {
-        this.setFormData[model] = value;
-      },
-      // 选项的单选框change事件触发
-      // model 为表单数据
-      handleRadioChange(value, item) {
-        this.setFormData[item.model] = value;
-      },
-      // 选择规格部分（新）
-      // 选择规格radio
-      specificationsRadioChange(e) {
-        this.setFormData.spec_type = e.detail.value;
-      },
-      // 选择规格弹窗
-      selectSpecification() {
-        attrList(this.merId, { page: 1, limit: 10000 }).then(res => {
-          if (res.data.list.length < 1) return Toast('暂无规格可选');
-          this.specificationClassification = res.data.list;
-          this.classified['attr'] = this.specificationClassification;
-          this.specificationClassification.forEach(item => {
-            this.$set(item, 'value', item.attr_template_id);
-            this.$set(item, 'label', item.template_name);
-            this.$refs.attr.open();
-          });
-        });
-      },
-      // 多规格时，选择属性
-      selectAttr(item) {
-        if (getStorage('attrValue')) {
-          removeStorage('attrValue');
-        }
-        this.setFormData.specifica = item.template_name;
-        this.setFormData.attr = [];
-        this.setFormData.attr = this.setFormData.attr.concat(item.template_value);
-        this.selectEdAttr = item; // 存储选择的数据，跳转时使用
-        this.$refs.attr.close();
-      },
-      // 前往设置多规格界面
-      setSpecifica() {
-        // specification 为规格 0为单规格 1为多规格
-        if (this.setFormData.spec_type == 0) {
-          navigateTo(1, '/pages/product/addGoods/singleSpecification');
-          return;
-        }
-        if (this.setFormData.spec_type == 1) {
-          let queryData = serialize(this.selectEdAttr);
-          setStorage('modifyPriceData', queryData);
-          navigateTo(1, '/pages/product/addGoods/modifyPrice');
-          return;
-        }
-      },
-      // 选择规格部分（新）结束
-      // switch切换
-      switchChange(value, item) {
-        if (item.model == 'delivery_free') {
-          if (value) {
-            this.setFormData[item.model] = '1';
-          } else {
-            this.setFormData[item.model] = '0';
-          }
-        }
-      },
-      // 多选切换
-      checkChange(value, item) {
-        this.setFormData[item.model] = value;
-        if (item.model == 'delivery_way') {
-          if (value.includes('2')) {
-            this.transport[1].DoNotShow = false;
-          } else {
-            this.transport[1].DoNotShow = true;
-          }
-          console.log(this.transport[1]);
-        }
-      },
+			handleClose() {
+				this.$refs.select_popup.close();
+			},
+			// 送货方式选择
+			deliveryWayChange(obj) {
+				this.setFormData.delivery_way = obj.detail.value;
+			},
+			// 是否包邮选择
+			deliveryFreeChange(val) {
+				if (val.detail.value) {
+					this.setFormData.delivery_free = '1';
+				} else {
+					this.setFormData.delivery_free = '0';
+				}
+			},
+			// 选择运费模板
+			tempIdSelect() {
+				this.getTemplateList();
+			},
+			// 请求运费模板列表
+			getTemplateList() {
+				templateList(this.merId, this.templateListPage).then(res => {
+					res.data.list.forEach(item => {
+						this.$set(item, 'value', item.shipping_template_id);
+						this.$set(item, 'label', item.name);
+					});
+					this.classified['temp_id'] = res.data.list;
+					this.$refs.tempId.open();
+				});
+			},
+			// 内部scroll-view滑动到最底部
+			scrolltolower() {},
+			// 获取运费模板数据
+			getTempIdData(obj) {
+				console.log(obj);
+				this.setFormData.temp_id = obj[0].value;
+				this.setFormData.tempName = obj[0].label;
+				this.$refs.tempId.close();
+			},
+			// 设置运费模板
+			setGoodsTemp() {
+				navigateTo(1, '/pages/product/addGoods/freightTemplate', {
+					mer_id: this.merId
+				});
+			},
+			// 开始下一步
 
-      handleClose() {
-        this.$refs.select_popup.close();
-      },
-      // 送货方式选择
-      deliveryWayChange(obj) {
-        this.setFormData.delivery_way = obj.detail.value;
-      },
-      // 是否包邮选择
-      deliveryFreeChange(val) {
-        if (val.detail.value) {
-          this.setFormData.delivery_free = '1';
-        } else {
-          this.setFormData.delivery_free = '0';
-        }
-      },
-      // 选择运费模板
-      tempIdSelect() {
-        this.getTemplateList();
-      },
-      // 请求运费模板列表
-      getTemplateList() {
-        templateList(this.merId, this.templateListPage).then(res => {
-          res.data.list.forEach(item => {
-            this.$set(item, 'value', item.shipping_template_id);
-            this.$set(item, 'label', item.name);
-          });
-          this.classified['temp_id'] = res.data.list;
-          this.$refs.tempId.open();
-        });
-      },
-      // 内部scroll-view滑动到最底部
-      scrolltolower() {},
-      // 获取运费模板数据
-      getTempIdData(obj) {
-        console.log(obj);
-        this.setFormData.temp_id = obj[0].value;
-        this.setFormData.tempName = obj[0].label;
-        this.$refs.tempId.close();
-      },
-      // 设置运费模板
-      setGoodsTemp() {
-        navigateTo(1, '/pages/product/addGoods/freightTemplate', { mer_id: this.merId });
-      },
-      // 开始下一步
+			handleNextStep() {
+				console.log(this.setFormData.setSpecificaValue)
+				let canJumpFlag = true;
+				let requireData = {
+					image: '请选择主图',
+					store_name: '请输入商品名', // 商品名
+					cate_id: '请选择平台分类', // 平台分类
+					mer_cate_id: '请选择店铺分类', // 店铺分类
+					unit_name: '请输入商品单位', // 商品单位
+				};
+				console.log({
+					...this.setFormData
+				})
+				Object.keys(requireData).some(item => {
+					if (!this.setFormData[item]) {
+						Toast(requireData[item]);
+						canJumpFlag = false;
+						return;
+					}
+				});
+				if (this.setFormData.spec_type == '0' && !this.setFormData.setSpecificaValue) {
+					Toast('商品价格不能为空');
+					return;
+				} else if (this.setFormData.spec_type == '1' && !this.setFormData.setSpecificaValue2) {
+					Toast('商品价格不能为空');
+					return;
+				}
+				if (!this.setFormData.delivery_way.length) {
+					Toast('请选择送货方式');
+					return;
+				}
+				if (this.setFormData.imageList.length < 2) {
+					Toast('请添加最少两张图片用于展示');
+					return;
+				}
 
-      handleNextStep() {
-        console.log(this.setFormData.setSpecificaValue)
-        let canJumpFlag = true;
-        let requireData = {
-          image: '请选择主图',
-          store_name: '请输入商品名', // 商品名
-          cate_id: '请选择平台分类', // 平台分类
-          mer_cate_id: '请选择店铺分类', // 店铺分类
-          unit_name: '请输入商品单位', // 商品单位
-        };
-        console.log({ ...this.setFormData })
-        Object.keys(requireData).some(item => {
-          if (!this.setFormData[item]) {
-            Toast(requireData[item]);
-            canJumpFlag = false;
-            return;
-          }
-        });
-        if (this.setFormData.spec_type == '0' && !this.setFormData.setSpecificaValue) {
-          Toast('商品价格不能为空');
-          return;
-        } else if (this.setFormData.spec_type == '1' && !this.setFormData.setSpecificaValue2) {
-          Toast('商品价格不能为空');
-          return;
-        }
-        if (!this.setFormData.delivery_way.length) {
-          Toast('请选择送货方式');
-          return;
-        }
-        if (this.setFormData.imageList.length < 2) {
-          Toast('请添加最少两张图片用于展示');
-          return;
-        }
-
-        if (canJumpFlag) {
-          // navigateTo(1, '/pages/product/addGoods/secound', { mer_id: this.merId, type: this.type });
-          // this.$refs.secound.open();
-          this.step = 2;
-        }
-      },
-      lastStep() {
-        this.step = 1;
-      }
-    }
-  };
+				if (canJumpFlag) {
+					// navigateTo(1, '/pages/product/addGoods/secound', { mer_id: this.merId, type: this.type });
+					// this.$refs.secound.open();
+					this.step = 2;
+				}
+			},
+			lastStep() {
+				this.step = 1;
+			}
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-  @import './scss/index.scss';
+	@import './scss/index.scss';
 </style>
\ No newline at end of file
diff --git a/pages/product/addGoods/singleSpecification.vue b/pages/product/addGoods/singleSpecification.vue
index a9c26ce..ad871b0 100644
--- a/pages/product/addGoods/singleSpecification.vue
+++ b/pages/product/addGoods/singleSpecification.vue
@@ -105,6 +105,7 @@
 				
 			}
 		},
+	
 		watch: {
 			singleSpecification: {
 				handler(val) {
@@ -125,6 +126,12 @@
 				})
 			}
 		},
+		// beforeDestroy() {
+		// 	console.log('123');
+		// 	uni.removeStorage({
+		// 		key: 'singleSpecification'
+		// 	});
+		// },
 		methods: {
 			selectMoreThan() {
 				this.formList = this.formList.concat(this.moreThanList);
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 7f25313..6dfc652 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -87,7 +87,7 @@
 								</view>
 							</view>
 							<view v-if="list.relevance.length == 1 && k===index" class="product">
-								<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;" 
+								<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;"
 									scroll-with-animation show-scrollbar="true">
 									<view class="product-item" v-for="(goods,idx) in list.relevance" :key="idx"
 										v-if="goods.spu">
@@ -203,7 +203,8 @@
 			</swiper-item>
 		</swiper>
 		<scroll-view scroll-y="true" v-if="currentNav === 3" class="video-list"
-			:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'" :refresher-triggered="isTriggered" @scrolltolower="getGoods()" >
+			:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'" :refresher-triggered="isTriggered"
+			@scrolltolower="getGoods()">
 			<block v-for="(item,index) in cateGoods" :key="index">
 				<view class="goods_item" @click="gogogo(item)">
 					<image class="goods_img" :src="item.image[0]" mode="aspectFill"></image>
@@ -320,7 +321,7 @@
 		}, mapGetters(['isLogin', 'uid'])),
 		data() {
 			return {
-				isTriggered:false,
+				isTriggered: false,
 				imgHost: HTTP_REQUEST_URL,
 				videoID: 0,
 				pinlunNum: 0,
@@ -390,8 +391,8 @@
 					page: 1,
 					limit: 5
 				},
-				communityId:'',
-				Listcount:'',
+				communityId: '',
+				Listcount: '',
 				loadMore: true,
 			}
 		},
@@ -427,6 +428,7 @@
 			}
 		},
 		onLoad(options) {
+			console.log(options);
 			this.getOptions(options);
 			this.videoID = options.id;
 			this.isUser = options.user == 1 ? true : false;
@@ -516,7 +518,7 @@
 				} = await graphicLstApi(this.where)
 				this.cateGoods.push(...data.list)
 				this.where.page++
-				if(data.list.length < this.where.limit){
+				if (data.list.length < this.where.limit) {
 					this.loadMore = false
 				}
 			},
@@ -700,7 +702,7 @@
 			animationfinish(event) {
 				let that = this
 				if (!that.loadVideo || !that.loadMore) return
-				if (this.k == this.dataList.length - 1 && this.currentNav === 1) {
+				if (this.k == this.dataList.length - 1 && this.currentNav == 1) {
 					that.loadVideo = false
 					this.get()
 				}
@@ -730,10 +732,10 @@
 							duration: 2000
 						});
 					}) :
-					videoList({
+					graphicLstApi({
 						page: that.page,
 						limit: that.limit,
-						id: that.videoID
+						category_id: -1
 					}).then(res => {
 						that.videoData(res.data.list)
 						if (res.data.list.length < that.limit) {
@@ -746,7 +748,7 @@
 							duration: 2000
 						});
 					})
-					that.loadVideo = true
+				that.loadVideo = true
 			},
 			getFocusList() {
 				let that = this;
diff --git a/pages/users/browsingHistory/index.vue b/pages/users/browsingHistory/index.vue
index 9cafaca..66c42b0 100644
--- a/pages/users/browsingHistory/index.vue
+++ b/pages/users/browsingHistory/index.vue
@@ -331,11 +331,11 @@
 <style lang="scss">
 page{background: #ffffff;}
 .history{
-	margin-bottom: 96rpx;
+	margin-bottom: 100rpx;
 	.history_count{
 		padding: 0 30rpx 0;
 		padding: 0 30rpx calc(0rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		padding: 0 30rpx calc(0rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		padding: 0 30rpx calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
 	}
 	.history_header{
 		justify-content: space-between;