|
@@ -241,15 +241,17 @@
|
|
|
// console.log('cartGoods===',this.cartGoods);
|
|
|
},
|
|
|
watch: {
|
|
|
- selectReceiveIndex: {
|
|
|
- handler: function(newValue, oldValue) {
|
|
|
- this.logisticsType = this.receiveWayList[newValue];
|
|
|
- if(this.orderInfo.goodsList.length>0){
|
|
|
- this.settlement();
|
|
|
- }
|
|
|
- },
|
|
|
- immediate: true
|
|
|
- }
|
|
|
+ // selectReceiveIndex: {
|
|
|
+ // handler: function(newValue, oldValue) {
|
|
|
+ // console.log('selectReceiveIndex',newValue);
|
|
|
+ // this.logisticsType = this.receiveWayList[newValue];
|
|
|
+ // console.log('logisticsType',this.logisticsType);
|
|
|
+ // if(this.orderInfo.goodsList.length>0){
|
|
|
+ // this.settlement();
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // immediate: true
|
|
|
+ // }
|
|
|
},
|
|
|
computed: {
|
|
|
totalWeight() {
|
|
@@ -350,7 +352,7 @@
|
|
|
orderType = 2
|
|
|
}
|
|
|
param.orderType = orderType;
|
|
|
- param.logisticsType = this.logisticsType;
|
|
|
+ // param.logisticsType = this.logisticsType;
|
|
|
param.goodsList = this.orderInfo.goodsList.map(item=>{
|
|
|
return {goodsId:item.id||item.goodsId,quantity:item.quantity}
|
|
|
});
|
|
@@ -382,6 +384,7 @@
|
|
|
logisticsType,
|
|
|
orderTotalCredit } = jsonData || {};
|
|
|
this.receiveWayList = logisticsType.split(",");//支持的物流方式
|
|
|
+ this.logisticsType = this.receiveWayList[this.selectReceiveIndex];
|
|
|
// console.log('orderTotalCredit',orderTotalCredit);
|
|
|
// console.log('receive',receive);
|
|
|
this.orderInfo = jsonData;
|
|
@@ -444,9 +447,14 @@
|
|
|
},
|
|
|
selectReceiveWay(index){
|
|
|
this.selectReceiveIndex = index;
|
|
|
- console.log('selectReceiveWay index',index);
|
|
|
- console.log('selectReceiveWay',this.receiveWayList[index]);
|
|
|
- console.log('pickupInfo',this.pickupInfo);
|
|
|
+ this.logisticsType = this.receiveWayList[index];
|
|
|
+ // console.log('logisticsType',this.logisticsType);
|
|
|
+ // if(this.orderInfo.goodsList.length>0){
|
|
|
+ // this.settlement();
|
|
|
+ // }
|
|
|
+ // console.log('selectReceiveWay index',index);
|
|
|
+ // console.log('selectReceiveWay',this.receiveWayList[index]);
|
|
|
+ // console.log('pickupInfo',this.pickupInfo);
|
|
|
}
|
|
|
}
|
|
|
}
|