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

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/55

pages/index/index.vue

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

pages/release/tosign.vue

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