feat: 修改门店手机号保留一天和核销码显示逻辑,优化位置授权获取
This commit is contained in:
parent
91bdf53348
commit
20013124b9
|
@ -422,7 +422,7 @@
|
||||||
|
|
||||||
// 门店手机号保留一天
|
// 门店手机号保留一天
|
||||||
const setPhoneOneDay = () => {
|
const setPhoneOneDay = () => {
|
||||||
if (uni.getStorageSync('VIP_PHONE')) return;
|
// if (uni.getStorageSync('VIP_PHONE')) return;
|
||||||
const currentDate = new Date();
|
const currentDate = new Date();
|
||||||
const nextDay = new Date(currentDate);
|
const nextDay = new Date(currentDate);
|
||||||
nextDay.setDate(currentDate.getDate() + 1);
|
nextDay.setDate(currentDate.getDate() + 1);
|
||||||
|
|
|
@ -105,7 +105,7 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="qr_code" v-if="datas.paid == 1 && datas.status == 1">
|
<view class="qr_code" v-if="datas.paid == 1 && datas.status == 1">
|
||||||
<up-image :src="datas.verify_img" width="404rpx" height="60rpx"></up-image>
|
<up-image :src="datas.verify_base64" width="404rpx" height="60rpx"></up-image>
|
||||||
<view style="font-weight: bold;color: #333;font-size: 26;margin-top: 20rpx;">
|
<view style="font-weight: bold;color: #333;font-size: 26;margin-top: 20rpx;">
|
||||||
核销码 {{datas.verify_code}}
|
核销码 {{datas.verify_code}}
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -107,7 +107,7 @@
|
||||||
<view class="mask" v-if='showVerifyPop' @click="showVerifyPop=false">
|
<view class="mask" v-if='showVerifyPop' @click="showVerifyPop=false">
|
||||||
<view
|
<view
|
||||||
style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);background-color: white;padding: 20rpx;">
|
style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);background-color: white;padding: 20rpx;">
|
||||||
<up-image :src="orderData.verify_img" width="710rpx" height="105rpx"></up-image>
|
<up-image :src="orderData.verify_base64" width="710rpx" height="105rpx"></up-image>
|
||||||
<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;margin-top: 20rpx;">
|
<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;margin-top: 20rpx;">
|
||||||
核销码 {{orderData.verify_code}}
|
核销码 {{orderData.verify_code}}
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -98,7 +98,7 @@
|
||||||
<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
|
<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
|
||||||
<view>优惠减免</view>
|
<view>优惠减免</view>
|
||||||
<view>
|
<view>
|
||||||
<text>-¥</text>{{ c_price(orderInfo.frozen_money, 0) }}<text>.{{ c_price(orderInfo.frozen_money, 1) }}</text>
|
<text>¥</text>{{ c_price(orderInfo.frozen_money, 0) }}<text>.{{ c_price(orderInfo.frozen_money, 1) }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="row" v-if="userInfo.user_ship==1 ">
|
<view class="row" v-if="userInfo.user_ship==1 ">
|
||||||
|
@ -562,20 +562,23 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
onLoad(options => {
|
onLoad(options => {
|
||||||
if (uni.getStorageSync('location')) {
|
// if (uni.getStorageSync('location')) {
|
||||||
try {
|
// try {
|
||||||
location = JSON.parse(uni.getStorageSync('location'))
|
// location = JSON.parse(uni.getStorageSync('location'))
|
||||||
checkOrder();
|
// checkOrder();
|
||||||
} catch (e) {
|
// } catch (e) {
|
||||||
|
// getLocation()
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
getLocation()
|
getLocation()
|
||||||
}
|
// }
|
||||||
|
|
||||||
} else {
|
|
||||||
getLocation()
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const getLocation = () => {
|
const getLocation = () => {
|
||||||
|
// #ifdef H5
|
||||||
|
userLocationfalse()
|
||||||
|
// #endif
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
uni.getSetting({
|
uni.getSetting({
|
||||||
success(res) {
|
success(res) {
|
||||||
if (res.authSetting["scope.userLocation"] == false) {
|
if (res.authSetting["scope.userLocation"] == false) {
|
||||||
|
@ -585,6 +588,8 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
// #endif
|
||||||
|
|
||||||
}
|
}
|
||||||
const LocationShowOpen = () => {
|
const LocationShowOpen = () => {
|
||||||
LocationShow.value = true;
|
LocationShow.value = true;
|
||||||
|
|
Loading…
Reference in New Issue