add
This commit is contained in:
parent
e64727de58
commit
26ada06159
|
|
@ -608,8 +608,6 @@
|
|||
for (let key in formData2) {
|
||||
formData2[key] = ''
|
||||
}
|
||||
|
||||
|
||||
tabsList.forEach(item => {
|
||||
item.name = '请选择'
|
||||
})
|
||||
|
|
@ -638,9 +636,11 @@
|
|||
else if (formData.village) return [3, 'village'];
|
||||
else if (formData.brigade) return [4, 'brigade'];
|
||||
}
|
||||
|
||||
const addressTbasChange = (e) => {
|
||||
currentAddressIndex.value = e.index
|
||||
}
|
||||
|
||||
const addressList = reactive({
|
||||
city: [],
|
||||
area: [],
|
||||
|
|
@ -722,8 +722,6 @@
|
|||
},
|
||||
]);
|
||||
|
||||
|
||||
|
||||
let timerInvol = null
|
||||
// 开起一个scoket监听用户知否支付成功
|
||||
const userInfo = useUserStore().userInfo;
|
||||
|
|
@ -757,7 +755,6 @@
|
|||
resetFormData()
|
||||
getLists()
|
||||
currentTab.value = 1
|
||||
|
||||
})
|
||||
return
|
||||
}
|
||||
|
|
@ -779,7 +776,6 @@
|
|||
// }, 10000)
|
||||
// })
|
||||
// return
|
||||
|
||||
uni.scanCode({
|
||||
success: function(res) {
|
||||
if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
|
||||
|
|
@ -796,7 +792,6 @@
|
|||
uni.$u.toast('支付超时');
|
||||
}, 30000)
|
||||
})
|
||||
|
||||
}
|
||||
});
|
||||
} else {
|
||||
|
|
@ -838,13 +833,10 @@
|
|||
uni.$u.toast('支付超时');
|
||||
}, 30000)
|
||||
})
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const rePay = (item) => {
|
||||
|
|
@ -889,8 +881,8 @@
|
|||
page_no: 1,
|
||||
page_size: 25,
|
||||
loadingOver: false
|
||||
|
||||
}
|
||||
|
||||
const count = ref(0)
|
||||
const getCount = async () => {
|
||||
if (Role.value == 4) return;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<template>
|
||||
<view style="flex-grow: 1;overflow-y: auto;">
|
||||
<view class="user-info"
|
||||
:style="{backgroundImage: userInfo.user_ship!=1?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/dbf18202406291057413355.png)' }">
|
||||
:style="{backgroundImage: userInfo.user_ship!=1?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/514af20240702100300627.png)' }">
|
||||
<view class="u-card">
|
||||
<view style="display: flex;" @click="updataInfp">
|
||||
<up-image :src="userInfo.avatar" mode="aspectFill" width="112rpx" height="112rpx"
|
||||
|
|
@ -51,11 +51,6 @@
|
|||
会员报备
|
||||
</view>
|
||||
|
||||
<view class="logo" v-if="userInfo.user_ship==1">
|
||||
<up-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/f361a202406291058319809.png"
|
||||
width="200rpx" height="200rpx"></up-image>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="balance" @click="navgo('/pageQuota/balanceDetail/index?type=2')">
|
||||
|
|
@ -301,7 +296,7 @@
|
|||
if (res.data.user_ship == 1) {
|
||||
uni.setNavigationBarColor({
|
||||
frontColor: "#000000",
|
||||
backgroundColor: "#F3FCF2"
|
||||
backgroundColor: "#EAFFE1"
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@
|
|||
<view class="top" style="align-items: flex-start;">
|
||||
<view style="color: #333;">
|
||||
<view style="margin: 0 10rpx;color:#20B128">推荐自提点</view>
|
||||
<!-- <view style=" margin: 0 10rpx;margin-top:5rpx;color:#20B128"> {{reservation?"次日可提":"当日可提" }}
|
||||
</view> -->
|
||||
<view style=" margin: 0 10rpx;margin-top:5rpx;color:#20B128"> {{reservation?"次日可提":"当日可提" }}
|
||||
</view>
|
||||
</view>
|
||||
<view>
|
||||
<view style="color: #333;">
|
||||
|
|
@ -54,10 +54,10 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view style="padding: 20rpx;background-color:#20B128;color: white;border-radius: 40rpx;flex-shrink: 0;"
|
||||
<view style="padding: 20rpx;background-color:#20B128;color: white;border-radius: 40rpx;flex-shrink: 0;"
|
||||
@click="navgo(`/multipleShop/index/index?event=settle&cart_id=${cartStore.cartList.join(',')}`)">
|
||||
切换门店
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -388,8 +388,8 @@
|
|||
|
||||
// 订单相关
|
||||
let location = {
|
||||
lat: '28.91318',
|
||||
long: "105.43779",
|
||||
lat: '',
|
||||
long: "",
|
||||
};
|
||||
let reservation = ref(0);
|
||||
const shop_Info = ref({})
|
||||
|
|
@ -464,7 +464,7 @@
|
|||
address_id: addressInfo.value.address_id,
|
||||
pay_type: pay_type.value,
|
||||
store_id: STORE_INFO.id || 0,
|
||||
// store_id: shop_Info.value.id,
|
||||
store_id: shop_Info.value.id,
|
||||
shipping_type: orderInfo.value.shipping_type,
|
||||
mark: formData.value.remark,
|
||||
is_storage: is_storage.value
|
||||
|
|
@ -546,8 +546,6 @@
|
|||
}
|
||||
|
||||
onLoad(options => {
|
||||
checkOrder();
|
||||
return
|
||||
if (uni.getStorageSync('location')) {
|
||||
location = JSON.parse(uni.getStorageSync('location'))
|
||||
checkOrder();
|
||||
|
|
|
|||
Loading…
Reference in New Issue