From 006041fca6ed00af59783b05f0f2cddc1fbef55f Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 17 Apr 2024 18:02:49 +0800
Subject: [PATCH] add

---
 pages.json                                    |  25 +-
 pages/product/addGood/addGood.vue             | 845 +++-------------
 pages/product/addGood/addGoodOld.vue          | 762 ++++++++++++++
 .../product/addGood/components/commodity.vue  | 957 +++++++++---------
 .../addGood/components/uploadImgVideo.vue     |  77 ++
 pages/product/addGoodDetail/addGoodDetail.vue |  99 ++
 static/images/addGodd/addGoodBg.png           | Bin 0 -> 8304 bytes
 uni.scss                                      |   1 +
 .../uni-data-select/uni-data-select.vue       |  40 +-
 9 files changed, 1583 insertions(+), 1223 deletions(-)
 create mode 100644 pages/product/addGood/addGoodOld.vue
 create mode 100644 pages/product/addGood/components/uploadImgVideo.vue
 create mode 100644 pages/product/addGoodDetail/addGoodDetail.vue
 create mode 100644 static/images/addGodd/addGoodBg.png

diff --git a/pages.json b/pages.json
index fd9a0b1..3facdbf 100644
--- a/pages.json
+++ b/pages.json
@@ -308,12 +308,11 @@
 			}
 		},
 		{
-		  "path" : "pages/cashier/cashier",
-		  "style" : 
-		  {
-		    "navigationBarTitleText" : "收银",
-		    "enablePullDownRefresh" : true
-		  }
+			"path": "pages/cashier/cashier",
+			"style": {
+				"navigationBarTitleText": "收银",
+				"enablePullDownRefresh": true
+			}
 		}
 	],
 	"subPackages": [{
@@ -1509,6 +1508,13 @@
 						"enablePullDownRefresh": false
 					}
 				},
+				{
+					"path": "addGood/addGoodOld",
+					"style": {
+						"navigationBarTitleText": "发布商品",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "addGood/addGood_one",
 					"style": {
@@ -1536,6 +1542,13 @@
 						"navigationBarTitleText": "更新库存",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "addGoodDetail/addGoodDetail",
+					"style": {
+						"navigationBarTitleText": "发布商品",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},
diff --git a/pages/product/addGood/addGood.vue b/pages/product/addGood/addGood.vue
index 33e97b4..6cb989b 100644
--- a/pages/product/addGood/addGood.vue
+++ b/pages/product/addGood/addGood.vue
@@ -1,762 +1,157 @@
 <template>
-	<view class="container">
-		<view class="step_one">
-			<view class="input_content">
-				<view class="bar-code" v-if="bar_code_dis">
-					<view>商品条码</view>
-					<input type="number" placeholder="请手动添加条码" v-model="code" :disabled="bar_code_dis"
-						placeholder-class="inputPlaceHolder" />
+	<view class='content'>
+		<u--form :model="model1" :rules="rules" ref="uForm" labelPosition="top"
+			:labelStyle="{fontWeight:'bold',fontSize:'32rpx'}" labelWidth='100'>
+			<u-form-item label="想卖什么" prop="userInfo.name" ref="item1">
+				<view class="borders">
+					<u--textarea v-model="model1.userInfo.name" placeholder="请描述您想卖的货品名称，如:红富士苹果、宁夏西瓜、梨。"></u--textarea>
 				</view>
-				<view class="input_content_textarea">
-					<textarea v-model="setFormData.store_name" placeholder="请输入45商品名称"
-						placeholder-class="placeholderStyle" maxlength="60" />
-					<view class="flex" style="justify-content: space-between;color: #999999;">
-						<view>(品牌,名称,规格,口味)</view>
-						<view>
-							<text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text>
-							<text v-else>0</text>/60
-						</view>
-					</view>
+			</u-form-item>
+			<u-form-item label="上传商品图" prop="userInfo.name" ref="item1">
+				<uploadImgVideo></uploadImgVideo>
+			</u-form-item>
+
+			<u-form-item label="商品售价" prop="userInfo.name" ref="item1">
+				<view class="borders" style="width:250rpx;height: 100rpx;">
+					<u--input placeholder="" v-model="text"></u--input>
 				</view>
-				<view class="photo_count">
-					<text class="photo_size" style="color: #e93323;">建议：图片尺寸为750*750px, 上传2张以上</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" @click="pop(item)"></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>
+				<text style="margin: 0 20rpx;">元</text>
+				<uni-section type="line" style="width:250rpx;">
+					<uni-data-select v-model="text" :localdata="range" placeholder=""></uni-data-select>
+				</uni-section>
+			</u-form-item>
+			<view class="footer">
+				<view class="footer-top">
+					<text style="margin: 0 auto;		">
+						显示全部<u-icon style="display: inline-block;font-weight: bold;" color="$uni-newTheme-color"
+							name="arrow-right"></u-icon>
+					</text>
 				</view>
-				<u-popup ref="select_popup" class="pop" :show="show" mode="center" closeOnClickOverlay
-					bgColor='transparent'>
-					<image :src="image"></image>
-					<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
-				</u-popup>
-			</view>
-
-			<!-- 商品详情 -->
-			<commodityComponent ref="commodityRef" v-if="showCommodity" :key="showCommodity"
-				:showCommodity="showCommodity" :product_id="product_id" :merId="merId" :code="code">
-			</commodityComponent>
-
-			<view class="popup_group">
-				<view class="popup_group_item popup_group_item_b" @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 popup_group_item_b">
-					<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>
-
-			<!-- 选择平台分类弹框 -->
-			<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>
-
-
-
-			<!-- 规格设置 -->
-			<picker mode="selector" :range="['单规格','多规格']" :value="setFormData.spec_type" @change="changeSpecType">
-				<view class="popup_group" style="margin-bottom: 0;">
-					<view class="popup_group_item">
-						<view class="popup_group_item_label">商品规格</view>
-						<view class="popup_group_item_value">
-							<view class="popup_group_item_message">
-								<span
-									class="popup_group_item_message_value">{{ setFormData.spec_type==0?'单规格':'多规格' }}</span>
-							</view>
-							<view><span class="iconfont">&#xe6bd;</span></view>
-						</view>
-					</view>
-				</view>
-				<u-modal :show="showSpecType" title="温馨提示" content="切换后商品原有规格将失效,是否继续?" show-cancel-button
-					confirm-text="继续" @confirm="changeSpecType2" @cancel="showSpecType=false"></u-modal>
-			</picker>
-			<priceComponent v-if="setFormData.spec_type==0" :datas="setFormData.attrValue[0]" ref="priceRef"
-				:product_id="product_id" :bar_code="code" @updateCode="updateCode">
-			</priceComponent>
-			<view v-else class="popup_group" style="margin-top: 0;border-top: 1rpx solid #eeeeee;">
-				<view class="popup_group_item" @click="navToSpecGood()">
-					<view class="popup_group_item_label" style="flex: 1; text-align: center;">
-						设置多规格
-						<text v-if="setFormData.attrValue.length>0">({{setFormData.attrValue.length}})</text>
-					</view>
+				<view class="footer-bottom">
+					发布内容越详尽，成单力越高
 				</view>
 			</view>
 
-
-			<view class="popup_group">
-				<!-- <view class="popup_group_item" @click="showMoreInfo=!showMoreInfo">
-          <view class="popup_group_item_label">更多信息</view>
-          <view class="popup_group_item_value" :class="showMoreInfo?'icon_bottom':'icon_top'">
-            <view><span class="iconfont">&#xe6bd;</span></view>
-          </view>
-        </view> -->
-				<block>
-					<view class="input_content">
-						<view class="input_content_describe" style="border: none;padding-bottom: 0;">
-							<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" style="width: 100%;" 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">
-            <view class="input_content_keyword">
-              <view class="input_content_keyword_label">最少购买件数</view>
-              <view class="input_content_keyword_value"><input v-model="setFormData.once_min_count" type="number" value=""
-                  placeholder="不限量" /></view>
-            </view>
-          </view> -->
-					<view class="radio">
-						<view class="radio_label ">送货方式</view>
-						<checkbox-group class="select_group flex_start" @change="changeDelivery">
-							<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>
-				</block>
-
+			<view class="submit-btn">
+				<u-button text="立即发布获取订单" @click='goDetail' :class="{height:'200px'}" color="#33BB3C"></u-button>
 			</view>
-
-		</view>
-
-		<view class="handle">
-			<view class="handle_button" @click="submitCreatedGoods">提交</view>
-		</view>
-
-
-		<!-- 图片选择器 -->
-		<avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
-		</avatar>
-
+		</u--form>
 	</view>
 </template>
 
 <script>
-	import {
-		TOKENNAME,
-		HTTP_REQUEST_URL
-	} from '@/config/app.js';
-	import {
-		categoryBrandlist,
-		categorySelect,
-		storeClassifyLst,
-		categoryList,
-		attrList,
-		templateList,
-		productDetail,
-		getDeliveryType,
-		productCreate,
-		productUpdate
-	} from '@/api/product.js';
-	import {
-		serialize,
-		Toast,
-		Loading,
-		hideLoading,
-		Modal
-	} from "@/libs/uniApi.js";
-	import avatar from "@/components/yq-avatar/yq-avatar.vue";
-	import platfrom from "./components/platform.vue";
-	import storeClassification from '../components/store_classification.vue';
-	import commodityComponent from "./components/commodity.vue";
-	import priceComponent from "./components/price.vue";
+	import uploadImgVideo from "./components/uploadImgVideo.vue"
 	export default {
 		components: {
-			avatar,
-			platfrom,
-			commodityComponent,
-			priceComponent,
-			storeClassification
+			uploadImgVideo,
 		},
 		data() {
 			return {
-				bar_code_dis: false,
-				merId: '', //商户id
-				product_id: '', //商品id
-				import: 0, //是否为导入商品
-				code: '', //商品条码
-				show: false, //是否预览图片
-				image: false, //预览的图
-				setFormData: {
-					store_name: '',
-					imageList: [],
-					attrValue: [],
-					cate_name: '', //平台名称
-					unit_name: '', //商品单位
-					cate_id: '', // 平台分类id
-					mer_cate_id: '', // 店铺分类
-					mer_cate_name: '', // 店铺分类名称
-					spec_type: '0', // 0.单规格 1：多规格
-					attr: [], // 商品规格
-					specifica: '', // 商品规格名称
-					// setSpecificaValue: '', // 价格设置提示
-					// setSpecificaValue2: '',
-					delivery_way: ['1', '2'], // 配送方式 1 到店核销 2 快递配送
-					delivery_free: '1', // 是否包邮 0不包邮 1包邮
-					temp_id: '', // 运费模板ID
-					tempName: '', // 运费模板名称
-					once_min_count: '', //最少购买件数
+				showSex: false,
+				model1: {
+					userInfo: {
+						name: '',
+						sex: '',
+					},
 				},
-				platformClassificationData: [], // 平台分类数据
-				merchantClassification: [], // 店铺分类
-				brand: [], // 品牌
-				showCommodity: false, // 是否显示商品,售价
-				deliveryFreeList: [{
-						value: '1',
-						name: '到店核销'
+				range: [{
+						value: 0,
+						text: "篮球"
 					},
 					{
-						value: '2',
-						name: '快递配送'
-					}
+						value: 1,
+						text: "足球"
+					},
+					{
+						value: 2,
+						text: "游泳"
+					},
 				],
-				// 分类数据容器
-				classified: {
-					cate_id: [],
-					mer_cate_id: [],
-					brand_id: [],
-					attr: [],
-					temp_id: []
+				text: "",
+
+				rules: {
+					// 'userInfo.name': {
+					// 	type: 'string',
+					// 	required: true,
+					// 	message: '请填写姓名',
+					// 	trigger: ['blur', 'change']
+					// },
+					// 'userInfo.sex': {
+					// 	type: 'string',
+					// 	max: 1,
+					// 	required: true,
+					// 	message: '请选择男或女',
+					// 	trigger: ['blur', 'change']
+					// },
 				},
-				productItem: {} || [],
-				showSpecType: false, // 是否显示切换窗口弹窗
-				spec_type: 0, //临时规格,0单规格,1多规格
+				radio: '',
+				switchVal: false
 			};
 		},
-		onLoad(opt) {
-			this.merId = Number(opt.mer_id);
-			this.product_id = opt.product_id;
-			this.import = opt.import;
-			// if (!opt.product_id) this.showCommodity = true;
-			this.showCommodity = true;
-			this.initData();
-
-			if (this.import == 1) {
-				this.getOpenerEventChannel().once('importAttrValue', (e) => {
-					this.attrValue = e.attrValue;
-					uni.setStorageSync('attrValue', JSON.stringify(e.attrValue));
-					this.attr = e.attr;
-					uni.setStorageSync('attr', JSON.stringify(e.attr));
-					this.setFormData = Object.assign({}, this.setFormData, e);
-					this.$nextTick(() => {
-						this.$refs.commodityRef?.setDatas({
-							addGoodsSecoundData: {
-								is_good: this.setFormData.is_good, // 是否推荐
-								is_gift_bag: this.setFormData.is_gift_bag,
-								sort: this.setFormData.sort,
-								once_count: this.setFormData.once_count, // 限购数量
-								video_link: this.setFormData.video_link,
-							},
-							goodsDis: {
-								store_name: this.setFormData.content?.title,
-								imageList: this.setFormData.content?.image
-							}
-						})
-					})
-				})
-			} else if (this.product_id) {
-				this.initDataEditData();
-			}
-		},
-		onBackPress() {},
-		onShow() {
-			this.initClasiffy();
-			// this.setFormData = Object.assign(this.setFormData, {
-			//   "store_name": "方法",
-			//   "imageList": [
-			//     "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/457c6202311181745387896.jpeg",
-			//     "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/185e2202311181745434402.jpeg"
-			//   ],
-			//   "cate_name": "丧葬服务",
-			//   "unit_name": "给",
-			//   "cate_id": 445,
-			//   "keyword": "22"
-			// })
-			// this.$nextTick(async () => {
-			//   await this.$u.sleep(200)
-			//   this.$refs.commodityRef.addGoodsSecoundData = {
-			//     "is_good": 1,
-			//     "is_gift_bag": 0,
-			//     "sort": "20",
-			//     "once_count": "",
-			//     "video_link": "https://lihai001.oss-cn-chengdu.aliyuncs.com/media/7ce3d202311181816166215.mp4"
-			//   }
-			//   this.$refs.commodityRef.goodsDis = {
-			//     "store_name": "",
-			//     "imageList": [
-			//       "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/fb73d202311181751262661.png"
-			//     ]
-			//   }
-			//   this.$refs.priceRef.singleSpecification = {
-			//     "price": "1",
-			//     "cost": "1",
-			//     "stock": "11",
-			//     "ot_price": "",
-			//     "wholesale_price": "",
-			//     "bar_code": "666",
-			//     "weight": "10",
-			//     "volume": "5",
-			//     "image": "",
-			//     "extension_one": "",
-			//     "extension_two": ""
-			//   }
-			// })
-		},
-		beforeDestroy() {},
-		watch: {
-			'setFormData.imageList'(val) {
-				this.setFormData.image = val.length ? val[0] : '';
-				this.setFormData.slider_image = val.length ? serialize(val).splice(1) : [];
-			}
-		},
 		methods: {
-			changeDelivery(e) {
-				this.setFormData.delivery_way = e.detail.value;
+			sexSelect(e) {
+				this.model1.userInfo.sex = e.name
+				this.$refs.uForm.validateField('userInfo.sex')
 			},
-			// 查询详情数据
-			initDataEditData() {
-				this.setFormData = {
-					imageList: [],
-					attrValue: [],
-					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: '', // 运费模板名称
-					once_min_count: '', //最小购买数量
-				};
-				productDetail(this.merId, this.product_id).then(async (res) => {
-					this.showCommodity = true;
-					if (res.data.content_arr && res.data.content_arr.length > 0) res.data.content = res.data
-						.content_arr;
-					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 (res.data.content && typeof res.data.content == 'string') res.data.content = JSON.parse(
-						res.data
-						.content);
-					this.setFormData.once_min_count <= 0 ? this.setFormData.once_min_count = '' : null;
-					this.setFormData.delivery_way = res.data.delivery_way;
-					//向组件注入数据
-					this.$nextTick(() => {
-						this.$refs.commodityRef.setDatas({
-							addGoodsSecoundData: {
-								is_good: res.data.is_good, // 是否推荐
-								is_gift_bag: res.data.is_gift_bag,
-								sort: res.data.sort,
-								once_count: res.data.once_count, // 限购数量
-								video_link: res.data.video_link,
-							},
-							goodsDis: {
-								store_name: res.data.content?.title,
-								imageList: res.data.content?.image
-							}
-						})
-						// 单规格
-						if (this.setFormData.spec_type == 0) {
-							this.$refs.priceRef.setDatas(res.data.attrValue[0]);
-						}
-					})
-					editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
-					hideLoading();
-
-				});
-			},
-			//获取商户分类
-			async initClasiffy() {
-				this.merchantClassification = (await storeClassifyLst(this.merId)).data;
-			},
-			initData() {
-				// 获取品牌
-				categoryBrandlist(this.merId).then((res) => {
-					this.brand = res.data;
-				}).catch(e => {
-					console.log(e);
-				});
-				// 获取平台分类
-				categoryList(this.merId).then((res) => {
-					res.data.forEach((item1) => {
-						item1.children.forEach((item2) => {
-							item2.children = null;
-						})
-					})
-					this.platformClassificationData = res.data;
-				}).catch(e => {
-					console.log(e);
-				})
-
-			},
-			// 更新商品条码
-			updateCode(e) {
-				this.code = e + '';
-			},
-			// 选择图片
-			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
-				// });
-        this.$util.uploadImageOne({
-          url: 'upload/image',
-          crop: {
-            width: 2000,
-            height: 2000,
-          }
-        },(res)=> {
-        	this.setFormData.imageList.push(res.data.path);
-        });
-			},
-			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 ' + this.$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
-			},
-			//图片预览
-			pop(e) {
-				this.show = true
-				this.image = e
-			},
-			// 关闭弹框
-			close() {
-				this.$refs.select_popup.close();
-				this.show = false
-			},
-			// 删除图片
-			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) {
-				console.log(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();
-				this.show = false
-			},
-			// 拼接字符串
-			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
-				};
-			},
-			// 求运费模板列表
-			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();
-				});
-			},
-
-			// 创建商品
-			submitCreatedGoods() {
-				console.log('创建商品');
-				// return console.log('商品规格', this.setFormData.attr);
-				console.log('是否推荐', this.$refs.commodityRef.addGoodsSecoundData);
-				console.log('商品详情', this.$refs.commodityRef.goodsDis, this.$refs.commodityRef.store_name);
-				if (this.setFormData.spec_type == 0) {
-					console.log('价格库存', this.$refs.priceRef.singleSpecification);
-				}
-				if (this.setFormData.delivery_way.length == 0) return Toast('请至少选择一种送货方式');
-				let postData = {
-					...this.setFormData,
-					...this.$refs.commodityRef.addGoodsSecoundData,
-					content: {
-						title: this.$refs.commodityRef.goodsDis?.store_name || '',
-						image: this.$refs.commodityRef.goodsDis?.imageList || []
-					},
-					video_link: this.$refs.commodityRef.addGoodsSecoundData.video_link,
-				};
-				if (this.setFormData.spec_type == 0) {
-					postData.attrValue = [this.$refs.priceRef.singleSpecification];
-				} else postData.attrValue = this.setFormData.attrValue;
-				postData.stock = postData.attrValue[0]?.stock || 0;
-				if (!postData.store_name || postData.store_name?.trim().length <= 0) return Toast('请输入商品名称');
-				if (!postData.imageList || postData.imageList?.length < 2) return Toast('请上传2张以上商品图片');
-				if (!postData.cate_name || postData.cate_name?.trim().length <= 0) return Toast('请选择平台分类');
-				if (!postData.unit_name || postData.unit_name?.trim().length <= 0) return Toast('请输入商品单位');
-				let userInfo = this.$store.state.app.userInfo;
-				if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo);
-				let showFlag = '';
-
-				console.log(postData);
-
-				postData.attrValue.forEach(t => {
-					if (userInfo.mer_info.wholesale && (!t.wholesale_price || +t.wholesale_price <= 0)) {
-						showFlag = '批发价不能小于0'
-					}
-					if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0';
-					if (!t.stock || +t.stock <= 0) showFlag = '库存不能小于0';
-					// if (!t.cost || +t.cost <= 0) showFlag = '成本价不能小于0';
-				})
-				if (showFlag) {
-					if (this.setFormData.spec_type == 1) showFlag += ', 请点击设置多规格设置';
-					return Toast(showFlag);
-				}
-				Loading();
-				if (this.product_id) {
-					productUpdate(this.merId, this.product_id, postData)
-						.then(res => {
-							hideLoading()
-							Modal('提交成功', '点击确定, 前往商品列表页面').then(() => {
-								uni.redirectTo({
-									url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
-								})
-							}).catch(() => {
-								uni.navigateBack()
-							})
-						})
-						.catch(rej => {
-							Toast(rej);
-						});
-
-				} else {
-					productCreate(this.merId, postData)
-						.then(res => {
-							hideLoading();
-							Modal('提交成功', '点击确定，前往商品列表页面').then(() => {
-								if (this.import == 1) {
-									uni.$emit('importAttrValueOK', this.setFormData.import_id);
-									uni.navigateBack();
-								} else uni.redirectTo({
-									url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
-								})
-							}).catch(() => {
-								uni.navigateBack()
-							})
-						})
-						.catch(rej => {
-							Toast(rej);
-						});
-				}
-			},
-			// 选择规格
-			changeSpecType(e) {
-				if (this.setFormData.spec_type != e.detail.value) {
-					this.showSpecType = true;
-				}
-				this.spec_type = e.detail.value;
-			},
-			// 二次确认
-			changeSpecType2() {
-				this.showSpecType = false;
-				this.setFormData.spec_type = this.spec_type + '';
-				this.setFormData.attrValue = [];
-				this.setFormData.attr = [];
-			},
-			// 跳转多规格页面
-			navToSpecGood() {
+			goDetail() {
 				uni.navigateTo({
-					url: '/pages/product/addGood/specGood?product_id=' + this.product_id,
-					success: (e) => {
-						// console.log(this.setFormData.attrValue, e);
-						e.eventChannel.emit('updateAttrValue', {
-							attrValue: JSON.parse(JSON.stringify(this.setFormData.attrValue)),
-							attr: JSON.parse(JSON.stringify(this.setFormData.attr))
-						});
-						uni.$once('updateSpecType', (e) => {
-							this.setFormData.attrValue = JSON.parse(JSON.stringify(e.attrValue));
-							this.setFormData.attr = JSON.parse(JSON.stringify(e.attr));
-						})
-					}
+					url: '/pages/product/addGoodDetail/addGoodDetail'
 				})
 			}
-		}
+		},
+
 	};
 </script>
 
-<style lang="scss" scoped>
-	@import './scss/index.scss';
+<style lang='scss'>
+	.content {
+		width: 100vw;
+		min-height: 100vh;
+		background-color: white;
+		box-sizing: border-box;
+		padding: 30rpx;
 
-	.pop {
-		z-index: 1;
+		.borders {
+			width: 690rpx;
+			border: 1px solid #CECECE;
+			border-radius: 10rpx;
+		}
 	}
 
-	.guanbi {
-		width: 20px;
-		height: 20px;
-		margin: 30px auto;
+	.footer {
+		position: absolute;
+		bottom: 270rpx;
+		left: 50%;
+		transform: translate(-50%, 0);
+		font-size: 28rpx;
+
+		.footer-top {
+			color: $uni-newTheme-color;
+			display: flex;
+			font-weight: bold;
+			align-items: center;
+		}
+
+		.footer-bottom {
+			font-size: 28rpx;
+			color: #989898;
+
+		}
+
+	}
+
+	.submit-btn {
+		position: absolute;
+		bottom: 86rpx;
+		left: 50%;
+		transform: translate(-50%, 0);
+		width: 670rpx;
+		border-radius: 40rpx;
+		overflow: hidden;
+	}
+
+	/deep/ .uni-select {
+		height: 100rpx;
+		border: 2rpx #CECECE solid;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/product/addGood/addGoodOld.vue b/pages/product/addGood/addGoodOld.vue
new file mode 100644
index 0000000..33e97b4
--- /dev/null
+++ b/pages/product/addGood/addGoodOld.vue
@@ -0,0 +1,762 @@
+<template>
+	<view class="container">
+		<view class="step_one">
+			<view class="input_content">
+				<view class="bar-code" v-if="bar_code_dis">
+					<view>商品条码</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="请输入45商品名称"
+						placeholder-class="placeholderStyle" maxlength="60" />
+					<view class="flex" style="justify-content: space-between;color: #999999;">
+						<view>(品牌,名称,规格,口味)</view>
+						<view>
+							<text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text>
+							<text v-else>0</text>/60
+						</view>
+					</view>
+				</view>
+				<view class="photo_count">
+					<text class="photo_size" style="color: #e93323;">建议：图片尺寸为750*750px, 上传2张以上</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" @click="pop(item)"></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>
+				<u-popup ref="select_popup" class="pop" :show="show" mode="center" closeOnClickOverlay
+					bgColor='transparent'>
+					<image :src="image"></image>
+					<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
+				</u-popup>
+			</view>
+
+			<!-- 商品详情 -->
+			<commodityComponent ref="commodityRef" v-if="showCommodity" :key="showCommodity"
+				:showCommodity="showCommodity" :product_id="product_id" :merId="merId" :code="code">
+			</commodityComponent>
+
+			<view class="popup_group">
+				<view class="popup_group_item popup_group_item_b" @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 popup_group_item_b">
+					<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>
+
+			<!-- 选择平台分类弹框 -->
+			<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>
+
+
+
+			<!-- 规格设置 -->
+			<picker mode="selector" :range="['单规格','多规格']" :value="setFormData.spec_type" @change="changeSpecType">
+				<view class="popup_group" style="margin-bottom: 0;">
+					<view class="popup_group_item">
+						<view class="popup_group_item_label">商品规格</view>
+						<view class="popup_group_item_value">
+							<view class="popup_group_item_message">
+								<span
+									class="popup_group_item_message_value">{{ setFormData.spec_type==0?'单规格':'多规格' }}</span>
+							</view>
+							<view><span class="iconfont">&#xe6bd;</span></view>
+						</view>
+					</view>
+				</view>
+				<u-modal :show="showSpecType" title="温馨提示" content="切换后商品原有规格将失效,是否继续?" show-cancel-button
+					confirm-text="继续" @confirm="changeSpecType2" @cancel="showSpecType=false"></u-modal>
+			</picker>
+			<priceComponent v-if="setFormData.spec_type==0" :datas="setFormData.attrValue[0]" ref="priceRef"
+				:product_id="product_id" :bar_code="code" @updateCode="updateCode">
+			</priceComponent>
+			<view v-else class="popup_group" style="margin-top: 0;border-top: 1rpx solid #eeeeee;">
+				<view class="popup_group_item" @click="navToSpecGood()">
+					<view class="popup_group_item_label" style="flex: 1; text-align: center;">
+						设置多规格
+						<text v-if="setFormData.attrValue.length>0">({{setFormData.attrValue.length}})</text>
+					</view>
+				</view>
+			</view>
+
+
+			<view class="popup_group">
+				<!-- <view class="popup_group_item" @click="showMoreInfo=!showMoreInfo">
+          <view class="popup_group_item_label">更多信息</view>
+          <view class="popup_group_item_value" :class="showMoreInfo?'icon_bottom':'icon_top'">
+            <view><span class="iconfont">&#xe6bd;</span></view>
+          </view>
+        </view> -->
+				<block>
+					<view class="input_content">
+						<view class="input_content_describe" style="border: none;padding-bottom: 0;">
+							<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" style="width: 100%;" 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">
+            <view class="input_content_keyword">
+              <view class="input_content_keyword_label">最少购买件数</view>
+              <view class="input_content_keyword_value"><input v-model="setFormData.once_min_count" type="number" value=""
+                  placeholder="不限量" /></view>
+            </view>
+          </view> -->
+					<view class="radio">
+						<view class="radio_label ">送货方式</view>
+						<checkbox-group class="select_group flex_start" @change="changeDelivery">
+							<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>
+				</block>
+
+			</view>
+
+		</view>
+
+		<view class="handle">
+			<view class="handle_button" @click="submitCreatedGoods">提交</view>
+		</view>
+
+
+		<!-- 图片选择器 -->
+		<avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
+		</avatar>
+
+	</view>
+</template>
+
+<script>
+	import {
+		TOKENNAME,
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	import {
+		categoryBrandlist,
+		categorySelect,
+		storeClassifyLst,
+		categoryList,
+		attrList,
+		templateList,
+		productDetail,
+		getDeliveryType,
+		productCreate,
+		productUpdate
+	} from '@/api/product.js';
+	import {
+		serialize,
+		Toast,
+		Loading,
+		hideLoading,
+		Modal
+	} from "@/libs/uniApi.js";
+	import avatar from "@/components/yq-avatar/yq-avatar.vue";
+	import platfrom from "./components/platform.vue";
+	import storeClassification from '../components/store_classification.vue';
+	import commodityComponent from "./components/commodity.vue";
+	import priceComponent from "./components/price.vue";
+	export default {
+		components: {
+			avatar,
+			platfrom,
+			commodityComponent,
+			priceComponent,
+			storeClassification
+		},
+		data() {
+			return {
+				bar_code_dis: false,
+				merId: '', //商户id
+				product_id: '', //商品id
+				import: 0, //是否为导入商品
+				code: '', //商品条码
+				show: false, //是否预览图片
+				image: false, //预览的图
+				setFormData: {
+					store_name: '',
+					imageList: [],
+					attrValue: [],
+					cate_name: '', //平台名称
+					unit_name: '', //商品单位
+					cate_id: '', // 平台分类id
+					mer_cate_id: '', // 店铺分类
+					mer_cate_name: '', // 店铺分类名称
+					spec_type: '0', // 0.单规格 1：多规格
+					attr: [], // 商品规格
+					specifica: '', // 商品规格名称
+					// setSpecificaValue: '', // 价格设置提示
+					// setSpecificaValue2: '',
+					delivery_way: ['1', '2'], // 配送方式 1 到店核销 2 快递配送
+					delivery_free: '1', // 是否包邮 0不包邮 1包邮
+					temp_id: '', // 运费模板ID
+					tempName: '', // 运费模板名称
+					once_min_count: '', //最少购买件数
+				},
+				platformClassificationData: [], // 平台分类数据
+				merchantClassification: [], // 店铺分类
+				brand: [], // 品牌
+				showCommodity: false, // 是否显示商品,售价
+				deliveryFreeList: [{
+						value: '1',
+						name: '到店核销'
+					},
+					{
+						value: '2',
+						name: '快递配送'
+					}
+				],
+				// 分类数据容器
+				classified: {
+					cate_id: [],
+					mer_cate_id: [],
+					brand_id: [],
+					attr: [],
+					temp_id: []
+				},
+				productItem: {} || [],
+				showSpecType: false, // 是否显示切换窗口弹窗
+				spec_type: 0, //临时规格,0单规格,1多规格
+			};
+		},
+		onLoad(opt) {
+			this.merId = Number(opt.mer_id);
+			this.product_id = opt.product_id;
+			this.import = opt.import;
+			// if (!opt.product_id) this.showCommodity = true;
+			this.showCommodity = true;
+			this.initData();
+
+			if (this.import == 1) {
+				this.getOpenerEventChannel().once('importAttrValue', (e) => {
+					this.attrValue = e.attrValue;
+					uni.setStorageSync('attrValue', JSON.stringify(e.attrValue));
+					this.attr = e.attr;
+					uni.setStorageSync('attr', JSON.stringify(e.attr));
+					this.setFormData = Object.assign({}, this.setFormData, e);
+					this.$nextTick(() => {
+						this.$refs.commodityRef?.setDatas({
+							addGoodsSecoundData: {
+								is_good: this.setFormData.is_good, // 是否推荐
+								is_gift_bag: this.setFormData.is_gift_bag,
+								sort: this.setFormData.sort,
+								once_count: this.setFormData.once_count, // 限购数量
+								video_link: this.setFormData.video_link,
+							},
+							goodsDis: {
+								store_name: this.setFormData.content?.title,
+								imageList: this.setFormData.content?.image
+							}
+						})
+					})
+				})
+			} else if (this.product_id) {
+				this.initDataEditData();
+			}
+		},
+		onBackPress() {},
+		onShow() {
+			this.initClasiffy();
+			// this.setFormData = Object.assign(this.setFormData, {
+			//   "store_name": "方法",
+			//   "imageList": [
+			//     "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/457c6202311181745387896.jpeg",
+			//     "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/185e2202311181745434402.jpeg"
+			//   ],
+			//   "cate_name": "丧葬服务",
+			//   "unit_name": "给",
+			//   "cate_id": 445,
+			//   "keyword": "22"
+			// })
+			// this.$nextTick(async () => {
+			//   await this.$u.sleep(200)
+			//   this.$refs.commodityRef.addGoodsSecoundData = {
+			//     "is_good": 1,
+			//     "is_gift_bag": 0,
+			//     "sort": "20",
+			//     "once_count": "",
+			//     "video_link": "https://lihai001.oss-cn-chengdu.aliyuncs.com/media/7ce3d202311181816166215.mp4"
+			//   }
+			//   this.$refs.commodityRef.goodsDis = {
+			//     "store_name": "",
+			//     "imageList": [
+			//       "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/fb73d202311181751262661.png"
+			//     ]
+			//   }
+			//   this.$refs.priceRef.singleSpecification = {
+			//     "price": "1",
+			//     "cost": "1",
+			//     "stock": "11",
+			//     "ot_price": "",
+			//     "wholesale_price": "",
+			//     "bar_code": "666",
+			//     "weight": "10",
+			//     "volume": "5",
+			//     "image": "",
+			//     "extension_one": "",
+			//     "extension_two": ""
+			//   }
+			// })
+		},
+		beforeDestroy() {},
+		watch: {
+			'setFormData.imageList'(val) {
+				this.setFormData.image = val.length ? val[0] : '';
+				this.setFormData.slider_image = val.length ? serialize(val).splice(1) : [];
+			}
+		},
+		methods: {
+			changeDelivery(e) {
+				this.setFormData.delivery_way = e.detail.value;
+			},
+			// 查询详情数据
+			initDataEditData() {
+				this.setFormData = {
+					imageList: [],
+					attrValue: [],
+					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: '', // 运费模板名称
+					once_min_count: '', //最小购买数量
+				};
+				productDetail(this.merId, this.product_id).then(async (res) => {
+					this.showCommodity = true;
+					if (res.data.content_arr && res.data.content_arr.length > 0) res.data.content = res.data
+						.content_arr;
+					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 (res.data.content && typeof res.data.content == 'string') res.data.content = JSON.parse(
+						res.data
+						.content);
+					this.setFormData.once_min_count <= 0 ? this.setFormData.once_min_count = '' : null;
+					this.setFormData.delivery_way = res.data.delivery_way;
+					//向组件注入数据
+					this.$nextTick(() => {
+						this.$refs.commodityRef.setDatas({
+							addGoodsSecoundData: {
+								is_good: res.data.is_good, // 是否推荐
+								is_gift_bag: res.data.is_gift_bag,
+								sort: res.data.sort,
+								once_count: res.data.once_count, // 限购数量
+								video_link: res.data.video_link,
+							},
+							goodsDis: {
+								store_name: res.data.content?.title,
+								imageList: res.data.content?.image
+							}
+						})
+						// 单规格
+						if (this.setFormData.spec_type == 0) {
+							this.$refs.priceRef.setDatas(res.data.attrValue[0]);
+						}
+					})
+					editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
+					hideLoading();
+
+				});
+			},
+			//获取商户分类
+			async initClasiffy() {
+				this.merchantClassification = (await storeClassifyLst(this.merId)).data;
+			},
+			initData() {
+				// 获取品牌
+				categoryBrandlist(this.merId).then((res) => {
+					this.brand = res.data;
+				}).catch(e => {
+					console.log(e);
+				});
+				// 获取平台分类
+				categoryList(this.merId).then((res) => {
+					res.data.forEach((item1) => {
+						item1.children.forEach((item2) => {
+							item2.children = null;
+						})
+					})
+					this.platformClassificationData = res.data;
+				}).catch(e => {
+					console.log(e);
+				})
+
+			},
+			// 更新商品条码
+			updateCode(e) {
+				this.code = e + '';
+			},
+			// 选择图片
+			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
+				// });
+        this.$util.uploadImageOne({
+          url: 'upload/image',
+          crop: {
+            width: 2000,
+            height: 2000,
+          }
+        },(res)=> {
+        	this.setFormData.imageList.push(res.data.path);
+        });
+			},
+			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 ' + this.$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
+			},
+			//图片预览
+			pop(e) {
+				this.show = true
+				this.image = e
+			},
+			// 关闭弹框
+			close() {
+				this.$refs.select_popup.close();
+				this.show = false
+			},
+			// 删除图片
+			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) {
+				console.log(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();
+				this.show = false
+			},
+			// 拼接字符串
+			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
+				};
+			},
+			// 求运费模板列表
+			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();
+				});
+			},
+
+			// 创建商品
+			submitCreatedGoods() {
+				console.log('创建商品');
+				// return console.log('商品规格', this.setFormData.attr);
+				console.log('是否推荐', this.$refs.commodityRef.addGoodsSecoundData);
+				console.log('商品详情', this.$refs.commodityRef.goodsDis, this.$refs.commodityRef.store_name);
+				if (this.setFormData.spec_type == 0) {
+					console.log('价格库存', this.$refs.priceRef.singleSpecification);
+				}
+				if (this.setFormData.delivery_way.length == 0) return Toast('请至少选择一种送货方式');
+				let postData = {
+					...this.setFormData,
+					...this.$refs.commodityRef.addGoodsSecoundData,
+					content: {
+						title: this.$refs.commodityRef.goodsDis?.store_name || '',
+						image: this.$refs.commodityRef.goodsDis?.imageList || []
+					},
+					video_link: this.$refs.commodityRef.addGoodsSecoundData.video_link,
+				};
+				if (this.setFormData.spec_type == 0) {
+					postData.attrValue = [this.$refs.priceRef.singleSpecification];
+				} else postData.attrValue = this.setFormData.attrValue;
+				postData.stock = postData.attrValue[0]?.stock || 0;
+				if (!postData.store_name || postData.store_name?.trim().length <= 0) return Toast('请输入商品名称');
+				if (!postData.imageList || postData.imageList?.length < 2) return Toast('请上传2张以上商品图片');
+				if (!postData.cate_name || postData.cate_name?.trim().length <= 0) return Toast('请选择平台分类');
+				if (!postData.unit_name || postData.unit_name?.trim().length <= 0) return Toast('请输入商品单位');
+				let userInfo = this.$store.state.app.userInfo;
+				if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo);
+				let showFlag = '';
+
+				console.log(postData);
+
+				postData.attrValue.forEach(t => {
+					if (userInfo.mer_info.wholesale && (!t.wholesale_price || +t.wholesale_price <= 0)) {
+						showFlag = '批发价不能小于0'
+					}
+					if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0';
+					if (!t.stock || +t.stock <= 0) showFlag = '库存不能小于0';
+					// if (!t.cost || +t.cost <= 0) showFlag = '成本价不能小于0';
+				})
+				if (showFlag) {
+					if (this.setFormData.spec_type == 1) showFlag += ', 请点击设置多规格设置';
+					return Toast(showFlag);
+				}
+				Loading();
+				if (this.product_id) {
+					productUpdate(this.merId, this.product_id, postData)
+						.then(res => {
+							hideLoading()
+							Modal('提交成功', '点击确定, 前往商品列表页面').then(() => {
+								uni.redirectTo({
+									url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
+								})
+							}).catch(() => {
+								uni.navigateBack()
+							})
+						})
+						.catch(rej => {
+							Toast(rej);
+						});
+
+				} else {
+					productCreate(this.merId, postData)
+						.then(res => {
+							hideLoading();
+							Modal('提交成功', '点击确定，前往商品列表页面').then(() => {
+								if (this.import == 1) {
+									uni.$emit('importAttrValueOK', this.setFormData.import_id);
+									uni.navigateBack();
+								} else uni.redirectTo({
+									url: `/pages/product/goodsOnSale/index?mer_id=${this.merId}&type=6`
+								})
+							}).catch(() => {
+								uni.navigateBack()
+							})
+						})
+						.catch(rej => {
+							Toast(rej);
+						});
+				}
+			},
+			// 选择规格
+			changeSpecType(e) {
+				if (this.setFormData.spec_type != e.detail.value) {
+					this.showSpecType = true;
+				}
+				this.spec_type = e.detail.value;
+			},
+			// 二次确认
+			changeSpecType2() {
+				this.showSpecType = false;
+				this.setFormData.spec_type = this.spec_type + '';
+				this.setFormData.attrValue = [];
+				this.setFormData.attr = [];
+			},
+			// 跳转多规格页面
+			navToSpecGood() {
+				uni.navigateTo({
+					url: '/pages/product/addGood/specGood?product_id=' + this.product_id,
+					success: (e) => {
+						// console.log(this.setFormData.attrValue, e);
+						e.eventChannel.emit('updateAttrValue', {
+							attrValue: JSON.parse(JSON.stringify(this.setFormData.attrValue)),
+							attr: JSON.parse(JSON.stringify(this.setFormData.attr))
+						});
+						uni.$once('updateSpecType', (e) => {
+							this.setFormData.attrValue = JSON.parse(JSON.stringify(e.attrValue));
+							this.setFormData.attr = JSON.parse(JSON.stringify(e.attr));
+						})
+					}
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import './scss/index.scss';
+
+	.pop {
+		z-index: 1;
+	}
+
+	.guanbi {
+		width: 20px;
+		height: 20px;
+		margin: 30px auto;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/addGood/components/commodity.vue b/pages/product/addGood/components/commodity.vue
index a17c77e..fb13e57 100644
--- a/pages/product/addGood/components/commodity.vue
+++ b/pages/product/addGood/components/commodity.vue
@@ -1,539 +1,550 @@
 <template>
-  <view class=" writeBg  ">
-    
-    <view class="content_list">
-      <view class="content_list_item">
-        <view>商品详情</view>
-      </view>
-      <input-goods-detils class="input-goods-detils" @getProductContent="getProductContent" :title="store_name" :prodectContent="goodsDis" :maxLength="200"></input-goods-detils>
-      <block v-if="!moreThanFlag">
-        <view class="content_list_video input-goods-detils">
-          <view class="content_list_video_title">商品视频</view>
-          <view class="video_list">
-            <view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
-              <view class="jiao" @click="deleteImage()">
-                <!-- video标签在app端层级过高 -->
-                <!--#ifndef APP-PLUS-->
-                <video :src="addGoodsSecoundData.video_link"></video>
-                <!--#endif-->
-                <!--#ifdef APP-PLUS-->
-                <img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png"
-                  style=" width:150rpx"></img>
-                <!--#endif-->
-                <image src="../../static/images/close.png" mode="widthFix"></image>
-              </view>
-        
-              <!--#ifndef APP-PLUS-->
-              <view style="position: absolute;">
-                <view class="videoHover" @click="videoshow">
-                </view>
-                <text class="video-text">点击可预览视频</text>
-              </view>
-              <!--#endif-->
-        
-              <!--#ifdef APP-PLUS-->
-              <view class='preview_video'>
-                <view class="videoHover" @click="videoshow">
-                </view>
-                <text class="video-text">点击可预览视频</text>
-              </view>
-              <!--#endif-->
-            </view>
-            <view class="photo" @click="uploadVideo" v-else>
-              <view>
-                <image src="../../static/images/creamer.png" mode="widthFix"></image>
-              </view>
-              <view>添加视频</view>
-            </view>
-          </view>
-        </view>
-        <view class="container_input marginTop_none input-goods-detils">
-          <view class="container_input_item">
-            <view class="container_input_item_label"><span>是否推荐</span></view>
-            <view class="container_input_item_value">
-              <switch :checked="addGoodsSecoundData.is_good == 1" color="#E93323" style="transform:scale(0.8)"
-                @change="isGood" />
-            </view>
-          </view>
-          <!-- <view class="container_input_item">
+	<view class=" writeBg  ">
+
+		<view class="content_list">
+			<view class="content_list_item">
+				<view>商品详情</view>
+			</view>
+			<input-goods-detils class="input-goods-detils" @getProductContent="getProductContent" :title="store_name"
+				:prodectContent="goodsDis" :maxLength="200"></input-goods-detils>
+			<block v-if="!moreThanFlag">
+				<view class="content_list_video input-goods-detils">
+					<view class="content_list_video_title">商品视频</view>
+					<view class="video_list">
+						<view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
+							<view class="jiao" @click="deleteImage()">
+								<!-- video标签在app端层级过高 -->
+								<!--#ifndef APP-PLUS-->
+								<video :src="addGoodsSecoundData.video_link"></video>
+								<!--#endif-->
+								<!--#ifdef APP-PLUS-->
+								<img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png"
+									style=" width:150rpx"></img>
+								<!--#endif-->
+								<image src="../../static/images/close.png" mode="widthFix"></image>
+							</view>
+
+							<!--#ifndef APP-PLUS-->
+							<view style="position: absolute;">
+								<view class="videoHover" @click="videoshow">
+								</view>
+								<text class="video-text">点击可预览视频</text>
+							</view>
+							<!--#endif-->
+
+							<!--#ifdef APP-PLUS-->
+							<view class='preview_video'>
+								<view class="videoHover" @click="videoshow">
+								</view>
+								<text class="video-text">点击可预览视频</text>
+							</view>
+							<!--#endif-->
+						</view>
+						<view class="photo" @click="uploadVideo" v-else>
+							<view>
+								<image src="../../static/images/creamer.png" mode="widthFix"></image>
+							</view>
+							<view>添加视频</view>
+						</view>
+					</view>
+				</view>
+				<view class="container_input marginTop_none input-goods-detils">
+					<view class="container_input_item">
+						<view class="container_input_item_label"><span>是否推荐</span></view>
+						<view class="container_input_item_value">
+							<switch :checked="addGoodsSecoundData.is_good == 1" color="#E93323"
+								style="transform:scale(0.8)" @change="isGood" />
+						</view>
+					</view>
+					<!-- <view class="container_input_item">
             <view class="container_input_item_label"><span>是否开启礼包</span></view>
             <view class="container_input_item_value">
               <switch :checked="addGoodsSecoundData.is_gift_bag == 1" color="#E93323" style="transform:scale(0.8)"
                 @change="isGiftBag" />
             </view>
           </view> -->
-        </view>
-       <!-- <view class="tip input-goods-detils">
+				</view>
+				<!-- <view class="tip input-goods-detils">
           <span class="iconfont">&#xe688;</span>
           <span>开启后此商品只能在分销礼包中展示并销售</span>
         </view> -->
-        <view class="container_input marginTop_none input-goods-detils">
-          <!-- <view class="container_input_item">
+				<view class="container_input marginTop_none input-goods-detils">
+					<!-- <view class="container_input_item">
             <view class="container_input_item_label"><span>限购数量</span></view>
             <view class="container_input_item_value">
               <input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
                 placeholder-class="inputPlaceHolder" />
             </view>
           </view> -->
-          <view class="container_input_item">
-            <view class="container_input_item_label"><span>商品排序</span></view>
-            <view class="container_input_item_value">
-              <input v-model="addGoodsSecoundData.sort" type="number" value="" placeholder="请输入商品排序"
-                placeholder-class="inputPlaceHolder" />
-            </view>
-          </view>
-        </view>
-      </block>
-      <view class="more_than" @click="moreThanFlag=!moreThanFlag" >
-      	<view v-if="moreThanFlag">更多</view>
-        <view v-else>收起</view>
-      </view>	
-    </view>
-    <view v-if="showVideo" class="video-count">
-      <!--#ifndef APP-PLUS-->
-      <video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
-      <!--#endif-->
-      <!--#ifdef APP-PLUS-->
+					<view class="container_input_item">
+						<view class="container_input_item_label"><span>商品排序</span></view>
+						<view class="container_input_item_value">
+							<input v-model="addGoodsSecoundData.sort" type="number" value="" placeholder="请输入商品排序"
+								placeholder-class="inputPlaceHolder" />
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class="more_than" @click="moreThanFlag=!moreThanFlag">
+				<view v-if="moreThanFlag">更多</view>
+				<view v-else>收起</view>
+			</view>
+		</view>
+		<view v-if="showVideo" class="video-count">
+			<!--#ifndef APP-PLUS-->
+			<video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
+			<!--#endif-->
+			<!--#ifdef APP-PLUS-->
 
-      <video id="myVideo" class="videoLink" autoplay loop
-        :src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
-      <!--#endif-->
-    </view>
-    <view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
-  </view>
+			<video id="myVideo" class="videoLink" autoplay loop
+				:src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
+			<!--#endif-->
+		</view>
+		<view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
+	</view>
 </template>
 <script>
-  import { TOKENNAME, HTTP_REQUEST_URL } from '@/config/app.js';
-  import store from 'store';
-  import {
-    navigateTo,
-    setStorage,
-    getStorage,
-    removeStorage,
-    navigateBack,
-    Toast,
-    Loading,
-    hideLoading,
-    Modal
-  } from '@/libs/uniApi.js';
-  import { productCreate, productUpdate } from 'api/product.js';
-  import inputGoodsDetils from './inputGoodsDetils.vue';
-  export default {
-    components: {
-      inputGoodsDetils
-    },
-    props: {
-      merId: {
-        type: [String, Number],
-        default: ''
-      },
-      product_id: {
-        type: [String, Number],
-        default: ''
-      },
-      showCommodity: {
-        type: Boolean,
-        default: false
-      },
-      resetKey: {
-        type: Boolean,
-        default: false
-      },
-      code: {
-        type: [String, Number],
-        default: 0
-      }
-    },
-    data() {
-      return {
-        showVideo: false,
-        disModel: false,
-        upload_max: 10,
-        uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
-        addGoodsSecoundData: {
-          is_good: 0, // 是否推荐
-          is_gift_bag: 0,
-          sort: '',
-          once_count: '', // 限购数量
-          video_link: ''
-        },
-        goodsDis: {imageList: [],store_name:""},
-        store_name:'',
-        moreThanFlag: true,
-      };
-    },
+	import {
+		TOKENNAME,
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	import store from 'store';
+	import {
+		navigateTo,
+		setStorage,
+		getStorage,
+		removeStorage,
+		navigateBack,
+		Toast,
+		Loading,
+		hideLoading,
+		Modal
+	} from '@/libs/uniApi.js';
+	import {
+		productCreate,
+		productUpdate
+	} from 'api/product.js';
+	import inputGoodsDetils from './inputGoodsDetils.vue';
+	export default {
+		components: {
+			inputGoodsDetils
+		},
+		props: {
+			merId: {
+				type: [String, Number],
+				default: ''
+			},
+			product_id: {
+				type: [String, Number],
+				default: ''
+			},
+			showCommodity: {
+				type: Boolean,
+				default: false
+			},
+			resetKey: {
+				type: Boolean,
+				default: false
+			},
+			code: {
+				type: [String, Number],
+				default: 0
+			}
+		},
+		data() {
+			return {
+				showVideo: false,
+				disModel: false,
+				upload_max: 10,
+				uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
+				addGoodsSecoundData: {
+					is_good: 0, // 是否推荐
+					is_gift_bag: 0,
+					sort: '',
+					once_count: '', // 限购数量
+					video_link: ''
+				},
+				goodsDis: {
+					imageList: [],
+					store_name: ""
+				},
+				store_name: '',
+				moreThanFlag: true,
+			};
+		},
 
-    mounted() {
-    },
-    methods: {
-      videoshow() {
-        this.showVideo = true
-        this.videoContext = uni.createVideoContext('myVideo', this);
-        this.$nextTick(() => {
-          this.videoContext.play();
-        })
-      },
-      setDatas(data){
-        this.addGoodsSecoundData = data.addGoodsSecoundData;
-        this.goodsDis = data.goodsDis;
-      },
-      // 是否推荐
-      isGood(e) {
-        this.addGoodsSecoundData.is_good = e.detail.value ? 1 : 0;
-      },
-      // 是否开启礼包
-      isGiftBag(e) {
-        this.addGoodsSecoundData.is_gift_bag = e.detail.value ? 1 : 0;
-      },
+		mounted() {},
+		methods: {
+			videoshow() {
+				this.showVideo = true
+				this.videoContext = uni.createVideoContext('myVideo', this);
+				this.$nextTick(() => {
+					this.videoContext.play();
+				})
+			},
+			setDatas(data) {
+				this.addGoodsSecoundData = data.addGoodsSecoundData;
+				this.goodsDis = data.goodsDis;
+			},
+			// 是否推荐
+			isGood(e) {
+				this.addGoodsSecoundData.is_good = e.detail.value ? 1 : 0;
+			},
+			// 是否开启礼包
+			isGiftBag(e) {
+				this.addGoodsSecoundData.is_gift_bag = e.detail.value ? 1 : 0;
+			},
 
-      switchChange(value, item) {
-        this.addGoodsSecoundData[item.model] = value ? 1 : 0;
-      },
-      // 跳转商品详情
-      inputGoodsDetils() {
-        navigateTo(1, '/pages/product/addGoods/addGoodDetils', { mer_id: this.merId });
-      },
-      // 上传视频
-      uploadVideo() {
-        uni.chooseVideo({
-          sourceType: ['camera', 'album'],
-          success: res => {
-            console.log(res)
+			switchChange(value, item) {
+				this.addGoodsSecoundData[item.model] = value ? 1 : 0;
+			},
+			// 跳转商品详情
+			inputGoodsDetils() {
+				navigateTo(1, '/pages/product/addGoods/addGoodDetils', {
+					mer_id: this.merId
+				});
+			},
+			// 上传视频
+			uploadVideo() {
+				uni.chooseVideo({
+					sourceType: ['camera', 'album'],
+					success: res => {
+						console.log(res)
 
-            if (Math.ceil(res.size / 1024) < this.upload_max * 1024) {
-              uni.uploadFile({
-                url: this.uploadUrl, //仅为示例，非真实的接口地址
-                filePath: res.tempFilePath,
-                name: 'file',
-                //请求参数
-                formData: {
-                  user: 'test'
-                },
-                header: {
-                  // #ifdef MP
-                  'Content-Type': 'multipart/form-data',
-                  // #endif
-                  [TOKENNAME]: 'Bearer ' + store.state.app.token
-                },
-                success: uploadFileRes => {
-                  let data = JSON.parse(uploadFileRes.data);
-                  this.addGoodsSecoundData.video_link = (data.data.src);
-                },
-                complete: a => {
-                  // console.log(a);
-                }
-              });
-            } else {
-              uni.showModal({
-                title: '提示',
-                content: `视频超出限制${this.upload_max}MB,已过滤`
-              });
-            }
-          },
-          fail: err => {
-            // 取消上传也会出现弹框
-            // uni.showModal({
-            //   content: JSON.stringify(err)
-            // });
-            console.log(err)
-          }
-        });
-      },
-      deleteImage(index) {
-        this.addGoodsSecoundData.video_link = '';
-      },
-      getProductContent(obj) {
-      	// console.log(obj);
-      	this.goodsDis = obj;
-      	this.a=obj.store_name
-      },
-    }
-  };
+						if (Math.ceil(res.size / 1024) < this.upload_max * 1024) {
+							uni.uploadFile({
+								url: this.uploadUrl, //仅为示例，非真实的接口地址
+								filePath: res.tempFilePath,
+								name: 'file',
+								//请求参数
+								// formData: {
+								//   user: 'test'
+								// },
+								header: {
+									// #ifdef MP
+									'Content-Type': 'multipart/form-data',
+									// #endif
+									[TOKENNAME]: 'Bearer ' + store.state.app.token
+								},
+								success: uploadFileRes => {
+									let data = JSON.parse(uploadFileRes.data);
+									this.addGoodsSecoundData.video_link = (data.data.src);
+								},
+								complete: a => {
+									// console.log(a);
+								}
+							});
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: `视频超出限制${this.upload_max}MB,已过滤`
+							});
+						}
+					},
+					fail: err => {
+						// 取消上传也会出现弹框
+						// uni.showModal({
+						//   content: JSON.stringify(err)
+						// });
+						console.log(err)
+					}
+				});
+			},
+			deleteImage(index) {
+				this.addGoodsSecoundData.video_link = '';
+			},
+			getProductContent(obj) {
+				// console.log(obj);
+				this.goodsDis = obj;
+				this.a = obj.store_name
+			},
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-  @import '../scss/index.scss';
+	@import '../scss/index.scss';
 
-  .content_list {
-    width: 710rpx;
-    margin: auto;
-    padding: 0 20rpx;
-    box-sizing: border-box;
-    background: #fff;
-    margin-top: 31rpx;
-    border-radius: 10rpx;
-    
-    .input-goods-detils{
-      width: 100%;
-      padding: 20rpx 10rpx !important;
-    }
-    
-    .more_than{
-      background: #FFFFFF;
-      border-radius: 0 0 10rpx 10rpx;
-      margin: auto;
-      // margin-top: 30rpx;
-      border-top: 1px solid #f5f5f5;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 100%;
-      height: 84rpx;
-      color: #333333;
-      font-size: 30rpx;
-    }
+	.content_list {
+		width: 710rpx;
+		margin: auto;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+		background: #fff;
+		margin-top: 31rpx;
+		border-radius: 10rpx;
 
-    .content_list_item {
-      padding: 32rpx 10rpx;
-      display: flex;
-      justify-content: space-between;
-      border-bottom: 1px solid #eee;
+		.input-goods-detils {
+			width: 100%;
+			padding: 20rpx 10rpx !important;
+		}
 
-      .content_list_item_han {
-        color: #bbbbbb;
-        display: flex;
-        align-items: center;
-      }
-    }
+		.more_than {
+			background: #FFFFFF;
+			border-radius: 0 0 10rpx 10rpx;
+			margin: auto;
+			// margin-top: 30rpx;
+			border-top: 1px solid #f5f5f5;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100%;
+			height: 84rpx;
+			color: #333333;
+			font-size: 30rpx;
+		}
 
-    .content_list_video {
-      min-height: 154rpx;
-      padding: 23rpx 10rpx;
-      display: flex;
-      justify-content: space-between;
+		.content_list_item {
+			padding: 32rpx 10rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #eee;
 
-      .content_list_video_title {
-        padding-top: 10rpx;
-      }
+			.content_list_item_han {
+				color: #bbbbbb;
+				display: flex;
+				align-items: center;
+			}
+		}
 
-      .video_list {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-        flex-wrap: wrap;
-      }
-    }
-  }
+		.content_list_video {
+			min-height: 154rpx;
+			padding: 23rpx 10rpx;
+			display: flex;
+			justify-content: space-between;
 
-  .videoHover {
-    width: 180rpx;
-    height: 180rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 10;
+			.content_list_video_title {
+				padding-top: 10rpx;
+			}
 
-    view {
-      width: 50rpx;
-      height: 50rpx;
-      background: #000000;
-      border-radius: 50rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
+			.video_list {
+				flex: 1;
+				display: flex;
+				justify-content: flex-end;
+				flex-wrap: wrap;
+			}
+		}
+	}
 
-      .iconfont {
-        color: #ffffff;
-        font-size: 21rpx;
-      }
-    }
-  }
+	.videoHover {
+		width: 180rpx;
+		height: 180rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 10;
 
-  .photo {
-    border: 1px solid #dddddd;
-    opacity: 1;
-    border-radius: 8rpx;
-    font-size: 28rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    text-align: center;
-    // padding: 27rpx 21rpx 24rpx 21rpx;
-    width: 150rpx;
-    height: 150rpx;
-    box-sizing: border-box;
-    color: #bbbbbb;
-    margin-left: 16rpx;
-    position: relative;
-    margin-bottom: 12rpx;
+		view {
+			width: 50rpx;
+			height: 50rpx;
+			background: #000000;
+			border-radius: 50rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 
-    image {
-      width: 62rpx;
-      margin-bottom: 10rpx;
-    }
-  }
+			.iconfont {
+				color: #ffffff;
+				font-size: 21rpx;
+			}
+		}
+	}
 
-  .jiao {
-    image {
-      position: absolute;
-      top: -14rpx;
-      right: -14rpx;
-      width: 40rpx;
-      height: 40rpx;
-      border-radius: 50%;
-      padding: 8rpx;
-      background: #e93323;
-      z-index: 2;
-    }
+	.photo {
+		border: 1px solid #dddddd;
+		opacity: 1;
+		border-radius: 8rpx;
+		font-size: 28rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		text-align: center;
+		// padding: 27rpx 21rpx 24rpx 21rpx;
+		width: 150rpx;
+		height: 150rpx;
+		box-sizing: border-box;
+		color: #bbbbbb;
+		margin-left: 16rpx;
+		position: relative;
+		margin-bottom: 12rpx;
 
-    video {
-      width: 150rpx;
-      height: 150rpx;
-    }
-  }
+		image {
+			width: 62rpx;
+			margin-bottom: 10rpx;
+		}
+	}
 
-  .preview_video {
-    position: absolute;
+	.jiao {
+		image {
+			position: absolute;
+			top: -14rpx;
+			right: -14rpx;
+			width: 40rpx;
+			height: 40rpx;
+			border-radius: 50%;
+			padding: 8rpx;
+			background: #e93323;
+			z-index: 2;
+		}
 
-  }
+		video {
+			width: 150rpx;
+			height: 150rpx;
+		}
+	}
 
-  .container_input {
-    background: #fff;
-    padding: 0 20rpx;
-    width: 710rpx;
+	.preview_video {
+		position: absolute;
 
-    margin: auto;
-    margin-top: 31rpx;
-    border-radius: 10rpx;
+	}
 
-    &_item {
-      display: flex;
-      height: 106rpx;
-      align-items: center;
+	.container_input {
+		background: #fff;
+		padding: 0 20rpx;
+		width: 710rpx;
 
-      .select_and_input {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+		margin: auto;
+		margin-top: 31rpx;
+		border-radius: 10rpx;
 
-        .greyColor {
-          color: #bbbbbb;
-        }
-      }
+		&_item {
+			display: flex;
+			height: 106rpx;
+			align-items: center;
 
-      .radio {
-        padding: 30rpx 0;
-      }
+			.select_and_input {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
 
-      &_label {
-        padding-left: 10rpx;
-        color: #333333;
-        font-size: 30rpx;
-        display: flex;
-        align-items: center;
+				.greyColor {
+					color: #bbbbbb;
+				}
+			}
 
-        .select_check {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: 40rpx;
-          height: 40rpx;
-          border: 1px solid #cccccc;
-          border-radius: 50%;
-          margin-right: 20rpx;
+			.radio {
+				padding: 30rpx 0;
+			}
 
-          .iconfont {
-            font-size: 24rpx;
-          }
-        }
+			&_label {
+				padding-left: 10rpx;
+				color: #333333;
+				font-size: 30rpx;
+				display: flex;
+				align-items: center;
 
-        .select {
-          background: #e93323;
-          border: none;
+				.select_check {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 40rpx;
+					height: 40rpx;
+					border: 1px solid #cccccc;
+					border-radius: 50%;
+					margin-right: 20rpx;
 
-          .iconfont {
-            color: #fff;
-          }
-        }
-      }
+					.iconfont {
+						font-size: 24rpx;
+					}
+				}
 
-      &_value {
-        padding-right: 10rpx;
-        flex: 1;
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
+				.select {
+					background: #e93323;
+					border: none;
 
-        >span:nth-child(1) {
-          display: inline-block;
-          margin-right: 15rpx;
-        }
+					.iconfont {
+						color: #fff;
+					}
+				}
+			}
 
-        .text {
-          color: #000;
-          display: inline-block;
-          max-width: 400rpx;
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-        }
+			&_value {
+				padding-right: 10rpx;
+				flex: 1;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
 
-        input {
-          text-align: right;
-        }
+				>span:nth-child(1) {
+					display: inline-block;
+					margin-right: 15rpx;
+				}
 
-        .select_group {
-          display: flex;
-        }
+				.text {
+					color: #000;
+					display: inline-block;
+					max-width: 400rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
 
-        &_select {
-          display: flex;
-          margin-right: 110rpx;
-        }
-      }
+				input {
+					text-align: right;
+				}
 
-      .flex_start {
-        padding: 0 10rpx;
-        margin-top: 40rpx;
-        justify-content: flex-start;
-      }
-    }
+				.select_group {
+					display: flex;
+				}
 
-    >view:not(:last-child) {
-      border-bottom: 1px solid #eeeeee;
-    }
-  }
+				&_select {
+					display: flex;
+					margin-right: 110rpx;
+				}
+			}
 
-  .inputPlaceHolder {
-    color: #bbbbbb;
-  }
+			.flex_start {
+				padding: 0 10rpx;
+				margin-top: 40rpx;
+				justify-content: flex-start;
+			}
+		}
 
-  .paddingTop_none {
-    padding-top: 0 !important;
-  }
+		>view:not(:last-child) {
+			border-bottom: 1px solid #eeeeee;
+		}
+	}
 
-  .marginTop_none {
-    margin-top: 0;
-  }
+	.inputPlaceHolder {
+		color: #bbbbbb;
+	}
 
-  .video-count {
-    position: fixed;
-    width: 600rpx;
-    height: 500rpx;
-    top: 50%;
-    left: 50%;
-    margin-left: -300rpx;
-    margin-top: -250rpx;
-    z-index: 100;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+	.paddingTop_none {
+		padding-top: 0 !important;
+	}
 
-    .videoLink {
-      width: 600rpx;
-      height: 500rpx;
-    }
-  }
+	.marginTop_none {
+		margin-top: 0;
+	}
 
-  // .writeBg {
-  // 	background: #fff;
-  // }
-  
-  .tip{
-    padding: 0 !important;
-    margin: 0 !important;
-  }
+	.video-count {
+		position: fixed;
+		width: 600rpx;
+		height: 500rpx;
+		top: 50%;
+		left: 50%;
+		margin-left: -300rpx;
+		margin-top: -250rpx;
+		z-index: 100;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.videoLink {
+			width: 600rpx;
+			height: 500rpx;
+		}
+	}
+
+	// .writeBg {
+	// 	background: #fff;
+	// }
+
+	.tip {
+		padding: 0 !important;
+		margin: 0 !important;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/product/addGood/components/uploadImgVideo.vue b/pages/product/addGood/components/uploadImgVideo.vue
new file mode 100644
index 0000000..12f2f72
--- /dev/null
+++ b/pages/product/addGood/components/uploadImgVideo.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="">
+		<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
+			:maxCount="10"></u-upload>
+
+	</view>
+</template>
+
+<script>
+	import {
+		TOKENNAME,
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	export default {
+		data() {
+			return {
+				fileList1: [],
+			}
+		},
+		methods: {
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: HTTP_REQUEST_URL + '/api/upload/image/field',
+						filePath: url,
+						// formData: {
+						// 	'filename': rsp.path,
+						// 	'name': that.imgName
+						// },
+						header: {
+							// #ifdef MP
+							"Content-Type": "multipart/form-data",
+							// #endif
+							[TOKENNAME]: 'Bearer ' + this.$store.state.app.token
+						},
+						success: (res) => {
+							setTimeout(() => {
+								resolve(res.data.data)
+							}, 1000)
+						}
+					});
+				})
+			},
+		}
+
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/product/addGoodDetail/addGoodDetail.vue b/pages/product/addGoodDetail/addGoodDetail.vue
new file mode 100644
index 0000000..45e8dda
--- /dev/null
+++ b/pages/product/addGoodDetail/addGoodDetail.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class='content'>
+
+		<u--form :model="model1" :rules="rules" ref="uForm" labelPosition="top"
+			:labelStyle="{fontSize:'32rpx',color:'#444444'}" labelWidth='100'>
+			<view class="good-baseInfo">
+				<u-form-item label="商品标题" prop="userInfo.name" ref="item1">
+
+					<u--input placeholder="建议描述产品品牌、名称" v-model="text"></u--input>
+				</u-form-item>
+				<u-form-item class='formItem' label="商品主图" prop="userInfo.name" ref="item1">
+					<uploadImgVideo />
+				</u-form-item>
+				<u-form-item label="商品细节图" prop="userInfo.name" ref="item1">
+					<uploadImgVideo />
+				</u-form-item>
+			</view>
+
+		</u--form>
+	</view>
+</template>
+
+<script>
+	import uploadImgVideo from "../addGood/components/uploadImgVideo.vue"
+	export default {
+		components: {
+			uploadImgVideo,
+		},
+		data() {
+			return {
+				showSex: false,
+				model1: {
+					userInfo: {
+						name: '',
+						sex: '',
+					},
+				},
+				range: [{
+						value: 0,
+						text: "篮球"
+					},
+					{
+						value: 1,
+						text: "足球"
+					},
+					{
+						value: 2,
+						text: "游泳"
+					},
+				],
+				text: "",
+
+				rules: {
+					// 'userInfo.name': {
+					// 	type: 'string',
+					// 	required: true,
+					// 	message: '请填写姓名',
+					// 	trigger: ['blur', 'change']
+					// },
+					// 'userInfo.sex': {
+					// 	type: 'string',
+					// 	max: 1,
+					// 	required: true,
+					// 	message: '请选择男或女',
+					// 	trigger: ['blur', 'change']
+					// },
+				},
+				radio: '',
+				switchVal: false
+			};
+		},
+		methods: {
+			sexSelect(e) {
+				this.model1.userInfo.sex = e.name
+				this.$refs.uForm.validateField('userInfo.sex')
+			},
+
+		},
+
+	};
+</script>
+
+<style lang='scss'>
+	.content {
+		width: 100vw;
+		min-height: 100vh;
+		background-color: #F1F1F1;
+		box-sizing: border-box;
+
+
+
+		.good-baseInfo {
+			background-color: white;
+			padding: 30rpx;
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/static/images/addGodd/addGoodBg.png b/static/images/addGodd/addGoodBg.png
new file mode 100644
index 0000000000000000000000000000000000000000..a299877107cb89a922d39c476f430e84fa78be91
GIT binary patch
literal 8304
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
M<y2*>WsHLU2RGsPqW}N^

literal 0
HcmV?d00001

diff --git a/uni.scss b/uni.scss
index 45776b4..f66c6a0 100644
--- a/uni.scss
+++ b/uni.scss
@@ -14,6 +14,7 @@
 @import '@/uni_modules/uview-ui/theme.scss';
 /* 颜色变量 */
 $uni-theme-color: #f45846;
+$uni-newTheme-color: #38BE41;
 $uni-theme-bg-color: linear-gradient(180deg, #f98649 0%, #f34e45 100%);
 
 /* 行为相关颜色 */
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index 9b32348..0b7fa55 100644
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -6,8 +6,8 @@
 				<view class="uni-select__input-box" @click="toggleSelector">
 					<view v-if="current" class="uni-select__input-text">{{current}}</view>
 					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
-					<view v-if="current && clear && !disabled" @click.stop="clearVal" >
-						<uni-icons type="clear" color="#c0c4cc" size="24"/>
+					<view v-if="current && clear && !disabled" @click.stop="clearVal">
+						<uni-icons type="clear" color="#c0c4cc" size="24" />
 					</view>
 					<view v-else>
 						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
@@ -20,9 +20,10 @@
 						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
 							<text>{{emptyTips}}</text>
 						</view>
-						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
-							@click="change(item)">
-							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData"
+							:key="index" @click="change(item)">
+							<text
+								:class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
 						</view>
 					</scroll-view>
 				</view>
@@ -125,7 +126,7 @@
 					common + placeholder :
 					common
 			},
-			valueCom(){
+			valueCom() {
 				// #ifdef VUE3
 				return this.modelValue;
 				// #endif
@@ -156,7 +157,7 @@
 			}
 		},
 		methods: {
-			debounce(fn, time = 100){
+			debounce(fn, time = 100) {
 				let timer = null
 				return function(...args) {
 					if (timer) clearTimeout(timer)
@@ -166,11 +167,11 @@
 				}
 			},
 			// 执行数据库查询
-			query(){
+			query() {
 				this.mixinDatacomEasyGet();
 			},
 			// 监听查询条件变更事件
-			onMixinDatacomPropsChange(){
+			onMixinDatacomPropsChange() {
 				if (this.collection) {
 					this.debounceGet();
 				}
@@ -193,9 +194,9 @@
 						}
 						defValue = defItem
 					}
-          if (defValue || defValue === 0) {
-					  this.emit(defValue)
-          }
+					if (defValue || defValue === 0) {
+						this.emit(defValue)
+					}
 				}
 				const def = this.mixinDatacomResData.find(item => item.value === defValue)
 				this.current = def ? this.formatItemName(def) : ''
@@ -258,7 +259,7 @@
 					let str = "";
 					str = this.format;
 					for (let key in item) {
-						str = str.replace(new RegExp(`{${key}}`,"g"),item[key]);
+						str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
 					}
 					return str;
 				} else {
@@ -272,26 +273,26 @@
 				}
 			},
 			// 获取当前加载的数据
-			getLoadData(){
+			getLoadData() {
 				return this.mixinDatacomResData;
 			},
 			// 获取当前缓存key
-			getCurrentCacheKey(){
+			getCurrentCacheKey() {
 				return this.collection;
 			},
 			// 获取缓存
-			getCache(name=this.getCurrentCacheKey()){
+			getCache(name = this.getCurrentCacheKey()) {
 				let cacheData = uni.getStorageSync(this.cacheKey) || {};
 				return cacheData[name];
 			},
 			// 设置缓存
-			setCache(value, name=this.getCurrentCacheKey()){
+			setCache(value, name = this.getCurrentCacheKey()) {
 				let cacheData = uni.getStorageSync(this.cacheKey) || {};
 				cacheData[name] = value;
 				uni.setStorageSync(this.cacheKey, cacheData);
 			},
 			// 删除缓存
-			removeCache(name=this.getCurrentCacheKey()){
+			removeCache(name = this.getCurrentCacheKey()) {
 				let cacheData = uni.getStorageSync(this.cacheKey) || {};
 				delete cacheData[name];
 				uni.setStorageSync(this.cacheKey, cacheData);
@@ -431,6 +432,7 @@
 			max-height: 600px;
 		}
 	}
+
 	/* #endif */
 
 	.uni-select__selector-empty,
@@ -514,4 +516,4 @@
 		left: 0;
 		z-index: 2;
 	}
-</style>
+</style>
\ No newline at end of file