Merge branch 'master' of https://gitee.com/virus010101/linfeng-community

src/main/resources/static/linfeng-community-uniapp-ky/README.md

@@ -2,10 +2,11 @@
 
 林风社交论坛用户端linfeng-community-uniapp-ky启动方式：
 
-将项目导入HBuilderX编辑器，在项目根目录执行npm install安装依赖，
+将项目导入HBuilderX编辑器，初次使用请在项目根目录执行npm install安装依赖，
-
-然后执行`运行`—>`运行到浏览器`
 
+运行到H5端请执行`运行`—>`运行到浏览器`
+运行到微信小程序需要注意，先在`mainfest.json`—>`微信小程序配置`，设置小程序APPID，
+然后再`运行`—>`运行到小程序模拟器`—>`微信开发者工具`
 注意：开源版适配H5和微信小程序端。
 
 

src/main/resources/static/linfeng-community-uniapp-ky/pages.json

@@ -113,7 +113,7 @@
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "林风论坛",
+		"navigationBarTitleText": "林风社交论坛开源版",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},

src/main/resources/static/linfeng-community-uniapp-ky/pages/login/weixin.vue

@@ -30,7 +30,7 @@
 			},
 			getSysInfo() {
 				this.$H.get("system/miniConfig").then(res => {
-					if(res.code==0){
+					if (res.code == 0) {
 						this.logo = res.logo;
 					}
 				})
@@ -39,14 +39,13 @@
 			async login() {
 				uni.showLoading({
 					mask: true,
-					title: '正在登陆'
+					title: '正在登录中'
 				});
 				var that = this;
 				let code = await this.getLoginCode();
 				that.$H.post('user/miniWxlogin', {
 					code: code
 				}).then(res => {
-
 					if (res.code === 0) {
 						uni.setStorageSync("hasLogin", true);
 						uni.setStorageSync("token", res.token);
@@ -57,12 +56,7 @@
 					}
 					uni.hideLoading();
 				})
-
-
-
 			},
-
-
 			getUserInfo() {
 				this.$H.get("user/userInfo").then(res => {
 					uni.setStorageSync("userInfo", res.result)