多颜色

ghsApp/src/admin/billing/affirm.vue

@@ -235,7 +235,7 @@ import { getUserDet} from "@/api/member"
 import ModalModule from "@/components/plugin/modal"
 import { getAllWl } from "@/api/shop"
 export default {
-  name: "BillingAffirm",
+  name: "affirm",
   components: {
     TuiListCell,
     AppAvatarModule,
@@ -504,6 +504,11 @@ export default {
         Fn = updateOrder
         params = {...params,id:this.option.orderId}
       }
+
+      //多颜色
+      let xj = uni.getStorageSync("xj"+this.option.customId)
+      params = {...params,xj:JSON.stringify(xj)}
+
       uni.showLoading({mask:true})
       Fn(params).then((res) => {
         uni.hideLoading()

ghsApp/src/admin/billing/index.vue

@@ -209,7 +209,7 @@ export default {
 			}else{
 				let userPrice = info.userPrice ? parseFloat(info.userPrice) : 0
 				let price = info.price ? parseFloat(info.price) : 0
-				this.$util.pageTo({url: "/admin/item/xj?stock="+info.stock+"&price="+price+"&customId="+this.option.customId+"&userPrice="+userPrice+"&productId="+info.id})
+				this.$util.pageTo({url: "/admin/item/xj?stock="+info.stock+"&price="+price+"&customId="+this.option.customId+"&userPrice="+userPrice+"&productId="+info.id+"&ptItemId="+info.itemId})
 			}
 		},
 		changeClass(index){

ghsApp/src/admin/billing/result.vue

@@ -1,7 +1,7 @@
 <template>
 
 <appResult :title="option.title">
-  <view v-if="detailInfo.hasNoticeCustom && detailInfo.hasNoticeCustom == 1" style="margin-bottom:30upx;font-weight:bold;color:#049E2C;font-size:33upx;">【客户已收到新订单提醒】</view>
+  <view v-if="detailInfo.hasNoticeCustom && detailInfo.hasNoticeCustom == 1" style="margin-bottom:30upx;font-weight:bold;color:#049E2C;font-size:36upx;">【客户已收到新订单提醒】</view>
   <!-- #ifdef MP-WEIXIN -->
   <button v-if="option.title != '报损成功'" class="admin-button-com big blue" open-type="share">
     分享给<text style="font-weight:bold;margin-left:12upx;">{{customName}}</text>

ghsApp/src/admin/item/xj.vue

@@ -61,18 +61,22 @@ export default {
 		...mapGetters(["getMyShopInfo","getLoginInfo"]),
 	},
 	onLoad() {
-
-		if(this.option.stock){
-			this.stock = this.option.stock ? parseFloat(this.option.stock) : 0
-		}
-
-		let history = uni.getStorageSync("xj"+this.option.customId)
-		if(!this.$util.isEmpty(history)){
-			history.forEach((item,index)=>{
-				this.numList[item.id] = item.num
+		this.stock = this.option.stock ? parseFloat(this.option.stock) : 0
+		let that = this
+		let saveInfo = uni.getStorageSync("xj"+this.option.customId)
+		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() {
 	},
@@ -106,7 +110,7 @@ export default {
 			uni.navigateBack({});
 		},
 		confirmXj(){
-
+			let ptItemId = this.option.ptItemId ? this.option.ptItemId : 0
 			let arr = []
 			this.numList.forEach((num,id)=>{
 				if(!this.$util.isEmpty(num) && Number(num)>0){
@@ -133,7 +137,23 @@ export default {
 				return false
 			}
 
-			uni.setStorageSync("xj"+this.option.customId, arr)
+			let saveInfo = uni.getStorageSync("xj"+this.option.customId)
+			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("xj"+this.option.customId, saveInfo)
 
 			//返回上一页带参数
 			let pages = getCurrentPages();

ghsApp/src/admin/item/xjSelect.vue

@@ -30,6 +30,7 @@
 			</form>
 		</view>
 		<view v-if="variety ==1" style="text-align:center;border-top:1upx dashed #cccccc;padding-bottom:10upx;"></view>
+		<view style="margin-bottom:18upx;font-size:30upx;text-align:center;font-weight:bold;color:black;">总库存 {{ productInfo.stock ? parseFloat(productInfo.stock) : 0 }}{{productInfo.bigUnit?productInfo.bigUnit:'扎'}}</view>
 		<view class="billing_box_bg" v-if="variety ==1">
 			<view class="scroll-middle_bx">
 				<block>
@@ -49,7 +50,7 @@
 										<view class="num-open_bx">
 											<view class="open-bx warn" @tap.stop.prevent>
 												<input type="number" v-model="xjItem.stock" 
-												style="width:230upx;border:1upx solid #cccccc;position:absolute;top:80upx;left:230upx;height:60upx;font-size:30upx;" placeholder="请填写数量" />
+												style="width:200upx;border:1upx solid #cccccc;position:absolute;top:80upx;left:230upx;height:60upx;font-size:30upx;" placeholder="请填写数量" />
 												<text v-if="xjItem.stock!='' && Number(xjItem.stock) == 0" 
 												style="position:absolute;top:90upx;left:510upx;font-size:30upx;color:red;font-weight:bold;">下架</text>
 											</view>
@@ -110,7 +111,8 @@ export default {
 			variety:0,
 			xjName:'',
 			xjId:0,
-			changeShow:false
+			changeShow:false,
+			productInfo:[]
 		};
 	},
 	computed:{
@@ -128,9 +130,9 @@ export default {
 		const token = uni.getStorageSync('token')
 		this.headers.token = token
 
-
 		getProductDetail({ id: this.option.itemId }).then(res => {
 			if(res.code == 1){
+				this.productInfo = res.data
 				this.variety = res.data.variety
 			}
 		})

ghsApp/src/mixins/product.js

@@ -145,6 +145,12 @@ export default {
 			uni.removeStorageSync('selectList_'+that.selectJobType+'_target_'+that.selectJobId)
 			that.reSetSelectInfo({selectJobType:that.selectJobType,selectJobId:that.selectJobId})
 
+			//删除多颜色
+			//console.log(that.selectJobType+that.selectJobId)
+			if(that.selectJobType == 'bill'){
+				uni.removeStorageSync("xj"+that.selectJobId)
+			}
+
 			if(!this.$util.isEmpty(this.globalClassItemList)){
 				this.globalClassItemList.forEach((item,index,arr) =>{
 					if(!this.$util.isEmpty(arr[index].child)){

ghsApp/src/pagesArrears/clearResult.vue

@@ -6,7 +6,7 @@
 				<view class="iconfont iconchenggong"></view>
 				<view class="result-title">账单已生成</view>
 				<view class="result-title">客户：{{customName}}</view>
-				<view v-if="hasNoticeCustom == 1" style="margin-bottom:30upx;font-weight:bold;color:#049E2C;font-size:33upx;">【客户已收到新账单提醒】</view>
+				<view v-if="hasNoticeCustom == 1" style="margin-bottom:30upx;font-weight:bold;color:#049E2C;font-size:36upx;">【客户已收到新账单提醒】</view>
 				<!-- #ifdef MP-WEIXIN -->
 				<button class="admin-button-com big blue" style="width:45vw;" open-type="share">邀客户结账</button>
 				<!-- #endif -->

hdApp/src/admin/billing/affirmGhs.vue

@@ -168,7 +168,7 @@ import { shopHouponHas } from '@/api/coupon'
 import {currentShop} from "@/api/shop"
 import ModalModule from "@/components/plugin/modal";
 export default {
-	name: "BillingAffirm", // 开单确认
+	name: "affirmGhs",
 	components: {
 		TuiListCell,
 		AppAvatarModule,
@@ -471,16 +471,9 @@ export default {
 		confirmFn(options) {
 			createOrder(options).then(res => {
 				this.resetSelectInfoByType(this.pageType);
-				const {
-					data: { id, orderSn }
-				} = res;
+				const { data: { id, orderSn } } = res;
 				let url = `/admin/billing/result?orderId=${id}&orderSn=${orderSn}`;
-				uni.redirectTo({
-					url: url,
-					success: result => {},
-					fail: () => {},
-					complete: () => {}
-				});
+				uni.redirectTo({ url: url })
 			});
 		},
 		affirmFormSubmit(){