Merge branch 'master' of http://1.14.104.71:10880/root/his_user_miniapp

pages/TUIKit/TUIPages/TUIChat/index.vue

@@ -345,8 +345,7 @@ export default defineComponent({
          const scrollH = res.height;
          data.scrollTop = scrollH;
 		  
-       })
-       .exec();
+       }).exec();
    };
 	const handleCustomerItem = (event: any, item: any) => {
 			if(item.payload.data=="order"){

pages/auth/login.vue

@@ -167,7 +167,6 @@ export default {
 		// 微信用户手机号登录
 		phoneLogin(e) {
 			var that=this;
-			
 			uni.showLoading({
 				title:"处理中"
 			})
@@ -195,12 +194,10 @@ export default {
 							.then( res => {
 								uni.hideLoading();
 								if(res.code==200){
-									uni.showToast({
-										icon:'none',
-										title: "登录成功",
-									});
-									uni.setStorageSync('userHistoryApp',res.user.historyApp);
+									uni.showToast({icon:'none',title: "登录成功"});
 									uni.setStorageSync('AppToken',res.token);
+									uni.setStorageSync('userHistoryApp',res.user.historyApp);
+									uni.setStorageSync('userInfo',JSON.stringify(res.user));
 									uni.setStorageSync('userId',res.user.userId);
 									uni.setStorageSync('avatar',res.user.avatar);
 									uni.setStorageSync('nickName',res.user.nickName);

pages/user/index.vue

@@ -264,7 +264,7 @@
 								var param={followId:res.data.followId};
 								startDrugReport(param).then(
 									res => {
-										uni.hideLoading()
+										uni.hideLoading();
 										//
 										// uni.switchTab({
 										// 	url:"/pages/TUIKit/TUIPages/TUIConversation/index"

pages_user/doFollow.vue

@@ -91,8 +91,7 @@
 								followId:this.followId,
 								formJson:JSON.stringify(this.form)
 							}
-							doFollow(data).then(
-								res => {
+							doFollow(data).then(res => {
 									if(res.code==200){
 										uni.showToast({
 											icon:'success',
@@ -107,7 +106,7 @@
 									}else{
 										uni.showToast({
 											icon:'none',
-											title: res.msg,
+											title: res.msg
 										});
 									}
 								},