feat/task1-c-wallet
parent
4477484616
commit
712cc5c3e6
|
|
@ -88,12 +88,16 @@ Page({
|
|||
common_order_is_booking: data.common_order_is_booking || 0,
|
||||
});
|
||||
if (this.data.address == null || this.data.address_id == 0) {
|
||||
this.setData({
|
||||
address: data.base.address,
|
||||
address_id: ((data.base.address || null) == null) ? 0 : data.base.address.id,
|
||||
});
|
||||
if((data.base.address || null) != null && data.base.address.length > 0) {
|
||||
this.setData({
|
||||
address: data.base.address,
|
||||
address_id: data.base.address.id,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
console.log(this.data.address)
|
||||
} else {
|
||||
this.setData({
|
||||
data_list_loding_status: 2,
|
||||
|
|
|
|||
|
|
@ -55,11 +55,14 @@ class BuyController extends CommonController
|
|||
// 商品校验
|
||||
if(isset($ret['code']) && $ret['code'] == 0)
|
||||
{
|
||||
// 用户默认地址
|
||||
$address = UserService::UserDefaultAddress(['user'=>$this->user]);
|
||||
|
||||
// 商品/基础信息
|
||||
$base = [
|
||||
'total_price' => empty($ret['data']) ? 0 : array_sum(array_column($ret['data'], 'total_price')),
|
||||
'total_stock' => empty($ret['data']) ? 0 : array_sum(array_column($ret['data'], 'stock')),
|
||||
'address' => UserService::UserDefaultAddress(['user'=>$this->user])['data'],
|
||||
'address' => empty($address['data']) ? null : $address['data'],
|
||||
];
|
||||
|
||||
// 支付方式
|
||||
|
|
|
|||
Loading…
Reference in New Issue