uopdate about conflict

This commit is contained in:
cmxdd
2020-08-10 10:24:36 +08:00
40 changed files with 1843 additions and 70 deletions

View File

@@ -156,6 +156,10 @@ export default {
this.getcarlist();
// 所有订单
this.getallorder(0);
const user = uni.getStorageSync('userinfo');
console.log(user)
this.imService.login(user.userId,user.member_avatar,"")
this.imService.connectIM()
// 订单状态: 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
},
onShow() {