py 2 лет назад
Родитель
Сommit
0dbeb426a0

+ 2 - 2
pages-address/edit-add.vue

@@ -138,7 +138,7 @@
 							uni.setStorageSync('isConfirmAddressFlag',true);
 						},1500)
 					}else{
-						tools.success('操作失败');
+						tools.error(res.msg);
 						this.isAJAX = false;
 					}
 				})
@@ -158,7 +158,7 @@
 							})
 						},1500)
 					}else{
-						tools.success('操作失败');
+						tools.error(res.msg);
 						this.isAJAX = false;
 					}
 				})

+ 3 - 0
pages-takeout/confirm-order.vue

@@ -267,6 +267,7 @@
 												url: "/pages/order/index"
 											})
 											uni.setStorageSync('orderPayType', 2)
+											uni.setStorageSync('saveData', false)
 										}, 1000)
 									},
 									fail: (err) => {
@@ -277,6 +278,7 @@
 												url: "/pages/order/index"
 											})
 											uni.setStorageSync('orderPayType', 2)
+											uni.setStorageSync('saveData', false)
 										}, 1000)
 									},
 								});
@@ -288,6 +290,7 @@
 										url: "/pages/order/index"
 									})
 									uni.setStorageSync('orderPayType', 2)
+									uni.setStorageSync('saveData', false)
 								}, 1000)
 							}
 						})

+ 6 - 7
pages-takeout/replace-mod/select-site.vue

@@ -3,8 +3,8 @@
 		<Nav title='选择站点'></Nav>
 
 		<scroll-view class="scroll-view-css box-border-box p-24" scroll-y="true" @scrolltolower="scrolltolower">
-			<view class="list-item align-items-center" :class="site_id == item.site_id?'s-b':''" v-for="(item,i) in list" :key="i"
-				@click="selectFun(item)">
+			<view class="list-item align-items-center" :class="site_id == item.site_id?'s-b':''"
+				v-for="(item,i) in list" :key="i" @click="selectFun(item)">
 				<view class="list-item-s">
 					<image v-if="site_id == item.site_id" src="@/static/img/common/y-select.png" mode=""></image>
 					<image v-else src="@/static/img/common/n-select.png" mode=""></image>
@@ -48,15 +48,14 @@
 			},
 			selectFun(item) {
 				this.site_id = item.site_id;
-
 				uni.setStorageSync('site_id', item.site_id)
 				uni.setStorageSync('site_name', item.name)
 				uni.setStorageSync('site_address', item.city_name + item.address)
 				uni.setStorageSync('site_logo', item.logo)
-
-				uni.reLaunch({
-					url: '/pages-takeout/replace-take'
-				})
+				tools.leftClick()
+				// uni.reLaunch({
+				// 	url: '/pages-takeout/replace-take'
+				// })
 			},
 		},
 	}

+ 29 - 15
pages-takeout/replace-take.vue

@@ -142,7 +142,8 @@
 						<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill" @click="closeCardBox()">
 						</image>
 						<view class="shop-buttom-num fs-24 fc-f text-align-center" @click="closeCardBox()">
-							{{cardData.total_num}}</view>
+							{{cardData.total_num}}
+						</view>
 						<view class="" @click="closeCardBox()">
 							<view class="">
 								<span class="fw-600 fs-24 fc-f">¥</span>
@@ -201,7 +202,7 @@
 		},
 		onShow() {
 			this.list = [];
-			this.pickup_code = [];
+			// this.pickup_code = [];
 			this.cardData = {
 					goods_list: [],
 					total_num: 0,
@@ -256,11 +257,17 @@
 							}
 							// 初始设置code 输入框数量
 							if (this.isInitial) {
-								for (let i = 0; i < this.cardData.total_num; i++) {
-									let obj = {
-										code: ''
-									};
-									this.pickup_code.push(obj);
+								let saveData = uni.getStorageSync('saveData')
+								if (saveData) {
+									return
+								} else {
+									this.pickup_code = [];
+									for (let i = 0; i < this.cardData.total_num; i++) {
+										let obj = {
+											code: ''
+										};
+										this.pickup_code.push(obj);
+									}
 								}
 							}
 						} else {
@@ -273,8 +280,10 @@
 			},
 			toBack() {
 				tools.leftClick()
+				uni.setStorageSync('saveData', false)
 			},
 			selectFun() {
+				uni.setStorageSync('saveData', true)
 				uni.navigateTo({
 					url: 'pages-takeout/replace-mod/select-site?site_id=' + this.addressData.site_id
 				})
@@ -283,9 +292,9 @@
 				this.$refs.popupBuy.close();
 			},
 			openBuyCrad() {
-				if (!this.addressData.site_id) {
-					return tools.error('请选择站点')
-				}
+				// if (!this.addressData.site_id) {
+				// 	return tools.error('请选择站点')
+				// }
 				if (this.pickup_code.length == 0) {
 					return tools.error('请选择商品')
 				}
@@ -298,14 +307,18 @@
 				if (this.pickup_code.length == 0) {
 					return tools.error('请选择商品')
 				}
-				let flag = this.pickup_code.every((item) => {return item.code});
+				let flag = this.pickup_code.every((item) => {
+					return item.code
+				});
 				if (!flag) {
-					return tools.error('请输入取件码')	
+					return tools.error('请输入取件码')
 				}
 				let codeRule = /^[A-Za-z0-9-]+$/
-				let flagRule = this.pickup_code.every((item) => {return codeRule.test(item.code)});
-				if(!flagRule){
-					return tools.error('请输入正确的取件码')	
+				let flagRule = this.pickup_code.every((item) => {
+					return codeRule.test(item.code)
+				});
+				if (!flagRule) {
+					return tools.error('请输入正确的取件码')
 				}
 
 				let arr = [];
@@ -314,6 +327,7 @@
 				})
 				let pickup_code = arr.join(',')
 				uni.setStorageSync('isConfirmAddressFlag', false);
+				uni.setStorageSync('saveData', true)
 				uni.navigateTo({
 					url: 'pages-takeout/confirm-order?pickup_code=' + pickup_code + '&type=2'
 				})