功能完善

This commit is contained in:
2024-04-13 19:15:20 +08:00
parent 23af4c25e3
commit d6f3f9c812
5 changed files with 11 additions and 8 deletions

View File

@@ -200,7 +200,7 @@ const payment = async () => {
// 'allowIntegral': 0,
// 'produceIntegralNumber': 0,
'remark': orderBean.value?.remark,
// 'address': JSON.stringify(deliveryAddress.value),
'address': JSON.stringify(deliveryAddress.value),
'orderGoods': orderBean?.value?.orderGoods?.map(item => (
{
'goodsId': item.id,

View File

@@ -61,9 +61,9 @@ const params = ref<{
});
onLoad(async (e: any) => {
// const result = await getAddressDetail(e.addrid);
params.value = JSON.parse(decodeURIComponent(e.bean));
console.log('----------->>>', params.value);
if(e.bean) {
params.value = JSON.parse(decodeURIComponent(e.bean));
}
});
const bindConsignee = (e: any) => {

View File

@@ -43,8 +43,11 @@ const fetchAddressList = async () => {
};
const onChecked = (e: any) => {
uni.navigateBack();
userStore.setDeliveryAddress(e);
const pages = getCurrentPages();
if(pages.length > 2 && pages[pages.length - 2].route?.includes('pages/mall/subs/order/order-confirm')) {
userStore.setDeliveryAddress(e);
uni.navigateBack();
}
};
</script>

View File

@@ -33,7 +33,7 @@
<view class='c-flex-row'>
<text class='add-shoppingcart secondary-text-color' @click.stop='add(item?.orderGoods[0])'>加入购物车</text>
<text class='payment accent-text-color' v-if='isPending(item)' @click.stop='pay(item?.id)'>立即支付
<text class='payment accent-text-color' v-if='isPending(item)' @click.stop='goPath(`/pages/mine/subs/order/detail?orderId=${item?.id}`)'>立即支付
</text>
</view>
</view>

View File

@@ -24,7 +24,7 @@
<view class='divider' />
<view class='c-flex-row'>
<text>手机号</text>
<input placeholder='请输入手机号' :disabled='userInfo.telephone.length!=0'
<input placeholder='请输入手机号' :disabled='(userInfo.telephone?.length||0)!=0'
v-model='params.telephone'
@input='bindTelephone' />
</view>