tianyi 2 weeks ago
parent
commit
09a50c7d1f
  1. 4
      package1/buyFood/buyFood.vue
  2. 2
      package1/index/deliveryPersonList.vue
  3. 7
      package1/order/orderDetail.vue
  4. 1
      package1/order/orderEvaluate.vue
  5. 1
      package1/order/orderList.vue
  6. 1
      package1/order/returnOrder.vue

4
package1/buyFood/buyFood.vue

@ -556,7 +556,7 @@
} }
if (option.item) { if (option.item) {
this.groupItem = JSON.parse(decodeURIComponent(option.item)); this.groupItem = JSON.parse(decodeURIComponent(option.item));
console.log("1111111",this.groupItem)
this.isGroupBuy = this.groupItem.orderType === 2; this.isGroupBuy = this.groupItem.orderType === 2;
this.isFaceToFace = this.groupItem.isFaceToFace || false; this.isFaceToFace = this.groupItem.isFaceToFace || false;
this.orderScene = this.groupItem.orderScene || this.orderScene; this.orderScene = this.groupItem.orderScene || this.orderScene;
@ -688,7 +688,7 @@
let targetMembers = this.groupItem?.groupRule?.groupCount || 2; let targetMembers = this.groupItem?.groupRule?.groupCount || 2;
let shopItemStr = encodeURIComponent(JSON.stringify(this.shopItem)); let shopItemStr = encodeURIComponent(JSON.stringify(this.shopItem));
let isFTF = this.isFaceToFace ? 1 : 0; let isFTF = this.isFaceToFace ? 1 : 0;
console.log(shopItemStr)
let sceneQuery = this.isStoreGroupOrder ? '&orderScene=storeGroup' : ''; let sceneQuery = this.isStoreGroupOrder ? '&orderScene=storeGroup' : '';
let path = `/package2/group/groupBuySingle?type=shop&item=${shopItemStr}&groupId=${groupId}&targetMembers=${targetMembers}&isFaceToFace=${isFTF}${sceneQuery}`; let path = `/package2/group/groupBuySingle?type=shop&item=${shopItemStr}&groupId=${groupId}&targetMembers=${targetMembers}&isFaceToFace=${isFTF}${sceneQuery}`;

2
package1/index/deliveryPersonList.vue

@ -165,7 +165,7 @@
}, },
methods: { methods: {
getLoca(item){ getLoca(item){
console.log('aaaaa',item)
this.markers = [{ this.markers = [{
id: 0, id: 0,
latitude: item.geolocation[0], latitude: item.geolocation[0],

7
package1/order/orderDetail.vue

@ -891,12 +891,10 @@
this.$refs.imgPopup.open() this.$refs.imgPopup.open()
this.$refs.uqrcode.toTempFilePath({ this.$refs.uqrcode.toTempFilePath({
success: res => { success: res => {
console.log(res)
that.newQRList = res.tempFilePath that.newQRList = res.tempFilePath
}, },
fail: err => { fail: err => {}
console.log(err)
}
}); });
}, },
pictureAdd(id, huan) { pictureAdd(id, huan) {
@ -991,7 +989,6 @@
}); });
}, },
checkEvaluate() { checkEvaluate() {
console.log(this.orderDetail)
if (this.orderDetail.comments != null && this.orderDetail.comments.length > 0) { if (this.orderDetail.comments != null && this.orderDetail.comments.length > 0) {
this.$refs.evaluatePopup.open() this.$refs.evaluatePopup.open()
} else { } else {

1
package1/order/orderEvaluate.vue

@ -179,7 +179,6 @@
}, },
onLoad(option) { onLoad(option) {
this.shopData = JSON.parse(option.item) this.shopData = JSON.parse(option.item)
console.log(this.shopData.deliveryType)
if(this.shopData.deliveryType == 1){ if(this.shopData.deliveryType == 1){
this.getOrderDetail() this.getOrderDetail()
} }

1
package1/order/orderList.vue

@ -502,7 +502,6 @@
} else { } else {
that.orderList = [...that.orderList, ...res.result.records] that.orderList = [...that.orderList, ...res.result.records]
} }
console.log(that.orderList)
for(let i=0;i<that.orderList.length;i++){ for(let i=0;i<that.orderList.length;i++){
that.orderList[i].num = 0 that.orderList[i].num = 0
for(let m=0;m<that.orderList[i].goodsList.length;m++){ for(let m=0;m<that.orderList[i].goodsList.length;m++){

1
package1/order/returnOrder.vue

@ -510,7 +510,6 @@
this.$refs.returnPopup.open('bottom'); this.$refs.returnPopup.open('bottom');
}, },
changeValue(type, index) { changeValue(type, index) {
console.log(this.orderDetail.goodsList[index])
if (!this.orderDetail.goodsList[index].returnCount) { if (!this.orderDetail.goodsList[index].returnCount) {
this.orderDetail.goodsList[index].returnCount = 0 this.orderDetail.goodsList[index].returnCount = 0
} }

Loading…
Cancel
Save