|
@@ -452,6 +452,8 @@ Page({
|
|
|
that.setData({
|
|
|
goodsInfo
|
|
|
})
|
|
|
+
|
|
|
+ that.getOrderDetail()
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -494,7 +496,7 @@ Page({
|
|
|
name: '',
|
|
|
phoneNumber: '',
|
|
|
detailAddress: '',
|
|
|
- cityCode: 0,
|
|
|
+ cityCode: null,
|
|
|
cityName: "",
|
|
|
provinceCode: 0,
|
|
|
provinceName: "",
|
|
@@ -660,8 +662,8 @@ Page({
|
|
|
})
|
|
|
|
|
|
this.setData({
|
|
|
- receiveAddress: this.data.receiveAddress || data.data,
|
|
|
- 'receiveAddressInfo.addressDetail': addressForm.provinceName + addressForm.cityName + addressForm.regionName + addressForm.detailAddress,
|
|
|
+ receiveAddress: data.data,
|
|
|
+ 'receiveAddressInfo.addressDetail': (addressForm.provinceName || '') + (addressForm.cityName || '') + (addressForm.regionName || '') + addressForm.detailAddress,
|
|
|
'receiveAddressInfo.name': addressForm.name,
|
|
|
'receiveAddressInfo.phoneNumber': addressForm.phoneNumber
|
|
|
})
|