Merge branch 'master' of https://gitea.igandanyiyuan.com/gdxz/uniapp-app

# Conflicts:
#	App.vue
#	manifest.json

pages_app/login/login.vue

@@ -161,7 +161,7 @@
 		
 		// #ifdef APP
 		uni.showToast({
-			title: '微信登录 11',
+			title: '微信登录',
 			icon: 'none'
 		});
 		// #endif
@@ -217,9 +217,10 @@
 								uni.setStorageSync('DEV_AUTH_YX_TOKEN_App', res.data.YX_token);
 								uni.setStorageSync('userInfo', res.data);
 							}
-
+							const app = getApp()
+							app.initNim({ account:result.data.YX_accid, token: result.data.YX_token })
 							// 跳转到首页
-							navTo({
+							uni.redirectTo({
 								url: '/pages/index/index'
 							})
 						}).catch(err=>{