多颜色

ghsApp/src/admin/billing/affirmGhsBook.vue

@@ -294,12 +294,7 @@ export default {
 			}
 
 			let xj = []
-			this.selectList.forEach((item) => {
-				let hasItem = uni.getStorageSync("ghsColorItem"+this.ghsInfo.id+"_"+item.itemId)
-				if (!this.$util.isEmpty(hasItem)){
-					xj.push(hasItem)
-				}
-			})
+
 			let params = {
 				sendType:this.form.sendType,
 				sendTimeWant:this.sendTimeWant,

ghsApp/src/admin/item/xj.vue

@@ -31,8 +31,8 @@
 		</view>
 
 		<div class="app-footer footer-button">
-			<button class="admin-button-com big default" @click="clearXj()">清除全部</button>
-			<button class="admin-button-com big default" @click="goBack()" style="margin-left:58upx;padding:30upx 55upx 30upx 55upx;">返回</button>
+			<button class="admin-button-com big blue" @click="clearXj()">清除全部</button>
+			<button class="admin-button-com big blue" @click="goBack()" style="margin-left:58upx;padding:30upx 55upx 30upx 55upx;">返回</button>
 			<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:58upx;padding:30upx 65upx; 30upx 65upx;" >确认</button>
 		</div>
 
@@ -84,6 +84,12 @@ export default {
 	},
 	methods: {
 		clearXj(){
+			let that = this
+			this.$util.confirmModal({content:'确认全部清除？'},() => {
+				that.confirmClearXj()
+			})
+		},
+		confirmClearXj(){
 			uni.removeStorageSync("xj"+this.option.customId)
 			if(!this.$util.isEmpty(this.numList)){
 				console.log('this.numList',this.numList)
@@ -366,11 +372,5 @@ export default {
 }
 .footer-button{
 	height:120upx;
-	& > button:nth-child(1){
-		color:#999999;
-	}
-	& > button:nth-child(2){
-		color:#999999;
-	}
 }
 </style>

ghsApp/src/mixins/cgProduct.js

@@ -213,7 +213,7 @@ export default {
 				uni.removeStorageSync('selectList'+this.pageType+'_ghs_'+ghsId);
 				//删除多颜色花材记忆
 				this.selectList.forEach((item) => {
-					uni.removeStorageSync("ghsColorItem"+ghsId+"_"+item.itemId)
+					uni.removeStorageSync("ghsColorItem"+ghsId)
 				})
 			}else{
 				uni.removeStorageSync('selectList'+this.pageType);

hdApp/src/admin/billing/affirmGhs.vue

@@ -488,14 +488,9 @@ export default {
 				}
 			}
 
-			let xj = []
-			this.selectList.forEach((item) => {
-				let hasItem = uni.getStorageSync("ghsColorItem"+this.ghsInfo.id+"_"+item.itemId)
-				if (!this.$util.isEmpty(hasItem)){
-					xj.push(hasItem)
-				}
-			})
-	
+			//多颜色
+			let xj = uni.getStorageSync("ghsColorItem"+this.ghsInfo.id)
+
 			let getType = this.form.sendType == 2 ? 1 : 2
 			let params = {
 				getType:getType,

hdApp/src/admin/item/xj.vue

@@ -32,8 +32,8 @@
 		</view>
 
 		<div class="app-footer footer-button">
-			<button class="admin-button-com big default" @click="clearXj()">清除全部</button>
-			<button class="admin-button-com big default" @click="goBack()" style="margin-left:58upx;padding:30upx 55upx 30upx 55upx;">返回</button>
+			<button class="admin-button-com big blue" @click="clearXj()">清除全部</button>
+			<button class="admin-button-com big blue" @click="goBack()" style="margin-left:58upx;padding:30upx 55upx 30upx 55upx;">返回</button>
 			<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:58upx;padding:30upx 65upx; 30upx 65upx;" >确认</button>
 		</div>
 
@@ -77,6 +77,12 @@ export default {
 	},
 	methods: {
 		clearXj(){
+			let that = this
+			this.$util.confirmModal({content:'确认全部清除？'},() => {
+				that.confirmClearXj()
+			})
+		},
+		confirmClearXj(){
 			uni.removeStorageSync("xj"+this.option.customId)
 			if(!this.$util.isEmpty(this.numList)){
 				console.log('this.numList',this.numList)
@@ -343,11 +349,5 @@ export default {
 }
 .footer-button{
 	height:120upx;
-	& > button:nth-child(1){
-		color:#999999;
-	}
-	& > button:nth-child(2){
-		color:#999999;
-	}
 }
 </style>

hdApp/src/mixins/cgProduct.js

@@ -212,9 +212,7 @@ export default {
 			if(ghsId){
 				uni.removeStorageSync('selectList'+this.pageType+'_ghs_'+ghsId);
 				//删除多颜色花材记忆
-				this.selectList.forEach((item) => {
-					uni.removeStorageSync("ghsColorItem"+ghsId+"_"+item.itemId)
-				})
+				uni.removeStorageSync("ghsColorItem"+ghsId)
 			}else{
 				uni.removeStorageSync('selectList'+this.pageType);
 			}

hdApp/src/pagesPurchase/purDetails.vue

@@ -485,7 +485,7 @@ export default {
               font-size: 27upx;
               font-weight:bold;
               .price {
-                font-size: 28upx;
+                font-size:25upx;
                 font-weight:bold;
               }
             }

hdApp/src/pagesPurchase/xj.vue

@@ -30,8 +30,8 @@
 			</block>
 		</view>
 		<div class="app-footer footer-button">
-			<button class="admin-button-com big default" @click="clearXj()">清除全部</button>
-			<button class="admin-button-com big default" @click="goBack()" style="margin-left:58upx;padding:30upx 55upx 30upx 55upx;">返回</button>
+			<button class="admin-button-com big blue" @click="clearXj()">清除全部</button>
+			<button class="admin-button-com big blue" @click="goBack()" style="margin-left:58upx;padding:30upx 55upx 30upx 55upx;">返回</button>
 			<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:58upx;padding:30upx 65upx; 30upx 65upx;" >确认</button>
 		</div>
 	</view>
@@ -65,12 +65,23 @@ export default {
 		this.xjStock = this.option.stock
 		this.xjPrice = this.option.price
 
-		let history = uni.getStorageSync("ghsColorItem"+this.option.ghsId+"_"+this.option.ptItemId)
-		if(!this.$util.isEmpty(history)){
-			history.forEach((item,index)=>{
-				this.numList[item.id] = item.num
+		let that = this
+		let saveInfo = uni.getStorageSync("ghsColorItem"+this.option.ghsId)
+		let ptItemId = this.option.ptItemId ? this.option.ptItemId : 0
+		if(!this.$util.isEmpty(saveInfo)){
+			saveInfo.forEach((item,index)=>{
+				if(item.ptItemId == ptItemId){
+					let hasList = item.list ? item.list : []
+					if(!that.$util.isEmpty(hasList)){
+						hasList.forEach((hasItem,hasIndex)=>{
+							that.numList[hasItem.id] = hasItem.num
+						})
+					}
+				}
 			})
 		}
+
+
 	},
 	onPullDownRefresh() {
 	},
@@ -81,7 +92,13 @@ export default {
 			uni.previewImage({urls: [url]})
 		},
 		clearXj(){
-			uni.removeStorageSync("ghsColorItem"+this.option.ghsId+"_"+this.option.ptItemId)
+			let that = this
+			this.$util.confirmModal({content:'确认全部清除？'},() => {
+				that.confirmClearXj()
+			})
+		},
+		confirmClearXj(){
+			uni.removeStorageSync("ghsColorItem"+this.option.ghsId)
 			if(!this.$util.isEmpty(this.numList)){
 				this.numList.forEach((item,index,arr)=>{
 					arr[index]=''
@@ -153,7 +170,24 @@ export default {
 				return false
 			}
 
-			uni.setStorageSync("ghsColorItem"+this.option.ghsId+"_"+this.option.ptItemId, arr)
+			let ptItemId = this.option.ptItemId ? this.option.ptItemId : 0
+			let saveInfo = uni.getStorageSync("ghsColorItem"+this.option.ghsId)
+			if(!this.$util.isEmpty(saveInfo)){
+				let getIndex = -1
+				saveInfo.forEach((colorItem,colorIndex)=>{
+					if(colorItem.ptItemId == ptItemId){
+						getIndex = colorIndex
+					}
+				})
+				if(getIndex > -1){
+					saveInfo[getIndex].list = arr
+				}else{
+					saveInfo.push({ptItemId:ptItemId,list:arr})
+				}
+			}else{
+				saveInfo = [{ptItemId:ptItemId,list:arr}]
+			}
+			uni.setStorageSync("ghsColorItem"+this.option.ghsId, saveInfo)
 
 			//返回上一页带参数
 			let pages = getCurrentPages();
@@ -356,11 +390,5 @@ export default {
 }
 .footer-button{
 	height:120upx;
-	& > button:nth-child(1){
-		color:#999999;
-	}
-	& > button:nth-child(2){
-		color:#999999;
-	}
 }
 </style>