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