theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'xbx' (#55) from xbx into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/55
This commit is contained in:
luyuan 2020-08-15 15:58:53 +08:00
commit 960f0453ec
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/index/index.vue
View File

@ -147,7 +147,7 @@ export default {
this.getallorder(0); this.getallorder(0);
const user = uni.getStorageSync('userinfo'); const user = uni.getStorageSync('userinfo');
console.log(user) console.log(user)
this.imService.login(user.userId,user.member_avatar,"") this.imService.login(user.userId,user.member_nickname,user.member_avatar)
this.imService.connectIM() this.imService.connectIM()
// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货 // 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
}, },
@ -285,7 +285,7 @@ export default {
getshiftlist() { getshiftlist() {
let that = this; let that = this;
this.$u.api.getshiftlist({}).then(res => { this.$u.api.getshiftlist({}).then(res => {
console.log(res); console.log(JSON.stringify(res));
if (res.errCode != 0) { if (res.errCode != 0) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,

3
pages/release/tosign.vue
View File

@ -75,7 +75,8 @@
}, },
shangchuan(){ shangchuan(){
uni.showLoading({ uni.showLoading({
title: '上传中' title: '上传中',
mask:true
}); });
}, },
tupian(){ tupian(){