diff --git a/pages/.DS_Store b/pages/.DS_Store
index 3d95444..5191d65 100644
Binary files a/pages/.DS_Store and b/pages/.DS_Store differ
diff --git a/pages/billing/changeGoods1.vue b/pages/billing/changeGoods1.vue
index 502b1e4..0c03424 100644
--- a/pages/billing/changeGoods1.vue
+++ b/pages/billing/changeGoods1.vue
@@ -73,7 +73,8 @@
 							<view class="popup-title-right-box">{{goodsDetail.productSn}}</view>
 						</view>
 					</view>
-					<view class="popup-container">
+					<view class="popup-container" style="position: relative;">
+						<view @tap="saveCheck" style="position: absolute;top: 20rpx;right: 20rpx;color: #088FEB;text-decoration: underline;">保存已选</view>
 						<ul style="border-top:20rpx;">
 							<li v-for="(items,index) in goodsDetail.attributeList" :key="index">
 								<view class="title-fur">
@@ -83,7 +84,7 @@
 									<uni-data-checkbox v-model="value" :localdata="range"
 										@change="change"></uni-data-checkbox>
 									<text v-for="(itemTag, index1) in items.value" :key="index1"
-										@tap.stop="attrNameChange(index,index1) "
+										@tap.stop="attrNameChange(index,itemTag.value,index1) "
 										:class="itemTag.isChecked ? 'checkedText' : '' "> {{itemTag.value}}</text>
 								</view>
 							</li>
@@ -192,7 +193,12 @@
 				productId:'',
 				productNum:0,
 				height:0,
-				pecsList:[]
+				pecsList:[],
+				pageOldTemList:[],
+				oldTemList:[],
+				goodsList:[],
+				newTemList:[],
+				dataObj :new Map()
 			}
 		},
 		filters: {
@@ -239,85 +245,155 @@
 					}
 				}).catch((res) => {})
 			},
-			//库存商品详情
-			getStockList(id) {
-				this.tui.request("/app/stock/productCount", "GET", {
-					productId: id
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						this.pecsList = res.result
-					} else {
-						this.tui.toast(res.message)
+			combination(arr) {
+				let result = [
+					[]
+				]
+			
+				arr.map(x => {
+					var res = []
+					result.map(y => {
+						x.specs.map(z => {
+							res.push([...y, z])
+						})
+					})
+					result = res
+				})
+				return result;
+			},
+			//保存已选
+			saveCheck(){
+				this.pageOldTemList = this.temporaryList
+				for(var i=0;i<this.goodsDetail.attributeList.length;i++){
+					this.goodsList[i].specs = []
+					for(var m=0;m<this.goodsDetail.attributeList[i].value.length;m++){
+						this.goodsDetail.attributeList[i].value[m].isChecked = false
 					}
-				}).catch((res) => {})
-				
+				}
 			},
-			attrNameChange(index, index1) {
-				
-				// this.goodsDetail.attributeList[index].value.forEach(item => {
-				// 	item.isChecked = false;
-				// })
-				this.goodsDetail.attributeList[index].isChecked = true;
-				this.goodsDetail.attributeList[index].value[index1].isChecked = true;
-				var name = '',
-					evalue = [],
-					obj = {}
-				for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
-					for (var m = 0, Ien = this.goodsDetail.attributeList[i].value; m < Ien.length; m++) {
-						if (Ien[m].isChecked == true) {
-							evalue.push(Ien[m].value)
-							name += Ien[m].value + '/'
-						}
-					}
-				}
-				this.keyList.map((item, index) => {
-					obj[item] = evalue[index]
-				})
-				let jishuqi = 0;
-				for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
-					if (this.goodsDetail.attributeList[i].isChecked == true) {
-						jishuqi++
-					}
-				}
-				if (this.goodsDetail.attributeList.length == jishuqi) {
-					this.tui.request("/app/stock/productCount", "post", {
-						productId: this.productId,
-						attributeList: JSON.stringify(obj)
-					}, false, true).then((res) => {
-						if (res.code == 200) {
-							this.productNum = res.result
+			attrNameChange(index, data1,index1) {
+				this.goodsDetail.attributeList[index].isChecked = !this.goodsDetail.attributeList[index].isChecked;
+				this.goodsDetail.attributeList[index].value[index1].isChecked = !this.goodsDetail.attributeList[index].value[index1].isChecked;
+				if(this.goodsList[index].specs.indexOf(data1) != -1){
+					this.goodsList[index].specs.splice(this.goodsList[index].specs.indexOf(data1),1)
+				}else{
+					this.goodsList[index].specs.push(data1)
+				}
+				let jishuqi = 0
+				for(var i = 0; i < this.goodsList.length; i++){
+					if(this.goodsList[i].specs.length > 0){
+						jishuqi++
+					}
+				}
+				var resultList = []
+				if(jishuqi == this.goodsList.length){
+					
+					resultList = this.combination(this.goodsList);
+				}
+				var evalue = []
+				var value = []
+				for (var m = 0; m < resultList.length; m++) {
+					var name = ''
+					let value1 = "{"
+					for (var j = 0; j < resultList[m].length; j++) {
+						if(j != resultList[m].length - 1){
+							name += resultList[m][j] + '/'
+							value1 += '"'+this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '",'
+						}else{
+							name += resultList[m][j]
+							value1 +=  '"'+this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '"'
+						}
+					}
+					value1 += "}"
+					value.push(value1)
+					evalue.push(name)
+				}
+				
+				if(jishuqi == 0){
+					this.oldTemList = []
+				}
+				if(this.temporaryList.length == 0){
+					if(jishuqi == this.goodsList.length){
+						for (var i = 0; i < value.length; i++) {
 							this.attributeList = {
-								attributeList: JSON.stringify(obj),
+								attributeList: value[i],
 								productCount: this.temporaryNum,
 								productNum:this.productNum,
-								name: name,
+								name: evalue[i],
 								price: this.purchasePrice
 							}
-							for (let i = 0; i < this.goodsDetail.attributeList.length; i++) {
-								this.goodsDetail.attributeList[i].isChecked = false;
-								for (let m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
-									this.goodsDetail.attributeList[i].value[m].isChecked = false
-								}
+							this.temporaryList.push(this.attributeList);
+						}	
+					}		
+				}else{
+					let newProductCount = 0;
+					for (var i = 0; i < value.length; i++) {
+						for (var m = 0; m < this.temporaryList.length; m++) {
+							if(this.temporaryList[m].attributeList == value[i]){
+								newProductCount = this.temporaryList[m].productCount
 							}
-							if (this.temporaryList.length == 0) {
-								this.temporaryList.push(this.attributeList);
-							} else {
-								for (var i = 0; i < this.temporaryList.length; i++) {
-									if (this.temporaryList[i].name.indexOf(this.attributeList.name) == -1 || this.temporaryList[i].name.indexOf(this.attributeList.name) == 1) {
-										if (this.temporaryList.length == (i + 1)) {
-											this.temporaryList.push(this.attributeList);
-											return
-										}
-									} else {
-										return
-									}
-								}
-							
+						}
+						this.attributeList = {
+							attributeList: value[i],
+							productCount: newProductCount,
+							productNum:this.productNum,
+							name: evalue[i],
+							price: this.purchasePrice
+						}
+						
+						this.newTemList.push(this.attributeList);
+						newProductCount = 0;
+					}
+					for (var i = 0; i < this.oldTemList.length; i++) {
+						let oldAttributeList = '';
+						let oldProductCount = '';
+						let notChcek = true;
+						for (var m = 0; m < this.newTemList.length; m++) {
+							if(this.oldTemList[i].attributeList == this.newTemList[m].attributeList){
+								this.newTemList[m].productCount = this.oldTemList[i].productCount
+								notChcek = false;
 							}
-						} else {
-							this.tui.toast(res.message)
 						}
-					}).catch((res) => {})
+						if(this.newTemList.length > 0 && notChcek){
+							this.newTemList.push(this.oldTemList[i]);
+						}
+					}
+					
+					for (var i = 0; i < this.pageOldTemList.length; i++) {
+						let oldAttributeList = '';
+						let oldProductCount = '';
+						let notChcek = true;
+						for (var m = 0; m < this.newTemList.length; m++) {
+							if(this.pageOldTemList[i].attributeList == this.newTemList[m].attributeList){
+								this.newTemList[m].productCount = this.pageOldTemList[i].productCount
+								notChcek = false;
+							}
+						}
+						if(this.newTemList.length > 0 && notChcek){
+							this.newTemList.push(this.pageOldTemList[i]);
+						}
+					}
+				}
+				this.$nextTick(()=>{
+					for(var i=0;i<this.temporaryList.length;i++){
+						for(var m=0;m<this.pecsList.length;m++){
+							if(this.temporaryList[i].attributeList == this.pecsList[m].attributeList){
+								this.temporaryList[i].productNum = this.pecsList[m].stockCount
+							}
+						}
+					}
+				})
+				
+				if(jishuqi != this.goodsList.length){
+					if(this.oldTemList.length ==0 && this.pageOldTemList.length ==0){
+						this.newTemList = []
+						this.temporaryList = [] 
+					}
+				}
+				if(this.newTemList.length != 0 && jishuqi == this.goodsList.length){
+					this.temporaryList = this.newTemList;
+					this.oldTemList = []
+					this.newTemList = []
 				}
 
 			},
@@ -387,52 +463,117 @@
 			},
 			//选择商品查询商品规格
 			checkGoods(item) {
-				this.goodsDetail = item;
-				this.temporaryList = []
-				this.columns = []
-				this.keyList = []
-				if (this.carList != '') {
-					this.zNum = 0
-					for (let i = 0; i < this.carList.length; i++) {
-
-						if (item.id == this.carList[i].id) {
-							this.zNum = this.carList[i].num
-							this.temporaryList = this.carList[i].saleDetailQueryDTO
-						}
-					}
+				let that = this;
+				this.goodsDetail = item;
+				this.temporaryList = []
+				this.columns = []
+				this.keyList = []
+				if (this.carList != '') {
+					this.zNum = 0
+					for (let i = 0; i < this.carList.length; i++) {
+				
+						if (item.id == this.carList[i].id) {
+							this.zNum = this.carList[i].num
+							this.temporaryList = this.carList[i].saleDetailQueryDTO
+							this.pageOldTemList = this.carList[i].saleDetailQueryDTO
+							this.oldTemList = this.carList[i].saleDetailQueryDTO
+						}
+					}
+					
 				}
-				this.getStockList(this.goodsDetail.id)
-				this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId", "POST", {
-					categoryId: this.goodsDetail.categoryId
-				}, false, true).then((res1) => {
-					if (res1.code == 200) {
-						if (typeof(res1.result) == 'string') {
-							let newObj = JSON.parse(res1.result)
-							let newArr = []
-							for (let val in newObj) {
-								let valueObj = [];
-								for (var i = 0; i < newObj[val].length; i++) {
-									valueObj.push({
-										value: newObj[val][i],
-										isChecked: false
-									})
-								}
-								newArr.push({
-									name: val,
-									value: valueObj
-								})
-							}
-							this.goodsDetail.attributeList = newArr;
-							this.goodsDetail.attributeList.forEach((item, index) => {
-								this.columns[index] = item.value;
-								this.keyList[index] = item.name;
-							})
-						}
-
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
+				this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId", "POST", {
+					categoryId: this.goodsDetail.categoryId
+				}, false, true).then((res1) => {
+					if (res1.code == 200) {
+						if (typeof(res1.result) == 'string') {
+							let newObj = JSON.parse(res1.result)
+							let newArr = []
+							let dataArr = []
+							for (let val in newObj) {
+								let valueObj = [];
+								let isTrue = false
+								for (var i = 0; i < newObj[val].length; i++) {
+									for (var m = 0; m < this.oldTemList.length; m++) {
+										var data = this.oldTemList[m].name.split('/')
+										for(var j = 0; j < data.length; j++){
+											if(data[j] == newObj[val][i]){
+												isTrue = true
+											}
+										}
+									}
+									for (var m = 0; m < this.pageOldTemList.length; m++) {
+										var data = this.pageOldTemList[m].name.split('/')
+										for(var j = 0; j < data.length; j++){
+											if(data[j] == newObj[val][i]){
+												isTrue = true
+											}
+										}
+									}
+									valueObj.push({
+										value: newObj[val][i],
+										isChecked: isTrue
+									})
+									that.dataObj.set(newObj[val][i],val)
+									isTrue = false
+								}
+								newArr.push({
+									name: val,
+									value: valueObj
+								})
+							}
+							console.log(that.dataObj)
+							this.goodsDetail.attributeList = newArr;
+							this.goodsDetail.attributeList.forEach((item, index) => {
+								this.columns[index] = item.value;
+								this.keyList[index] = item.name;
+							})
+							console.log('看看看看',this.goodsDetail.attributeList) 
+							for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
+								let oldCheck = false
+								let oldValue = []
+								for (var m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
+									if(this.goodsDetail.attributeList[i].value[m].isChecked == true){
+										oldCheck = true
+										oldValue.push(this.goodsDetail.attributeList[i].value[m].value)
+									}
+								}
+								if(oldCheck){
+									let specs1 = {
+										specs:[]
+									}
+									
+									specs1.specs = oldValue
+									this.goodsList.push(specs1)
+								}else{
+									let specs1 = { 
+										specs:[]
+									}
+									this.goodsList.push(specs1)
+								}
+								oldCheck = false
+								oldValue = []
+							}
+							console.log(this.goodsList)
+						}
+				
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+				this.getKCList(item.id);
+			},
+			//库存商品详情
+			getKCList(id) {
+				this.tui.request("/app/stock/productCount", "GET", {
+					productId: id
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.pecsList = res.result
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+				
 			},
 			//顶部搜索框
 			search(res) {
diff --git a/pages/index/downStearmList.vue b/pages/index/downStearmList.vue
index 233016c..0072909 100644
--- a/pages/index/downStearmList.vue
+++ b/pages/index/downStearmList.vue
@@ -985,21 +985,24 @@
 	}
 
 	.attrs {
-		text {
-			display: inline-block;
-			border: 1px solid #5fd9ee;
-			margin: 20rpx;
-			background-color: #fff;
-			color: #5fd9ee;
-			width: 100rpx;
-			line-height: 70rpx;
-			height: 70rpx;
-			text-align: center;
+		text {
+			display: inline-block;
+			border: 1px solid #5fd9ee;
+			margin: 20rpx;
+			background-color: #fff;
+			color: #5fd9ee;
+			padding: 0 10px;
+			min-width: 100rpx;
+			line-height: 35px;
+			height: 70rpx;
+			text-align: center;
+			border-radius: 20rpx;
 		}
 
-		.checkedText {
-			background-color: $u-primary;
-			color: #fff;
+		.checkedText {
+			background-color: #5fd9ee;
+			color: #fff;
+			border-radius: 20rpx;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/inventory/addinventory.vue b/pages/inventory/addinventory.vue
index 0508e25..9749754 100644
--- a/pages/inventory/addinventory.vue
+++ b/pages/inventory/addinventory.vue
@@ -10,18 +10,18 @@
 							style="border-bottom: 1px solid #fff;text-align: center;" :value="khName.consigneeName">
 						<uni-icons type="right" size="16" style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
 					</view>
-				</view>
-				<view class="shop-box" style="border-bottom: 1px solid #eee;margin-bottom: 20rpx;">
-					<u-grid :col="2" border>
-						<u-grid-item index="add" @tap.stop="scanCodeAdd">
-							<u-icon name="scan" size="36"></u-icon>
-							<text>扫一扫</text>
-						</u-grid-item>
-						<u-grid-item @tap.stop="goodsAdd">
-							<u-icon name="plus" size="28"></u-icon>
-							<text>添加商品</text>
-						</u-grid-item>
-					</u-grid>
+				</view>
+				<view class="shop-box" style="border-bottom: 1px solid #eee;margin-bottom: 20rpx;">
+					<u-grid :col="2" border>
+						<u-grid-item index="add" @tap.stop="scanCodeAdd">
+							<u-icon name="scan" size="36"></u-icon>
+							<text>扫一扫</text>
+						</u-grid-item>
+						<u-grid-item @tap.stop="goodsAdd">
+							<u-icon name="plus" size="28"></u-icon>
+							<text>添加商品</text>
+						</u-grid-item>
+					</u-grid>
 				</view>
 			</view>
 			<view class="content-box" style="margin-top: 212rpx;">
@@ -38,21 +38,24 @@
 
 					</view>
 					<view class="shop-type">
-						<view class="shop-collapse" v-for="(values,keys) in Array.from(value[1].stockLogList)" :key="keys">
-							<view @tap.stop="delShopSpec(value[0],values[0])">
-								<uni-icons color="red" type="minus" size="26"></uni-icons>
+						<view class="shop-collapse" v-for="(values,keys) in Array.from(value[1].stockLogList)"
+							:key="keys">
+							<view @tap.stop="delShopSpec(value[0],values[0])">
+								<uni-icons color="red" type="minus" size="26"></uni-icons>
 							</view>
 							<text>{{values[0] | sliceMsg}}</text>
 							<!-- <text style="color: red;">单价：￥{{item.price}}</text> -->
-							<view style="text-align: left;padding-left: 5px;width:50%;display: flex;">数量：<uni-number-box max="100000" style="margin-top:16rpx;" v-model="values[1]" @change="GoodsNumChange($event,value[0],values[0])" /></view>
+							<view style="text-align: left;padding-left: 5px;width:50%;display: flex;">数量：<uni-number-box
+									max="100000" style="margin-top:16rpx;" v-model="values[1].productCount"
+									@change="GoodsNumChange($event,value,values)" /></view>
 						</view>
 						<view
 							style="position: absolute;top: 130rpx;right: 40rpx;color: blue;text-decoration: underline;"
 							@tap="clickCollapse(value[0])" v-if='storageType==0'>
 							维护采购价
-						</view>
-						<view style="position: absolute;top: 30rpx;right: 30rpx;" @tap.stop="delShop(value[0])">
-							<uni-icons color="red" type="trash" size="26"></uni-icons>
+						</view>
+						<view style="position: absolute;top: 30rpx;right: 30rpx;" @tap.stop="delShop(value[0])">
+							<uni-icons color="red" type="trash" size="26"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -108,8 +111,9 @@
 				<view class="shop-popup-content">
 					<view class="shop-popup-title">
 						<view class="shop-popup-title-left">
-							<img class="img-radius" :src="goodsDetail.productPicture" alt="" v-if="goodsDetail.productPicture">
-							<view class="noPic" v-else>暂无图片</view>	
+							<img class="img-radius" :src="goodsDetail.productPicture" alt=""
+								v-if="goodsDetail.productPicture">
+							<view class="noPic" v-else>暂无图片</view>
 						</view>
 						<view class="shop-popup-title-right">
 							<view class="shop-popup-title-right-box" style="color: #088FEB;">{{goodsDetail.productName}}
@@ -117,7 +121,10 @@
 							<view class="shop-popup-title-right-box">{{goodsDetail.productSn}}</view>
 						</view>
 					</view>
-					<view class="shop-popup-container">
+					<view class="shop-popup-container" style="position: relative;">
+						<view @tap="saveCheck"
+							style="position: absolute;top: 20rpx;right: 20rpx;color: #088FEB;text-decoration: underline;">
+							保存已选</view>
 						<ul style="border-top:20rpx;">
 							<li v-for="(items,index) in goodsDetail.attributeList" :key="index">
 								<view class="shop-title-fur">
@@ -126,32 +133,33 @@
 								<view class="shop-attrs">
 									<uni-data-checkbox v-model="value" :localdata="range"></uni-data-checkbox>
 									<text v-for="(itemTag, index1) in items.value" :key="index1"
-										@tap.stop="attrNameChange(index,index1) "
+										@tap.stop="attrNameChange(index,itemTag.value,index1)"
 										:class="itemTag.isChecked ? 'checkedText' : '' "> {{itemTag.value}}</text>
 								</view>
 							</li>
-						</ul>
-						<view style="padding-bottom: 100rpx;">
-							<view class="shop-checkList" v-for="(item,index) in temporaryList" :key="index">
-								<view @tap.stop="delCarData(index)" style="margin-right: 20rpx">
-									<uni-icons color="red" type="minus" size="26"></uni-icons>
-								</view>
-								<view class="shop-checkList-box">
-									<text style="width: 300rpx;display: inline-block;">{{item.name}}</text>  <text style="color:#777;font-size: 12px;">库存:{{item.productNum}}</text>
-								</view>
-								<uni-number-box max='1000000' v-model="item.productCount" @change="temporaryChange" />
-							</view>
+						</ul>
+						<view style="padding-bottom: 100rpx;">
+							<view class="shop-checkList" v-for="(item,index) in temporaryList" :key="index">
+								<view @tap.stop="delCarData(index)" style="margin-right: 20rpx">
+									<uni-icons color="red" type="minus" size="26"></uni-icons>
+								</view>
+								<view class="shop-checkList-box">
+									<text style="width: 300rpx;display: inline-block;">{{item.name}}</text> <text
+										style="color:#777;font-size: 12px;">库存:{{item.productNum}}</text>
+								</view>
+								<uni-number-box max='1000000' v-model="item.productCount" @change="temporaryChange" />
+							</view>
 						</view>
 					</view>
-					
-				</view>
-				<view class="shop-popup-bottom" v-for="(item,index) in temporaryList" :key="index">
-					<view class="shop-popup-bottom-left">
-						<text>数量：{{zNum}} 件</text>
-					</view>
-					<view class="shop-popup-bottom-right">
-						<view class="bottom-btn" @tap="temporaryCheck">选好了</view>
-					</view>
+
+				</view>
+				<view class="shop-popup-bottom">
+					<view class="shop-popup-bottom-left">
+						<text>数量：{{zNum}} 件</text>
+					</view>
+					<view class="shop-popup-bottom-right">
+						<view class="bottom-btn" @tap="temporaryCheck">选好了</view>
+					</view>
 				</view>
 			</uni-popup>
 		</view>
@@ -193,10 +201,16 @@
 				columns: [],
 				keyList: [],
 				temporaryList: [],
-				zNum: 0,
-				storageType:'',
-				productNum:0,
-				productId:''
+				zNum: 0,
+				storageType: '',
+				productNum: 0,
+				productId: '',
+				pageOldTemList: [],
+				oldTemList: [],
+				goodsList: [],
+				newTemList: [],
+				pecsList: [],
+				dataObj: new Map()
 			}
 		},
 		filters: {
@@ -228,8 +242,11 @@
 						stockLogList1: []
 					}
 					for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
-						obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, this.carList1[i]
-							.saleDetailQueryDTO[m].productCount)
+						var data1 = {
+							productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
+							name: this.carList1[i].saleDetailQueryDTO[m].name
+						}
+						obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
 						obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount
 					}
 					this.carList.set(this.carList1[i].id, obj)
@@ -240,18 +257,25 @@
 					if (this.carList.has(this.carList1[i].id) == true) { //商品相同
 						for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
 							if (this.carList.get(this.carList1[i].id).stockLogList.has(this.carList1[i].saleDetailQueryDTO[
-									m].attributeList) == true) { //规格相同
-								this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[
-										m].attributeList, this.carList.get(this.carList1[i].id).stockLogList.get(this
-										.carList1[i].saleDetailQueryDTO[m].attributeList) + this.carList1[i]
-									.saleDetailQueryDTO[m].productCount)
-									
+									m].attributeList) == true) { //规格相同
+									
+								var data1 = {
+									productCount: this.carList.get(this.carList1[i].id).stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].attributeList).productCount + this.carList1[i].saleDetailQueryDTO[m].productCount,
+									name: this.carList1[i].saleDetailQueryDTO[m].name
+								}
+								
+								this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
+
 							} else { //规格不同
+								var data1 = {
+									productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
+									name: this.carList1[i].saleDetailQueryDTO[m].name
+								}
 								this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[
-									m].attributeList, this.carList1[i].saleDetailQueryDTO[m].productCount)
-								
-							}
-							this.carList.get(this.carList1[i].id).productCount += this.carList1[i].saleDetailQueryDTO[
+									m].attributeList, data1)
+
+							}
+							this.carList.get(this.carList1[i].id).productCount += this.carList1[i].saleDetailQueryDTO[
 								m].productCount
 						}
 					} else { //商品不同
@@ -261,22 +285,27 @@
 							productCount: 0,
 							productId: this.carList1[i].id,
 							productName: this.carList1[i].productName,
-							productPicture: this.carList1[i].productPicture,
+							productPicture: this.carList1[i].productPicture,
 							productSn: this.carList1[i].productSn,
 							stockLogList: new Map(),
 							stockLogList1: [],
 							name: ''
 						}
 						for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
-							obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, this.carList1[i]
-								.saleDetailQueryDTO[m].productCount)
-							obj.name = this.carList1[i].saleDetailQueryDTO[m].name
+							var data1 = {
+								productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
+								name: this.carList1[i].saleDetailQueryDTO[m].name
+							}
+							obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
+
+							obj.name = this.carList1[i].saleDetailQueryDTO[m].name
 							obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount
 						}
 						this.carList.set(this.carList1[i].id, obj)
-					}
-					
-					this.carList.get(this.carList1[i].id).price = this.carList.get(this.carList1[i].id).purchasePrice * this.carList.get(this.carList1[i].id).productCount;
+					}
+
+					this.carList.get(this.carList1[i].id).price = this.carList.get(this.carList1[i].id).purchasePrice *
+						this.carList.get(this.carList1[i].id).productCount;
 				}
 				this.carList1 = []
 			}
@@ -285,136 +314,215 @@
 		onLoad() {
 			this.storageType = uni.getStorageSync('type')
 		},
-		methods: {
-			//扫一扫功能
-			scanCodeAdd() {
-				uni.scanCode({
-					success: (res) => {
-						if(res.scanType == "QR_CODE"){ //二维码
-							
-							let shopId = res.result.split(',')[1]
-							if(shopId == uni.getStorageSync('shopId')){
-								this.productId = res.result.split(',')[0]
-								this.toggle('bottom', res.result.split(',')[0]);
-								if (item.saleDetailDTOList) {
-									for (let i = 0; i < item.saleDetailDTOList.length; i++) {
-										this.carList.push(item.saleDetailDTOList[i])
-									}
-								}
-							}else{
-								this.tui.toast('您的店铺中暂无该商品！')
-							}
-						}else{
-							
-							this.tui.request("/app/product/getByBarcode", "POST", {
-								barcode:res.result
-							}, false, true).then((res1) => {
-								if (res1.code == 200) {
-									this.productId = res1.result[0].id
-									if(res1.result == ''){
-										this.tui.toast('您的店铺中暂无该商品！')
-									}else{
-										this.toggle('bottom', res1.result[0].id);
-										if (item.saleDetailDTOList) {
-											for (let i = 0; i < item.saleDetailDTOList.length; i++) {
-												this.carList.push(item.saleDetailDTOList[i])
-											}
-										}
-									}
-									
-								} else {
-									this.tui.toast(res.message)
-								}
-							}).catch((res) => {
-								this.tui.toast(res)
-							})
-						}
-				
-					},
-					fail: (res) => {
-						uni.showToast({
-							title: '扫描失败',
-							icon: 'none'
-						})
-					}
-				})
+		methods: {
+			//保存已选
+			saveCheck() {
+				this.pageOldTemList = this.temporaryList
+				for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
+					this.goodsList[i].specs = []
+					for (var m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
+						this.goodsDetail.attributeList[i].value[m].isChecked = false
+					}
+				}
+			},
+			combination(arr) {
+				let result = [
+					[]
+				]
+
+				arr.map(x => {
+					var res = []
+					result.map(y => {
+						x.specs.map(z => {
+							res.push([...y, z])
+						})
+					})
+					result = res
+				})
+				return result;
+			},
+			//扫一扫功能
+			scanCodeAdd() {
+				uni.scanCode({
+					success: (res) => {
+						if (res.scanType == "QR_CODE") { //二维码
+
+							let shopId = res.result.split(',')[1]
+							if (shopId == uni.getStorageSync('shopId')) {
+								this.productId = res.result.split(',')[0]
+								this.toggle('bottom', res.result.split(',')[0]);
+								// if (item.saleDetailDTOList) {
+								// 	for (let i = 0; i < item.saleDetailDTOList.length; i++) {
+								// 		this.carList.push(item.saleDetailDTOList[i])
+								// 	}
+								// }
+							} else {
+								this.tui.toast('您的店铺中暂无该商品！')
+							}
+						} else {
+
+							this.tui.request("/app/product/getByBarcode", "POST", {
+								barcode: res.result
+							}, false, true).then((res1) => {
+								if (res1.code == 200) {
+									this.productId = res1.result[0].id
+									if (res1.result == '') {
+										this.tui.toast('您的店铺中暂无该商品！')
+									} else {
+										this.toggle('bottom', res1.result[0].id);
+										// if (item.saleDetailDTOList) {
+										// 	for (let i = 0; i < item.saleDetailDTOList.length; i++) {
+										// 		this.carList.push(item.saleDetailDTOList[i])
+										// 	}
+										// }
+									}
+
+								} else {
+									this.tui.toast(res.message)
+								}
+							}).catch((res) => {
+								this.tui.toast(res)
+							})
+						}
+
+					},
+					fail: (res) => {
+						uni.showToast({
+							title: '扫描失败',
+							icon: 'none'
+						})
+					}
+				})
 			},
 			goodsAdd() {
 				uni.navigateTo({
 					url: "/pages/inventory/changeGoods1"
 				})
 			},
-			attrNameChange(index, index1) {
-				this.goodsDetail.attributeList[index].value.forEach(item => {
-					item.isChecked = false;
-				})
-				this.goodsDetail.attributeList[index].isChecked = true;
-				this.goodsDetail.attributeList[index].value[index1].isChecked = true;
-				var name = '',
-					evalue = [],
-					obj = {}
-				for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
-					for (var m = 0, Ien = this.goodsDetail.attributeList[i].value; m < Ien.length; m++) {
-						if (Ien[m].isChecked == true) {
-							evalue.push(Ien[m].value)
-							name += Ien[m].value + '/'
-						}
-					}
+			attrNameChange(index, data1, index1) {
+				this.goodsDetail.attributeList[index].isChecked = !this.goodsDetail.attributeList[index].isChecked;
+				this.goodsDetail.attributeList[index].value[index1].isChecked = !this.goodsDetail.attributeList[index]
+					.value[index1].isChecked;
+				if (this.goodsList[index].specs.indexOf(data1) != -1) {
+					this.goodsList[index].specs.splice(this.goodsList[index].specs.indexOf(data1), 1)
+				} else {
+					this.goodsList[index].specs.push(data1)
 				}
-				this.keyList.map((item, index) => {
-					obj[item] = evalue[index]
-				})
-				let jishuqi = 0;
-				for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
-					if (this.goodsDetail.attributeList[i].isChecked == true) {
+				let jishuqi = 0
+				for (var i = 0; i < this.goodsList.length; i++) {
+					if (this.goodsList[i].specs.length > 0) {
 						jishuqi++
 					}
 				}
-				if (this.goodsDetail.attributeList.length == jishuqi) {
-					this.tui.request("/app/stock/productCount", "post", {
-						productId: this.productId,
-						attributeList: JSON.stringify(obj)
-					}, false, true).then((res) => {
-						if (res.code == 200) {
-							this.productNum = res.result
-							this.attributeList = {
-								attributeList: JSON.stringify(obj),
-								productCount: this.temporaryNum,
-								productNum:this.productNum,
-								name: name,
-								price: this.purchasePrice
-							}
-							
-							for (let i = 0; i < this.goodsDetail.attributeList.length; i++) {
-								this.goodsDetail.attributeList[i].isChecked = false;
-								for (let m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
-									this.goodsDetail.attributeList[i].value[m].isChecked = false
-								}
-							}
-							if (this.temporaryList.length == 0) {
-								this.temporaryList.push(this.attributeList);
-							} else {
-								for (var i = 0; i < this.temporaryList.length; i++) {
-									if (this.temporaryList[i].name.indexOf(this.attributeList.name) == -1 || this.temporaryList[i].name.indexOf(this.attributeList.name) == 1) {
-										if (this.temporaryList.length == (i + 1)) {
-											this.temporaryList.push(this.attributeList);
-											return
-										}
-									} else {
-										this.temporaryList[i] = this.attributeList
-										return
-										
-									}
-								}
-							
-							}
-						} else {
-							this.tui.toast(res.message)
-						}
-					}).catch((res) => {})
+				var resultList = []
+				if (jishuqi == this.goodsList.length) {
 
+					resultList = this.combination(this.goodsList);
+				}
+				var evalue = []
+				var value = []
+				for (var m = 0; m < resultList.length; m++) {
+					var name = ''
+					let value1 = "{"
+					for (var j = 0; j < resultList[m].length; j++) {
+						if (j != resultList[m].length - 1) {
+							name += resultList[m][j] + '/'
+							value1 += '"' + this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '",'
+						} else {
+							name += resultList[m][j]
+							value1 += '"' + this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '"'
+						}
+					}
+					value1 += "}"
+					value.push(value1)
+					evalue.push(name)
 				}
 
+				if (jishuqi == 0) {
+					this.oldTemList = []
+				}
+				if (this.temporaryList.length == 0) {
+					if (jishuqi == this.goodsList.length) {
+						for (var i = 0; i < value.length; i++) {
+							this.attributeList = {
+								attributeList: value[i],
+								productCount: this.temporaryNum,
+								productNum: this.productNum,
+								name: evalue[i],
+								price: this.purchasePrice
+							}
+							this.temporaryList.push(this.attributeList);
+						}
+					}
+				} else {
+					let newProductCount = 0;
+					for (var i = 0; i < value.length; i++) {
+						for (var m = 0; m < this.temporaryList.length; m++) {
+							if (this.temporaryList[m].attributeList == value[i]) {
+								newProductCount = this.temporaryList[m].productCount
+							}
+						}
+						this.attributeList = {
+							attributeList: value[i],
+							productCount: newProductCount,
+							productNum: this.productNum,
+							name: evalue[i],
+							price: this.purchasePrice
+						}
+
+						this.newTemList.push(this.attributeList);
+						newProductCount = 0;
+					}
+					for (var i = 0; i < this.oldTemList.length; i++) {
+						let oldAttributeList = '';
+						let oldProductCount = '';
+						let notChcek = true;
+						for (var m = 0; m < this.newTemList.length; m++) {
+							if (this.oldTemList[i].attributeList == this.newTemList[m].attributeList) {
+								this.newTemList[m].productCount = this.oldTemList[i].productCount
+								notChcek = false;
+							}
+						}
+						if (this.newTemList.length > 0 && notChcek) {
+							this.newTemList.push(this.oldTemList[i]);
+						}
+					}
+
+					for (var i = 0; i < this.pageOldTemList.length; i++) {
+						let oldAttributeList = '';
+						let oldProductCount = '';
+						let notChcek = true;
+						for (var m = 0; m < this.newTemList.length; m++) {
+							if (this.pageOldTemList[i].attributeList == this.newTemList[m].attributeList) {
+								this.newTemList[m].productCount = this.pageOldTemList[i].productCount
+								notChcek = false;
+							}
+						}
+						if (this.newTemList.length > 0 && notChcek) {
+							this.newTemList.push(this.pageOldTemList[i]);
+						}
+					}
+				}
+				this.$nextTick(() => {
+					for (var i = 0; i < this.temporaryList.length; i++) {
+						for (var m = 0; m < this.pecsList.length; m++) {
+							if (this.temporaryList[i].attributeList == this.pecsList[m].attributeList) {
+								this.temporaryList[i].productNum = this.pecsList[m].stockCount
+							}
+						}
+					}
+				})
+				if (jishuqi != this.goodsList.length) {
+					if (this.oldTemList.length == 0 && this.pageOldTemList.length == 0) {
+						this.newTemList = []
+						this.temporaryList = []
+					}
+				}
+				if (this.newTemList.length != 0 && jishuqi == this.goodsList.length) {
+					this.temporaryList = this.newTemList;
+					this.oldTemList = []
+					this.newTemList = []
+				}
 			},
 			//弹出商品规格选择
 			toggle(type, id) {
@@ -424,28 +532,104 @@
 			},
 			//通过商品id查询商品详细信息
 			getById(id) {
+				let that = this;
 				this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => {
-					if (res.code == 200) {
-						if(res.result.delFlag ==0){
-							this.tui.toast("请将商品上架后再操作！")
-							return
+					if (res.code == 200) {
+						if (res.result.delFlag == 0) {
+							that.tui.toast("请将商品上架后再操作！")
+							return
+						}
+						that.goodsDetail = res.result;
+						that.temporaryList = []
+
+
+						if (that.carList.size > 0) {
+							// let isTrue = false
+							that.carList.forEach(function(value, key) {
+								value.stockLogList.forEach(function(values, keys) {
+									if(value.stockLogList1.length == 0){
+										let obj = {
+											productCount: values.productCount,
+											name: values.name,
+											attributeList: keys,
+											productNum: that.productNum
+										}
+										value.stockLogList1.push(obj)
+									}else{
+										for(var i=0;i<value.stockLogList1.length;i++){
+											if(value.stockLogList1[i].attributeList != keys){
+												if(value.stockLogList1.length == (i+1)){
+													let obj = {
+														productCount: values.productCount,
+														name: values.name,
+														attributeList: keys,
+														productNum: that.productNum
+													}
+													value.stockLogList1.push(obj)
+												}
+											}
+										}
+									}
+									
+										
+								})
+							})
+							that.zNum = 0
+							that.$nextTick(() => {
+								that.carList.forEach(function(value, key) {
+									if (that.carList.has(id) == true) {
+										that.zNum = value.productCount
+										that.temporaryList = value.stockLogList1
+										that.pageOldTemList = value.stockLogList1
+										that.oldTemList = value.stockLogList1
+									}
+									value.stockLogList1 = []
+								})
+							})
+							
 						}
-						this.goodsDetail = res.result;
+						that.$nextTick(() => {
+							console.log('oldTemList', that.oldTemList)
+							console.log('temporaryList', that.temporaryList)
+							console.log('pageOldTemList', that.pageOldTemList)
+						})
+
 						this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId", "POST", {
 							categoryId: this.goodsDetail.categoryId
 						}, false, true).then((res1) => {
-							if (res1.code == 200) {
+							if (res1.code == 200) {
+								this.goodsList = []
 								this.$refs.shopPopup.open('bottom')
 								if (typeof(res1.result) == 'string') {
 									let newObj = JSON.parse(res1.result)
 									let newArr = []
+									let dataArr = []
 									for (let val in newObj) {
 										let valueObj = [];
+										// let isTrue = false
 										for (var i = 0; i < newObj[val].length; i++) {
+											// for (var m = 0; m < this.oldTemList.length; m++) {
+											// 	var data = this.oldTemList[m].name.split('/')
+											// 	for (var j = 0; j < data.length; j++) {
+											// 		if (data[j] == newObj[val][i]) {
+											// 			isTrue = true
+											// 		}
+											// 	}
+											// }
+											// for (var m = 0; m < this.pageOldTemList.length; m++) {
+											// 	var data = this.pageOldTemList[m].name.split('/')
+											// 	for (var j = 0; j < data.length; j++) {
+											// 		if (data[j] == newObj[val][i]) {
+											// 			isTrue = true
+											// 		}
+											// 	}
+											// }
 											valueObj.push({
 												value: newObj[val][i],
 												isChecked: false
 											})
+											this.dataObj.set(newObj[val][i], val)
+											// isTrue = false
 										}
 										newArr.push({
 											name: val,
@@ -453,20 +637,58 @@
 										})
 									}
 									this.goodsDetail.attributeList = newArr;
-									this.goodsDetail.attributeList.forEach((item, index) => {
-										this.columns[index] = item.value;
-										this.keyList[index] = item.name;
-									})
+									for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
+										let oldCheck = false
+										let oldValue = []
+										for (var m = 0; m < this.goodsDetail.attributeList[i].value
+											.length; m++) {
+											if (this.goodsDetail.attributeList[i].value[m].isChecked == true) {
+												oldCheck = true
+												oldValue.push(this.goodsDetail.attributeList[i].value[m].value)
+											}
+										}
+										// if (oldCheck) {
+										// 	let specs1 = {
+										// 		specs: []
+										// 	}
+
+										// 	specs1.specs = oldValue
+										// 	this.goodsList.push(specs1)
+										// } else {
+											let specs1 = {
+												specs: []
+											}
+											this.goodsList.push(specs1)
+										// }
+										oldCheck = false
+										oldValue = []
+									}
+								} else {
+									this.tui.toast('失败了')
 								}
 
 							} else {
-								this.tui.toast(res.message)
+								this.tui.toast(res1.message)
 							}
 						}).catch((res) => {})
 					} else {
 						this.tui.toast(res.message)
 					}
 				}).catch((res) => {})
+				this.getKCList(id);
+			},
+			//库存商品详情
+			getKCList(id) {
+				this.tui.request("/app/stock/productCount", "GET", {
+					productId: id
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.pecsList = res.result
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+
 			},
 			temporaryChange(val) {
 				this.zNum = 0
@@ -477,9 +699,8 @@
 
 			//弹窗选择规格后，点击弹窗中选好了按钮
 			temporaryCheck() {
-				let that = this,
-					carList1 = []
-				
+				let that = this,
+					carList1 = []
 				let data = {
 					id: this.goodsDetail.id,
 					price: 0,
@@ -501,6 +722,7 @@
 						this.goodsDetail.attributeList[i].value[m].isChecked = false
 					}
 				}
+
 				if (this.carList.size == 0) { //当前页没有数据
 					for (let i = 0; i < carList1.length; i++) {
 						let obj = {
@@ -515,34 +737,52 @@
 							stockLogList1: []
 						}
 						for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
-							obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, carList1[i]
-								.saleDetailQueryDTO[m].productCount)
+
+							var data1 = {
+								productCount: carList1[i].saleDetailQueryDTO[m].productCount,
+								name: carList1[i].saleDetailQueryDTO[m].name
+							}
+							obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, data1)
 							obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
 						}
 						this.carList.set(carList1[i].id, obj)
 					}
 					carList1 = []
-				} else { //当前页有数据
-					for (let i = 0; i < carList1.length; i++) {
+
+				} else { //当前页有数据
+					
+					for (let i = 0; i < carList1.length; i++) {
+						this.carList.get(carList1[i].id).productCount = 0
 						if (this.carList.has(carList1[i].id) == true) { //商品相同
 							for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
 								if (this.carList.get(carList1[i].id).stockLogList.has(carList1[i]
 										.saleDetailQueryDTO[
-											m].attributeList) == true) { //规格相同
-									this.carList.get(carList1[i].id).stockLogList.set(carList1[i]
-										.saleDetailQueryDTO[
-											m].attributeList, this.carList.get(carList1[i].id).stockLogList.get(
-												carList1[i].saleDetailQueryDTO[m].attributeList) + carList1[i]
-										.saleDetailQueryDTO[m].productCount)
-										
+											m].attributeList) == true) { //规格相同
+											
+											// var data1 = {
+											// 	productCount: carList1[i].saleDetailQueryDTO[m].productCount,
+											// 	name: carList1[i].saleDetailQueryDTO[m].name
+											// }
+											// this.carList.get(carList1[i].id).stockLogList.set(carList1[i].saleDetailQueryDTO[
+											// 	m].attributeList, data1)
+									// this.carList.get(carList1[i].id).stockLogList.set(carList1[i]
+									// 	.saleDetailQueryDTO[
+									// 		m].attributeList, this.carList.get(carList1[i].id).stockLogList.get(
+									// 		carList1[i].saleDetailQueryDTO[m].attributeList) + carList1[i]
+									// 	.saleDetailQueryDTO[m].productCount)
+
 								} else { //规格不同
-									this.carList.get(carList1[i].id).stockLogList.set(carList1[i]
-										.saleDetailQueryDTO[
-											m].attributeList, carList1[i].saleDetailQueryDTO[m].productCount)
-								}
-								this.carList.get(carList1[i].id).productCount += carList1[i].saleDetailQueryDTO[
-									m].productCount
-								that.carList.get(carList1[i].id).price = that.carList.get(carList1[i].id).productCount * that.carList.get(carList1[i].id).purchasePrice
+									var data1 = {
+										productCount: carList1[i].saleDetailQueryDTO[m].productCount,
+										name: carList1[i].saleDetailQueryDTO[m].name
+									}
+									this.carList.get(carList1[i].id).stockLogList.set(carList1[i].saleDetailQueryDTO[
+										m].attributeList, data1)
+								}
+								this.carList.get(carList1[i].id).productCount += carList1[i].saleDetailQueryDTO[
+									m].productCount
+								that.carList.get(carList1[i].id).price = that.carList.get(carList1[i].id).productCount *
+									that.carList.get(carList1[i].id).purchasePrice
 							}
 						} else { //商品不同
 							let obj = {
@@ -552,15 +792,18 @@
 								productId: carList1[i].id,
 								productName: carList1[i].productName,
 								productPicture: carList1[i].productPicture,
-								stockLogList: new Map(),
+								stockLogList: new Map(),
 								productSn: carList1[i].productSn,
 								stockLogList1: [],
 								name: ''
 							}
+
 							for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
-								obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, carList1[i]
-									.saleDetailQueryDTO[m].productCount)
-								obj.name = carList1[i].saleDetailQueryDTO[m].name
+								var data1 = {
+									productCount: carList1[i].saleDetailQueryDTO[m].productCount,
+									name: carList1[i].saleDetailQueryDTO[m].name
+								}
+								obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, data1)
 								obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
 							}
 							this.carList.set(carList1[i].id, obj)
@@ -571,13 +814,13 @@
 				this.getAllPrice()
 				this.$refs.shopPopup.close()
 
-			},
-			changessPrice(){
-				this.noPay = this.shouldPay - this.alreadyPay;
+			},
+			changessPrice() {
+				this.noPay = this.shouldPay - this.alreadyPay;
 			},
 			//计算欠款
-			changePay(e) {
-				this.alreadyPay = e.target.value >this.shouldPay ?this.shouldPay :e.target.value
+			changePay(e) {
+				this.alreadyPay = e.target.value > this.shouldPay ? this.shouldPay : e.target.value
 				this.noPay = this.shouldPay - this.alreadyPay
 			},
 			//跳转选择供应商
@@ -585,107 +828,108 @@
 				uni.navigateTo({
 					url: '/pages/index/peopleList?popleType=' + popleType
 				})
-			},
-			//删除整条商品
-			delShop(id) {
-				var that = this;
-				uni.showModal({
-					title: "提示",
-					content: "确定删除此条商品吗？",
-					success: function(res) {
-						if(res.confirm){
-							if(that.carList.has(id) == true){
-								that.carList.delete(id)
-							}
-							that.getAllPrice()
-							that.$forceUpdate()
-						}
-					}
-				})
-				
-			},
-			//选商品的时候能删除规格
-			delCarData(index) {
-				this.temporaryList.splice(index, 1);
-				this.temporaryChange()
-				// uni.showModal({
-				// 	title: "提示",
-				// 	content: "确定删除此条商品吗？",
-				// 	success: function(res) {
-				// 		if(res.confirm){
-				// 			that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name);
-				// 			that.carList.get(id).stockLogList.delete(name)
-				// 			that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(id).purchasePrice
-				// 			if(that.carList.get(id).stockLogList.size == 0){
-				// 				that.carList.delete(id)
-				// 			}
-							
-				// 			that.getAllPrice()
-				// 		}
-				// 		that.$forceUpdate()
-				// 	}
-				// })
-				
-			},
-			//删除商品下的某一个规格
-			delShopSpec(id,name) {
-				var that = this;
-				uni.showModal({
-					title: "提示",
-					content: "确定删除此条商品吗？",
-					success: function(res) {
-						if(res.confirm){
-							that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name);
-							that.carList.get(id).stockLogList.delete(name)
-							that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(id).purchasePrice
-							if(that.carList.get(id).stockLogList.size == 0){
-								that.carList.delete(id)
-							}
-							
-							that.getAllPrice()
-						}
-						that.$forceUpdate()
-					}
-				})
-				
+			},
+			//删除整条商品
+			delShop(id) {
+				var that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条商品吗？",
+					success: function(res) {
+						if (res.confirm) {
+							if (that.carList.has(id) == true) {
+								that.carList.delete(id)
+							}
+							that.getAllPrice()
+							that.$forceUpdate()
+						}
+					}
+				})
+
+			},
+			//选商品的时候能删除规格
+			delCarData(index) {
+				this.temporaryList.splice(index, 1);
+				this.temporaryChange()
+				// uni.showModal({
+				// 	title: "提示",
+				// 	content: "确定删除此条商品吗？",
+				// 	success: function(res) {
+				// 		if(res.confirm){
+				// 			that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name);
+				// 			that.carList.get(id).stockLogList.delete(name)
+				// 			that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(id).purchasePrice
+				// 			if(that.carList.get(id).stockLogList.size == 0){
+				// 				that.carList.delete(id)
+				// 			}
+
+				// 			that.getAllPrice()
+				// 		}
+				// 		that.$forceUpdate()
+				// 	}
+				// })
+
+			},
+			//删除商品下的某一个规格
+			delShopSpec(id, name) {
+				var that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条商品吗？",
+					success: function(res) {
+						if (res.confirm) {
+							that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name);
+							that.carList.get(id).stockLogList.delete(name)
+							that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(
+								id).purchasePrice
+							if (that.carList.get(id).stockLogList.size == 0) {
+								that.carList.delete(id)
+							}
+
+							that.getAllPrice()
+						}
+						that.$forceUpdate()
+					}
+				})
+
 			},
 			inventorySubmit() {
-				if (this.khName == '' || this.carList == '') {
-					uni.showToast({
-						title: "商品信息填写完成后入库！",
-						icon: 'none'
-					})
+				if (this.khName == '' || this.carList == '') {
+					uni.showToast({
+						title: "商品信息填写完成后入库！",
+						icon: 'none'
+					})
 					return
-				}else{
-					if(this.storageType==0){
-						this.carList.forEach(function(value, key) {
-							if(value.purchasePrice == '' || value.purchasePrice == 0){
-								uni.showToast({
-									title: value.productName + "的价格必须维护！",
-									icon: 'none'
-								})
-								throw new Error("End");
-							}
-						})
-					}
+				} else {
+					if (this.storageType == 0) {
+						this.carList.forEach(function(value, key) {
+							if (value.purchasePrice == '' || value.purchasePrice == 0) {
+								uni.showToast({
+									title: value.productName + "的价格必须维护！",
+									icon: 'none'
+								})
+								throw new Error("End");
+							}
+						})
+					}
 				}
 				let that = this;
 				let purchase = {
-					alreadyPay: this.alreadyPay == ''?0:this.alreadyPay, //已付金额
-					noPay: this.noPay == ''?0:this.noPay, //欠款
+					alreadyPay: this.alreadyPay == '' ? 0 : this.alreadyPay, //已付金额
+					noPay: this.noPay == '' ? 0 : this.noPay, //欠款
 					shouldPay: this.shouldPay, //应付金额
 					totalAmount: this.totalAmount, //总数量
-					remark: this.remark,
-					otherPay:this.otherPay == ''?0:this.otherPay,
+					remark: this.remark,
+					otherPay: this.otherPay == '' ? 0 : this.otherPay,
 					supplierId: this.khName.id, //供应商id和姓名
 					supplierName: this.khName.consigneeName
 				}
 				let purchaseDetails = [];
 				this.carList.forEach(function(value, key) {
-					value.stockLogList.forEach(function(values, keys) {
-						if(values <= 0){
-							that.tui.toast("入库数量不能为零！")
-							return;
+					value.stockLogList.forEach(function(values, keys) {
+						if (values <= 0) {
+							that.tui.toast("入库数量不能为零！")
+							return;
 						}
 						let obj = {
 							productCount: values,
@@ -694,34 +938,34 @@
 						value.stockLogList1.push(obj)
 					})
 					purchaseDetails.push(value)
-				})
-				uni.showModal({
-					title: "提示",
-					content: "请再次确认供应商、商品库存、规格是否正确，入库后不可修改。确认入库吗？",
-					success: function(res) {
-						if(res.confirm){
-							that.tui.request("/app/stock/putInOfProduct", "post", {
-								purchase: purchase,
-								purchaseDetails: purchaseDetails
-							}, false, false).then((res) => {
-								if (res.code == 200) {
-									uni.showToast({
-										title: "入库成功",
-										icon: 'none'
-									})
-									uni.navigateBack({
-										delta: 2
-									})
-								} else {
-									uni.showToast({
-										title: "入库失败",
-										icon: 'none'
-									})
-								}
-							})
-						}
-						that.$forceUpdate()
-					}
+				})
+				uni.showModal({
+					title: "提示",
+					content: "请再次确认供应商、商品库存、规格是否正确，入库后不可修改。确认入库吗？",
+					success: function(res) {
+						if (res.confirm) {
+							that.tui.request("/app/stock/putInOfProduct", "post", {
+								purchase: purchase,
+								purchaseDetails: purchaseDetails
+							}, false, false).then((res) => {
+								if (res.code == 200) {
+									uni.showToast({
+										title: "入库成功",
+										icon: 'none'
+									})
+									uni.navigateBack({
+										delta: 2
+									})
+								} else {
+									uni.showToast({
+										title: "入库失败",
+										icon: 'none'
+									})
+								}
+							})
+						}
+						that.$forceUpdate()
+					}
 				})
 			},
 			//编辑每一个的单价
@@ -735,31 +979,36 @@
 				let that = this;
 				that.carList.get(that.index).purchasePrice = val
 				that.carList.get(that.index).price = val * that.carList.get(that.index).productCount;
-				this.getAllPrice()
-				
-			},
-			//计算总金额和总数量
-			getAllPrice(){
-				let that = this;
-				this.shouldPay = 0
-				this.totalAmount = 0
-				this.carList.forEach(function(value, key) {
-					that.shouldPay = that.shouldPay + value.price
-					that.totalAmount = that.totalAmount + value.productCount
-				})
-				this.alreadyPay = this.shouldPay
-				that.noPay = this.shouldPay - this.alreadyPay
-			},
-			//修改已选规格的数量
-			GoodsNumChange(e,index,index1){
+				this.getAllPrice()
+
+			},
+			//计算总金额和总数量
+			getAllPrice() {
+				let that = this;
+				this.shouldPay = 0
+				this.totalAmount = 0
+				this.carList.forEach(function(value, key) {
+					that.shouldPay = that.shouldPay + value.price
+					that.totalAmount = that.totalAmount + value.productCount
+				})
+				this.alreadyPay = this.shouldPay
+				that.noPay = this.shouldPay - this.alreadyPay
+			},
+			//修改已选规格的数量
+			GoodsNumChange(e, index, index1) {
 				let that = this;
-				this.carList.get(index).stockLogList.set(index1,e)
-				this.carList.get(index).productCount = 0
-				this.carList.get(index).stockLogList.forEach(function(value, key) {
-					that.carList.get(index).productCount = that.carList.get(index).productCount + value
-					that.carList.get(index).price = that.carList.get(index).productCount * that.carList.get(index).purchasePrice
-				})
-				this.getAllPrice();
+				console.log('开始了')
+				console.log(this.carList)
+				console.log(e)
+				console.log(this.index)
+				console.log(this.index1)
+				this.carList.get(index).stockLogList.set(index1, e)
+				this.carList.get(index).productCount = 0
+				this.carList.get(index).stockLogList.forEach(function(value, key) {
+					that.carList.get(index).productCount = that.carList.get(index).productCount + value
+					that.carList.get(index).price = that.carList.get(index).productCount * that.carList.get(index).purchasePrice
+				})
+				this.getAllPrice();
 			}
 		}
 	}
@@ -960,8 +1209,8 @@
 		justify-content: center;
 		padding: 15px;
 		height: 1200rpx;
-		background-color: #fff;
-		margin-bottom: 30rpx;
+		background-color: #fff;
+		margin-bottom: 30rpx;
 		overflow: scroll;
 	}
 
@@ -1020,15 +1269,18 @@
 			margin: 20rpx;
 			background-color: #fff;
 			color: #5fd9ee;
-			width: 100rpx;
-			line-height: 70rpx;
+			padding: 0 10px;
+			min-width: 100rpx;
+			line-height: 35px;
 			height: 70rpx;
 			text-align: center;
+			border-radius: 20rpx;
 		}
 
 		.checkedText {
-			background-color: $u-primary;
+			background-color: #5fd9ee;
 			color: #fff;
+			border-radius: 20rpx;
 		}
 	}
 
@@ -1046,13 +1298,13 @@
 	}
 
 	.shop-popup-bottom {
-		width: 95%;
-		height: 100rpx;
-		position: fixed;
-		bottom: 0;
-		left: 2.5%;
-		display: flex;
-		z-index: 99;
+		width: 95%;
+		height: 100rpx;
+		position: fixed;
+		bottom: 0;
+		left: 2.5%;
+		display: flex;
+		z-index: 99;
 		background: #fff;
 	}
 
@@ -1076,15 +1328,16 @@
 			background: linear-gradient(90deg, #60F3FF, #088FEB);
 			border-radius: 70rpx;
 		}
-	}
-	.noPic{
-		border-radius: 10px;
-		width: 150rpx;
-		height: 150rpx;
-		// margin: 30rpx 0 0 30rpx;
-		text-align: center;
-		line-height: 140rpx;
-		color: #777;
-		background: #eee;
+	}
+
+	.noPic {
+		border-radius: 10px;
+		width: 150rpx;
+		height: 150rpx;
+		// margin: 30rpx 0 0 30rpx;
+		text-align: center;
+		line-height: 140rpx;
+		color: #777;
+		background: #eee;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/inventory/changeGoods1.vue b/pages/inventory/changeGoods1.vue
index 8211748..a78e232 100644
--- a/pages/inventory/changeGoods1.vue
+++ b/pages/inventory/changeGoods1.vue
@@ -1,28 +1,30 @@
 <template>
-	<view class="page1">
-		<view style="z-index: 99;width: 100%;">
-			<view style="background: #fff;">
-				<button size="default" type="default" @tap="goAddGoods" hover-class="is-hover">新增商品</button>
-			</view>
-			<view class="title-box">
-				<uni-search-bar class="uni-mt-10" radius="5" placeholder="商品名称/货号/供应商" cancelButton="none"
-					@confirm="search" />
-			</view>
+	<view class="page1">
+		<view style="z-index: 99;width: 100%;">
+			<view style="background: #fff;">
+				<button size="default" type="default" @tap="goAddGoods" hover-class="is-hover">新增商品</button>
+			</view>
+			<view class="title-box">
+				<uni-search-bar class="uni-mt-10" radius="5" placeholder="商品名称/货号/供应商" cancelButton="none"
+					@confirm="search" />
+			</view>
 		</view>
 		<view class="content-box" :style="{height:height - 360 +'rpx'}">
 			<view class="content-left">
 				<view class="left-box" v-for="(item, index) in indexList" :key="item"
 					:class="item.parentId ? 'left-box-hover':''" @tap="clickLeftBtn(index)">
-					<text style="width: 100%;height: 90rpx;line-height: 90rpx;display: inline-block;overflow: hidden;" :class="item.parentId ? 'red' :''">{{item.categoryName}}</text>
+					<text style="width: 100%;height: 90rpx;line-height: 90rpx;display: inline-block;overflow: hidden;"
+						:class="item.parentId ? 'red' :''">{{item.categoryName}}</text>
 				</view>
 			</view>
 			<view class="content-right">
-				<view class="right-box" v-for="item in shopList" :key="item" @tap="toggle('bottom',item)">
-					<!-- 当商品的delFlag=0和未入库状态时，显示此遮罩，点击弹出弹窗提示不能操作 -->
-					<view class="shop-mask" v-if="item.delFlag == 0 || item.inStorageStatus == 0" @tap.stop="clickMask(item)"></view>
+				<view class="right-box" v-for="(item,index) in shopList" :key="index" @tap="toggle('bottom',item)">
+					<!-- 当商品的delFlag=0和未入库状态时，显示此遮罩，点击弹出弹窗提示不能操作 -->
+					<view class="shop-mask" v-if="item.delFlag == 0 || item.inStorageStatus == 0"
+						@tap.stop="clickMask(item)"></view>
 					<view class="box-left">
-						<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
-						<view class="noPic" v-else>暂无图片</view>	
+						<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
+						<view class="noPic" v-else>暂无图片</view>
 					</view>
 					<view class="box-right">
 						<view class="box-right-name">{{item.productName}}</view>
@@ -68,8 +70,9 @@
 				<view class="popup-content">
 					<view class="popup-title">
 						<view class="popup-title-left">
-							<img class="img-radius" :src="goodsDetail.productPicture" alt="" v-if="goodsDetail.productPicture">
-							<view class="noPic" v-else>暂无图片</view>	
+							<img class="img-radius" :src="goodsDetail.productPicture" alt=""
+								v-if="goodsDetail.productPicture">
+							<view class="noPic" v-else>暂无图片</view>
 						</view>
 						<view class="popup-title-right">
 							<view class="popup-title-right-box" style="color: #088FEB;">{{goodsDetail.productName}}
@@ -80,7 +83,8 @@
 							</view>
 						</view>
 					</view>
-					<view class="popup-container">
+					<view class="popup-container">
+						<view @tap="saveCheck" style="position: absolute;top: 20rpx;right: 20rpx;color: #088FEB;text-decoration: underline;">保存已选</view>
 						<ul style="border-top:20rpx;">
 							<li v-for="(items,index) in goodsDetail.attributeList" :key="index">
 								<view class="title-fur">
@@ -90,32 +94,33 @@
 									<uni-data-checkbox v-model="value" :localdata="range"
 										@change="change"></uni-data-checkbox>
 									<text v-for="(itemTag, index1) in items.value" :key="index1"
-										@tap.stop="attrNameChange(index,index1) "
+										@tap.stop="attrNameChange(index,itemTag.value,index1) "
 										:class="itemTag.isChecked ? 'checkedText' : '' "> {{itemTag.value}}</text>
 								</view>
 							</li>
-						</ul>
-						<view style="padding-bottom: 100rpx;">
-							<view class="checkList" v-for="item in temporaryList">
-								<view @tap.stop="delCarData(index)" style="margin-right: 20rpx">
-									<uni-icons color="red" type="minus" size="26"></uni-icons>
-								</view>
-								<view class="checkList-box">
-									<text style="width: 300rpx;display: inline-block;">{{item.name}}</text>  <text style="color:#777;font-size: 12px;">库存:{{item.productNum}}</text>
-								</view>
-								<uni-number-box max="100000" v-model="item.productCount" @change="temporaryChange" />
-							</view>
+						</ul>
+						<view style="padding-bottom: 100rpx;">
+							<view class="checkList" v-for="(item,index) in temporaryList" :key="index">
+								<view @tap.stop="delCarData(index)" style="margin-right: 20rpx">
+									<uni-icons color="red" type="minus" size="26"></uni-icons>
+								</view>
+								<view class="checkList-box">
+									<text style="width: 300rpx;display: inline-block;">{{item.name}}</text> <text
+										style="color:#777;font-size: 12px;">库存:{{item.productNum}}</text>
+								</view>
+								<uni-number-box max="100000" v-model="item.productCount" @change="temporaryChange" />
+							</view>
 						</view>
 					</view>
-				</view>
-				<view class="popup-bottom">
-					<view class="popup-bottom-left">
-						<text>数量：{{zNum}} 件</text>
-						<!-- <text>￥{{zPrice}}</text> -->
-					</view>
-					<view class="popup-bottom-right">
-						<view class="bottom-btn" @tap="temporaryCheck">选好了</view>
-					</view>
+				</view>
+				<view class="popup-bottom">
+					<view class="popup-bottom-left">
+						<text>数量：{{zNum}} 件</text>
+						<!-- <text>￥{{zPrice}}</text> -->
+					</view>
+					<view class="popup-bottom-right">
+						<view class="bottom-btn" @tap="temporaryCheck">选好了</view>
+					</view>
 				</view>
 			</uni-popup>
 		</view>
@@ -125,8 +130,8 @@
 				<view v-for="(item,index) in carList" :key="index" style="position: relative;">
 					<view class="popup-title">
 						<view class="popup-title-left">
-							<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
-							<view class="noPic" v-else>暂无图片</view>	
+							<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
+							<view class="noPic" v-else>暂无图片</view>
 						</view>
 						<view class="popup-title-right">
 							<view class="popup-title-right-box" style="color: #088FEB;">{{item.productName}}</view>
@@ -139,19 +144,20 @@
 								</view>
 							</view>
 						</view>
-					</view>
-					<view style="padding-bottom: 100rpx;">
-						<view class="popup-container" v-for="(item1,index1) in item.saleDetailQueryDTO" :key="index1">
-							<view class="checkList">
-								<view style="margin-right:5%;" @tap="delShopSpec(item.id,item1.attributeList)">
-									<uni-icons color="red" type="minus" size="26"></uni-icons>
-								</view>
-								<view class="checkList-box">
-									{{item1.attributeList | sliceMsg}}
-								</view>
-								<uni-number-box max="100000" v-model="item1.productCount" @change="carChange($event,index,index1)" />
-							</view>
-						</view>
+					</view>
+					<view style="padding-bottom: 100rpx;">
+						<view class="popup-container" v-for="(item1,index1) in item.saleDetailQueryDTO" :key="index1">
+							<view class="checkList">
+								<view style="margin-right:5%;" @tap="delShopSpec(item.id,item1.attributeList)">
+									<uni-icons color="red" type="minus" size="26"></uni-icons>
+								</view>
+								<view class="checkList-box">
+									{{item1.attributeList | sliceMsg}}
+								</view>
+								<uni-number-box max="100000" v-model="item1.productCount"
+									@change="carChange($event,index,index1)" />
+							</view>
+						</view>
 					</view>
 				</view>
 
@@ -189,43 +195,49 @@
 				columns: [],
 				keyList: [],
 				evalue: [],
-				attributeList: [],
-				purchasePrice: "",
-				zPrice:0,
-				zNum:0,
-				storageType:0,
-				carNum:0,
-				carType:0,
-				productId:'',
-				productNum:0,
-				height:0
+				attributeList: {},
+				purchasePrice: "",
+				zPrice: 0,
+				zNum: 0,
+				storageType: 0,
+				carNum: 0,
+				carType: 0,
+				productId: '',
+				productNum: 0,
+				height: 0,
+				oldTemList:[],
+				pageOldTemList:[],
+				goodsList:[],
+				newTemList:[],
+				pecsList:[],
+				dataObj :new Map() //拿到的 规格值为key的
 			}
-		},
-		filters: {
-			sliceMsg(val) {
-				var name = ''
-				if (typeof(val) == 'string') {
-					let newObj = JSON.parse(val)
-					for (let as in newObj) {
-						name += newObj[as] + '/'
-					}
-				}
-				return name;
-			},
-			maxNum(val) {
-				if (val >= 10) {
-					return 10
-				} else if (val < 0) {
-					return 0
-				}
-			}
 		},
-		onLoad() {
-			this.height = wx.getSystemInfoSync().windowHeight
+		filters: {
+			sliceMsg(val) {
+				var name = ''
+				if (typeof(val) == 'string') {
+					let newObj = JSON.parse(val)
+					for (let as in newObj) {
+						name += newObj[as] + '/'
+					}
+				}
+				return name;
+			},
+			maxNum(val) {
+				if (val >= 10) {
+					return 10
+				} else if (val < 0) {
+					return 0
+				}
+			}
+		},
+		onLoad() {
+			this.height = wx.getSystemInfoSync().windowHeight
 			this.storageType = uni.getStorageSync('type')
-		},
-		onShow(){
-			this.getGategoryList()
+		},
+		onShow() {
+			this.getGategoryList()
 		},
 		methods: {
 			//初始化获取分类列表
@@ -241,7 +253,7 @@
 							} else {
 								this.indexList[i].parentId = false
 							}
-						}
+						}
 						this.categoryId = this.indexList[0].id
 						this.getShareList(this.indexList[0].id);
 					} else {
@@ -249,80 +261,162 @@
 					}
 				}).catch((res) => {})
 			},
-			attrNameChange(index, index1) {
-				// this.goodsDetail.attributeList[index].value.forEach(item => {
-				// 	item.isChecked = false;
-				// })
-				this.goodsDetail.attributeList[index].isChecked = true;
-				this.goodsDetail.attributeList[index].value[index1].isChecked = true;
-				var name = '',
-					evalue = [],
-					obj = {}
-				for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
-					for (var m = 0, Ien = this.goodsDetail.attributeList[i].value; m < Ien.length; m++) {
-						if (Ien[m].isChecked == true) {
-							evalue.push(Ien[m].value)
-							name += Ien[m].value + '/'
-						}
-					}
-				}
-				this.keyList.map((item, index) => {
-					obj[item] = evalue[index]
+			combination(arr) {
+				let result = [
+					[]
+				]
+
+				arr.map(x => {
+					var res = []
+					result.map(y => {
+						x.specs.map(z => {
+							res.push([...y, z])
+						})
+					})
+					result = res
 				})
-				let jishuqi = 0;
-				for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
-					if (this.goodsDetail.attributeList[i].isChecked == true) {
-						jishuqi++
-					}
-				}
-				if (this.goodsDetail.attributeList.length == jishuqi) {
-					this.tui.request("/app/stock/productCount", "post", {
-						productId: this.productId,
-						attributeList: JSON.stringify(obj)
-					}, false, true).then((res) => {
-						if (res.code == 200) {
-							this.productNum = res.result
+				return result;
+			},
+			//保存已选
+			saveCheck(){
+				this.pageOldTemList = this.temporaryList
+				for(var i=0;i<this.goodsDetail.attributeList.length;i++){
+					this.goodsList[i].specs = []
+					for(var m=0;m<this.goodsDetail.attributeList[i].value.length;m++){
+						this.goodsDetail.attributeList[i].value[m].isChecked = false
+					}
+				}
+			},
+			attrNameChange(index, data1,index1) {	
+				this.goodsDetail.attributeList[index].isChecked = !this.goodsDetail.attributeList[index].isChecked;
+				this.goodsDetail.attributeList[index].value[index1].isChecked = !this.goodsDetail.attributeList[index].value[index1].isChecked;
+				if(this.goodsList[index].specs.indexOf(data1) != -1){
+					this.goodsList[index].specs.splice(this.goodsList[index].specs.indexOf(data1),1)
+				}else{
+					this.goodsList[index].specs.push(data1)
+				}
+				let jishuqi = 0
+				for(var i = 0; i < this.goodsList.length; i++){
+					if(this.goodsList[i].specs.length > 0){
+						jishuqi++
+					}
+				}
+				var resultList = []
+				if(jishuqi == this.goodsList.length){
+					
+					resultList = this.combination(this.goodsList);
+				}
+				var evalue = []
+				var value = []
+				for (var m = 0; m < resultList.length; m++) {
+					var name = ''
+					let value1 = "{"
+					for (var j = 0; j < resultList[m].length; j++) {
+						if(j != resultList[m].length - 1){
+							name += resultList[m][j] + '/'
+							value1 += '"'+this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '",'
+						}else{
+							name += resultList[m][j]
+							value1 +=  '"'+this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '"'
+						}
+					}
+					value1 += "}"
+					value.push(value1)
+					evalue.push(name)
+				}
+				
+				if(jishuqi == 0){
+					this.oldTemList = []
+				}
+				if(this.temporaryList.length == 0){
+					if(jishuqi == this.goodsList.length){
+						for (var i = 0; i < value.length; i++) {
 							this.attributeList = {
-								attributeList: JSON.stringify(obj),
+								attributeList: value[i],
 								productCount: this.temporaryNum,
 								productNum:this.productNum,
-								name: name,
+								name: evalue[i],
 								price: this.purchasePrice
 							}
-							for(let i=0;i<this.goodsDetail.attributeList.length;i++){
-								this.goodsDetail.attributeList[i].isChecked = false;
-								for (let m=0;m<this.goodsDetail.attributeList[i].value.length;m++) {
-									this.goodsDetail.attributeList[i].value[m].isChecked = false
-								}
+							this.temporaryList.push(this.attributeList);
+						}	
+					}		
+				}else{
+					let newProductCount = 0;
+					for (var i = 0; i < value.length; i++) {
+						for (var m = 0; m < this.temporaryList.length; m++) {
+							if(this.temporaryList[m].attributeList == value[i]){
+								newProductCount = this.temporaryList[m].productCount
 							}
-							if (this.temporaryList.length == 0) {
-								this.temporaryList.push(this.attributeList);
-							} else {
-								for (var i = 0; i < this.temporaryList.length; i++) {
-									if (this.temporaryList[i].name.indexOf(this.attributeList.name) == -1 || this.temporaryList[i].name.indexOf(this.attributeList.name) == 1) {
-										
-										if (this.temporaryList.length == (i+1)) {
-											this.temporaryList.push(this.attributeList);
-											return
-										}
-									} else {
-										return
-										
-									}
-								}
-							
+						}
+						this.attributeList = {
+							attributeList: value[i],
+							productCount: newProductCount,
+							productNum:this.productNum,
+							name: evalue[i],
+							price: this.purchasePrice
+						}
+						
+						this.newTemList.push(this.attributeList);
+						newProductCount = 0;
+					}
+					for (var i = 0; i < this.oldTemList.length; i++) {
+						let oldAttributeList = '';
+						let oldProductCount = '';
+						let notChcek = true;
+						for (var m = 0; m < this.newTemList.length; m++) {
+							if(this.oldTemList[i].attributeList == this.newTemList[m].attributeList){
+								this.newTemList[m].productCount = this.oldTemList[i].productCount
+								notChcek = false;
+							}
+						}
+						if(this.newTemList.length > 0 && notChcek){
+							this.newTemList.push(this.oldTemList[i]);
+						}
+					}
+					
+					for (var i = 0; i < this.pageOldTemList.length; i++) {
+						let oldAttributeList = '';
+						let oldProductCount = '';
+						let notChcek = true;
+						for (var m = 0; m < this.newTemList.length; m++) {
+							if(this.pageOldTemList[i].attributeList == this.newTemList[m].attributeList){
+								this.newTemList[m].productCount = this.pageOldTemList[i].productCount
+								notChcek = false;
 							}
-						} else {
-							this.tui.toast(res.message)
 						}
-					}).catch((res) => {})										
+						if(this.newTemList.length > 0 && notChcek){
+							this.newTemList.push(this.pageOldTemList[i]);
+						}
+					}
+				}
+				this.$nextTick(()=>{
+					for(var i=0;i<this.temporaryList.length;i++){
+						for(var m=0;m<this.pecsList.length;m++){
+							if(this.temporaryList[i].attributeList == this.pecsList[m].attributeList){
+								this.temporaryList[i].productNum = this.pecsList[m].stockCount
+							}
+						}
+					}
+				})
+				
+				if(jishuqi != this.goodsList.length){
+					if(this.oldTemList.length ==0 && this.pageOldTemList.length ==0){
+						this.newTemList = []
+						this.temporaryList = [] 
+					}
+				}
+				if(this.newTemList.length != 0 && jishuqi == this.goodsList.length){
+					this.temporaryList = this.newTemList;
+					this.oldTemList = []
+					this.newTemList = []
 				}
 			},
-			temporaryChange(val) {
+			temporaryChange(val) {
 				this.zNum = 0
-				for (var i=0;i<this.temporaryList.length;i++) {
-					this.zNum +=  this.temporaryList[i].productCount || 0
-				}
+				for (var i = 0; i < this.temporaryList.length; i++) {
+					this.zNum += this.temporaryList[i].productCount || 0
+				}
 				this.zPrice = this.zNum * this.purchasePrice
 			},
 			//点击底部选好了，返回上一页
@@ -351,38 +445,39 @@
 			},
 			//获取弹出层状态
 			change(e) {
+				
+			},
+			carChange(e, index, index1) {
 
-			},
-			carChange(e,index,index1) {
-
-				this.carNum = 0
-				for (let i = 0; i < this.carList.length; i++) {
-					this.carList[i].num = 0
-					for (let m = 0; m < this.carList[i].saleDetailQueryDTO.length; m++) {
-						this.carList[i].num += this.carList[i].saleDetailQueryDTO[m].productCount
-					}
-					this.carNum += this.carList[i].num
-				}
-			},
-			//跳转新增商品
-			goAddGoods(){
-				uni.navigateTo({
-					url: "/pages/inventory/addGoods"
-				})
+				this.carNum = 0
+				for (let i = 0; i < this.carList.length; i++) {
+					this.carList[i].num = 0
+					for (let m = 0; m < this.carList[i].saleDetailQueryDTO.length; m++) {
+						this.carList[i].num += this.carList[i].saleDetailQueryDTO[m].productCount
+					}
+					this.carNum += this.carList[i].num
+				}
+			},
+			//跳转新增商品
+			goAddGoods() {
+				uni.navigateTo({
+					url: "/pages/inventory/addGoods"
+				})
 			},
 			//弹出购物车或者商品规格选择弹窗
 			toggle(type, item) {
 
 				this.type = type
-				if (type == 'carPopup') {
-					this.carNum = 0
-					for (let i=0;i<this.carList.length;i++) {
-						this.carNum += this.carList[i].num
-					}
-					this.carType = this.carList.length
+				if (type == 'carPopup') {
+					this.carNum = 0
+					for (let i = 0; i < this.carList.length; i++) {
+						this.carNum += this.carList[i].num
+					}
+					this.carType = this.carList.length
 					this.$refs.carPopup.open('bottom')
-				} else {
-					this.productId = item.id
+				} else {
+					this.productId = item.id
+					this.goodsList = []
 					this.checkGoods(item);
 					this.$refs.popup.open('bottom')
 				}
@@ -390,71 +485,136 @@
 			},
 			//选择商品查询商品规格
 			checkGoods(item) {
-				this.goodsDetail = item;
-				this.temporaryList = []
-				this.columns = []
-				this.keyList = []
-				if(this.carList != ''){
-					this.zNum = 0
-					for(let i=0;i<this.carList.length;i++){
-						
-						if(item.id == this.carList[i].id){
-							this.zNum = this.carList[i].num
+				let that = this;
+				this.goodsDetail = item;
+				this.temporaryList = []
+				this.columns = []
+				this.keyList = []
+				if (this.carList != '') {
+					this.zNum = 0
+					for (let i = 0; i < this.carList.length; i++) {
+
+						if (item.id == this.carList[i].id) {
+							this.zNum = this.carList[i].num
 							this.temporaryList = this.carList[i].saleDetailQueryDTO
-						}
+							this.pageOldTemList = this.carList[i].saleDetailQueryDTO
+							this.oldTemList = this.carList[i].saleDetailQueryDTO
+						}
 					}
+					
 				}
-				this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId", "POST", {
-					categoryId: this.goodsDetail.categoryId
-				}, false, true).then((res1) => {
-					if (res1.code == 200) {
-						if (typeof(res1.result) == 'string') {
-							let newObj = JSON.parse(res1.result)
+				console.log('弹唱',this.carList)
+				this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId", "POST", {
+					categoryId: this.goodsDetail.categoryId
+				}, false, true).then((res1) => {
+					if (res1.code == 200) {
+						if (typeof(res1.result) == 'string') {
+							let newObj = JSON.parse(res1.result)
 							let newArr = []
-							for (let val in newObj) {
+							let dataArr = []
+							for (let val in newObj) {
 								let valueObj = [];
+								let isTrue = false
 								for (var i = 0; i < newObj[val].length; i++) {
+									for (var m = 0; m < this.oldTemList.length; m++) {
+										var data = this.oldTemList[m].name.split('/')
+										for(var j = 0; j < data.length; j++){
+											if(data[j] == newObj[val][i]){
+												isTrue = true
+											}
+										}
+									}
+									for (var m = 0; m < this.pageOldTemList.length; m++) {
+										var data = this.pageOldTemList[m].name.split('/')
+										for(var j = 0; j < data.length; j++){
+											if(data[j] == newObj[val][i]){
+												isTrue = true
+											}
+										}
+									}
 									valueObj.push({
 										value: newObj[val][i],
-										isChecked: false
+										isChecked: isTrue
 									})
-								}
-								newArr.push({
-									name: val,
-									value: valueObj
-								})
+									that.dataObj.set(newObj[val][i],val)
+									isTrue = false
+								}
+								newArr.push({
+									name: val,
+									value: valueObj
+								})
 							}
-							this.goodsDetail.attributeList = newArr;
-							this.goodsDetail.attributeList.forEach((item, index) => {
-								this.columns[index] = item.value;
-								this.keyList[index] = item.name;
+							console.log(that.dataObj)
+							this.goodsDetail.attributeList = newArr;
+							this.goodsDetail.attributeList.forEach((item, index) => {
+								this.columns[index] = item.value;
+								this.keyList[index] = item.name;
 							})
-						}
-						
+							console.log('看看看看',this.goodsDetail.attributeList) 
+							for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
+								let oldCheck = false
+								let oldValue = []
+								for (var m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
+									if(this.goodsDetail.attributeList[i].value[m].isChecked == true){
+										oldCheck = true
+										oldValue.push(this.goodsDetail.attributeList[i].value[m].value)
+									}
+								}
+								if(oldCheck){
+									let specs1 = {
+										specs:[]
+									}
+									
+									specs1.specs = oldValue
+									this.goodsList.push(specs1)
+								}else{
+									let specs1 = { 
+										specs:[]
+									}
+									this.goodsList.push(specs1)
+								}
+								oldCheck = false
+								oldValue = []
+							}
+							console.log(this.goodsList)
+						}
+
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+				this.getKCList(item.id);
+			},
+			//库存商品详情
+			getKCList(id) {
+				this.tui.request("/app/stock/productCount", "GET", {
+					productId: id
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.pecsList = res.result
 					} else {
 						this.tui.toast(res.message)
 					}
-				}).catch((res) => {})
-				
-
+				}).catch((res) => {})
+				
 			},
 			//顶部搜索框
 			search(res) {
 				this.searchName = res.value
 				this.getShareList()
-			},
-			//未入库遮罩
-			clickMask(item){
-				let title = ''
-				if(item.delFlag == 0){
-					title = '请将商品上架后再操作！'
-				}else{
-					title = '请将上次入库的采购价维护后再进行操作！'
-				}
-				uni.showToast({
-					title: title,
-					icon: 'none'
-				})
+			},
+			//未入库遮罩
+			clickMask(item) {
+				let title = ''
+				if (item.delFlag == 0) {
+					title = '请将商品上架后再操作！'
+				} else {
+					title = '请将上次入库的采购价维护后再进行操作！'
+				}
+				uni.showToast({
+					title: title,
+					icon: 'none'
+				})
 			},
 			//点击左侧菜单切换
 			clickLeftBtn(index) {
@@ -464,7 +624,7 @@
 					} else {
 						this.indexList[i].parentId = false
 					}
-				}
+				}
 				this.categoryId = this.indexList[index].id
 				this.getShareList(this.indexList[index].id)
 			},
@@ -476,123 +636,126 @@
 				this.goodsDetail.price = this.temporaryList[0].price = val
 			},
 			//弹窗选择规格后，点击弹窗中选好了按钮
-			temporaryCheck() {
-				let data = {
-					id: this.goodsDetail.id,
-					price: this.zPrice,
-					num: this.zNum,
-					productName: this.goodsDetail.productName,
-					productSn: this.goodsDetail.productSn,
-					productPicture: this.goodsDetail.productPicture,
-					supplierName: this.goodsDetail.supplierName,
-					saleDetailQueryDTO:this.temporaryList
-				}
-				if(this.carList.length == 0){
-					this.carList.push(data)
-				}else{
-					let aa = true;
-					for(let i = 0; i < this.carList.length; i++){
-						if(this.carList[i].id == data.id){
-							this.carList[i] = data
-							aa = false
-						}
-					}
-					if(aa){
-						this.carList.push(data)
-					}
-				}
-				
-				
-				for (let i = 0; i < this.carList.length; i++) {
-					this.carList[i].num = 0
-					for (let m = 0; m < this.carList[i].saleDetailQueryDTO.length; m++) {
-						this.carList[i].num += this.carList[i].saleDetailQueryDTO[m].productCount
-					}
-				}
-				this.temporaryList = []
-				this.purchasePrice = ""
-				this.zPrice = ''
-				this.zNum = ''
-				for(let i=0;i<this.goodsDetail.attributeList.length;i++){
-					this.goodsDetail.attributeList[i].isChecked = false;
-					for (let m=0;m<this.goodsDetail.attributeList[i].value.length;m++) {
-						this.goodsDetail.attributeList[i].value[m].isChecked = false
-					}
-				}
-				this.$refs.popup.close()				
-			},
-			//删除整条商品
-			delShop(item){
-				var that = this;
-				uni.showModal({
-					title: "提示",
-					content: "确定删除此条商品吗？",
-					success: function(res) {
-						if (res.confirm) {
-							for(let i=0;i<that.carList.length;i++){
-								if(that.carList[i].id == item.id){
-									that.carNum -= that.carList[i].num
-									that.carList.splice(i, 1)
-								}
-							}
-							that.carType = that.carList.length
-						}
-						that.$forceUpdate()
-					}
-				})
-			},
-			//选商品的时候能删除规格
+			temporaryCheck() {
+				let data = {
+					id: this.goodsDetail.id,
+					price: this.zPrice,
+					num: this.zNum,
+					productName: this.goodsDetail.productName,
+					productSn: this.goodsDetail.productSn,
+					productPicture: this.goodsDetail.productPicture,
+					supplierName: this.goodsDetail.supplierName,
+					saleDetailQueryDTO: this.temporaryList
+				}
+				if (this.carList.length == 0) {
+					this.carList.push(data)
+				} else {
+					let aa = true;
+					for (let i = 0; i < this.carList.length; i++) {
+						if (this.carList[i].id == data.id) {
+							this.carList[i] = data
+							aa = false
+						}
+					}
+					if (aa) {
+						this.carList.push(data)
+					}
+				}
+
+
+				for (let i = 0; i < this.carList.length; i++) {
+					this.carList[i].num = 0
+					for (let m = 0; m < this.carList[i].saleDetailQueryDTO.length; m++) {
+						this.carList[i].num += this.carList[i].saleDetailQueryDTO[m].productCount
+					}
+				}
+				this.temporaryList = []
+				this.purchasePrice = ""
+				this.zPrice = ''
+				this.zNum = ''
+				for (let i = 0; i < this.goodsDetail.attributeList.length; i++) {
+					this.goodsDetail.attributeList[i].isChecked = false;
+					for (let m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
+						this.goodsDetail.attributeList[i].value[m].isChecked = false
+					}
+				}
+				this.$refs.popup.close()
+				console.log(this.carList)
+			},
+			//删除整条商品
+			delShop(item) {
+				var that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条商品吗？",
+					success: function(res) {
+						if (res.confirm) {
+							for (let i = 0; i < that.carList.length; i++) {
+								if (that.carList[i].id == item.id) {
+									that.carNum -= that.carList[i].num
+									that.carList.splice(i, 1)
+								}
+							}
+							that.carType = that.carList.length
+						}
+						that.$forceUpdate()
+					}
+				})
+			},
+			//选商品的时候能删除规格
 			delCarData(index) {
-				this.temporaryList.splice(index, 1);
-				this.temporaryChange()
-				// uni.showModal({
-				// 	title: "提示",
-				// 	content: "确定删除此条商品吗？",
-				// 	success: function(res) {
-				// 		if(res.confirm){
-				// 			that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name);
-				// 			that.carList.get(id).stockLogList.delete(name)
-				// 			that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(id).purchasePrice
-				// 			if(that.carList.get(id).stockLogList.size == 0){
-				// 				that.carList.delete(id)
-				// 			}
-							
-				// 			that.getAllPrice()
-				// 		}
-				// 		that.$forceUpdate()
-				// 	}
-				// })
-				
-			},
-			//删除商品下的某一个规格
-			delShopSpec(index,index1){
-				var that = this;
-				uni.showModal({
-					title: "提示",
-					content: "确定删除此条商品吗？",
-					success: function(res) {
-						if (res.confirm) {
-							for(let i=0;i<that.carList.length;i++){
-								for(let m=0;m<that.carList[i].saleDetailQueryDTO.length;m++){
-									if(that.carList[i].id == index){
-										if(that.carList[i].saleDetailQueryDTO[m].attributeList == index1){
-											that.carList[i].num -= that.carList[i].saleDetailQueryDTO[m].productCount
-											that.carNum -= that.carList[i].saleDetailQueryDTO[m].productCount
-											that.carList[i].saleDetailQueryDTO.splice(m, 1)
-											continue;
-										}
-									}
-									
-								}
-								if(that.carList[i].saleDetailQueryDTO.length == 0){
-									that.carList.splice(i, 1)
-								}
-							}
-							that.carType = that.carList.length
-						}
-						that.$forceUpdate()
-					}
-				})
+				console.log(index)
+				this.temporaryList.splice(index, 1);
+				this.temporaryChange()
+				// uni.showModal({
+				// 	title: "提示",
+				// 	content: "确定删除此条商品吗？",
+				// 	success: function(res) {
+				// 		if(res.confirm){
+				// 			that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name);
+				// 			that.carList.get(id).stockLogList.delete(name)
+				// 			that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(id).purchasePrice
+				// 			if(that.carList.get(id).stockLogList.size == 0){
+				// 				that.carList.delete(id)
+				// 			}
+
+				// 			that.getAllPrice()
+				// 		}
+				// 		that.$forceUpdate()
+				// 	}
+				// })
+
+			},
+			//删除商品下的某一个规格
+			delShopSpec(index, index1) {
+				var that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条商品吗？",
+					success: function(res) {
+						if (res.confirm) {
+							for (let i = 0; i < that.carList.length; i++) {
+								for (let m = 0; m < that.carList[i].saleDetailQueryDTO.length; m++) {
+									if (that.carList[i].id == index) {
+										if (that.carList[i].saleDetailQueryDTO[m].attributeList == index1) {
+											that.carList[i].num -= that.carList[i].saleDetailQueryDTO[m]
+												.productCount
+											that.carNum -= that.carList[i].saleDetailQueryDTO[m].productCount
+											that.carList[i].saleDetailQueryDTO.splice(m, 1)
+											continue;
+										}
+									}
+
+								}
+								if (that.carList[i].saleDetailQueryDTO.length == 0) {
+									that.carList.splice(i, 1)
+								}
+							}
+							that.carType = that.carList.length
+						}
+						that.$forceUpdate()
+					}
+				})
 			}
 		}
 	}
@@ -602,12 +765,14 @@
 	page {
 		height: 100%;
 	}
-	button {
-		color: #ffffff !important;
-		background: #5fd9ee !important;
-		width: 95%;
-		margin-top: 20rpx;
+
+	button {
+		color: #ffffff !important;
+		background: #5fd9ee !important;
+		width: 95%;
+		margin-top: 20rpx;
 	}
+
 	.page1 {
 		display: flex;
 		flex-direction: column;
@@ -625,12 +790,12 @@
 	}
 
 	.popup-content {
-		align-items: center;
-		justify-content: center;
-		padding: 15px;
-		height: 1200rpx;
-		background-color: #fff;
-		margin-bottom: 30rpx;
+		align-items: center;
+		justify-content: center;
+		padding: 15px;
+		height: 1200rpx;
+		background-color: #fff;
+		margin-bottom: 30rpx;
 		overflow: scroll;
 	}
 
@@ -665,7 +830,8 @@
 	.popup-container {
 		width: 100%;
 		background: #fff;
-		height: 50rpx;
+		height: 50rpx;
+		position: relative;
 	}
 
 	.uni-tab__text {
@@ -678,24 +844,25 @@
 	}
 
 	.bottom-box {
-		width: 100%;
-		height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		display: flex;
-		background: #fff;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		display: flex;
+		background: #fff;
 		z-index: 98;
 	}
 
 	.bottom-left {
 		width: 15%;
-		position: relative;
+		position: relative;
 		padding-top: 20rpx;
 	}
 
 	.bottom-right {
 		width: 85%;
 		padding-top: 20rpx;
+
 		.bottom-btn {
 			width: 85%;
 			line-height: 35px;
@@ -725,7 +892,7 @@
 	.content-left {
 		width: 170rpx;
 		background: #eee;
-		height: 100%;
+		height: 100%;
 		overflow: scroll;
 	}
 
@@ -760,7 +927,7 @@
 		border-right: 3px solid red;
 	}
 
-	.content-right {
+	.content-right {
 		flex: 1;
 		overflow-y: scroll;
 	}
@@ -878,13 +1045,13 @@
 	}
 
 	.popup-bottom {
-		width: 95%;
-		height: 100rpx;
-		position: fixed;
-		bottom: 0;
-		left: 2.5%;
-		display: flex;
-		z-index: 99;
+		width: 95%;
+		height: 100rpx;
+		position: fixed;
+		bottom: 0;
+		left: 2.5%;
+		display: flex;
+		z-index: 99;
 		background: #fff;
 	}
 
@@ -913,38 +1080,43 @@
 
 	.attrs {
 		text {
-			display: inline-block;
-			border: 1px solid #5fd9ee;
-			margin: 20rpx;
-			background-color: #fff;
-			color: #5fd9ee;
-			width: 100rpx;
-			line-height: 70rpx;
-			height: 70rpx;
-			text-align: center;
+			display: inline-block;
+			border: 1px solid #5fd9ee;
+			margin: 20rpx;
+			background-color: #fff;
+			color: #5fd9ee;
+			padding: 0 10px;
+			min-width: 100rpx;
+			line-height: 35px;
+			height: 70rpx;
+			text-align: center;
+			border-radius: 20rpx;
 		}
 
 		.checkedText {
-			background-color: $u-primary;
-			color: #fff;
+			background-color: #5fd9ee;
+			color: #fff;
+			border-radius: 20rpx;
 		}
-	}
-	.shop-mask {
-		width: 100%;
-		height: 190rpx;
-		position: absolute;
-		top: 0;	
-		left: 0;
-		background: rgba(0, 0, 0, 0.1);
-	}
-	.noPic{
-		border-radius: 10px;
-		width: 150rpx;
-		height: 150rpx;
-		// margin: 30rpx 0 0 30rpx;
-		text-align: center;
-		line-height: 140rpx;
-		color: #777;
-		background: #eee;
+	}
+
+	.shop-mask {
+		width: 100%;
+		height: 190rpx;
+		position: absolute;
+		top: 0;
+		left: 0;
+		background: rgba(0, 0, 0, 0.1);
+	}
+
+	.noPic {
+		border-radius: 10px;
+		width: 150rpx;
+		height: 150rpx;
+		// margin: 30rpx 0 0 30rpx;
+		text-align: center;
+		line-height: 140rpx;
+		color: #777;
+		background: #eee;
 	}
 </style>
\ No newline at end of file