root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
tianyi 3 weeks ago
parent
593c64e484
commit
5edfb7edbe
13 changed files with 28 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      package2/group/groupBuyList.vue
  2. 12
      package2/group/groupBuySingle.vue
  3. 4
      package2/group/searchGroup.vue
  4. 4
      package2/group/shopEvaluate.vue
  5. 6
      package2/myCenter/addGoods.vue
  6. 2
      package2/myCenter/addType.vue
  7. 2
      package2/myCenter/dataStatistics.vue
  8. 4
      package2/myCenter/goodsList.vue
  9. 4
      package2/myCenter/partTimeJobRegister.vue
  10. 4
      package2/myCenter/wallet.vue
  11. 2
      package2/partTimeJob/partTimeJobCenter.vue
  12. 2
      package2/shop/orderDetail.vue
  13. 5
      package2/shop/shopOrderList.vue

6
package2/group/groupBuyList.vue
View File

@ -340,7 +340,7 @@
}
}
} else {
that.tui.toast(res.message,1000)
that.tui.toast(res.message)
return
}
}).catch((res) => {})
@ -358,7 +358,7 @@
}
}
} else {
that.tui.toast(res.message,1000)
that.tui.toast(res.message)
return
}
}).catch((res) => {})
@ -410,7 +410,7 @@
that.isArea = false
that.$forceUpdate()
} else {
that.tui.toast(res.message,1000)
that.tui.toast(res.message)
return
}
uni.hideLoading()

12
package2/group/groupBuySingle.vue
View File

@ -771,7 +771,7 @@
if (res.code == 200) {
this.tuanzhangOrder = res.result;
} else {
that.tui.toast(res.message, 1000)
that.tui.toast(res.message)
return
}
uni.hideLoading()
@ -951,7 +951,7 @@
that.pageNum = that.searchForm.pageNum;
that.$forceUpdate();
} else {
that.tui.toast(res.message, 1000);
that.tui.toast(res.message);
return;
}
uni.hideLoading();
@ -971,7 +971,7 @@
}
that.$forceUpdate()
} else {
that.tui.toast(res.message, 1000)
that.tui.toast(res.message)
return
}
uni.hideLoading()
@ -1132,7 +1132,7 @@
that.$forceUpdate();
} else {
that.tui.toast(res.message, 1000);
that.tui.toast(res.message);
return;
}
uni.hideLoading();
@ -1666,7 +1666,7 @@
});
},
fail: function(err) {
that.tui.toast("支付失败或取消", 1000);
that.tui.toast("支付失败或取消");
}
});
} else {
@ -1685,7 +1685,7 @@
}, 1500);
});
} else {
that.tui.toast(res.message, 1000);
that.tui.toast(res.message);
}
}
})

4
package2/group/searchGroup.vue
View File

@ -260,7 +260,7 @@
console.log(that.shopArea)
}
} else {
that.tui.toast(res.message,1000)
that.tui.toast(res.message)
return
}
}).catch((res) => {})
@ -294,7 +294,7 @@
that.isArea = false
that.$forceUpdate()
} else {
that.tui.toast(res.message,1000)
that.tui.toast(res.message)
return
}
uni.hideLoading()

4
package2/group/shopEvaluate.vue
View File

@ -231,7 +231,7 @@
that.menuList[0].num = res.result.total
}
} else {
that.tui.toast(res.message,1000)
that.tui.toast(res.message)
return
}
uni.hideLoading()
@ -267,7 +267,7 @@
this.back()
}, 1000)
} else {
that.tui.toast(res.message,1000);
that.tui.toast(res.message);
}
uni.hideLoading();
}).catch((res) => {});

6
package2/myCenter/addGoods.vue
View File

@ -225,7 +225,7 @@
},
fail() {
this.tui.toast("您未授权，图片上传功能可能会出现错误",1000)
this.tui.toast("您未授权，图片上传功能可能会出现错误")
}
})
this.typeItem = JSON.parse(JSON.stringify(this.typeItem)) || ''
@ -264,7 +264,7 @@
this.formData.categoryId = res.result.categoryId
this.edit(this.formData)
} else {
this.tui.toast(res.message,1000)
this.tui.toast(res.message)
}
}).catch((res) => {})
}
@ -380,7 +380,7 @@
}
} else {
this.tui.toast(res.message,1000)
this.tui.toast(res.message)
}
}).catch((res) => {})
},

2
package2/myCenter/addType.vue
View File

@ -107,7 +107,7 @@
if (res.code == 200) {
this.indexList = res.result;
} else {
this.tui.toast(res.message,1000)
this.tui.toast(res.message)
}
}).catch(() => {});
},

2
package2/myCenter/dataStatistics.vue
View File

@ -146,7 +146,7 @@
if (res.code == 200) {
this.shopInfo = res.result
} else {
this.tui.toast(res.message,1000)
this.tui.toast(res.message)
}
})

4
package2/myCenter/goodsList.vue
View File

@ -380,7 +380,7 @@
this.pages = res.result.pages
}
} else {
this.tui.toast(res.message,1000)
this.tui.toast(res.message)
}
}).catch((res) => {})
},
@ -417,7 +417,7 @@
this.categoryId = this.indexList[0].id
this.getShareList();
} else {
this.tui.toast(res.message,1000)
this.tui.toast(res.message)
}
}).catch((res) => {})
},

4
package2/myCenter/partTimeJobRegister.vue
View File

@ -297,7 +297,7 @@
that.$forceUpdate();
}
} else {
that.tui.toast(res.message, 1000)
that.tui.toast(res.message)
return
}
}).catch((res) => {})
@ -313,7 +313,7 @@
}
}
} else {
that.tui.toast(res.message, 1000)
that.tui.toast(res.message)
return
}
}).catch((res) => {})

4
package2/myCenter/wallet.vue
View File

@ -200,7 +200,7 @@
this.$refs.payPopup.close();
this.beginData();
} else {
that.tui.toast(res.message,1000)
that.tui.toast(res.message)
return
}
uni.hideLoading()
@ -231,7 +231,7 @@
}
that.$forceUpdate()
} else {
that.tui.toast(res.message,1000)
that.tui.toast(res.message)
return
}
uni.hideLoading()

2
package2/partTimeJob/partTimeJobCenter.vue
View File

@ -199,7 +199,7 @@
}
that.$forceUpdate();
} else {
that.tui.toast(res.message,1000);
that.tui.toast(res.message);
return;
}
uni.hideLoading();

2
package2/shop/orderDetail.vue
View File

@ -22,7 +22,7 @@
</view>
<view class="box1" style="display: flex;height: 100rpx;line-height: 100rpx;padding: 0 20rpx;">
<view style="border: 1px solid #48D1CC;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;border-radius: 20rpx;margin-top: auto;margin-bottom: auto;color: #48D1CC;font-weight: 700;">
{{data.deliveryType == 2?'自取订单':'配送订单'}}
{{data.deliveryType == 1?'配送订单':data.isPack == 1?'自取-打包':data.isPack == 0?'自取-堂食':'自取'}}
</view>
<view v-if="data.deliveryType == 1" style="display: flex;flex: 1;padding-left: 20rpx;">
<text style="flex: 1;">配送员：{{(data.deliveryInfo.workerName == 'null' || !data.deliveryInfo.workerName) ?"":data.deliveryInfo.workerName}}</text>

5
package2/shop/shopOrderList.vue
View File

@ -54,8 +54,8 @@
</view>
</view>
<view style="height: 80rpx;border-top: 1px solid #eee;display: flex;">
<view class="pinzi" @tap.stop="tanchuang(item.deliveryType)" style="width:80rpx;font-weight:700;margin-right: 20rpx;color:#00231C;background:linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))">
{{item.deliveryType == 1?'配送':'自取'}}
<view class="pinzi" @tap.stop="tanchuang(item.deliveryType)" style="width:auto;font-weight:700;margin-right: 20rpx;color:#00231C;background:linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));padding:0 12rpx;">
{{item.deliveryType == 1?'配送':item.isPack == 1?'自取-打包':item.isPack == 0?'自取-堂食':'自取'}}
</view>
<view v-if="item.orderType != 1 && item.groupInfo != null" @tap.stop="getGroupOrders(item.id)" class="pinzi">
拼
@ -259,7 +259,6 @@
if (that.currentIndex == 7) {
that.orderList[i].goodsList = that.orderList[i].items
}
console.log('哈哈哈哈哈1',that.orderList)
that.orderList[i].goodsNum = 0
for (let m = 0; m < that.orderList[i].goodsList.length; m++) {
that.orderList[i].goodsNum += that.orderList[i].goodsList[m].quantity

Write Preview
Loading…
Cancel
Save