多颜色管理

ghsApp/src/admin/item/add.vue

@@ -83,6 +83,15 @@
           <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="单位为公斤，参考红玫每扎1.2公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">颜色可选</view>
+          <view class="switch_bx">
+            <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
+            <text v-if="form.variety == 1">可选</text>
+            <text v-else>不可选</text>
+          </view>
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">库存预警值</div>
           <input v-model="form.stockWarning" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
@@ -199,6 +208,9 @@ export default {
     goStockDetail(id){
 				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})
 		},
+    varietyChange(e){
+      this.form.variety = e.detail.value ? 1 : 0;
+    },
     statusChange(e){
       this.form.status = e.detail.value ? 1 : 2;
     },

ghsApp/src/admin/item/copy.vue

@@ -82,6 +82,15 @@
           <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" @focus="form.weight=''" placeholder="单位为公斤，参考红玫每扎1.2公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">颜色可选</view>
+          <view class="switch_bx">
+            <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
+            <text v-if="form.variety == 1">可选</text>
+            <text v-else>不可选</text>
+          </view>
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存预警值</view>
           <input v-model="form.stockWarning" @focus="form.stockWarning=''" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
@@ -198,6 +207,9 @@ export default {
     goStockDetail(id){
 				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})
 		},
+    varietyChange(e){
+      this.form.variety = e.detail.value ? 1 : 0;
+    },
     statusChange(e){
       this.form.status = e.detail.value ? 1 : 2;
     },

ghsApp/src/pages.json

@@ -347,7 +347,7 @@
 				{"path": "add","style": {"navigationBarTitleText": "添加花材"}},
 				{"path": "copy","style": {"navigationBarTitleText": "复制花材"}},
 				{"path": "xj","style": {"navigationBarTitleText": "请选择颜色"}},
-				{"path": "xjSelect","style": {"navigationBarTitleText": "小菊颜色选择"}},
+				{"path": "xjSelect","style": {"navigationBarTitleText": "颜色管理"}},
 				{"path": "rechargeHb","style": {"navigationBarTitleText": "充值活动"}},
 				{"path": "colorManage","style": {"navigationBarTitleText": "花材颜色"}}
 			]

hdApp/src/admin/billing/affirmGhs.vue

@@ -206,7 +206,7 @@ export default {
 				}
 				this.customNum({ ...item, bigCount: item.bigCount, smallCount: item.smallCount })
 			}else{
-				this.$msg('小菊请返回列表修改')
+				this.$msg('多颜色请返回列表修改')
 			}
 		},
 		//自定义数量
@@ -293,14 +293,14 @@ export default {
 				}
 				this.addEvent(item)
 			}else{
-				this.$msg('小菊请返回列表修改')
+				this.$msg('多颜色请返回列表修改')
 			}
 		},
 		delItem(item) {
 			if(item.variety == 0){
 				this.delEvent(item)
 			}else{
-				this.$msg('小菊请返回列表修改')
+				this.$msg('多颜色请返回列表修改')
 			}
 		},
 		bindDateChange(e){
@@ -378,8 +378,16 @@ export default {
 		affirmFormSubmit(){
 			const product = this.selectList.map(ele => {
 				return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId };
-			});
-			let xj = uni.getStorageSync("ghsXj"+this.ghsInfo.id)
+			})
+
+			let xj = []
+			this.selectList.forEach((item) => {
+				let hasItem = uni.getStorageSync("ghsXj"+this.ghsInfo.id+"_"+item.itemId)
+				if (!this.$util.isEmpty(hasItem)){
+					xj.push(hasItem)
+				}
+			})
+	
 			let params = {
 				getType:this.form.sendType,
 				sendTimeWant:this.sendTimeWant,

hdApp/src/admin/billing/affirmGhsBook.vue

@@ -316,7 +316,15 @@ export default {
 				this.$msg('请选择配送时间')
 				return false
 			}
-			let xj = uni.getStorageSync("ghsXj"+this.ghsInfo.id)
+
+			let xj = []
+			this.selectList.forEach((item) => {
+				let hasItem = uni.getStorageSync("ghsXj"+this.ghsInfo.id+"_"+item.itemId)
+				if (!this.$util.isEmpty(hasItem)){
+					xj.push(hasItem)
+				}
+			})
+
 			let params = {
 				getType:this.form.sendType,
 				sendTimeWant:this.sendTimeWant,

hdApp/src/mixins/cgProduct.js

@@ -215,8 +215,10 @@ export default {
 		removeMemory(ghsId){
 			if(ghsId){
 				uni.removeStorageSync('selectList'+this.pageType+'_ghs_'+ghsId);
-				//删除小菊的记忆
-				uni.removeStorageSync("ghsXj"+ghsId)
+				//删除多颜色花材记忆
+				this.selectList.forEach((item) => {
+					uni.removeStorageSync("ghsXj"+ghsId+"_"+item.itemId)
+				})
 			}else{
 				uni.removeStorageSync('selectList'+this.pageType);
 			}

hdApp/src/pagesPurchase/bookProduct.vue

@@ -162,7 +162,7 @@ export default {
 			shopId:0,
 			infoData:{},
 			xjData:{},
-			xjDataInfo:{},
+			hasColorInfo:{},
 			shareDiscount:1,
 			ghsId:0,
 			newCustomGift:{xrFlAmount:0},
@@ -204,7 +204,7 @@ export default {
 
 			const list = this.selectList;
 
-			this.customData = this.xjDataInfo
+			this.customData = this.hasColorInfo
 
 			if(this.xjData.cancel == 1){
 				this.customData.bigCount = 0
@@ -218,14 +218,14 @@ export default {
 				let has = false
 				for (let index = 0; index < list.length; index++) {
 					const element = list[index];
-					if (element.id == this.xjDataInfo.id && element.classId == this.xjDataInfo.classId) {
+					if (element.id == this.hasColorInfo.id && element.classId == this.hasColorInfo.classId) {
 						has = true
 					}
 				}
 
 				if(has == false){
 					let params = {
-						...this.xjDataInfo,
+						...this.hasColorInfo,
 						bigCount: null, //扎数
 						smallCount: null, //支数
 						autoPrice: null, //调价价格
@@ -284,7 +284,7 @@ export default {
 		},
 		//去特殊品种页，如小菊等
 		goToSpecialVariety(info){
-			this.xjDataInfo = info
+			this.hasColorInfo = info
 			if(info.stock <= 0){
 				uni.showToast({title:"没有库存",icon:"none"})
 			}else{

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -220,13 +220,12 @@ export default {
 			shopId:0,
 			infoData:{},
 			xjData:{},
-			xjDataInfo:{},
+			hasColorInfo:{},
 			shareDiscount:1,
 			ghsId:0,
 			newCustomGift:{xrFlAmount:0},
 			isNewCustom:false,
 			showInvite:false,
-			//推荐新人福利
 			tjFl:0,
 			cartItemShow:false
 		};
@@ -257,14 +256,11 @@ export default {
 
 		if(this.xjData.hasUpdate == 1){
 
-			const list = this.selectList;
-
-			this.customData = this.xjDataInfo
+			this.customData = this.hasColorInfo
 
 			if(this.xjData.cancel == 1){
 				this.customData.bigCount = 0
 				this.customData.smallCount = 0
-				console.log('this.customData',this.customData)
 				this.affirm({index:0})
 			}else{
 
@@ -273,19 +269,19 @@ export default {
 				let has = false
 				for (let index = 0; index < list.length; index++) {
 					const element = list[index];
-					if (element.id == this.xjDataInfo.id && element.classId == this.xjDataInfo.classId) {
+					if (element.id == this.hasColorInfo.id && element.classId == this.hasColorInfo.classId) {
 						has = true
 					}
 				}
 
 				if(has == false){
 					let params = {
-						...this.xjDataInfo,
-						bigCount: null, //扎数
-						smallCount: null, //支数
-						autoPrice: null, //调价价格
-						realityWeight: null, //调价价格
-						userPrice: null, //调价价格
+						...this.hasColorInfo,
+						bigCount: null,
+						smallCount: null,
+						autoPrice: null,
+						realityWeight: null,
+						userPrice: null,
 					};
 					list.push(params);
 					this.setSelectInfoByType({ type: this.pageType, info: list });
@@ -390,11 +386,11 @@ export default {
 		},
 		//去特殊品种页，如小菊等
 		goToSpecialVariety(info){
-			this.xjDataInfo = info
+			this.hasColorInfo = info
 			if(info.stock <= 0){
 				uni.showToast({title:"没有库存",icon:"none"})
 			}else{
-				this.$util.pageTo({url: "/pagesPurchase/xj",query: {stock:info.stock,price: info.price,ghsId:this.option.id,itemId:info.id}})
+				this.$util.pageTo({url: "/pagesPurchase/xj",query: {stock:info.stock,price: info.price,ghsId:this.option.id,ptItemId:info.itemId}})
 			}
 		},
 	    showPopup() {
@@ -404,7 +400,7 @@ export default {
 	      this.popupShow = false;
 	    },
 		showBigCover(item){
-            this.$util.pageTo({url: "/admin/ghsProduct/detail",query: {id: item.id,ghsId:this.option.id}})
+			this.$util.pageTo({url: "/admin/ghsProduct/detail",query: {id: item.id,ghsId:this.option.id}})
 		},
 		init(){
 
@@ -592,7 +588,6 @@ export default {
 			if (val.index === 0) {
 				this.cancelEvent();
 			} else {
-				console.log(444, this.selectList);
 				uni.navigateTo({
 					url: "/admin/billing/affirm"
 				});

hdApp/src/pagesPurchase/order.vue

@@ -11,11 +11,13 @@
             </view>
             <text class="debt-amount" v-if="Number(ghsInfo.debtAmount)>0">-¥{{parseFloat(ghsInfo.debtAmount)}}</text>
             <view class="cg-button" @click="enterShop(ghsInfo)">进店</view>
+
             <view :class="[ghsInfo.kiloFee && Number(ghsInfo.kiloFee)>0 ? 'could-book' : 'not-book', 'book-button']"  @click="bookItem(ghsInfo)">预订</view>
             <view :class="[ghsInfo.kiloFee && Number(ghsInfo.kiloFee)>0 ? 'could-book-text' : 'not-book-text', 'book-button-text']">
               <text>提前订货更便宜，</text>
               <text class="explain" @click="getBookItemExplain(ghsInfo)">预订说明</text>
             </view>
+
             <view class="store_btn">
               <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})">结账单</view>
               <view class="btn_entrance" @click="pageTo({url:'/pagesPurchase/shopping'})" > 采购记录 </view>
@@ -82,6 +84,8 @@ export default {
       this.pageTo({url: '/pagesPurchase/ghsProduct?id='+id,type:2})
     },
     bookItem(item){
+      this.$msg("升级中");
+      return false
       //没有设置每公斤运费则不能进入预订页面
       if(item.kiloFee && Number(item.kiloFee)<=0){
         this.$msg("即将开通，敬请期待");

hdApp/src/pagesPurchase/xj.vue

@@ -62,13 +62,12 @@ export default {
 		this.xjStock = this.option.stock
 		this.xjPrice = this.option.price
 
-		let history = uni.getStorageSync("ghsXj"+this.option.ghsId)
+		let history = uni.getStorageSync("ghsXj"+this.option.ghsId+"_"+this.option.ptItemId)
 		if(!this.$util.isEmpty(history)){
 			history.forEach((item,index)=>{
 				this.numList[item.id] = item.num
 			})
 		}
-		console.log('this.numList',this.numList)
 	},
 	onPullDownRefresh() {
 	},
@@ -76,20 +75,15 @@ export default {
 	},
 	methods: {
 		previewImg(url){
-			console.log('abc')
-			uni.previewImage({
-				urls: [url]
-			})
+			uni.previewImage({urls: [url]})
 		},
 		clearXj(){
-			uni.removeStorageSync("ghsXj"+this.option.ghsId)
+			uni.removeStorageSync("ghsXj"+this.option.ghsId+"_"+this.option.ptItemId)
 			if(!this.$util.isEmpty(this.numList)){
-				console.log('this.numList',this.numList)
 				this.numList.forEach((item,index,arr)=>{
 					arr[index]=''
 				})
 				this.$forceUpdate();
-				console.log('this.numList',this.numList)
 			}
 
 			//返回上一页带参数
@@ -113,7 +107,7 @@ export default {
 			let arr = []
 			this.numList.forEach((num,id)=>{
 				if(!this.$util.isEmpty(num) && Number(num)>0){
-					arr.push({id:id,num:num})
+					arr.push({id:id,num:num,ptItemId:this.option.ptItemId})
 				}
 			})
 
@@ -136,7 +130,7 @@ export default {
 				return false
 			}
 
-			uni.setStorageSync("ghsXj"+this.option.ghsId, arr)
+			uni.setStorageSync("ghsXj"+this.option.ghsId+"_"+this.option.ptItemId, arr)
 
 			//返回上一页带参数
 			let pages = getCurrentPages();
@@ -147,9 +141,8 @@ export default {
 
 		},
 		init(){
-			getGhsXj({ghsId:this.option.ghsId,itemId:this.option.itemId}).then(res => {
+			getGhsXj({ghsId:this.option.ghsId,ptItemId:this.option.ptItemId}).then(res => {
 				this.xjList = res.data.list
-				console.log('list',this.xjList)
 			});
 		}
 	}