diff --git a/package1/myCenter/addGoods.vue b/package1/myCenter/addGoods.vue
index 1d28900..1ee161d 100644
--- a/package1/myCenter/addGoods.vue
+++ b/package1/myCenter/addGoods.vue
@@ -1,85 +1,115 @@
 <!-- 底部菜单--库存--新增商品 -->
 <template>
 	<view class="page1">
+		<view class="title">
+			<view class="title-sreach">
+				<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
+					<uni-icons type="left" size="28"></uni-icons>
+				</view>
+				<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
+					商家详情
+				</view>
+			</view>
+		</view>
 		<view class="formBox">
 			<uni-forms ref="form" :modelValue="formData" :rules="rules" labelWidth="170rpx">
 				<uni-forms-item label="商品名称" name="productName" required>
 					<uni-easyinput type="text" v-model="formData.productName" placeholder="请输入商品名称" trim="all" />
 				</uni-forms-item>
 				<uni-forms-item label="商品主图" name="productPicture">
-					<view v-if="formData.productPicture !=''">
-						<img :src="formData.productPicture" alt="" class="upload-img">
+					<view class="upload-img" @tap="pictureAdd"
+						style="background: #eee;text-align: center;line-height: 160rpx;">
+						<uni-icons type="camera" size="28" color="#777"></uni-icons>
 					</view>
-					<u-upload :fileList="formData.productPicture" @afterRead="afterRead" @delete="deletePic" name="1"
-						multiple :maxCount="1"></u-upload>
+					<view style="overflow-x: scroll;display: flex;width: 350rpx;">
+						<view v-if="formData.productPicture !=''" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
+							<img :src="formData.productPicture" alt="" class="upload-img">
+						</view>
+					</view>
+				</uni-forms-item>
+				<uni-forms-item label="排名" name="orderFiled">
+					<input type="digit" class="content-input" v-model="formData.orderFiled" placeholder="请输入排名">
 				</uni-forms-item>
-				<uni-forms-item label="批发价" name="wholesalePrice">
-					<!-- <uni-easyinput type="digit" v-model="formData.wholesalePrice" placeholder="请输入批发价" trim="all" /> -->
-					<input type="digit" class="content-input" v-model="formData.wholesalePrice"
-						@focus="obtainPrice($event,'wholesalePrice')" @blur="changessPrice($event,'wholesalePrice')"
-						placeholder="请输入批发价">
+				<uni-forms-item label="店铺分类" name="editTitle">
+					<input type="digit" class="content-input" v-model="editTitle" disabled>
 				</uni-forms-item>
-				<uni-forms-item label="商品分类" name="categoryId">
-					<view class="content-list">
-						<view class="list-val">
-							<input type="text" placeholder="请选择商品分类" disabled :value="typeItem.categoryName"
-								style="border-bottom: 1px solid #fff;text-align: center;" @tap="goGategoryLow">
-							<uni-icons type="right" size="16"
-								style="margin-left: 40rpx;line-height: 70rpx;"></uni-icons>
+				<uni-forms-item label="商品规格" name="attributeListPrice">
+					<view>
+						<view v-for="(item,index) in formData.attributeListPrice" :key="index" style="display: flex;margin-top:5px;">
+							<input class="content-input" v-model="item.specName" v-if="item.specName != ''&& formData.attributeListPrice.length != 1" style="padding-right: 10px;" disabled />
+							<input class="content-input" v-model="item.specPrice" style="padding-right: 10px;margin-right: 10px;" @click="changePrice(index)" placeholder="商品价格" />
+							<input class="content-input" v-model="item.specNum" style="padding-right: 10px;" @click="changecount(index)" placeholder="商品库存"/>
+							<button @click="deldantiaoguige(index)" v-if="formData.attributeListPrice.length>1" style="width: 120px;height: 30px;line-height: 30px;color: red;border:none;background: #fff;">删除</button>
+						</view>
+						<view @click="checkSpec('guige')" style="margin-top: 5px;width: 80px;height: 30px;text-align: center;line-height: 30px;background: rgba(0, 35, 28, 1);border-radius: 30px;color: rgba(166, 255, 234, 1);">
+							选择规格
 						</view>
 					</view>
 				</uni-forms-item>
-				<view style="display: flex;" v-if="customerCategoryList != null">
-					<view class="" style="width: 28%;"></view>
-					<view class="" style="width: 72%;min-height: 80rpx;padding: 0 20rpx 20rpx 0;">
-						<view v-for="(item,index) in customerCategoryList" :key="index">
-							{{item.categoryName}}:{{item.categoryPrice}}
+				<uni-forms-item label="拼团信息" name="productGroupBuyPrices">
+					<view>
+						<view v-for="(item,index) in formData.productGroupBuyPrices" :key="index" style="display: flex;margin-top:5px;">
+							<input class="content-input" v-model="item.groupCount" style="padding-right: 10px;margin-right: 10px;" placeholder="成团人数" />
+							<input class="content-input" v-model="item.groupPrice" style="padding-right: 10px;" placeholder="成团价格"/>
+							<button @click="delGroup(index)" v-if="formData.productGroupBuyPrices.length>1" style="width: 120px;height: 30px;line-height: 30px;color: red;border:none;background: #fff;">删除</button>
 						</view>
-					</view>
-				</view>
-				<uni-forms-item label="添加规格" name="categoryId">
-					<view class="content-list">
-						<view class="list-val">
-							<input type="text" placeholder="点击选择规格" disabled
-								style="border-bottom: 1px solid #fff;text-align: center;" @tap="ejectRuleSelect">
+						<view @click="addGroup()" style="margin-top: 5px;width: 80px;height: 30px;text-align: center;line-height: 30px;background: rgba(0, 35, 28, 1);border-radius: 30px;color: rgba(166, 255, 234, 1);">
+							新增拼团
 						</view>
 					</view>
 				</uni-forms-item>
-				<view v-for="(item,index) in multipleList" :key="index" style="display: flex;">
-					<view class="" style="width: 28%;">
-						{{item.attributeName}}
-					</view>
-					<view class="" style="width: 72%;min-height: 80rpx;padding: 0 20rpx 20rpx 0;">
-						<view v-for="(item1,index1) in item.productAttributeValueVoList" :key="index1"
-							style="float: left;padding-right: 20rpx;">
-							{{item1.value}}
+				<uni-forms-item label="商品属性" name="attributeList1">
+					<view style="display: flex;flex-direction: column;">
+						<view v-for="(value,key) in Array.from(formData.attributeList1)" :key="index" style="display: flex;">
+							{{value[0]}}:
+							<view v-for="(item,index) in value[1].title" :key="index">
+								{{item}}、
+							</view>
+						</view>
+						<view @click="checkSpec('shuxing')" style="width: 80px;height: 30px;text-align: center;line-height: 30px;background: rgba(0, 35, 28, 1);border-radius: 30px;color: rgba(166, 255, 234, 1);">
+							选择属性
 						</view>
 					</view>
-				</view>
-				<uni-forms-item label="商品条码" name="barcode">
-					<uni-easyinput type="text" v-model="formData.barcode" placeholder="可以扫码商品条码添加" trim="all" />
-					<u-icon name="camera" size="36" @tap.stop='scanCodeAdd'></u-icon>
 				</uni-forms-item>
-				<uni-forms-item label="多图上传" name="productPicture">
-					<view class="upload-img" @tap="pictureAdd"
-						style="background: #eee;text-align: center;line-height: 160rpx;">
-						<uni-icons type="camera" size="28" color="#777"></uni-icons>
-					</view>
-					<view style="overflow-x: scroll;display: flex;width: 350rpx;">
-						<view v-if="formData.productPictures !=''" v-for="(item,index) in formData.productPictures"
-							:key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
-							<img :src="item.productPicture" alt="" class="upload-img">
+				<uni-forms-item label="可售时间" name="sellTime">
+					<view style="display: flex;flex-direction: column;">
+						<view style="line-height: 37px;">
+							<radio :checked="formData.sellTime==0" name="sellTime" @click="checkSellTime(0)" />全时段售卖
+							<radio :checked="formData.sellTime==1" name="sellTime" @click="checkSellTime(1)" />自定义时段
+						</view>
+						<view style="display: flex;" v-if="formData.sellTime == 1">
+							<picker mode="time" v-model="formData.sellBeginTime" start="00:00" end="23:59" @change="selectDateRange($event,'start')">
+								<view class="uni-input">{{formData.sellBeginTime}}</view>
+							</picker>
+							<view style="width: 25px;height: 25px;line-height: 25px;text-align: center;">-</view>
+							<picker mode="time" v-model="formData.sellEndTime" start="00:00" end="23:59" @change="selectDateRange($event,'end')">
+								<view class="uni-input">{{formData.sellEndTime}}</view>
+							</picker>
 						</view>
 					</view>
-
 				</uni-forms-item>
-				<uni-forms-item label="尾货预警" name="salesWeek">
-					<!-- <uni-easyinput type="digit" v-model="formData.salesWeek" placeholder="请输入零售价" trim="all" /> -->
-					<uni-datetime-picker type="date" :clear-icon="false" v-model="formData.salesWeek" />
+				<uni-forms-item label="设置加料" name="isMoreBuy">
+					<view style="line-height: 37px;">
+						<radio :checked="formData.isMoreBuy==0" name="isMoreBuy" @click="checkisMoreBuy('0')" />否
+						<radio :checked="formData.isMoreBuy==1" name="isMoreBuy" @click="checkisMoreBuy('1')" />是
+					</view>
+				</uni-forms-item>
+				<uni-forms-item label="餐盒费" name="lunchBox">
+					<input type="digit" class="content-input" v-model="formData.lunchBox" placeholder="请输入餐盒费">
+				</uni-forms-item>
+				<uni-forms-item label="起售数量" name="startPayNum">
+					<input type="digit" class="content-input" v-model="formData.startPayNum" placeholder="请输入起售数量">
 				</uni-forms-item>
-				<uni-forms-item label="货品简介" name="productIntro">
-					<uni-easyinput type="textarea" autoHeight v-model="formData.productIntro" placeholder="请输入货品简介"
-						trim="all" />
+				<uni-forms-item label="详细图文" name="startPayNum">
+					<view class="xiangxi-box">
+						<sp-editor
+							:keys="keys" 
+							@init="initEditor" 
+							@input="inputOver" 
+							@upinImage="upinImage" 
+							@overMax="overMax">
+						</sp-editor>
+					</view>
 				</uni-forms-item>
 			</uni-forms>
 			<view>
@@ -87,116 +117,23 @@
 			</view>
 		</view>
 		<!-- 添加分类弹出层 -->
-		<uni-popup ref="addTypeDialog" background-color="#fff" @change="changeAddType">
+		<uni-popup ref="addTypeDialog" background-color="#fff">
 			<view class="add-popup-content">
-				<view class="add-popup-title">
-					<text>颜色尺码库</text>
-					<uni-icons @tap='$refs.addTypeDialog.close()' type="closeempty" color='red' size="16"
-						style="height:40rpx;line-height: 40rpx;position: absolute !important;bottom:0;right: 30rpx;"></uni-icons>
-				</view>
-				<view class="add-popup-container">
-					<ul>
-						<li v-for="(item,index) in defaultList" :key="index">
-							<view class="title-fur">
-								<view class="name">{{item.name}}</view>
-								<u-icon size="20" name="plus" color="#5fd9ee" @tap="toggle(index) "></u-icon>
-							</view>
-							<view class="content-fur">
-								<view class="content-low" :class="item1.checked?'checked':''"
-									v-for="(item1,index1) in item.list" :key="index1"
-									@tap.stop="isCheckPrec(item,item1.value,index1)">{{item1.value}}</view>
-							</view>
-						</li>
-					</ul>
-					<view class="add-popup-bottom">
-						<view class="add-popup-btn" @tap="dialogInputConfirm()">确认</view>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="addDialog" type="dialog">
-			<uni-popup-dialog ref="addClose" mode="input" :title="'请输入规格名'" :value="specVal" placeholder="请输入规格名称"
-				@confirm="addSpec" @close="dialogClose">
-			</uni-popup-dialog>
-		</uni-popup>
-		<!-- 查看商品库存弹出层 -->
-		<uni-popup ref="carPopup" background-color="#fff">
-			<view class="popup-content" style="height:auto !important;">
-				<view style="font-size: 36rpx;font-weight: bold;text-align: center;">提示</view>
-				<view v-if="goodsList !=''"
-					style="width:100%;font-weight:bold;text-align: center;font-size: 28rpx;margin: 20rpx 0;">
-					{{formData.productSn}}有以下库存，确认继续删除吗？
-				</view>
-				<view class="tui-order-item boxbg">
-					<view style="display: flex;border-bottom: 1px solid #eee;height: 50rpx;line-height: 50rpx;">
-						<view style="width: 70%;text-align: center;border-right: 1px solid #eee;">商品规格</view>
-						<view style="width: 29%;text-align: center;">数量</view>
-					</view>
-					<view class="shop-box" v-for="(item,index) in goodsList" :key="index" style="position: relative;">
-						<view style='height: 50rpx;line-height: 50rpx;'>
-							<view
-								style="width: 70%;text-align: center;border-right: 1px solid #eee;float: left;height: 50rpx;overflow: hidden;">
-								{{item.attributeList | sliceMsg}}
-							</view>
-							<view style="width: 29%;text-align: center;float: left;">
-								{{item.stockCount}}
-							</view>
+				<view style="height:450px;">
+					<view class="content-left" style="float: left;">
+						<view class="left-box" v-for="(item,index) in categoryData" :key="index"
+							:class="item.parentId ? 'left-box-hover':''" @tap="clickLeftBtn(index)">
+							<text style="width: 100%;height: 50px;line-height: 50px;display: inline-block;overflow: hidden;"
+								:class="item.parentId ? 'red' :''">{{item.title}}</text>
 						</view>
 					</view>
-				</view>
-				<!-- <u-loadmore :status="status" /> -->
-				<view class="popup-bottom">
-					<view class="popup-bottom-left">
-						<view class="bottom-btn" @tap="this.$refs.carPopup.close()"
-							style="background: linear-gradient(90deg, #FF9797, #FFC1E0);">再想想</view>
-					</view>
-					<view class="popup-bottom-right">
-						<view class="bottom-btn" @tap="cancelCheck">取消选中</view>
+					<view v-for="(item,index) in categorySonData" :key="index" @tap="checkSpecValue(index)" class="content-low" :class="item.checked?'checked':''">
+						{{item.title}}
 					</view>
 				</view>
-			</view>
-		</uni-popup>
-		<!-- 维护客户价格弹出层 -->
-		<uni-popup ref="customPopup" background-color="#fff">
-			<view class="popup-content" style="height: auto;max-height: 600rpx;margin-bottom: 0;">
-				<view v-for="(item,index) in customerCategoryList" :key="index">
-					<view style="height: 60rpx;line-height: 60rpx;">
-						{{item.categoryName}}
-					</view>
-					<input type="digit" v-model='item.categoryPrice' placeholder="请输入客户价格" style="height: 60rpx;padding-left: 20rpx;border: 1px solid #eee;border-radius: 10rpx;">
-				</view>
-				<view @tap="updateCate" style="text-align:center;margin-top:20rpx;width: 100%;height: 60rpx;line-height: 60rpx;background: #088FEB;color: #fff;">
-					确认
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 给供应商回款的弹层 -->
-		<uni-popup ref="warnPopup" background-color="#fff">
-			<view class="popup-content" style="width: 500rpx;height: 760rpx;">
-				<view style="font-size: 36rpx;font-weight: bold;text-align: center;">提示</view>
-				<view
-					style="width:100%;font-weight:bold;font-size: 28rpx;line-height: 40rpx;margin: 20rpx 0;display: flex;flex-direction: column;">
-					<text>历次入库总数量:{{guigeNum}}</text>
-					<text style="margin: 20rpx 0;">差价:{{guigeNum}} * ({{oldPurchasePrice}} - {{formData.purchasePrice}})
-						= {{zPrice}}</text>
-					<view>是否使用此<input type="text" v-model="zPrice"
-							style="width: 150rpx;border-bottom:1px solid #000;color:red;text-align:center;display: inline-block;">
-						（金额可修改）金额，给供应商“{{dataList.supplierName}}”回款？</view>
-				</view>
-				<view style="border: 1px solid #eee;height: 70rpx;margin: 30rpx auto 0;">
-					<uni-datetime-picker type="datetime" :clear-icon="false" v-model="single" />
-				</view>
-				<view style="border: 1px solid #eee;height: 140rpx;margin: 30rpx auto 0;">
-					<textarea maxlength="-1" @input='changeRemark($event)' v-model="rechargeRemark" placeholder="请输入充值备注" style='width: 100%;height: 100%;padding:10rpx' />
-				</view>
-				<view class="popup-bottom" style="position: unset;margin-top:20rpx;">
-					<view class="popup-bottom-left">
-						<view class="bottom-btn" @tap="this.$refs.warnPopup.close()"
-							style="background: linear-gradient(90deg, #FF9797, #FFC1E0);">不需要</view>
-					</view>
-					<view class="popup-bottom-right">
-						<view class="bottom-btn" @tap="supplierCollection">回款</view>
-					</view>
+				<view slot="footer" style="display: flex;padding-left: 20px;margin-top: 10px;">
+					<button type="text" @tap="$refs.addTypeDialog.close()" style="margin-right: 10px;">取消</button>
+					<button type="text" @tap="guigeSubmit">提交</button>
 				</view>
 			</view>
 		</uni-popup>
@@ -207,863 +144,355 @@
 	export default {
 		data() {
 			return {
-				single:'',
-				rechargeRemark:'',
-				fileList1: [],
-				oldMultipleList: [],
-				specVal: '',
-				snList: [],
-				prefixRule: '',
-				addIndex: 0,
-				numRule: '',
-				goodsList: [],
-				snName: '',
+				categoryData:[],
+				categoryIndex: 0,
+				modalclassType:'',
+				categorySonData:[],
+				specValueArr:[],
+				attrValueArr:[],
+				editorIns: null,
+				menuButtonInfo: {},
 				formData: {
-					productName: '',
-					price: 0,
-					productSn: '',
-					purchasePrice: 0,
-					wholesalePrice: 0,
-					commission:0,
-					productPicture: '',
-					productIntro: '',
-					categoryId: '',
-					salesWeek: '',
-					tailWarn: '',
-					barcode: '',
-					productPictures: [],
-					productCategoryVo: {}
+					id: '',
+					shopId: '',
+					categoryId: '', //商品分类id
+					categoryName: '', //商品分类名称
+					productPicture: '', //商品图标
+					productName: '', //商品名称
+					orderFiled: '', //商品名称
+					lunchBox: 0, //餐盒
+					startPayNum: '', //起售数量
+					attributeListPrice: [{ //商品规格
+						specPrice: "",
+						specNum: 9999
+					}],
+					sellTime: 0, //可售时间
+					isMoreBuy: 0,
+					sellBeginTime: '00:00', //可售时段自定义---开始时间
+					sellEndTime: '00:00', //可售时段自定义---结束时间
+					attributeList: '',
+					productGroupBuyPrices: [],
+					attributeList1: new Map(), //商品属性
+					productIntro: "" //详细图文
 				},
-				defaultList: [{
-					name: '颜色',
-					list: [{
-						value: '均色',
-						checked: false,
-					}, {
-						value: '白色',
-						checked: false,
-					}, {
-						value: '黑色',
-						checked: false,
-					}, {
-						value: '浅蓝',
-						checked: false,
-					}, {
-						value: '蓝色',
-						checked: false,
-					}, {
-						value: '灰色',
-						checked: false,
-					}, {
-						value: '咖色',
-						checked: false,
-					}, {
-						value: '紫色',
-						checked: false,
-					}, {
-						value: '红色',
-						checked: false,
-					}, {
-						value: '米色',
-						checked: false,
-					}]
-				}, {
-					name: '尺码',
-					list: [{
-						value: '均码',
-						checked: false,
-					}, {
-						value: 'XS码',
-						checked: false
-					}, {
-						value: 'S码',
-						checked: false,
-					}, {
-						value: 'M码',
-						checked: false,
-					}, {
-						value: 'L码',
-						checked: false,
-					}, {
-						value: 'XL码',
-						checked: false,
-					}, {
-						value: '2XL码',
-						checked: false,
-					}, {
-						value: '3XL码',
-						checked: false,
-					}, {
-						value: '4XL码',
-						checked: false,
-					}, {
-						value: '25码',
-						checked: false
-					}, {
-						value: '26码',
-						checked: false
-					}, {
-						value: '27码',
-						checked: false
-					}, {
-						value: '28码',
-						checked: false
-					}, {
-						value: '29码',
-						checked: false
-					}, {
-						value: '30码',
-						checked: false
-					}, {
-						value: '31码',
-						checked: false
-					}, {
-						value: '32码',
-						checked: false
-					}, {
-						value: '33码',
-						checked: false
-					}, {
-						value: '34码',
-						checked: false
-					}, {
-						value: '35码',
-						checked: false
-					}, {
-						value: '36码',
-						checked: false
-					}, {
-						value: '37码',
-						checked: false
-					}, {
-						value: '38码',
-						checked: false
-					}, {
-						value: '39码',
-						checked: false
-					}, {
-						value: '40码',
-						checked: false
-					}, {
-						value: '41码',
-						checked: false
-					}, {
-						value: '42码',
-						checked: false
-					}, {
-						value: '43码',
-						checked: false
-					}, {
-						value: '44码',
-						checked: false
-					}, {
-						value: '45码',
-						checked: false
-					}]
-				}],
-				categoryList: [],
-				cancelArr: [],
-				productId: '',
-				shopId:'',
-				arrtList: [],
-				guigeNum: 0, //总共有多少件库存
-				differencePurchasePrice: 0, //旧采购价和新维护采购价的差额差额
-				oldPurchasePrice: 0,
-
-				userType: '',
-				typeItem: {},
-				arrtChange: [],
-				categoryId: '',
-				dataList: {},
-				zPrice: 0,
-				type: 'add',
-				customerCategoryList:[],
-				multipleList: [],
 				rules: {
-					categoryId: {
-						rules: [{
-							required: true,
-							errorMessage: '请选择商品分类',
-						}, ],
-					},
-					productSn: {
-						rules: [{
-							required: true,
-							errorMessage: '请填写货号',
-						}, ],
-					},
 					productName: {
 						rules: [{
 							required: true,
-							errorMessage: '请填写商品名称',
-						}, ],
+							errorMessage: '请输入名称',
+						}]
 					}
-				}
+				},
 			}
 		},
 		filters: {
-			sliceMsg(val) {
-				var name = ''
-				if (typeof(val) == 'string') {
-					let newObj = JSON.parse(val)
-					for (let as in newObj) {
-						name += newObj[as] + '/'
-					}
-				}
-				return name;
-			}
+
 		},
 		onShow() {
-			let that = this;
-			uni.authorize({
-				scope: 'scope.writePhotosAlbum',
-				success() {
-
-				},
-				fail() {
-					this.tui.toast("您未授权，图片上传功能可能会出现错误")
-				}
-			})
-			this.shopId = uni.getStorageSync('shopId')
-			this.typeItem = JSON.parse(JSON.stringify(this.typeItem)) || ''
-			if (this.typeItem) {
-				this.formData.categoryId = this.typeItem.id
-			}
-			
+			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
 		},
 		onLoad(option) {
-			this.getCustomerCategoryList()
-			if (option.dataList) {
-				this.dataList = JSON.parse(option.dataList)
-				this.tui.request("/app/product/getById/" + this.dataList.id, "POST", {
 
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						this.type = 'edit'
-						this.customerCategoryList = this.checkPriceRule((res.result.customerCategoryRule != '' && res.result.customerCategoryRule != null)? JSON.parse(res.result.customerCategoryRule): null)
-						
-						this.formData.attrId = res.result.attrId
-						this.formData.productName = res.result.productName
-						this.formData.barcode = res.result.barcode
-						this.formData.price = res.result.price
-						this.formData.productSn = res.result.productSn
-						this.formData.stockCount = this.dataList.stockCount
-						this.formData.minusStockCount = this.dataList.minusStockCount
-						this.formData.purchasePrice = res.result.purchasePrice
-						this.oldPurchasePrice = res.result.purchasePrice
-						this.formData.wholesalePrice = res.result.wholesalePrice
-						
-						this.formData.commission = res.result.commission
-						this.formData.productPicture = res.result.productPicture
-						this.formData.productIntro = res.result.productIntro
-						this.formData.categoryId = res.result.categoryId
-						this.formData.salesWeek = res.result.salesWeek
-						this.formData.tailWarn = res.result.tailWarn
-						this.getChildrenPic()
-						this.getGoodsSpec()
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			}
-			this.userType = uni.getStorageSync('type')
-			
-			this.getGategoryList()
-			this.getSnList()
 		},
 		methods: {
-			//查询商品规格
-			getGoodsSpec() {
-				this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId", "POST", {
-					categoryId: this.formData.attrId,
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						if (typeof(res.result.attributeAndValue) == 'string') {
-							let newObj = JSON.parse(res.result.attributeAndValue)
-							let newArr = []
-							for (let val in newObj) {
-								let valueObj = {}
-								valueObj.attributeName = val
-								valueObj.productAttributeValueVoList = []
-								for (var i = 0; i < newObj[val].length; i++) {
-									valueObj.productAttributeValueVoList.push({
-										value: newObj[val][i],
-										checked: true
-									})
-								}
-								this.multipleList.push(valueObj)
-							}
-						} else {
-							that.tui.toast('失败了')
-						}
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
+			/**
+			 * 获取输入内容
+			 * @param {Object} e {html,text} 内容的html文本，和text文本
+			 */
+			inputOver(e) {
+				// 可以在此处获取到编辑器已编辑的内容
+				console.log('==== inputOver :', e)
+				this.productIntro = e
 			},
-			//获取子图
-			getChildrenPic() {
-				this.tui.request("/app/productPicture/getProductPictureByProductId", "POST", {
-					productId: this.dataList.id,
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						for (let i = 0; i < res.result.length; i++) {
-							let data = {
-								productPicture: res.result[i].productPicture
-							}
-							this.formData.productPictures.push(data)
-						}
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
+			/**
+			 * 超出最大内容限制
+			 * @param {Object} e {html,text} 内容的html文本，和text文本
+			 */
+			overMax(e) {
+				// 若设置了最大字数限制，可在此处触发超出限制的回调
+				console.log('==== overMax :', e)
 			},
-			supplierCollection() {
-				this.tui.request('/app/debt/recharge', "post", {
-					userId: this.dataList.supplierId,
-					amountOwed: this.zPrice,
-					dealingsTime:this.single,
-					remark:this.rechargeRemark,
-					userType: '1'
-				}, false, false).then((res) => {
-					if (res.code == 200) {
-						this.tui.toast('回款成功')
-						this.$refs.warnPopup.close()
-					} else {
-						this.tui.toast(res.message)
-						this.$refs.warnPopup.close()
-					}
+			/**
+			 * 编辑器就绪
+			 * @param {Object} editor 编辑器实例，你可以自定义调用editor实例的方法
+			 * @tutorial editor组件 https://uniapp.dcloud.net.cn/component/editor.html#editor-%E7%BB%84%E4%BB%B6
+			 * @tutorial 相关api https://uniapp.dcloud.net.cn/api/media/editor-context.html
+			 */
+			initEditor(editor) {
+				this.editorIns = editor // 保存编辑器实例
+				// 保存编辑器实例后，可以在此处获取后端数据，并赋值给编辑器初始化内容
+				
+			},
+			/**
+			 * 直接运行示例工程插入图片无法正常显示的看这里
+			 * 因为插件默认采用云端存储图片的方式
+			 * 以$emit('upinImage', tempFiles, this.editorCtx)的方式回调
+			 * @param {Object} tempFiles
+			 * @param {Object} editorCtx
+			 */
+			upinImage(tempFiles, editorCtx) {
+				/**
+				 * 本地临时插入图片预览
+				 * 注意：这里仅是示例本地图片预览，因为需要将图片先上传到云端，再将图片插入到编辑器中
+				 * 正式开发时，还请将此处注释，并解开下面 使用 uniCloud.uploadFile 上传图片的示例方法 的注释
+				 * @tutorial https://uniapp.dcloud.net.cn/api/media/editor-context.html#editorcontext-insertimage
+				 */
+				// #ifdef MP-WEIXIN
+				// 注意微信小程序的图片路径是在tempFilePath字段中
+				editorCtx.insertImage({
+					src: tempFiles[0].tempFilePath,
+					width: '80%', // 默认不建议铺满宽度100%，预留一点空隙以便用户编辑
+					success: function() {}
 				})
+				// #endif
+
+				// #ifndef MP-WEIXIN
+				editorCtx.insertImage({
+					src: tempFiles[0].path,
+					width: '80%', // 默认不建议铺满宽度100%，预留一点空隙以便用户编辑
+					success: function() {}
+				})
+				// #endif
+
+				/**
+				 * 使用 uniCloud.uploadFile 上传图片的示例方法（可适用多选上传）
+				 * 正式开发环境中，请将上面 本地临时插入图片预览 注释后，模仿以下写法
+				 */
+				// tempFiles.forEach(async (item) => {
+				//   uni.showLoading({
+				//     title: '上传中请稍后',
+				//     mask: true
+				//   })
+				//   let upfile = await uniCloud.uploadFile({
+				//     filePath: item.path,
+				//     // 同名会导致报错 policy_does_not_allow_file_overwrite
+				//     // cloudPath可由 想要存储的文件夹/文件名 拼接，若不拼文件夹名则默认存储在cloudstorage文件夹中
+				//     cloudPath: `cloudstorage/${item.name}`,
+				//     cloudPathAsRealPath: true
+				//   })
+				//   editorCtx.insertImage({
+				//     src: upfile.fileID,
+				//     width: '80%', // 默认不建议铺满宽度100%，预留一点空隙以便用户编辑
+				//     success: function () {
+				//       uni.hideLoading()
+				//     }
+				//   })
+				// })
 			},
-			//获取客户分类
-			getCustomerCategoryList(){
-				this.tui.request("/app/customerCategory/getCustomerCategoryListByShopId", "POST", {
-					shopId:uni.getStorageSync('shopId')
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						if(res.result.length > 0){
-							this.customerCategoryList = res.result
-							for(let i=0;i<this.customerCategoryList.length;i++){
-								let data = {
-									categoryName:this.customerCategoryList[i].categoryName,
-									categoryId:this.customerCategoryList[i].id,
-									categoryPrice:""
-								}
-								this.customerCategoryList[i] = data
+			
+			// 触发提交表单
+			submit() {
+				let that = this;
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						if (this.modalType == 0) {
+							// 添加 避免编辑后传入id等数据 记得删除
+							delete this.formData.id;
+							if(this.formData.isMoreBuy != 1){
+								this.formData.isMoreBuy = 0
 							}
-						}else{
-							this.customerCategoryList = null
-						}
-						
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			//进入页面，查询货号列表
-			getSnList() {
-				this.snList = []
-				this.snName = ''
-				this.tui.request("/app/productSn/getProductSnByShopId", "POST", {}, false, true).then((res1) => {
-					if (res1.code == 200) {
-						if (res1.result != '') {
-							for (let i = 0; i < res1.result.length; i++) {
-								let data = {
-									text: '前缀:' + res1.result[i].snPre + ',位数:' + res1.result[i].snSufLength,
-									value: res1.result[i].snPre
+							this.formData.attributeListPrice = JSON.stringify(this.formData.attributeListPrice)
+							this.formData.attributeList = Object.fromEntries(this.formData.attributeList1)
+							this.formData.attributeList = JSON.stringify(this.formData.attributeList)
+							
+							
+							this.tui.request("/app/product/save", "post", this.formData, false, false).then((res) => {
+								if(res.code == 200){
+									that.tui.toast("操作成功");
 								}
-								this.snList.push(data)
-							}
-							this.snName = res1.result[0].snPre
-						}
-					} else {
-						this.tui.toast(res.message)
-					}
-					this.$forceUpdate()
-				}).catch((res) => {})
-			},
-			//初始化获取分类列表
-			getGategoryList() {
-				this.tui.request("/app/productCategory/list", "get", {
-					// shopId: 1,
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						if (res.result.length > 0) {
-							if(this.formData.categoryId != '' && this.formData.categoryId != undefined){
-								for(let i=0;i<res.result.length;i++){
-									if(res.result[i].id == this.formData.categoryId){
-										this.typeItem = res.result[i]
-									}
+							}).catch(() => {});
+						} else if (this.modalType == 1) {
+							// 编辑
+							this.formData.attributeListPrice = JSON.stringify(this.formData.attributeListPrice)
+							this.formData.attributeList = Object.fromEntries(this.formData.attributeList1)
+							this.formData.attributeList = JSON.stringify(this.formData.attributeList)
+							this.formData.productPictures = []
+							this.tui.request("/app/product/edit", "post", this.formData, false, false).then((res) => {
+								if(res.code == 200){
+									that.tui.toast("操作成功");
 								}
-							}else{
-								this.typeItem = res.result[0]
-								this.formData.categoryId = this.typeItem.id
-							}
-							
+							}).catch(() => {});
 						}
-					} else {
-						this.tui.toast(res.message)
 					}
-				}).catch((res) => {})
-			},
-			// 删除图片
-			deletePic(event) {
-				this[`fileList${event.name}`].splice(event.index, 1)
-			},
-			addSpec(e) {
-				let data = {
-					value: e,
-					checked: false
-				}
-				this.defaultList[this.addIndex].list.push(data)
-				this.$refs.addClose.val = ''
+				});
 			},
-			cancelCheck() {
-				let data = this.cancelArr
-				this.addMultipleType(data[0], data[1], data[2])
-				this.$refs.carPopup.close()
+			back() {
+				uni.navigateBack()
 			},
-			//点击取消按钮
-			dialogClose() {
-				this.inputVal = '';
-				this.specVal = '';
-				this.$refs.inputClose.val = ''
-				this.$refs.addClose.val = ''
-
+			checkisMoreBuy(type){
+				this.formData.isMoreBuy = type;
 			},
-			// 新增图片
-			async afterRead(event) {
-				let lists = [].concat(event.file)
-				if (this.formData.productPicture == undefined) this.formData.productPicture = [];
-				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++
-				}
+			checkSellTime(type){
+				this.formData.sellTime = type;
 			},
-			obtainPrice(e, type, num) {
-				this.linshiPrice = e.target.value
-				if (type == 'price') {
-					this.formData.price = ''
-				} else if (type == 'wholesalePrice') {
-					this.formData.wholesalePrice = ''
-				} else if (type == 'commission') {
-					this.formData.commission = ''
-				} else if (type == 'purchasePrice') {
-					this.formData.purchasePrice = ''
+			selectDateRange(e,type){
+				if(type == 'start'){
+					this.formData.sellBeginTime = e.detail.value
+				}else{
+					this.formData.sellEndTime = e.detail.value
 				}
 			},
-			generateSn(value) {
-				this.tui.request("/app/productSn/getNewProductSn", "POST", {
-					snPre: value
-				}, false, true).then((res1) => {
-					if (res1.code == 200) {
-						this.tui.request('/app/product/getByProductSn', "post", {
-							productSn: res1.result
-						}, false, true).then((res) => {
-							if (res.code == 200) {
-								if (res.result != '') {
-									this.generateSn(value)
-								} else {
-									this.formData.productSn = res1.result
-									this.$forceUpdate()
-								}
+			guigeSubmit(){
+				if(this.modalclassType == 'shuxing'){
+					for(let i=0;i<this.attrValueArr.length;i++){
+						if(this.formData.attributeList1.size == 0){
+							//set  has get
+							let data = {
+								title:[]
 							}
-						})
-						
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			updateCate(){
-				this.$refs.customPopup.close()
-				this.$forceUpdate()
-			},
-			checkPriceRule(ruleArr){
-				if(ruleArr != null && ruleArr != ''){
-					if(this.customerCategoryList != '' && this.customerCategoryList != null){
-						let categorySon = []
-						for(let i=0;i<this.customerCategoryList.length;i++){
-							let isHae = false
-							for(let j=0;j<ruleArr.length;j++){
-								if(this.customerCategoryList[i].categoryId == ruleArr[j].categoryId){
-									isHae = true
+							data.title.push(this.attrValueArr[i].title)
+							this.formData.attributeList1.set(this.attrValueArr[i].parentName,data)
+						}else{
+							if(this.formData.attributeList1.has(this.attrValueArr[i].parentName) && this.formData.attributeList1.get(this.attrValueArr[i].parentName).title.indexOf(this.attrValueArr[i].title) == -1){
+								this.formData.attributeList1.get(this.attrValueArr[i].parentName).title.push(this.attrValueArr[i].title)
+							}else{
+								let data = {
+									title:[]
 								}
-							}
-							if(isHae == false){
-								ruleArr.push(this.customerCategoryList[i])
+								data.title.push(this.attrValueArr[i].title)
+								this.formData.attributeList1.set(this.attrValueArr[i].parentName,data)
 							}
 						}
-						
-					}else{
-						ruleArr = this.customerCategoryList
 					}
 				}else{
-					ruleArr = this.customerCategoryList
-				}
-				
-				return ruleArr
-			},
-			async startGetSn() {
-				var that = this;
-				if (this.prefixRule == '') {
-					this.tui.toast('请输入货号生成前缀规则')
-					return
-				}
-				if (this.numRule == '') {
-					this.tui.toast('请输入货号生成位数规则')
-					return
-				}
-				await this.tui.request("/app/productSn/addAndGetNewProductSn", "POST", {
-					snPre: this.prefixRule,
-					snSufLength: this.numRule
-				}, false, false).then((res1) => {
-					if (res1.code == 200) {
-						if (res1.message == '货号前缀已存在！') { //被删除，调启用方法
-							uni.showModal({
-								title: "提示",
-								content: "货号已经被删除，是否重新启用？",
-								success: function(res) {
-									if (res.confirm) {
-										that.tui.request("/app/productSn/useAgainProductSn",
-											"POST", {
-												id: res1.result.id
-											}, false, true).then((res2) => {
-											if (res2.code == 200) {
-												that.tui.toast('重新启用成功')
-												setTimeout(res => {
-													that.getSnList()
-													that.generateSn(this
-														.prefixRule)
-												}, 1000)
-											} else {
-												that.tui.toast(res2.message)
-											}
-											that.$forceUpdate()
-										}).catch((res) => {})
-									}
-								}
-							})
-						} else {
-							this.formData.productSn = res1.result
+					//guige
+					let message = []
+					for(let i=0;i<this.specValueArr.length;i++){
+						for(let m=0;m<this.formData.attributeListPrice.length;m++){
+							if(this.specValueArr[i].id == this.formData.attributeListPrice[m].id){
+								this.specValueArr[i].specPrice = this.formData.attributeListPrice[m].specPrice
+								this.specValueArr[i].specName = this.formData.attributeListPrice[m].specName
+								this.specValueArr[i].specNum = this.formData.attributeListPrice[m].specNum
+							}
 						}
-
-					} else {
-						this.tui.toast(res.message)
+						message.push({
+							id:this.specValueArr[i].id,
+							specName:this.specValueArr[i].specName == undefined ? this.specValueArr[i].title : this.specValueArr[i].specName,
+							specPrice:this.specValueArr[i].specPrice == undefined ? '' : this.specValueArr[i].specPrice,
+							specNum:this.specValueArr[i].specNum == undefined ? 9999 : this.specValueArr[i].specNum
+						})
 					}
-				}).catch((res) => {})
-			},
-			changeAddType(e) {
-				if (e.show == false && this.multipleList == '') {
-					this.multipleList = this.oldMultipleList
+					this.formData.attributeListPrice = message
 				}
+				this.$forceUpdate()
+				this.$refs.addTypeDialog.close()
 			},
-			async dialogInputConfirm(e) {
-				let that = this;
-				if (that.multipleList == '') {
-					that.multipleList = [{
-						attributeName: '颜色',
-						productAttributeValueVoList: [{
-							checked: true,
-							value: "均色"
-						}]
-					}, {
-						attributeName: '尺码',
-						productAttributeValueVoList: [{
-							checked: true,
-							value: "均码"
-						}]
-					}]
-				} else {
-					
-						if (that.multipleList[0].productAttributeValueVoList == '') {
-							that.multipleList[0].productAttributeValueVoList = [{
-								checked: true,
-								value: "均色"
-							}]
-						} 
-						if (that.multipleList[1].productAttributeValueVoList == '') {
-							that.multipleList[1].productAttributeValueVoList = [{
-								checked: true,
-								value: "均码"
-							}]
-						}
-						
+			add() {
+				if (!this.selectNode.id) {
+					this.$Message.warning("请先选择一个分类");
+					return;
 				}
-				
-				that.$refs.addTypeDialog.close()
+				this.modalType = 0;
+				this.$refs.form.resetFields();
+				this.form.sort = this.data.length + 1;
+				this.formData = {
+					id:'',
+					shopId:'',
+					categoryId:'', //商品分类id
+					categoryName:'', //商品分类名称
+					productPicture:'', //商品图标
+					productName:'', //商品名称
+					lunchBox:0, //餐盒
+					startPayNum:'', //起售数量
+					orderFiled:'',//排名
+					attributeListPrice:[{ //商品规格
+						specPrice:"",
+						specNum:9999
+					}],
+					sellTime:0, //可售时间
+					sellBeginTime:'', //可售时段自定义---开始时间
+					sellEndTime:'', //可售时段自定义---结束时间
+					attributeList:'',
+					productGroupBuyPrices:[],
+					attributeList1:new Map(), //商品属性
+					productIntro:"" //详细图文
+				}
+				this.specValueArr = []
+				this.attrValueArr = []
+				this.formData.shopId = this.shopId
+				this.formData.categoryId = this.selectNode.id
+				this.formData.categoryName = this.selectNode.categoryName
+				this.modalVisible = true;
 			},
-			changessPrice(e, type) {
-				if (type == 'price') {
-					if (this.linshiPrice == e.target.value) {
-						this.formData.price = e.target.value
-					} else {
-						if (e.target.value == '') {
-							this.formData.price = this.linshiPrice
-						} else {
-							this.formData.price = e.target.value
-						}
-
-					}
-				} else if (type == 'wholesalePrice') {
-					if (this.linshiPrice == e.target.value) {
-						this.formData.wholesalePrice = e.target.value
-					} else {
-						if (e.target.value == '') {
-							this.formData.wholesalePrice = this.linshiPrice
-						} else {
-							this.formData.wholesalePrice = e.target.value
-						}
-
+			edit(v) {
+				this.modalType = 1;
+				// 转换null为""
+				for (let attr in v) {
+					if (v[attr] == null) {
+						v[attr] = "";
 					}
-				} else if (type == 'commission') {
-					if (this.linshiPrice == e.target.value) {
-						this.formData.commission = e.target.value
-					} else {
-						if (e.target.value == '') {
-							this.formData.commission = this.linshiPrice
-						} else {
-							this.formData.commission = e.target.value
-						}
-
-					}
-				} else if (type == 'purchasePrice') {
-					uni.showLoading({
-						title: '加载中...',
-						mask: true
-					})
-					if (this.linshiPrice == e.target.value) {
-						this.formData.purchasePrice = e.target.value
-					} else {
-						if (e.target.value == '') {
-							this.formData.purchasePrice = this.linshiPrice
-						} else {
-							this.formData.purchasePrice = e.target.value
-							
-							if (this.dataList.id == undefined) {
-								uni.hideLoading()
-								return
-							}
-							this.differencePurchasePrice = Number(this.oldPurchasePrice) - Number(e.target.value)
-							this.tui.request("/app/purchase/getPurchaseListByProductId", "post", {
-								productId: this.dataList.id,
-								pageSize: 9999,
-								pageNum: this.pageNum
-							}, false, false).then((res) => {
-								if (res.code == 200) {
-									this.guigeNum = 0
-									for (let i = 0; i < res.result.records.length; i++) {
-										this.guigeNum += Number(res.result.records[i].purchase.totalAmount)
-									}
-
-									setTimeout(res => {
-										this.zPrice = this.guigeNum * this.differencePurchasePrice
-										if (this.zPrice != 0) {
-											this.getMonth()
-											this.$refs.warnPopup.open()
-										}
-
-										uni.hideLoading()
-									}, 300)
-								} else {
-									this.tui.toast(res.message)
-								}
-							}).catch((res) => {})
-
-						}
-					}
-					uni.hideLoading()
 				}
-
-			},
-			getMonth() {
-				this.single = Date.now()
-			},
-			toggle(index) {
-				this.addIndex = index
-				this.$refs.addDialog.open()
-			},
-			uploadFilePromise(url) {
-				let that = this;
-				return new Promise((resolve, reject) => {
-					uni.compressImage({
-						src: url,
-						quality: 50,
-						success: res => {
-
-							let a = uni.uploadFile({
-								url: that.tui.interfaceUrl() + '/upload/file',
-								filePath: res.tempFilePath,
-								name: 'file',
-								header: {
-									"content-type": "multipart/form-data",
-									'accessToken': this.tui.getToken()
-								},
-								formData: {},
-								success: (uploadFileRes) => {
-
-									let path = JSON.parse(uploadFileRes.data)
-									//后端返回的地址，存入图片地址
-									this.formData.productPicture = path.result
-								}
-							});
-						}
-					})
-
-				})
-			},
-			categoryChange(e) {
-				this.categoryId = e
-			},
-			ejectRuleSelect() {
+				let str = JSON.stringify(v);
+				let data = JSON.parse(str);
+				console.log('111111',data)
+				this.formData = data;
+				this.formData.attributeList1 = JSON.parse(this.formData.attributeList)
+				this.formData.attributeList1 = new Map(Object.entries(this.formData.attributeList1));
+				this.formData.attributeListPrice = JSON.parse(this.formData.attributeListPrice)
 				
-				if (this.dataList.id) {
-					//颜色
-					for (let m = 0; m < this.multipleList[0].productAttributeValueVoList.length; m++) {
-						let isTrue = true
-						for (let i = 0; i < this.defaultList[0].list.length; i++) {
-							if (this.defaultList[0].list[i].value == this.multipleList[0].productAttributeValueVoList[m]
-								.value) {
-								isTrue = false
-								this.defaultList[0].list[i].checked = true
-							} else {
-								if (this.defaultList[0].list.length == (i + 1) && isTrue == true) {
-									this.multipleList[0].productAttributeValueVoList[m].checked = true
-									this.defaultList[0].list.push(this.multipleList[0].productAttributeValueVoList[m])
-								}
+				console.log("this.formData.attributeList1",this.formData.attributeList1)
+				console.log("this.formData.attributeListPrice",this.formData.attributeListPrice)
+				
+				this.formData.attributeList1.forEach((value, key) => {
+					for(let i = 0;i<value.title.length;i++){
+						this.attrValueArr.push({
+							parentName:key,
+							title:value.title[i]
+						})
+					}
+				});
+				this.specValueArr = this.formData.attributeListPrice
+				
+				
+				this.formData.sellTime = this.formData.sellBeginTime != '' ? 1 : 0
+				this.modalVisible = true;
+			},
+			checkSpecValue(index){
+				this.categorySonData[index].checked = !this.categorySonData[index].checked
+				if(this.modalclassType == 'shuxing'){
+					if(this.categorySonData[index].checked == true){
+						this.categorySonData[index].parentName = this.typeToAttrName
+						this.attrValueArr.push(this.categorySonData[index])
+					}else{
+						for(let i=0;i<this.attrValueArr.length;i++){
+							if(this.categorySonData[index].title == this.attrValueArr[i].title){
+								this.attrValueArr.splice(i,1)
 							}
 						}
 					}
-					//尺码
-					for (let m = 0; m < this.multipleList[1].productAttributeValueVoList.length; m++) {
-						let isTrue = true
-						for (let i = 0; i < this.defaultList[1].list.length; i++) {
-							if (this.defaultList[1].list[i].value == this.multipleList[1].productAttributeValueVoList[m]
-								.value) {
-								isTrue = false
-								this.defaultList[1].list[i].checked = true
-							} else {
-								if (this.defaultList[1].list.length == (i + 1) && isTrue == true) {
-									this.multipleList[1].productAttributeValueVoList[m].checked = true
-									this.defaultList[1].list.push(this.multipleList[1].productAttributeValueVoList[m])
-								}
+				}else{
+					//guige
+					if(this.categorySonData[index].checked == true){
+						this.specValueArr.push(this.categorySonData[index])
+					}else{
+						for(let i=0;i<this.specValueArr.length;i++){
+							if(this.categorySonData[index].id == this.specValueArr[i].id){
+								this.specValueArr.splice(i,1)
 							}
 						}
 					}
 				}
-				this.$nextTick(() => {
-					this.oldMultipleList = this.multipleList
-					if (this.dataList == '') {
-						this.multipleList = []
-					}
-					this.$refs.addTypeDialog.open('bottom')
-				})
+				this.$forceUpdate()
 			},
-			// 触发提交表单
-			submit() {
-				let that = this;
-				let url = ''
-				this.$refs.form.validate().then(res => {
-					if (that.dataList.id) {
-						url = '/app/product/edit'
-						this.formData.id = that.dataList.id
-						this.formData.stockCount = that.dataList.stockCount
-						this.formData.supplierId = that.dataList.supplierId
-						this.formData.supplierName = that.dataList.supplierName
-						this.formData.delFlag = that.dataList.delFlag
+			//点击左侧菜单切换
+			clickLeftBtn(index) {
+				for (var i = 0; i < this.categoryData.length; i++) {
+					if (i == index) {
+						this.categoryData[i].parentId = true
 					} else {
-						url = '/app/product/save'
-						if (this.userType == 1) {
-							this.formData.purchasePrice = ''
-						}
-					}
-					if (res.productPicture == '') {
-						res.productPicture = ''
+						this.categoryData[i].parentId = false
 					}
-					if(this.customerCategoryList != null){
-						this.formData.customerCategoryRule = JSON.stringify(this.customerCategoryList)
-					}
-					this.formData.productCategoryVo = {
-						productAttributeOfAddVos: this.multipleList.length > 0 ? this.multipleList : [{
-							attributeName: '颜色',
-							productAttributeValueVoList: [{
-								checked: true,
-								value: "均色"
-							}]
-						}, {
-							attributeName: '尺码',
-							productAttributeValueVoList: [{
-								checked: true,
-								value: "均码"
-							}]
-						}]
-					}
-					
-					that.tui.request(url, "post", this.formData, false, false).then((res1) => {
-						if (res1.code == 200) {
-							if (that.dataList.id) { //编辑商品
-								let pages = getCurrentPages();
-								let prevPage = pages[pages.length - 3];
-								let shopList = prevPage.$vm.shopList
-								for (let i = 0; i < shopList.length; i++) {
-									if (shopList[i].id == this.formData.id) {
-										//修改了分类，就直接删除列表中的商品
-										if (this.formData.categoryId != that.dataList.categoryId) {
-											shopList.splice(i, 1);
-										} else {
-											shopList[i] = this.formData
-										}
-									}
-								}
-								uni.navigateBack({
-									delta: 2
-								})
-							} else { //新增商品
-								uni.navigateBack({
-									delta: 1
-								})
-							}
-
-						} else {
-							uni.showToast({
-								title: "添加失败",
-								icon: 'none'
-							})
-						}
-					})
-				}).catch(err => {
-
-				})
-			},
-			//跳转分类页
-			goGategoryLow() {
-				uni.navigateTo({
-					url: '/package1/inventory/gategory'
-				})
+				}
+				this.categoryIndex = index
+				this.typeToAttrName = this.categoryData[this.categoryIndex].title
+				this.getCateGorySon(this.categoryData[this.categoryIndex].id)
 			},
 			pictureAdd(id, huan) {
 				let that = this
 				uni.chooseMedia({
 					count: 9,
 					mediaType: ['image'],
-					sourceType: ['album'],
+					sourceType: ['album', 'camera'],
 					success(res) {
 						uni.showLoading({
 							title: '加载中...',
@@ -1072,10 +501,121 @@
 						for (let i = 0; i < res.tempFiles.length; i++) {
 							that.upLoadFile(res.tempFiles[i].tempFilePath)
 						}
-
 					}
 				})
 			},
+			checkSpec(type){
+				this.$refs.addTypeDialog.open()
+				this.modalclassType = type
+				this.tui.request("/dictData/getByCondition", "GET", {
+					name: "",
+					status: "",
+					pageNumber: 1,
+					pageSize: 100000,
+					sort: 'sortOrder',
+					order: 'asc',
+					dictId: '2026945661353725952'
+				}, false, true).then((res) => {
+					if(res.code == 200){
+						this.categoryData = res.result.content
+						for (var i = 0; i < this.categoryData.length; i++) {
+							if (i == this.categoryIndex) {
+								this.categoryData[i].parentId = true
+							} else {
+								this.categoryData[i].parentId = false
+							}
+						}
+						//如果是选择属性，需要拿一个分类名，保存成parent
+						this.typeToAttrName = res.result.content[this.categoryIndex].title
+						this.getCateGorySon(res.result.content[this.categoryIndex].id)
+					}
+				}).catch(() => {});
+			},
+			getCateGorySon(id){
+				this.tui.request("/dictData/getByCondition", "GET", {
+					name: "",
+					status: "",
+					pageNumber: 1,
+					pageSize: 100000,
+					sort: 'sortOrder',
+					order: 'asc',
+					dictId: id
+				}, false, true).then((res) => {
+					if(res.code == 200){
+						this.categorySonData = res.result.content
+						if(this.modalclassType == 'shuxing'){
+							for (var i = 0; i < this.categorySonData.length; i++) {
+								if(this.attrValueArr.length>0){
+									let index1 = false
+									for (var m = 0; m < this.attrValueArr.length; m++) {
+										if(this.attrValueArr[m].title == this.categorySonData[i].title){
+											index1 = true
+											this.categorySonData[i].checked = true
+										}
+									}
+									if(index1){
+										this.categorySonData[i].checked = true
+									}
+								}else{
+									this.categorySonData[i].checked = false
+								}
+							}
+						}else{
+							//guige
+							
+							
+							for (var i = 0; i < this.categorySonData.length; i++) {
+								if(this.specValueArr.length>0){
+									for (var m = 0; m < this.specValueArr.length; m++) {
+										if(this.specValueArr[m].id == this.categorySonData[i].id){
+											this.categorySonData[i].checked = true
+										}
+									}
+								}else{
+									this.categorySonData[i].checked = false
+								}
+							}
+						}
+						
+					}
+				}).catch(() => {});
+			},
+			deldantiaoguige(index){
+				for (var m = 0; m < this.specValueArr.length; m++) {
+					if(this.specValueArr[m].id == this.formData.attributeListPrice[index].id){
+						this.specValueArr.splice(m,1)
+						this.formData.attributeListPrice.splice(index,1)
+						console.log("11",this.formData.attributeListPrice)
+						if(this.formData.attributeListPrice.length == 1){
+							this.formData.attributeListPrice = []
+							this.formData.attributeListPrice.push({
+								specName:"",
+								specPrice:'',
+								specNum:9999
+							})
+							this.specValueArr = []
+						}
+						this.$forceUpdate()
+						return
+					}
+				}
+			},
+			delGroup(index){
+				this.formData.productGroupBuyPrices.splice(index,1)
+			},
+			changePrice(index){
+				this.specValueArr[index].specPrice = this.formData.attributeListPrice[index].specPrice
+			},
+			changeCount(index){
+				this.specValueArr[index].specNum = this.formData.attributeListPrice[index].specNum
+			},
+			addGroup(){
+				let data = {
+					groupCount:'',
+					groupPrice:0
+				}
+				this.formData.productGroupBuyPrices.push(data)
+			},
 			async upLoadFile(path) {
 				let that = this;
 				let hiver_token = uni.getStorageSync("hiver_token")
@@ -1090,10 +630,7 @@
 					formData: {},
 					success: (uploadFileRes) => {
 						let pathData = JSON.parse(uploadFileRes.data)
-						let data = {
-							productPicture: pathData.result
-						}
-						this.formData.productPictures.push(data)
+						that.formData.productPicture = pathData.result
 						that.$forceUpdate()
 					},
 					fail: (err) => {
@@ -1107,240 +644,80 @@
 				await setTimeout(res => {
 					uni.hideLoading();
 				}, 1000)
-			},
-			scanCodeAdd() {
-				let that = this;
-				uni.scanCode({
-					scanType: ['barCode'],
-					success: (res) => {
-						that.tui.request('/app/product/getByBarcode', "post", {
-							barcode: res.result
-						}, false, true).then((res1) => {
-							if (res1.code == 200) {
-								if (res1.result != '') {
-									that.tui.toast('当前条码已被商品：“' + res1.result[0].productName +
-										'”占用，请重新输入')
-								} else {
-									that.formData.barcode = res.result;
-								}
-							}
-						})
-					},
-					fail: (res) => {
-						uni.showToast({
-							title: '扫描失败',
-							icon: 'none'
-						})
-					}
-				})
-			},
-			isCheckPrec(item, item1, index) {
-				if (item.list[index].checked == true) {
-					this.getTypeToNum(item, item1, index)
-				} else {
-					this.addMultipleType(item, item1, index)
-				}
-			},
-			//选择多个规格保存
-			addMultipleType(item, item1, index) {
-				item.list[index].checked = !item.list[index].checked
-				var list = []
-				if (this.multipleList == '' && item.list[index].checked == true) {
-					if(item.name == '颜色'){
-						var data = {
-							attributeName: '尺码',
-							productAttributeValueVoList: []
-						}
-						this.multipleList.push(data)
-					}
-					if(item.name == '尺码'){
-						var data = {
-							attributeName: '颜色',
-							productAttributeValueVoList: []
-						}
-						this.multipleList.push(data)
-					}
-					list.push(item.list[index])
-					var data = {
-						attributeName: item.name,
-						productAttributeValueVoList: list
-					}
-					this.multipleList.push(data)
-				} else {
-					
-					if (this.multipleList[0].attributeName == item.name) { //同种分类
-						if(this.multipleList[0].productAttributeValueVoList.length == 0){
-							this.multipleList[0].productAttributeValueVoList.push(item.list[index])
-						}else{
-							for (var m = 0; m < this.multipleList[0].productAttributeValueVoList.length; m++) {
-								if (this.multipleList[0].productAttributeValueVoList[m].value == item.list[index]
-									.value) { //规格相同
-									this.multipleList[0].productAttributeValueVoList.splice(m, 1)
-									return;
-								} else { //规格不同
-									if (m + 1 == this.multipleList[0].productAttributeValueVoList.length) {
-										this.multipleList[0].productAttributeValueVoList.push(item.list[index])
-										return;
-									}
-								}
-							}
-						}
-						
-					}
-					
-					if (this.multipleList[1].attributeName == item.name) { //同种分类
-						if(this.multipleList[1].productAttributeValueVoList.length == 0){
-							this.multipleList[1].productAttributeValueVoList.push(item.list[index])
-						}else{
-							for (var m = 0; m < this.multipleList[1].productAttributeValueVoList.length; m++) {
-								if (this.multipleList[1].productAttributeValueVoList[m].value == item.list[index]
-									.value) { //规格相同
-									this.multipleList[1].productAttributeValueVoList.splice(m, 1)
-									return;
-								} else { //规格不同
-									if (m + 1 == this.multipleList[1].productAttributeValueVoList.length) {
-										this.multipleList[1].productAttributeValueVoList.push(item.list[index])
-										return;
-									}
-								}
-							}
-						}
-						
-					}
-				}
-			},
-			//查询分类下有没有库存
-			getTypeToNum(item, item1, index) {
-				let that = this;
-				this.tui.request("/app/stock/getlistByAttributeList", "post", {
-					categoryId: this.formData.attrId,
-					attributeList: item.list[index].value,
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						if (res.result != '') { //有库存
-							this.goodsList = res.result
-							this.cancelArr = [item, item1, index]
-							this.$refs.carPopup.open('bottom')
-						} else {
-							this.addMultipleType(item, item1, index)
-						}
-					}
-				}).catch((res) => {})
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	page,.page1{
-		font-size: 28rpx;
-	}
-	.list-val {
-		width: 486rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-	}
-
-	.list-val input {
-		width: 400rpx;
-		height: 70rpx;
-		display: inline-block;
-		line-height: 70rpx;
-		text-align: left !important;
-		padding-left: 20rpx;
-		float: left;
-		font-size: 25rpx;
-	}
-
-	.formBox {
-		margin: 20rpx;
-		padding: 20rpx 26rpx;
-		border-radius: 14rpx;
-		box-shadow: 0px 1px 10px 2px #e2e2e2;
-		background-color: #fff;
-
-		.uni-data-select {
-			width: 100%;
-		}
-
-		.attrs {
-			text {
-				display: inline-block;
-				border: 1px solid $u-primary;
-				padding: 14rpx 20rpx;
-				margin: 20rpx;
-				background-color: #fff;
-				color: $u-primary;
-			}
-
-			.checkedText {
-				background-color: $u-primary;
-				color: #fff;
-			}
-		}
-	}
-
-	.upload-img {
-		width: 160rpx;
-		height: 160rpx;
+	page {
+		width: 100%;
+		height: 100%;
+		font-size: 24rpx;
+		background: #F5F8F5;
+		color: #00231C;
 	}
 
-	.checked {
-		background: #60F3FF !important;
-		color: #fff !important;
-		border-radius: 5px !important;
+	.page1 {
+		width: 100%;
+		height: 100%;
+		font-size: 24rpx;
+		position: relative;
 	}
 
-	.content-list {
-		height: 70rpx;
-		border: 1px solid #eee;
+	.title {
+		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
+		width: 100%;
+		height: 54%;
 	}
 
-	.sn-content-list {
-		width: 95%;
-		margin: 0 auto;
+	.title-sreach {
+		width: 100%;
 		display: flex;
-		height: 80rpx;
-		border-bottom: 1px solid #eee;
+		height: 200rpx;
+		position: relative;
 	}
 
-	.sn-content-list:last-child {
-		border-bottom: none;
-		height: auto;
+	.back-btn {
+		position: absolute;
+		bottom: 0;
+		left: 0;
 	}
 
-	.sn-list-name {
-		width: 200rpx;
-		text-align: left;
-		line-height: 80rpx;
-		height: 80rpx;
-		padding-left: 20rpx;
+	.title-name {
+		padding-top: 55px;
+		font-size: 36rpx;
+		font-weight: 700;
+		flex: 1;
+		text-align: center;
 	}
 
-	.sn-list-val {
-		width: 560rpx;
-		height: 80rpx;
-		line-height: 80rpx;
+	.formBox {
+		padding: 20rpx 26rpx;
+		border-radius: 14rpx;
+		box-shadow: 0px 1px 10px 2px #e2e2e2;
+		background-color: #fff;
+		position: fixed;
+		top: 100px;
+		left: 2.5%;
+		width: 95%;
+		overflow: scroll;
+		height: 85%;
 	}
 
-	.sn-list-val input {
-		width: 400rpx;
-		height: 60rpx;
-		display: inline-block;
-		line-height: 60rpx;
-		float: left;
-		margin-top: 10rpx;
-		padding-left: 20rpx;
-		border-bottom: 1px solid #088FEB;
+	.upload-img {
+		width: 160rpx;
+		height: 160rpx;
 	}
 
 	button {
 		height: 90rpx;
 		line-height: 90rpx;
 		font-size: 36rpx;
-		color: #fff;
-		background: #5fd9ee;
+		background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
 		border-radius: 10px;
+		font-weight: 700;
+		flex: 1;
 	}
 
 	.content-input {
@@ -1359,135 +736,62 @@
 	.add-popup-content {
 		align-items: center;
 		justify-content: center;
-		padding: 30rpx;
-		width: 100%;
+		padding: 30rpx 30rpx 30rpx 0;
+		width: 300px;
 		height: 1050rpx;
 		background-color: #fff;
 		overflow: scroll;
+		border-radius: 10px;
 	}
-
-	.add-popup-title {
-		font-size: 36rpx;
-		font-weight: bold;
-		text-align: center;
-		position: relative;
-	}
-
-	.add-popup-container {
-		margin-top: 20rpx;
-	}
-
-	.add-popup-bottom {
-		display: flex;
-		height: 80rpx;
-		color: #fff;
-		line-height: 80rpx;
-		margin-top: 50rpx;
-	}
-
-	.add-popup-btn {
+	.xiangxi-box{
 		flex: 1;
-		text-align: center;
-		background: linear-gradient(90deg, #60F3FF, #088FEB);
-	}
-
-	.title-fur {
-		width: 95%;
-		height: 70rpx;
-		margin: 0 auto;
-		border-bottom: 1px solid #eee;
-
-		.name {
-			font-size: 30rpx;
-			width: 90%;
-			float: left;
-			height: 70rpx;
-			line-height: 70rpx;
-		}
-	}
-
-	.content-fur {
-		padding-bottom: 25rpx;
-	}
-
-	.content-low {
-		width: auto;
 		border: 1px solid #eee;
-		display: inline-block;
-		min-width: 90rpx;
-		padding: 5rpx;
-		font-size: 35rpx;
-		text-align: center;
-		color: #777;
-		margin: 20rpx 0 0 20rpx;
-		border-radius: 5px;
-	}
-
-	.type-popup {
-		width: 500rpx;
-		height: auto;
-		background: #fff;
 		border-radius: 10px;
-		position: relative;
-		margin-bottom: 40rpx;
 	}
-
-	.popup-content {
-		align-items: center;
-		justify-content: center;
-		padding: 30rpx;
-		height: 1200rpx;
-		background-color: #fff;
-		margin-bottom: 30rpx;
-		overflow: scroll;
+	.left-box {
+		width: 100%;
+		height: 50px;
+		font-size: 14px;
+		text-align: center;
+		line-height: 50px;
+		border-bottom: 1px solid #fff;
 	}
-
-	.popup-container {
+	
+	.left-box-hover {
 		width: 100%;
-		background: #fff;
-		height: 50rpx;
+		height: 50px;
+		font-size: 14px;
+		text-align: center;
+		line-height: 50px;
+		border-bottom: 1px solid #fff;
+		background-color: #fff;
 	}
-
-	.popup-bottom {
-		width: 95%;
-		height: 100rpx;
-		position: fixed;
-		bottom: 0;
-		left: 2.5%;
-		display: flex;
-		z-index: 99;
-		background: #fff;
+	.content-left {
+		width: 80px;
+		background: #eee;
+		height: 450px;
+		overflow: scroll;
+		scrollbar-width: none;
 	}
-
-	.popup-bottom-left {
-		width: 50%;
-		line-height: 80rpx;
+	.content-low{
+		height: 30px;
+		padding: 0 5px;
+		border: 1px solid #eee;
+		display: inline-block;
+		margin: 5px;
+		font-weight: bold;
+		line-height: 30px;
 	}
-
-	.popup-bottom-right {
-		width: 50%;
-		line-height: 100rpx;
+	.checked{
+		background: #60F3FF;
+		color: #fff !important;
 	}
-
-	.bottom-btn {
-		width: 70%;
-		line-height: 70rpx;
-		height: 70rpx;
+	.uni-input{
+		width: 100px;
+		height: 25px;
+		line-height: 25px;
+		border-radius: 5px;
+		border: 1px solid #eee;
 		text-align: center;
-		/* margin-top: 10rpx; */
-		color: #fff;
-		font-size: 28rpx;
-		margin: 0 auto;
-		background: linear-gradient(90deg, #60F3FF, #088FEB);
-		border-radius: 70rpx;
-	}
-	@media screen and (min-width: 760px) {
-		.add-popup-content{
-			height: 800px !important;
-		}
-		.vue-ref{
-			padding-bottom:0 !important;
-		}
 	}
-	
 </style>
\ No newline at end of file