From 9999345976b4012d3a6d037742414dc812c31e8d Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Wed, 8 Mar 2023 15:39:12 +0800
Subject: [PATCH 1/4] update

---
 .../utils/config.js                           | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/utils/config.js b/src/main/resources/static/linfeng-community-uniapp-ky/utils/config.js
index 14af21e..e7e2be8 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/utils/config.js
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/utils/config.js
@@ -1,21 +1,21 @@
-const miniappName = "林风社交论坛"; //分享时的标题
-const shareH5Url = "https://www.linfeng.tech/#/"; //H5分享路径
-
-
-//本地环境配置
-// const baseUrl = "localhost:8080";
-// const domain = 'http://' + baseUrl + "/app/"; 
-
-//线上环境配置
-const baseUrl = "wxapi.linfeng.tech";
-const domain = 'https://' + baseUrl + "/app/"; 
-
-
-
-
-export default {
-	baseUrl: baseUrl,
-	domain: domain,
-	miniappName: miniappName,
-	shareH5Url: shareH5Url
+const miniappName = "林风社交论坛"; //分享时的标题
+const shareH5Url = "https://www.linfeng.tech/#/"; //H5分享路径
+
+
+//本地环境配置
+// const baseUrl = "localhost:8080";
+// const domain = 'http://' + baseUrl + "/app/"; 
+
+//线上环境配置
+const baseUrl = "wxapi.linfeng.tech";
+const domain = 'https://' + baseUrl + "/app/";
+
+
+
+
+export default {
+	baseUrl: baseUrl,
+	domain: domain,
+	miniappName: miniappName,
+	shareH5Url: shareH5Url
 }

From 1136cfbb22bf7d68827af7e21c65340fa4b423bc Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Wed, 8 Mar 2023 15:44:35 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utils/request.js                          | 132 +++++++++---------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/utils/request.js b/src/main/resources/static/linfeng-community-uniapp-ky/utils/request.js
index 4ff9062..e0e8c30 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/utils/request.js
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/utils/request.js
@@ -1,67 +1,67 @@
-import config from './config.js';
-export default {
-	request(options = {}) {
-		return new Promise((resolve, reject) => {
-			let url = options.url;
-			if (url.indexOf("http://") == -1 && url.indexOf("https://") == -1) {
-				options.url = config.domain + url;
-			}
-			options.header.token = uni.getStorageSync("token");
-			options.complete = (response) => {
-				if (response.statusCode == 200 || response.statusCode == 0) {
-					if (response.data.code == 401 || response.data.code == 420) {
-						// #ifdef MP-WEIXIN
-						uni.navigateTo({
-							url: "/pages/login/weixin"
-						})
-						// #endif
-
-						// #ifdef H5
-						uni.navigateTo({
-							url: "/pages/login/login"
-						})
-						// #endif
-					}
-
-					if (response.data.code == 500) {
-						uni.showToast({
-							title: response.data.msg,
-							icon: "none",
-							duration: 2000
-						});
-					}
-					resolve(response.data)
-				} else {
-					uni.showToast({
-						title: '请求异常！',
-						icon: "none"
-					});
-				}
-			}
-
-			uni.request(options)
-		})
-	},
-
-	post(url, data = {}, header = {}) {
-
-		let options = {
-			url: url,
-			data: data,
-			header: header,
-			method: "POST"
-		}
-
-		return this.request(options);
-	},
-
-	get(url, data = {}, header = {}) {
-		let options = {
-			url: url,
-			data: data,
-			header: header
-		}
-
-		return this.request(options);
-	}
+import config from './config.js';
+export default {
+	request(options = {}) {
+		return new Promise((resolve, reject) => {
+			let url = options.url;
+			if (url.indexOf("http://") == -1 && url.indexOf("https://") == -1) {
+				options.url = config.domain + url;
+			}
+			options.header.token = uni.getStorageSync("token");
+			options.complete = (response) => {
+				if (response.statusCode == 200 || response.statusCode == 0) {
+					if (response.data.code == 401 || response.data.code == 420) {
+						// #ifdef MP-WEIXIN
+						uni.navigateTo({
+							url: "/pages/login/weixin"
+						})
+						// #endif
+
+						// #ifdef H5
+						uni.navigateTo({
+							url: "/pages/login/login"
+						})
+						// #endif
+					}
+
+					if (response.data.code == 500) {
+						uni.showToast({
+							title: response.data.msg,
+							icon: "none",
+							duration: 2000
+						});
+					}
+					resolve(response.data)
+				} else {
+					uni.showToast({
+						title: '请求异常！',
+						icon: "none"
+					});
+				}
+			}
+
+			uni.request(options)
+		})
+	},
+
+	post(url, data = {}, header = {}) {
+
+		let options = {
+			url: url,
+			data: data,
+			header: header,
+			method: "POST"
+		}
+
+		return this.request(options);
+	},
+
+	get(url, data = {}, header = {}) {
+		let options = {
+			url: url,
+			data: data,
+			header: header
+		}
+
+		return this.request(options);
+	}
 };

From 06884d384c0d657dc1e0557fe709d2dfefced4b3 Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Wed, 8 Mar 2023 15:45:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B9=BF=E5=9C=BA?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/square/square.vue                   | 498 +++++++++---------
 1 file changed, 249 insertions(+), 249 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue
index 3699691..bf1a836 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue
@@ -1,250 +1,250 @@
-<template>
-	<view>
-		<!-- navbar -->
-		<u-navbar :is-back="false" :border-bottom="false">
-			<u-icon name="plus-circle" :size="40" class="add-icon" @click="goPostAdd"></u-icon>
-			<u-tabs :list="pageTab" :current="pageCurrent" @change="pageTabChange"></u-tabs>
-		</u-navbar>
-		<!-- 创作广场 -->
-		<view v-show="pageCurrent == 0">
-			<!-- 分类 -->
-			<view class="tabs-wrap">
-				<u-tabs :list="classList" name="cateName" :current="current" @change="tabChange"></u-tabs>
-			</view>
-			<view v-show="current == 0">
-				<!-- 轮播图 -->
-				<view class="wrap">
-					<u-swiper :list="swiperList" name="img" border-radius="20" mode="dot" :effect3d="true"></u-swiper>
-				</view>
-			</view>
-			<!-- 帖子列表 -->
-			<post-list :list="postList" :loadStatus="loadPostStatus"></post-list>
-		</view>
-		<!-- 发帖达人 -->
-		<view v-show="pageCurrent == 1">
-			<navigator :url="'/pages/user/home?uid=' + item.uid" class="user-item" hover-class="none"
-				v-for="(item, index) in userList" :key="index">
-				<view v-if="index < 10" class="user-index-hot">{{ index + 1 }}</view>
-				<view v-else class="user-index">{{ index + 1 }}</view>
-				<image class="avatar" mode="aspectFill" :src="item.avatar"></image>
-				<view class="right">
-					<text class="username">{{ item.username }}</text>
-					<view class="tag-wrap">
-						<text class="tag" :key="index2">{{ item.intro }}</text>
-						<text class="tag" :key="index2">+{{ item.postNumber }}</text>
-					</view>
-				</view>
-			</navigator>
-			<!-- 加载状态 -->
-			<block v-if="userList.length === 0 && loadStatus == 'nomore'">
-				<u-empty margin-top="100" text="暂无内容" mode="favor"></u-empty>
-			</block>
-			<block v-else>
-				<view class="no-info">
-					<u-loadmore :status="loadStatus" />
-				</view>
-			</block>
-		</view>
-
-
-		<!-- 发帖入口 -->
-		<add-post-tag></add-post-tag>
-	</view>
-</template>
-
-<script>
-	import addPostTag from '../../components/add-post-tag/add-post-tag.vue'
-	export default {
-		data() {
-			return {
-				pageCurrent: 0,
-				current: 0,
-				pageTab: [{
-						name: '创作广场'
-					},
-					{
-						name: '发帖达人'
-					}
-				],
-				classList: [{
-					cateId: 0,
-					cateName: '推荐'
-				}],
-				swiperList: [],
-				postList: [],
-				loadPostStatus: 'loadmore',
-				classId: 0,
-				page: 1,
-				userList: [],
-				loadStatus: 'nomore'
-			}
-		},
-		onLoad() {
-			this.getBannerList();
-			this.getPostList();
-			this.getClassList();
-			this.getUserRanking();
-		},
-		onReachBottom() {
-			if (this.pageCurrent == 0) {
-				this.page++;
-				this.getPostList()
-			}
-			if (this.pageCurrent == 1) {
-				this.userList = [];
-				this.getUserRanking();
-			}
-		},
-		onPullDownRefresh() {
-			if (this.pageCurrent == 0) {
-				this.page = 1
-				this.pageList = []
-				this.getPostList()
-			} else if (this.pageCurrent == 1) {
-				this.userList = [];
-				this.getUserRanking();
-			}
-		},
-		methods: {
-			getBannerList() {
-				this.$H.get('link/list').then(res => {
-					if (res.code == 0) {
-						this.swiperList = res.result
-					}
-				})
-			},
-			toSearch() {
-				uni.showToast({
-					icon: 'none',
-					title: '暂无搜索'
-				})
-			},
-			goPostAdd() {
-				uni.navigateTo({
-					url: '/pages/post/add'
-				})
-			},
-			pageTabChange(index) {
-				this.pageCurrent = index
-			},
-			tabChange(index) {
-				this.current = index
-				this.page = 1
-				this.classId = this.classList[index].cateId
-				this.postList = []
-				this.getPostList()
-			},
-			getClassList() {
-				this.$H.get('topic/classList').then(res => {
-					this.classList = this.classList.concat(res.result)
-				})
-			},
-			getUserRanking() {
-				this.$H
-					.post('user/userRank')
-					.then(res => {
-						this.userList = res.result;
-					});
-			},
-			// 根据分页和分类展示帖子列表
-			getPostList() {
-				console.log('classId:', this.classId)
-				this.loadPostStatus = 'loading';
-				this.$H
-					.post('post/list', {
-						classId: this.classId,
-						page: this.page
-					})
-					.then(res => {
-						this.postList = this.postList.concat(res.result.data);
-						if (res.result.current_page === res.result.last_page || res.result.last_page === 0) {
-							this.loadPostStatus = 'nomore';
-						} else {
-							this.loadPostStatus = 'loadmore';
-						}
-					});
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.add-icon {
-		margin-left: 20rpx;
-		margin-right: 30%;
-	}
-
-	.tabs-wrap {
-		position: sticky;
-		z-index: 999;
-	}
-
-	.wrap {
-		padding: 0 40rpx;
-	}
-
-	// 用户列表
-	.user-item {
-		margin: 30rpx;
-		padding: 20rpx;
-		display: flex;
-		border-bottom: 1px solid #f5f5f5;
-
-		.user-index-hot {
-			margin-right: 20rpx;
-			color: #fff;
-			background-image: linear-gradient(#e64340, #ffaac3);
-			width: 55rpx;
-			height: 55rpx;
-			border-radius: 50%;
-			text-align: center;
-			line-height: 55rpx;
-		}
-
-		.user-index {
-			margin-right: 20rpx;
-			color: #aaaaff;
-			font-weight: bold;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.avatar {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 10rpx;
-			margin-right: 20rpx;
-		}
-
-		.right {
-			flex: 1;
-
-			.username {
-				font-weight: bold;
-			}
-
-			.tag-wrap {
-				font-size: 20rpx;
-
-				.tag {
-					display: inline-block;
-					padding: 5rpx 20rpx;
-					border-radius: 10rpx;
-					margin-right: 20rpx;
-					margin-bottom: 20rpx;
-					background-color: #7da9bd;
-
-					&:nth-child(2n) {
-						background-color: #ccb3ff;
-					}
-
-				}
-			}
-		}
-
-		.no-info {
-			margin: 30rpx 0;
-		}
-	}
+<template>
+	<view>
+		<!-- navbar -->
+		<u-navbar :is-back="false" :border-bottom="false">
+			<u-icon name="plus-circle" :size="40" class="add-icon" @click="goPostAdd"></u-icon>
+			<u-tabs :list="pageTab" :current="pageCurrent" @change="pageTabChange"></u-tabs>
+		</u-navbar>
+		<!-- 创作广场 -->
+		<view v-show="pageCurrent == 0">
+			<!-- 分类 -->
+			<view class="tabs-wrap">
+				<u-tabs :list="classList" name="cateName" :current="current" @change="tabChange"></u-tabs>
+			</view>
+			<view v-show="current == 0">
+				<!-- 轮播图 -->
+				<view class="wrap">
+					<u-swiper :list="swiperList" name="img" border-radius="20" mode="dot" :effect3d="true"></u-swiper>
+				</view>
+			</view>
+			<!-- 帖子列表 -->
+			<post-list :list="postList" :loadStatus="loadPostStatus"></post-list>
+		</view>
+		<!-- 发帖达人 -->
+		<view v-show="pageCurrent == 1">
+			<navigator :url="'/pages/user/home?uid=' + item.uid" class="user-item" hover-class="none"
+				v-for="(item, index) in userList" :key="index">
+				<view v-if="index < 10" class="user-index-hot">{{ index + 1 }}</view>
+				<view v-else class="user-index">{{ index + 1 }}</view>
+				<image class="avatar" mode="aspectFill" :src="item.avatar"></image>
+				<view class="right">
+					<text class="username">{{ item.username }}</text>
+					<view class="tag-wrap">
+						<text class="tag" :key="index2">{{ item.intro }}</text>
+						<text class="tag" :key="index2">+{{ item.postNumber }}</text>
+					</view>
+				</view>
+			</navigator>
+			<!-- 加载状态 -->
+			<block v-if="userList.length === 0 && loadStatus == 'nomore'">
+				<u-empty margin-top="100" text="暂无内容" mode="favor"></u-empty>
+			</block>
+			<block v-else>
+				<view class="no-info">
+					<u-loadmore :status="loadStatus" />
+				</view>
+			</block>
+		</view>
+
+
+		<!-- 发帖入口 -->
+		<add-post-tag></add-post-tag>
+	</view>
+</template>
+
+<script>
+	import addPostTag from '../../components/add-post-tag/add-post-tag.vue'
+	export default {
+		data() {
+			return {
+				pageCurrent: 0,
+				current: 0,
+				pageTab: [{
+						name: '创作广场'
+					},
+					{
+						name: '发帖达人'
+					}
+				],
+				classList: [{
+					cateId: 0,
+					cateName: '推荐'
+				}],
+				swiperList: [],
+				postList: [],
+				loadPostStatus: 'loadmore',
+				classId: 0,
+				page: 1,
+				userList: [],
+				loadStatus: 'nomore'
+			}
+		},
+		onLoad() {
+			this.getBannerList();
+			this.getPostList();
+			this.getClassList();
+			this.getUserRanking();
+		},
+		onReachBottom() {
+			if (this.pageCurrent == 0) {
+				this.page++;
+				this.getPostList()
+			}
+			if (this.pageCurrent == 1) {
+				this.userList = [];
+				this.getUserRanking();
+			}
+		},
+		onPullDownRefresh() {
+			if (this.pageCurrent == 0) {
+				this.page = 1
+				this.pageList = []
+				this.getPostList()
+			} else if (this.pageCurrent == 1) {
+				this.userList = [];
+				this.getUserRanking();
+			}
+		},
+		methods: {
+			getBannerList() {
+				this.$H.get('link/list').then(res => {
+					if (res.code == 0) {
+						this.swiperList = res.result
+					}
+				})
+			},
+			toSearch() {
+				uni.showToast({
+					icon: 'none',
+					title: '暂无搜索'
+				})
+			},
+			goPostAdd() {
+				uni.navigateTo({
+					url: '/pages/post/add'
+				})
+			},
+			pageTabChange(index) {
+				this.pageCurrent = index
+			},
+			tabChange(index) {
+				this.current = index
+				this.page = 1
+				this.classId = this.classList[index].cateId
+				this.postList = []
+				this.getPostList()
+			},
+			getClassList() {
+				this.$H.get('topic/classList').then(res => {
+					this.classList = this.classList.concat(res.result)
+				})
+			},
+			getUserRanking() {
+				this.$H
+					.post('user/userRank')
+					.then(res => {
+						this.userList = res.result;
+					});
+			},
+			// 根据分页和分类展示帖子列表
+			getPostList() {
+				console.log('classId:', this.classId)
+				this.loadPostStatus = 'loading';
+				this.$H
+					.post('post/list', {
+						classId: this.classId,
+						page: this.page
+					})
+					.then(res => {
+						this.postList = this.postList.concat(res.result.data);
+						if (res.result.current_page === res.result.last_page || res.result.last_page === 0) {
+							this.loadPostStatus = 'nomore';
+						} else {
+							this.loadPostStatus = 'loadmore';
+						}
+					});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.add-icon {
+		margin-left: 20rpx;
+		margin-right: 30%;
+	}
+
+	.tabs-wrap {
+		position: sticky;
+		z-index: 999;
+	}
+
+	.wrap {
+		padding: 0 40rpx;
+	}
+
+	// 用户列表
+	.user-item {
+		margin: 30rpx;
+		padding: 20rpx;
+		display: flex;
+		border-bottom: 1px solid #f5f5f5;
+
+		.user-index-hot {
+			margin-right: 20rpx;
+			color: #fff;
+			background-image: linear-gradient(#e64340, #ffaac3);
+			width: 55rpx;
+			height: 55rpx;
+			border-radius: 50%;
+			text-align: center;
+			line-height: 55rpx;
+		}
+
+		.user-index {
+			margin-right: 20rpx;
+			color: #aaaaff;
+			font-weight: bold;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.avatar {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 10rpx;
+			margin-right: 20rpx;
+		}
+
+		.right {
+			flex: 1;
+
+			.username {
+				font-weight: bold;
+			}
+
+			.tag-wrap {
+				font-size: 20rpx;
+
+				.tag {
+					display: inline-block;
+					padding: 5rpx 20rpx;
+					border-radius: 10rpx;
+					margin-right: 20rpx;
+					margin-bottom: 20rpx;
+					background-color: #7da9bd;
+
+					&:nth-child(2n) {
+						background-color: #ccb3ff;
+					}
+
+				}
+			}
+		}
+
+		.no-info {
+			margin: 30rpx 0;
+		}
+	}
 </style>

From 3fc9c96055f8908fb82a429d3f65fcd2ff54ef7c Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Wed, 8 Mar 2023 15:46:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linfeng-community-uniapp-ky/index.html    | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/index.html b/src/main/resources/static/linfeng-community-uniapp-ky/index.html
index c3ff205..1cc887d 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/index.html
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/index.html
@@ -1,20 +1,22 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title></title>
-    <!--preload-links-->
-    <!--app-context-->
-  </head>
-  <body>
-    <div id="app"><!--app-html--></div>
-    <script type="module" src="/main.js"></script>
-  </body>
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<script>
+			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+				CSS.supports('top: constant(a)'))
+			document.write(
+				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+				(coverSupport ? ', viewport-fit=cover' : '') + '" />')
+		</script>
+		<title></title>
+		<!--preload-links-->
+		<!--app-context-->
+	</head>
+	<body>
+		<div id="app">
+			<!--app-html-->
+		</div>
+		<script type="module" src="/main.js"></script>
+	</body>
 </html>