|
|
@@ -95,12 +95,10 @@ export default {
|
|
|
remark: '',
|
|
|
loading: false,
|
|
|
submitting: false,
|
|
|
- buyerId: null,
|
|
|
actualAmount: 0
|
|
|
}
|
|
|
},
|
|
|
onLoad() {
|
|
|
- this.buyerId = uni.getStorageSync('userId')
|
|
|
var stored = uni.getStorageSync('checkoutItems')
|
|
|
if (stored) {
|
|
|
this.items = stored
|
|
|
@@ -120,9 +118,9 @@ export default {
|
|
|
this.loading = true
|
|
|
var that = this
|
|
|
uni.request({
|
|
|
- url: config.danshop('/danshop/address/list'),
|
|
|
+ url: config.api('/api/user/address/list'),
|
|
|
method: 'POST',
|
|
|
- data: { userId: this.buyerId },
|
|
|
+ data: {},
|
|
|
header: {
|
|
|
'Content-Type': 'application/json',
|
|
|
'Authorization': 'Bearer ' + uni.getStorageSync('token')
|
|
|
@@ -183,16 +181,22 @@ export default {
|
|
|
quantity: this.items[i].quantity
|
|
|
})
|
|
|
}
|
|
|
+ var addressSnapshot = JSON.stringify({
|
|
|
+ receiverName: this.selectedAddress.receiverName,
|
|
|
+ phone: this.selectedAddress.phone,
|
|
|
+ province: this.selectedAddress.province,
|
|
|
+ city: this.selectedAddress.city,
|
|
|
+ district: this.selectedAddress.district,
|
|
|
+ street: this.selectedAddress.street
|
|
|
+ })
|
|
|
var that = this
|
|
|
uni.request({
|
|
|
- url: config.danshop('/danshop/order/create'),
|
|
|
+ url: config.api('/api/product/order/create'),
|
|
|
method: 'POST',
|
|
|
data: {
|
|
|
- buyerId: this.buyerId,
|
|
|
- addressId: this.selectedAddress.id,
|
|
|
items: orderItems,
|
|
|
remark: this.remark,
|
|
|
- freight: this.freight
|
|
|
+ addressSnapshot: addressSnapshot
|
|
|
},
|
|
|
header: {
|
|
|
'Content-Type': 'application/json',
|
|
|
@@ -206,7 +210,7 @@ export default {
|
|
|
uni.removeStorageSync('checkoutItems')
|
|
|
setTimeout(function() {
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/shop/payment/payment?orderNo=' + order.orderNo + '&amount=' + order.actualAmount
|
|
|
+ url: '/pages/shop/payment/payment?orderNo=' + order.orderNo + '&amount=' + order.totalAmount
|
|
|
})
|
|
|
}, 1000)
|
|
|
} else {
|