From 3884f93ad88d18b9909c8e7154ba5b3e2c03deac Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 15 Aug 2020 13:33:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4864c5f..aba1c05 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -146,7 +146,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拒绝退款/退货
 	},
-- 
2.45.2


From 1cc3f289fe8e757741cad9ae44729e29fcc2a703 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 15 Aug 2020 15:58:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=A2=A6?=
 =?UTF-8?q?=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue    | 2 +-
 pages/release/tosign.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index aba1c05..ca08a1d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -284,7 +284,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,
diff --git a/pages/release/tosign.vue b/pages/release/tosign.vue
index 22fb6c6..6868355 100644
--- a/pages/release/tosign.vue
+++ b/pages/release/tosign.vue
@@ -75,7 +75,8 @@
 			},
 			shangchuan(){
 				uni.showLoading({
-					title: '上传中'
+					title: '上传中',
+					mask:true
 				});
 			},
 			tupian(){
-- 
2.45.2