From c53830e1853b77b99c9a1cda9acc1f448edcace1 Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Sat, 4 Mar 2023 23:10:11 +0800
Subject: [PATCH 01/11] update

---
 .../pages/index/index.vue                     | 298 +++++++++---------
 .../utils/config.js                           |   8 +-
 2 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/index/index.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/index/index.vue
index b687c9c..988ce7b 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/index/index.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/index/index.vue
@@ -1,150 +1,150 @@
-<template>
-	<view>
-		<u-navbar :is-back="false" z-index="99999">
-			<u-tabs :list="tabList" font-size="35" name="cateName" bg-color="#fff" :current="current"
-				@change="tabChange"></u-tabs>
-		</u-navbar>
-		<!-- 最新 -->
-		<view v-if="current === 1">
-			<post-list :list="lastPost" :loadStatus="loadStatus2"></post-list>
-		</view>
-		<!-- 关注 -->
-		<view v-if="current === 0">
-			<post-list :list="followUserPost" :loadStatus="loadStatus1"></post-list>
-		</view>
-		<!-- 发贴入口 -->
-		<add-post-tag></add-post-tag>
-	</view>
-</template>
-
-<script>
-	import postList from '../../components/post-list/post-list.vue';
-	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
-	export default {
-		components: {
-			postList,
-			addPostTag
-		},
-		data() {
-			return {
-				sessionUid: uni.getStorageSync('userInfo').uid,
-				loadStatus1: 'loadmore',
-				loadStatus2: 'loadmore',
-				page1: 1,
-				page2: 1,
-				shareCover: '',
-				followUserPost: [],
-				lastPost: [],
-				tabList: [{
-						name: '关注'
-					},
-					{
-						name: '最新'
-					}
-				],
-				current: 1,
-
-			};
-		},
-		onShareAppMessage(res) {
-			return {
-				title: this.$c.miniappName,
-				path: '/pages/index/index',
-				imageUrl: this.shareCover
-			};
-		},
-		onLoad() {
-			this.getLastPost();
-		},
-		onReachBottom() {
-			if (this.current === 0) {
-				this.page1++;
-				this.getFollowUserPost();
-			}
-
-			if (this.current === 1) {
-				this.page2++;
-				this.getLastPost();
-			}
-		},
-		onPullDownRefresh() {
-			if (this.current === 0) {
-				this.page1 = 1;
-				this.followUserPost = [];
-				this.getFollowUserPost();
-			}
-			if (this.current === 1) {
-				this.page2 = 1;
-				this.lastPost = [];
-				this.getLastPost();
-			}
-			uni.stopPullDownRefresh();
-		},
-		methods: {
-
-			tabChange(index) {
-				this.current = index;
-				this.followUserPost = [];
-				this.lastPost = [];
-
-				if (index === 0) {
-					this.page1 = 1;
-					this.getFollowUserPost();
-
-				}
-				if (index === 1) {
-					this.page2 = 1;
-					this.getLastPost();
-				}
-			},
-			getSysInfo() {
-				this.$H.get('system/miniConfig').then(res => {
-					this.shareCover = res.result.intro;
-				});
-			},
-			// 获取关注用户帖子
-			getFollowUserPost() {
-				this.loadStatus1 = 'loading';
-				this.$H
-					.get('post/followUserPost', {
-						page: this.page1
-					})
-					.then(res => {
-						if (res.code == 0 && res.result) {
-							this.followUserPost = this.followUserPost.concat(res.result.data);
-							if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
-								this.loadStatus1 = 'nomore';
-							} else {
-								this.loadStatus1 = 'loadmore';
-							}
-						} else {
-							this.loadStatus1 = 'nomore';
-						}
-
-					});
-			},
-			//获取最新帖子
-			getLastPost() {
-				this.loadStatus2 = 'loading';
-				this.$H
-					.get('post/lastPost', {
-						page: this.page2
-					})
-					.then(res => {
-						this.lastPost = this.lastPost.concat(res.result.data);
-						if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
-							this.loadStatus2 = 'nomore';
-						} else {
-							this.loadStatus2 = 'loadmore';
-						}
-					});
-			},
-		}
-	};
-</script>
-
-<style>
-	page {
-		background-color: #F5F5F5;
-	}
+<template>
+	<view>
+		<u-navbar :is-back="false" z-index="99999">
+			<u-tabs :list="tabList" font-size="35" name="cateName" bg-color="#fff" :current="current"
+				@change="tabChange"></u-tabs>
+		</u-navbar>
+		<!-- 最新 -->
+		<view v-if="current === 1">
+			<post-list :list="lastPost" :loadStatus="loadStatus2"></post-list>
+		</view>
+		<!-- 关注 -->
+		<view v-if="current === 0">
+			<post-list :list="followUserPost" :loadStatus="loadStatus1"></post-list>
+		</view>
+		<!-- 发贴入口 -->
+		<add-post-tag></add-post-tag>
+	</view>
+</template>
+
+<script>
+	import postList from '../../components/post-list/post-list.vue';
+	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
+	export default {
+		components: {
+			postList,
+			addPostTag
+		},
+		data() {
+			return {
+				sessionUid: uni.getStorageSync('userInfo').uid,
+				loadStatus1: 'loadmore',
+				loadStatus2: 'loadmore',
+				page1: 1,
+				page2: 1,
+				shareCover: '',
+				followUserPost: [],
+				lastPost: [],
+				tabList: [{
+						name: '关注'
+					},
+					{
+						name: '最新'
+					}
+				],
+				current: 1,
+
+			};
+		},
+		onShareAppMessage(res) {
+			return {
+				title: this.$c.miniappName,
+				path: '/pages/index/index',
+				imageUrl: this.shareCover
+			};
+		},
+		onLoad() {
+			this.getLastPost();
+		},
+		onReachBottom() {
+			if (this.current === 0) {
+				this.page1++;
+				this.getFollowUserPost();
+			}
+
+			if (this.current === 1) {
+				this.page2++;
+				this.getLastPost();
+			}
+		},
+		onPullDownRefresh() {
+			if (this.current === 0) {
+				this.page1 = 1;
+				this.followUserPost = [];
+				this.getFollowUserPost();
+			}
+			if (this.current === 1) {
+				this.page2 = 1;
+				this.lastPost = [];
+				this.getLastPost();
+			}
+			uni.stopPullDownRefresh();
+		},
+		methods: {
+
+			tabChange(index) {
+				this.current = index;
+				this.followUserPost = [];
+				this.lastPost = [];
+
+				if (index === 0) {
+					this.page1 = 1;
+					this.getFollowUserPost();
+
+				}
+				if (index === 1) {
+					this.page2 = 1;
+					this.getLastPost();
+				}
+			},
+			getSysInfo() {
+				this.$H.get('system/miniConfig').then(res => {
+					this.shareCover = res.result.intro;
+				});
+			},
+			// 获取关注用户帖子
+			getFollowUserPost() {
+				this.loadStatus1 = 'loading';
+				this.$H
+					.get('post/followUserPost', {
+						page: this.page1
+					})
+					.then(res => {
+						if (res.code == 0 && res.result) {
+							this.followUserPost = this.followUserPost.concat(res.result.data);
+							if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
+								this.loadStatus1 = 'nomore';
+							} else {
+								this.loadStatus1 = 'loadmore';
+							}
+						} else {
+							this.loadStatus1 = 'nomore';
+						}
+
+					});
+			},
+			//获取最新帖子
+			getLastPost() {
+				this.loadStatus2 = 'loading';
+				this.$H
+					.get('post/lastPost', {
+						page: this.page2
+					})
+					.then(res => {
+						this.lastPost = this.lastPost.concat(res.result.data);
+						if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
+							this.loadStatus2 = 'nomore';
+						} else {
+							this.loadStatus2 = 'loadmore';
+						}
+					});
+			},
+		}
+	};
+</script>
+
+<style>
+	page {
+		background-color: #F5F5F5;
+	}
 </style>
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 5ce0272..7e882f7 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
@@ -3,12 +3,12 @@ const shareH5Url = "https://www.linfeng.tech/#/"; //H5分享路径
 
 
 //本地环境配置
-const baseUrl = "localhost:8080";
-const domain = 'http://' + baseUrl + "/app/"; 
+// const baseUrl = "localhost:8080";
+// const domain = 'http://' + baseUrl + "/app/"; 
 
 //线上环境配置
-// const baseUrl = "wxapi.linfeng.tech";
-// const domain = 'https://' + baseUrl + "/app/"; 
+const baseUrl = "wxapi.linfeng.tech";
+const domain = 'https://' + baseUrl + "/app/"; 
 
 
 

From 2bcde7f232435acb184475db8142dfb7bea9f446 Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Sat, 4 Mar 2023 23:15:25 +0800
Subject: [PATCH 02/11] update

---
 .../pages/index/index.vue                     | 298 +++++++++---------
 1 file changed, 149 insertions(+), 149 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/index/index.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/index/index.vue
index b687c9c..988ce7b 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/index/index.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/index/index.vue
@@ -1,150 +1,150 @@
-<template>
-	<view>
-		<u-navbar :is-back="false" z-index="99999">
-			<u-tabs :list="tabList" font-size="35" name="cateName" bg-color="#fff" :current="current"
-				@change="tabChange"></u-tabs>
-		</u-navbar>
-		<!-- 最新 -->
-		<view v-if="current === 1">
-			<post-list :list="lastPost" :loadStatus="loadStatus2"></post-list>
-		</view>
-		<!-- 关注 -->
-		<view v-if="current === 0">
-			<post-list :list="followUserPost" :loadStatus="loadStatus1"></post-list>
-		</view>
-		<!-- 发贴入口 -->
-		<add-post-tag></add-post-tag>
-	</view>
-</template>
-
-<script>
-	import postList from '../../components/post-list/post-list.vue';
-	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
-	export default {
-		components: {
-			postList,
-			addPostTag
-		},
-		data() {
-			return {
-				sessionUid: uni.getStorageSync('userInfo').uid,
-				loadStatus1: 'loadmore',
-				loadStatus2: 'loadmore',
-				page1: 1,
-				page2: 1,
-				shareCover: '',
-				followUserPost: [],
-				lastPost: [],
-				tabList: [{
-						name: '关注'
-					},
-					{
-						name: '最新'
-					}
-				],
-				current: 1,
-
-			};
-		},
-		onShareAppMessage(res) {
-			return {
-				title: this.$c.miniappName,
-				path: '/pages/index/index',
-				imageUrl: this.shareCover
-			};
-		},
-		onLoad() {
-			this.getLastPost();
-		},
-		onReachBottom() {
-			if (this.current === 0) {
-				this.page1++;
-				this.getFollowUserPost();
-			}
-
-			if (this.current === 1) {
-				this.page2++;
-				this.getLastPost();
-			}
-		},
-		onPullDownRefresh() {
-			if (this.current === 0) {
-				this.page1 = 1;
-				this.followUserPost = [];
-				this.getFollowUserPost();
-			}
-			if (this.current === 1) {
-				this.page2 = 1;
-				this.lastPost = [];
-				this.getLastPost();
-			}
-			uni.stopPullDownRefresh();
-		},
-		methods: {
-
-			tabChange(index) {
-				this.current = index;
-				this.followUserPost = [];
-				this.lastPost = [];
-
-				if (index === 0) {
-					this.page1 = 1;
-					this.getFollowUserPost();
-
-				}
-				if (index === 1) {
-					this.page2 = 1;
-					this.getLastPost();
-				}
-			},
-			getSysInfo() {
-				this.$H.get('system/miniConfig').then(res => {
-					this.shareCover = res.result.intro;
-				});
-			},
-			// 获取关注用户帖子
-			getFollowUserPost() {
-				this.loadStatus1 = 'loading';
-				this.$H
-					.get('post/followUserPost', {
-						page: this.page1
-					})
-					.then(res => {
-						if (res.code == 0 && res.result) {
-							this.followUserPost = this.followUserPost.concat(res.result.data);
-							if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
-								this.loadStatus1 = 'nomore';
-							} else {
-								this.loadStatus1 = 'loadmore';
-							}
-						} else {
-							this.loadStatus1 = 'nomore';
-						}
-
-					});
-			},
-			//获取最新帖子
-			getLastPost() {
-				this.loadStatus2 = 'loading';
-				this.$H
-					.get('post/lastPost', {
-						page: this.page2
-					})
-					.then(res => {
-						this.lastPost = this.lastPost.concat(res.result.data);
-						if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
-							this.loadStatus2 = 'nomore';
-						} else {
-							this.loadStatus2 = 'loadmore';
-						}
-					});
-			},
-		}
-	};
-</script>
-
-<style>
-	page {
-		background-color: #F5F5F5;
-	}
+<template>
+	<view>
+		<u-navbar :is-back="false" z-index="99999">
+			<u-tabs :list="tabList" font-size="35" name="cateName" bg-color="#fff" :current="current"
+				@change="tabChange"></u-tabs>
+		</u-navbar>
+		<!-- 最新 -->
+		<view v-if="current === 1">
+			<post-list :list="lastPost" :loadStatus="loadStatus2"></post-list>
+		</view>
+		<!-- 关注 -->
+		<view v-if="current === 0">
+			<post-list :list="followUserPost" :loadStatus="loadStatus1"></post-list>
+		</view>
+		<!-- 发贴入口 -->
+		<add-post-tag></add-post-tag>
+	</view>
+</template>
+
+<script>
+	import postList from '../../components/post-list/post-list.vue';
+	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
+	export default {
+		components: {
+			postList,
+			addPostTag
+		},
+		data() {
+			return {
+				sessionUid: uni.getStorageSync('userInfo').uid,
+				loadStatus1: 'loadmore',
+				loadStatus2: 'loadmore',
+				page1: 1,
+				page2: 1,
+				shareCover: '',
+				followUserPost: [],
+				lastPost: [],
+				tabList: [{
+						name: '关注'
+					},
+					{
+						name: '最新'
+					}
+				],
+				current: 1,
+
+			};
+		},
+		onShareAppMessage(res) {
+			return {
+				title: this.$c.miniappName,
+				path: '/pages/index/index',
+				imageUrl: this.shareCover
+			};
+		},
+		onLoad() {
+			this.getLastPost();
+		},
+		onReachBottom() {
+			if (this.current === 0) {
+				this.page1++;
+				this.getFollowUserPost();
+			}
+
+			if (this.current === 1) {
+				this.page2++;
+				this.getLastPost();
+			}
+		},
+		onPullDownRefresh() {
+			if (this.current === 0) {
+				this.page1 = 1;
+				this.followUserPost = [];
+				this.getFollowUserPost();
+			}
+			if (this.current === 1) {
+				this.page2 = 1;
+				this.lastPost = [];
+				this.getLastPost();
+			}
+			uni.stopPullDownRefresh();
+		},
+		methods: {
+
+			tabChange(index) {
+				this.current = index;
+				this.followUserPost = [];
+				this.lastPost = [];
+
+				if (index === 0) {
+					this.page1 = 1;
+					this.getFollowUserPost();
+
+				}
+				if (index === 1) {
+					this.page2 = 1;
+					this.getLastPost();
+				}
+			},
+			getSysInfo() {
+				this.$H.get('system/miniConfig').then(res => {
+					this.shareCover = res.result.intro;
+				});
+			},
+			// 获取关注用户帖子
+			getFollowUserPost() {
+				this.loadStatus1 = 'loading';
+				this.$H
+					.get('post/followUserPost', {
+						page: this.page1
+					})
+					.then(res => {
+						if (res.code == 0 && res.result) {
+							this.followUserPost = this.followUserPost.concat(res.result.data);
+							if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
+								this.loadStatus1 = 'nomore';
+							} else {
+								this.loadStatus1 = 'loadmore';
+							}
+						} else {
+							this.loadStatus1 = 'nomore';
+						}
+
+					});
+			},
+			//获取最新帖子
+			getLastPost() {
+				this.loadStatus2 = 'loading';
+				this.$H
+					.get('post/lastPost', {
+						page: this.page2
+					})
+					.then(res => {
+						this.lastPost = this.lastPost.concat(res.result.data);
+						if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
+							this.loadStatus2 = 'nomore';
+						} else {
+							this.loadStatus2 = 'loadmore';
+						}
+					});
+			},
+		}
+	};
+</script>
+
+<style>
+	page {
+		background-color: #F5F5F5;
+	}
 </style>

From ab33328874aa14f9f50b10b8a906647e293536c2 Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Sat, 4 Mar 2023 23:16:29 +0800
Subject: [PATCH 03/11] login

---
 .../pages/login/login.vue                     | 198 +++++++++---------
 1 file changed, 99 insertions(+), 99 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/login.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/login.vue
index 0cb8a0a..96d6b6f 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/login.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/login.vue
@@ -1,100 +1,100 @@
-<template>
-	<view class="login-register">
-		<view class="title">请先登录/注册</view>
-		<u-form :model="form" ref="uForm">
-			<u-form-item>
-				<u-input v-model="form.mobile" placeholder="请输入手机号" />
-			</u-form-item>
-			<u-form-item>
-				<u-input v-model="form.code" placeholder="请输入验证码" />
-				<u-button slot="right" size="mini" @click="getCode">{{tips}}</u-button>
-				<u-verification-code :seconds="60" @end="end" @start="start" ref="uCode" @change="codeChange">
-				</u-verification-code>
-			</u-form-item>
-		</u-form>
-		<view class="button-login">
-			<u-button v-show="form.mobile && form.code" type="success" @click="phoneLogin" shape="circle">登录</u-button>
-			<u-button v-show="!form.mobile || !form.code" type="default" shape="circle">登录</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				form: {
-					mobile: "",
-					code: ""
-				},
-				tips: '验证码'
-			};
-		},
-		methods: {
-			phoneLogin() {
-				uni.showLoading({
-					mask: true,
-					title: '登录中'
-				});
-				this.$H.post("user/smsLogin", this.form).then(res => {
-					if (res.code == 0) {
-						uni.setStorageSync("hasLogin", true);
-						uni.setStorageSync("token", res.token);
-						uni.switchTab({
-							url: '/pages/index/index'
-						});
-					}
-
-					uni.hideLoading();
-				})
-			},
-			codeChange(text) {
-				this.tips = text;
-			},
-			getCode() {
-				let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
-				if (this.form.mobile == '') {
-					this.$u.toast('请输入手机号');
-				} else if (!phoneCodeVerification.test(this.form.mobile)) {
-					this.$u.toast('请输入规范的手机号');
-				} else {
-
-					if (this.$refs.uCode.canGetCode) {
-						uni.showLoading({
-							title: '正在获取验证码'
-						})
-						this.$H.post("user/sendSmsCode", {
-							mobile: this.form.mobile
-						}).then(res => {
-							if (res.code == 0) {
-								uni.hideLoading();
-								this.$refs.uCode.start();
-								this.$u.toast(res.msg);
-							}
-						})
-					} else {
-						this.$u.toast('倒计时结束后再发送');
-					}
-				}
-			},
-			end() {},
-			start() {}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.login-register {
-		padding: 20rpx 50rpx;
-	}
-
-	.button-login {
-		margin-top: 100rpx;
-	}
-
-	.title {
-		font-size: 40rpx;
-		font-weight: 600;
-		margin-bottom: 50rpx;
-	}
+<template>
+	<view class="login-register">
+		<view class="title">请先登录/注册</view>
+		<u-form :model="form" ref="uForm">
+			<u-form-item>
+				<u-input v-model="form.mobile" placeholder="请输入手机号" />
+			</u-form-item>
+			<u-form-item>
+				<u-input v-model="form.code" placeholder="请输入验证码" />
+				<u-button slot="right" size="mini" @click="getCode">{{tips}}</u-button>
+				<u-verification-code :seconds="60" @end="end" @start="start" ref="uCode" @change="codeChange">
+				</u-verification-code>
+			</u-form-item>
+		</u-form>
+		<view class="button-login">
+			<u-button v-show="form.mobile && form.code" type="success" @click="phoneLogin" shape="circle">登录</u-button>
+			<u-button v-show="!form.mobile || !form.code" type="default" shape="circle">登录</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form: {
+					mobile: "",
+					code: ""
+				},
+				tips: '验证码'
+			};
+		},
+		methods: {
+			phoneLogin() {
+				uni.showLoading({
+					mask: true,
+					title: '登录中'
+				});
+				this.$H.post("user/smsLogin", this.form).then(res => {
+					if (res.code == 0) {
+						uni.setStorageSync("hasLogin", true);
+						uni.setStorageSync("token", res.token);
+						uni.switchTab({
+							url: '/pages/index/index'
+						});
+					}
+
+					uni.hideLoading();
+				})
+			},
+			codeChange(text) {
+				this.tips = text;
+			},
+			getCode() {
+				let phoneCodeVerification = /^[1][3-9][0-9]{9}$/;
+				if (this.form.mobile == '') {
+					this.$u.toast('请输入手机号');
+				} else if (!phoneCodeVerification.test(this.form.mobile)) {
+					this.$u.toast('请输入规范的手机号');
+				} else {
+
+					if (this.$refs.uCode.canGetCode) {
+						uni.showLoading({
+							title: '正在获取验证码'
+						})
+						this.$H.post("user/sendSmsCode", {
+							mobile: this.form.mobile
+						}).then(res => {
+							if (res.code == 0) {
+								uni.hideLoading();
+								this.$refs.uCode.start();
+								this.$u.toast(res.msg);
+							}
+						})
+					} else {
+						this.$u.toast('倒计时结束后再发送');
+					}
+				}
+			},
+			end() {},
+			start() {}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.login-register {
+		padding: 20rpx 50rpx;
+	}
+
+	.button-login {
+		margin-top: 100rpx;
+	}
+
+	.title {
+		font-size: 40rpx;
+		font-weight: 600;
+		margin-bottom: 50rpx;
+	}
 </style>

From 7d563ef9547701ec914fc7773d3da8db517201a3 Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Sat, 4 Mar 2023 23:17:00 +0800
Subject: [PATCH 04/11] myupdate

---
 .../pages/my/post.vue                         | 154 +++++++++---------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/my/post.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/my/post.vue
index 226ab9a..006d509 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/my/post.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/my/post.vue
@@ -1,78 +1,78 @@
-<template>
-	<view>
-		<post-list :list="postList" :loadStatus="loadStatus"></post-list>
-	</view>
-</template>
-
-<script>
-	import postList from '../../components/post-list/post-list.vue';
-	export default {
-		components: {
-			postList
-		},
-		data() {
-			return {
-				postList: [],
-				loadStatus: "loading",
-				page: 1,
-				type: 1, //1 点赞帖子   2 我的帖子
-			};
-		},
-		onLoad(options) {
-			this.type = options.type
-			if (options.type == 1) {
-				this.getCollectPostList();
-			} else if (options.type == 2) {
-				this.getMyPostList();
-			}
-
-		},
-		onReachBottom() {
-			if (this.type == 1) {
-				this.page++;
-				this.getCollectPostList();
-			} else if (this.type == 2) {
-				this.page++;
-				this.getMyPostList();
-			}
-		},
-		methods: {
-			getCollectPostList() {
-				this.loadStatus = "loading";
-				this.$H.get('post/myCollectPost', {
-					page: this.page
-				}).then(res => {
-					if (res.result.data) {
-						this.postList = this.postList.concat(res.result.data);
-						if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
-							this.loadStatus = "nomore";
-						} else {
-							this.loadStatus = "loadmore"
-						}
-					} else {
-						this.loadStatus = "nomore";
-					}
-				})
-			},
-			getMyPostList() {
-				this.loadStatus = "loading";
-				this.$H.get('post/myPost', {
-					page: this.page
-				}).then(res => {
-					this.postList = this.postList.concat(res.result.data);
-					if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
-						this.loadStatus = "nomore";
-					} else {
-						this.loadStatus = "loadmore"
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #f5f5f5;
-	}
+<template>
+	<view>
+		<post-list :list="postList" :loadStatus="loadStatus"></post-list>
+	</view>
+</template>
+
+<script>
+	import postList from '../../components/post-list/post-list.vue';
+	export default {
+		components: {
+			postList
+		},
+		data() {
+			return {
+				postList: [],
+				loadStatus: "loading",
+				page: 1,
+				type: 1, //1 点赞帖子   2 我的帖子
+			};
+		},
+		onLoad(options) {
+			this.type = options.type
+			if (options.type == 1) {
+				this.getCollectPostList();
+			} else if (options.type == 2) {
+				this.getMyPostList();
+			}
+
+		},
+		onReachBottom() {
+			if (this.type == 1) {
+				this.page++;
+				this.getCollectPostList();
+			} else if (this.type == 2) {
+				this.page++;
+				this.getMyPostList();
+			}
+		},
+		methods: {
+			getCollectPostList() {
+				this.loadStatus = "loading";
+				this.$H.get('post/myCollectPost', {
+					page: this.page
+				}).then(res => {
+					if (res.result.data) {
+						this.postList = this.postList.concat(res.result.data);
+						if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
+							this.loadStatus = "nomore";
+						} else {
+							this.loadStatus = "loadmore"
+						}
+					} else {
+						this.loadStatus = "nomore";
+					}
+				})
+			},
+			getMyPostList() {
+				this.loadStatus = "loading";
+				this.$H.get('post/myPost', {
+					page: this.page
+				}).then(res => {
+					this.postList = this.postList.concat(res.result.data);
+					if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
+						this.loadStatus = "nomore";
+					} else {
+						this.loadStatus = "loadmore"
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f5f5f5;
+	}
 </style>

From ba289eb1bf92f3ae84ac470fd16797814264e170 Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Sat, 4 Mar 2023 23:30:16 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/post/add.vue                        | 330 +++++++++---------
 .../utils/config.js                           |   6 +-
 2 files changed, 166 insertions(+), 170 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/add.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/add.vue
index 79d1e30..4f01e67 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/add.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/add.vue
@@ -1,166 +1,166 @@
-<template>
-	<view class="container">
-		<input v-model="form.title" class="title-input" placeholder="标题" />
-		<textarea placeholder="说些什么叭..." :auto-height="true" maxlength="-1" v-model="form.content"
-			class="content-display"></textarea>
-		<!-- 上传图片 -->
-		<block v-if="form.type == 1">
-			<u-upload ref="uUpload" :size-type="['original']" name="Image" :max-count="4" :header="header"
-				:action="uploadImgUrl" @on-uploaded="submit" :auto-upload="false"></u-upload>
-		</block>
-		<!-- 分类 -->
-		<view @click="chooseClass" class="choose-item">
-			<u-icon class="icon add-icon" name="file-text-fill" color="#999" size="40"></u-icon>
-			<text class="txt">{{ cateName || '选择帖子分类' }}</text>
-			<u-icon class="u-icon" name="arrow-right"></u-icon>
-		</view>
-		<view class="button-style">
-			<u-button v-if="form.type == 1" :custom-style="btnStyle" @click="uploadImg" shape="circle">发布</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				btnStyle: {
-					color: "#fff",
-					backgroundColor: '#333333'
-				},
-				uploadImgUrl: this.$c.domain + 'common/upload',
-				form: {
-					title: '',
-					type: 1,
-					topicId: 2,
-					discussId: '',
-					content: '',
-					media: [],
-					longitude: 0,
-					latitude: 0,
-					address: '',
-					cut: 0, //分类id
-					pay: '',
-				},
-				cateName: '',
-				header: {
-					token: uni.getStorageSync('token')
-				},
-
-			};
-		},
-		onLoad(options) {
-			if(!uni.getStorageSync("hasLogin")){
-				this.$u.toast('请先登录哦');
-			}
-		},
-		methods: {
-			chooseClass() {
-				uni.navigateTo({
-					url: "category"
-				})
-			},
-			uploadImg() {
-
-				if (!this.form.content) {
-					this.$u.toast('内容不能为空');
-					return;
-				}
-				if (!this.form.title) {
-					this.$u.toast('标题不能为空');
-					return;
-				}
-
-				uni.showLoading({
-					mask: true,
-					title: '发布中'
-				});
-				this.$refs.uUpload.upload();
-			},
-
-			submit(e) {
-				uni.showLoading({
-					mask: true,
-					title: '发布中'
-				});
-
-				let mediaList = [];
-				e.forEach(function(item, index) {
-					mediaList.push(item.response.result);
-				});
-
-				this.form.media = mediaList;
-
-				this.$H.post('post/addPost', this.form).then(res => {
-					if (res.code == 0) {
-						uni.redirectTo({
-							url: '/pages/post/post?id=' + res.result
-						});
-					}
-					uni.hideLoading();
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	.title-input {
-		border-bottom: 1px solid #F5F5F5;
-		margin: 20rpx 0;
-		padding: 20rpx 0;
-	}
-
-	.content-display {
-		width: 100%;
-		padding: 20rpx 0;
-		min-height: 300rpx;
-	}
-
-	.choose-item {
-		display: flex;
-		align-items: center;
-		padding: 20rpx;
-		border-bottom: 1px solid #F5F5F5;
-	
-	&:last-child {
-			border: 0;
-		}
-
-		.txt {
-			margin-left: 20rpx;
-		}
-
-		.sw {
-			margin-left: 300rpx;
-		}
-
-		.inputStyle {
-			margin-left: 60rpx;
-			width: 400rpx;
-		}
-
-		.radio {
-			margin-left: 320rpx;
-		}
-
-		.icon {
-			width: 40rpx;
-			height: 40rpx;
-		}
-
-		.u-icon {
-			margin-left: auto;
-			color: #999;
-		}
-
-		.add-icon {
-			margin-left: 0;
-		}
-	}
-
-	.button-style {
-		margin-top: 50rpx;
-		color: #F4F4F5;
-	}
+<template>
+	<view class="container">
+		<input v-model="form.title" class="title-input" placeholder="标题" />
+		<textarea placeholder="说些什么叭..." :auto-height="true" maxlength="-1" v-model="form.content"
+			class="content-display"></textarea>
+		<!-- 上传图片 -->
+		<block v-if="form.type == 1">
+			<u-upload ref="uUpload" :size-type="['original']" name="Image" :max-count="4" :header="header"
+				:action="uploadImgUrl" @on-uploaded="submit" :auto-upload="false"></u-upload>
+		</block>
+		<!-- 分类 -->
+		<view @click="chooseClass" class="choose-item">
+			<u-icon class="icon add-icon" name="file-text-fill" color="#999" size="40"></u-icon>
+			<text class="txt">{{ cateName || '选择帖子分类' }}</text>
+			<u-icon class="u-icon" name="arrow-right"></u-icon>
+		</view>
+		<view class="button-style">
+			<u-button v-if="form.type == 1" :custom-style="btnStyle" @click="uploadImg" shape="circle">发布</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				btnStyle: {
+					color: "#fff",
+					backgroundColor: '#333333'
+				},
+				uploadImgUrl: this.$c.domain + 'common/upload',
+				form: {
+					title: '',
+					type: 1,
+					topicId: 2,
+					discussId: '',
+					content: '',
+					media: [],
+					longitude: 0,
+					latitude: 0,
+					address: '',
+					cut: 0, //分类id
+					pay: '',
+				},
+				cateName: '',
+				header: {
+					token: uni.getStorageSync('token')
+				},
+
+			};
+		},
+		onLoad(options) {
+			if (!uni.getStorageSync("hasLogin")) {
+				this.$u.toast('请先登录哦');
+			}
+		},
+		methods: {
+			chooseClass() {
+				uni.navigateTo({
+					url: "category"
+				})
+			},
+			uploadImg() {
+
+				if (!this.form.content) {
+					this.$u.toast('内容不能为空');
+					return;
+				}
+				if (!this.form.title) {
+					this.$u.toast('标题不能为空');
+					return;
+				}
+
+				uni.showLoading({
+					mask: true,
+					title: '发布中'
+				});
+				this.$refs.uUpload.upload();
+			},
+
+			submit(e) {
+				uni.showLoading({
+					mask: true,
+					title: '发布中'
+				});
+
+				let mediaList = [];
+				e.forEach(function(item, index) {
+					mediaList.push(item.response.result);
+				});
+
+				this.form.media = mediaList;
+
+				this.$H.post('post/addPost', this.form).then(res => {
+					if (res.code == 0) {
+						uni.redirectTo({
+							url: '/pages/post/post?id=' + res.result
+						});
+					}
+					uni.hideLoading();
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.title-input {
+		border-bottom: 1px solid #F5F5F5;
+		margin: 20rpx 0;
+		padding: 20rpx 0;
+	}
+
+	.content-display {
+		width: 100%;
+		padding: 20rpx 0;
+		min-height: 300rpx;
+	}
+
+	.choose-item {
+		display: flex;
+		align-items: center;
+		padding: 20rpx;
+		border-bottom: 1px solid #F5F5F5;
+
+		&:last-child {
+			border: 0;
+		}
+
+		.txt {
+			margin-left: 20rpx;
+		}
+
+		.sw {
+			margin-left: 300rpx;
+		}
+
+		.inputStyle {
+			margin-left: 60rpx;
+			width: 400rpx;
+		}
+
+		.radio {
+			margin-left: 320rpx;
+		}
+
+		.icon {
+			width: 40rpx;
+			height: 40rpx;
+		}
+
+		.u-icon {
+			margin-left: auto;
+			color: #999;
+		}
+
+		.add-icon {
+			margin-left: 0;
+		}
+	}
+
+	.button-style {
+		margin-top: 50rpx;
+		color: #F4F4F5;
+	}
 </style>
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 1bb6405..14af21e 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
@@ -7,13 +7,9 @@ const shareH5Url = "https://www.linfeng.tech/#/"; //H5分享路径
 // const domain = 'http://' + baseUrl + "/app/"; 
 
 //线上环境配置
-<<<<<<< HEAD
 const baseUrl = "wxapi.linfeng.tech";
 const domain = 'https://' + baseUrl + "/app/"; 
-=======
-// const baseUrl = "";
-// const domain = 'https://' + baseUrl + "/app/"; 
->>>>>>> 85ba2abf696189e458edd77880b587e2e8b9d91c
+
 
 
 

From ccf3162d5051816c5d671eb2eecf6b81e746df54 Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Sat, 4 Mar 2023 23:30:58 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/user/home.vue                       | 584 +++++++++---------
 1 file changed, 292 insertions(+), 292 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue
index 6279f55..7b861fa 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue
@@ -1,293 +1,293 @@
-<template>
-	<view>
-		<view style="position: absolute;">
-			<u-navbar :custom-back="onBack" back-icon-color="#0c0000" :background="background" :border-bottom="false">
-			</u-navbar>
-		</view>
-		<view class="container">
-			<view class="info-wrap">
-				<u-avatar class="avatar" :src="userInfo.avatar" :show-level='userInfo.type == 1'
-					level-bg-color="#8072f3" size="130"></u-avatar>
-				<view class="user-style">
-					<view class="username">{{userInfo.username}}
-						<text class="iconfont icon-nan kong" v-if="userInfo.gender=='男'"></text>
-						<text class="iconfont icon-nv kong" v-else-if="userInfo.gender=='女'"></text>
-					</view>
-
-					<text class="desc">{{userInfo.intro}}</text>
-					<text class="desc" v-if="userInfo.city">IP:{{userInfo.city}}</text>
-
-					<view class="btn-box" v-if="currUid!=uid">
-						<u-button v-show="!userInfo.isFollow" @click="follow" :custom-style="btnStyle" class="btn"
-							shape="circle" size="mini">
-							<u-icon name="plus"></u-icon>
-							<text>关注</text>
-						</u-button>
-						<u-button v-show="userInfo.isFollow" @click="cancelFollow" :custom-style="btnStyle2" class="btn"
-							shape="circle" size="mini">
-							<text>已关注</text>
-						</u-button>
-						<u-button :custom-style="btnStyle2" @click="chat" shape="circle" size="mini">
-							<text style="margin: 0 15rpx;">私信</text>
-						</u-button>
-					</view>
-				</view>
-			</view>
-			<!-- 帖子 -->
-			<view>
-				<view class="title-desc">发布的动态</view>
-				<post-list :list="postList" :loadStatus="loadStatus"></post-list>
-			</view>
-		</view>
-
-		<!-- 发贴入口 -->
-		<add-post-tag></add-post-tag>
-
-	</view>
-</template>
-
-<script>
-	import postList from '../../components/post-list/post-list.vue';
-	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
-	export default {
-		components: {
-			postList
-		},
-		data() {
-			return {
-				loading: true,
-				btnStyle: {
-					color: "#fff",
-					backgroundColor: '#000000'
-				},
-				btnStyle2: {
-					border: '1px solid #000000',
-					color: "#000000"
-				},
-				background: {
-					backgroundColor: 'unset'
-				},
-				tabs: [{
-					tab_name: '帖子'
-				}],
-				current: 1,
-				uid: 0,
-				postList: [],
-				topicList: [],
-				userInfo: {},
-				userJson: "",
-				loadStatus: "loading",
-				page: 1,
-				currUid: 0
-			};
-		},
-		onLoad(options) {
-			this.uid = options.uid;
-			this.getUserInfo();
-			this.getPostList();
-			if (uni.getStorageSync('userInfo').uid) {
-				this.currUid = uni.getStorageSync('userInfo').uid;
-			}
-		},
-		onReachBottom() {
-			this.page++;
-			this.getPostList();
-		},
-		methods: {
-			onBack() {
-				uni.navigateBack();
-			},
-			follow() {
-				this.$H.post('user/addFollow', {
-					id: this.userInfo.uid
-				}).then(res => {
-					if (res.code === 0) {
-						this.userInfo.isFollow = true;
-					} else {
-						this.$u.toast(res.msg);
-					}
-				})
-			},
-			cancelFollow() {
-				this.$H.post('user/cancelFollow', {
-					id: this.userInfo.uid
-				}).then(res => {
-					if (res.code === 0) {
-						this.userInfo.isFollow = false;
-					}
-				})
-			},
-
-			getPostList() {
-				this.loadStatus = "loading";
-				this.$H.post('post/list', {
-					page: this.page,
-					uid: this.uid
-				}).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.loadStatus = "nomore";
-					} else {
-						this.loadStatus = "loadmore"
-					}
-				})
-			},
-			chat(){
-				this.$u.toast('开源版暂未开放')
-			},
-			getUserInfo() {
-				this.$H.post('user/userInfoById', {
-					uid: this.uid
-				}).then(res => {
-					if (res.code == 0) {
-						this.userInfo = res.result;
-						if (res.result.gender === 1) {
-							this.userInfo.gender = '男'
-						} else if (res.result.gender === 2) {
-							this.userInfo.gender = '女'
-						} else {
-							this.userInfo.gender = '保密'
-						}
-
-						let user = {
-							uid: res.result.uid,
-							username: res.result.username,
-							avatar: res.result.avatar,
-						}
-						this.userJson = JSON.stringify(user)
-						uni.setNavigationBarTitle({
-							title: this.userInfo.username
-						});
-					} else {
-						setTimeout(function() {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-						}, 1500);
-					}
-
-
-					this.loading = false;
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: #f5f5f5;
-	}
-</style>
-<style lang="scss" scoped>
-	.container {
-		padding: 30rpx;
-		position: relative;
-		top: 100rpx;
-		width: 100%;
-	}
-
-	.info-wrap {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.avatar {
-		width: 130rpx;
-		height: 130rpx;
-		border-radius: 100rpx !important;
-		z-index: 999;
-		margin: 150rpx 550rpx 100rpx 50rpx;
-	}
-
-	.info-wrap .user-style {
-		background-color: #FFFFFF;
-		border-radius: 30rpx;
-		padding: 30rpx;
-		position: absolute;
-		top: 85rpx;
-		width: 100%;
-		box-shadow: 5rpx 10rpx 20rpx #e6e6e6;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.info-wrap .user-style .username {
-		font-size: 34rpx;
-		font-weight: bold;
-		margin: 10rpx 10rpx 10rpx 90rpx;
-
-		.kong {
-			margin-left: 25rpx;
-		}
-	}
-
-	.info-wrap .user-style .num-box {
-		font-size: 24rpx;
-		margin: 20rpx 0;
-		text-align: center;
-	}
-
-	.info-wrap .user-style .num-box .txt {
-		color: #999;
-		margin-left: 5rpx;
-	}
-
-	.info-wrap .user-style .num-box text {
-		margin-right: 30rpx;
-	}
-
-	.info-wrap .user-style .desc {
-		font-size: 28rpx;
-		color: #999;
-		margin: 1rpx 20rpx 20rpx 140rpx;
-	}
-
-	.info-wrap .user-style .btn-box {
-		margin: 0rpx 30rpx 10rpx 90rpx;
-	}
-
-	.info-wrap .user-style .btn-box .btn {
-		margin-right: 20rpx;
-	}
-
-	.tab-box {
-		margin-top: 30rpx;
-		margin-bottom: 30rpx;
-	}
-
-	.info-c {
-		display: flex;
-		flex-direction: column;
-	}
-
-	.info-c>text {
-		margin-bottom: 20rpx;
-		color: #999;
-	}
-
-	.info-c .level-box {
-		margin-bottom: 20rpx;
-		display: flex;
-		align-items: center;
-		color: #999;
-
-		.level {
-			font-size: 20rpx;
-			color: #fff;
-			padding: 5rpx 10rpx;
-			background-color: #333333;
-			border-radius: 10rpx;
-			margin-right: 10rpx;
-		}
-	}
-
-	.title-desc {
-		// margin-left: 30rpx;
-		margin: auto;
-		font-size: 32rpx;
-		color: #565656;
-		font-weight: 500;
-	}
+<template>
+	<view>
+		<view style="position: absolute;">
+			<u-navbar :custom-back="onBack" back-icon-color="#0c0000" :background="background" :border-bottom="false">
+			</u-navbar>
+		</view>
+		<view class="container">
+			<view class="info-wrap">
+				<u-avatar class="avatar" :src="userInfo.avatar" :show-level='userInfo.type == 1'
+					level-bg-color="#8072f3" size="130"></u-avatar>
+				<view class="user-style">
+					<view class="username">{{userInfo.username}}
+						<text class="iconfont icon-nan kong" v-if="userInfo.gender=='男'"></text>
+						<text class="iconfont icon-nv kong" v-else-if="userInfo.gender=='女'"></text>
+					</view>
+
+					<text class="desc">{{userInfo.intro}}</text>
+					<text class="desc" v-if="userInfo.city">IP:{{userInfo.city}}</text>
+
+					<view class="btn-box" v-if="currUid!=uid">
+						<u-button v-show="!userInfo.isFollow" @click="follow" :custom-style="btnStyle" class="btn"
+							shape="circle" size="mini">
+							<u-icon name="plus"></u-icon>
+							<text>关注</text>
+						</u-button>
+						<u-button v-show="userInfo.isFollow" @click="cancelFollow" :custom-style="btnStyle2" class="btn"
+							shape="circle" size="mini">
+							<text>已关注</text>
+						</u-button>
+						<u-button :custom-style="btnStyle2" @click="chat" shape="circle" size="mini">
+							<text style="margin: 0 15rpx;">私信</text>
+						</u-button>
+					</view>
+				</view>
+			</view>
+			<!-- 帖子 -->
+			<view>
+				<view class="title-desc">发布的动态</view>
+				<post-list :list="postList" :loadStatus="loadStatus"></post-list>
+			</view>
+		</view>
+
+		<!-- 发贴入口 -->
+		<add-post-tag></add-post-tag>
+
+	</view>
+</template>
+
+<script>
+	import postList from '../../components/post-list/post-list.vue';
+	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
+	export default {
+		components: {
+			postList
+		},
+		data() {
+			return {
+				loading: true,
+				btnStyle: {
+					color: "#fff",
+					backgroundColor: '#000000'
+				},
+				btnStyle2: {
+					border: '1px solid #000000',
+					color: "#000000"
+				},
+				background: {
+					backgroundColor: 'unset'
+				},
+				tabs: [{
+					tab_name: '帖子'
+				}],
+				current: 1,
+				uid: 0,
+				postList: [],
+				topicList: [],
+				userInfo: {},
+				userJson: "",
+				loadStatus: "loading",
+				page: 1,
+				currUid: 0
+			};
+		},
+		onLoad(options) {
+			this.uid = options.uid;
+			this.getUserInfo();
+			this.getPostList();
+			if (uni.getStorageSync('userInfo').uid) {
+				this.currUid = uni.getStorageSync('userInfo').uid;
+			}
+		},
+		onReachBottom() {
+			this.page++;
+			this.getPostList();
+		},
+		methods: {
+			onBack() {
+				uni.navigateBack();
+			},
+			follow() {
+				this.$H.post('user/addFollow', {
+					id: this.userInfo.uid
+				}).then(res => {
+					if (res.code === 0) {
+						this.userInfo.isFollow = true;
+					} else {
+						this.$u.toast(res.msg);
+					}
+				})
+			},
+			cancelFollow() {
+				this.$H.post('user/cancelFollow', {
+					id: this.userInfo.uid
+				}).then(res => {
+					if (res.code === 0) {
+						this.userInfo.isFollow = false;
+					}
+				})
+			},
+
+			getPostList() {
+				this.loadStatus = "loading";
+				this.$H.post('post/list', {
+					page: this.page,
+					uid: this.uid
+				}).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.loadStatus = "nomore";
+					} else {
+						this.loadStatus = "loadmore"
+					}
+				})
+			},
+			chat() {
+				this.$u.toast('开源版暂未开放')
+			},
+			getUserInfo() {
+				this.$H.post('user/userInfoById', {
+					uid: this.uid
+				}).then(res => {
+					if (res.code == 0) {
+						this.userInfo = res.result;
+						if (res.result.gender === 1) {
+							this.userInfo.gender = '男'
+						} else if (res.result.gender === 2) {
+							this.userInfo.gender = '女'
+						} else {
+							this.userInfo.gender = '保密'
+						}
+
+						let user = {
+							uid: res.result.uid,
+							username: res.result.username,
+							avatar: res.result.avatar,
+						}
+						this.userJson = JSON.stringify(user)
+						uni.setNavigationBarTitle({
+							title: this.userInfo.username
+						});
+					} else {
+						setTimeout(function() {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+						}, 1500);
+					}
+
+
+					this.loading = false;
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #f5f5f5;
+	}
+</style>
+<style lang="scss" scoped>
+	.container {
+		padding: 30rpx;
+		position: relative;
+		top: 100rpx;
+		width: 100%;
+	}
+
+	.info-wrap {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.avatar {
+		width: 130rpx;
+		height: 130rpx;
+		border-radius: 100rpx !important;
+		z-index: 999;
+		margin: 150rpx 550rpx 100rpx 50rpx;
+	}
+
+	.info-wrap .user-style {
+		background-color: #FFFFFF;
+		border-radius: 30rpx;
+		padding: 30rpx;
+		position: absolute;
+		top: 85rpx;
+		width: 100%;
+		box-shadow: 5rpx 10rpx 20rpx #e6e6e6;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.info-wrap .user-style .username {
+		font-size: 34rpx;
+		font-weight: bold;
+		margin: 10rpx 10rpx 10rpx 90rpx;
+
+		.kong {
+			margin-left: 25rpx;
+		}
+	}
+
+	.info-wrap .user-style .num-box {
+		font-size: 24rpx;
+		margin: 20rpx 0;
+		text-align: center;
+	}
+
+	.info-wrap .user-style .num-box .txt {
+		color: #999;
+		margin-left: 5rpx;
+	}
+
+	.info-wrap .user-style .num-box text {
+		margin-right: 30rpx;
+	}
+
+	.info-wrap .user-style .desc {
+		font-size: 28rpx;
+		color: #999;
+		margin: 1rpx 20rpx 20rpx 140rpx;
+	}
+
+	.info-wrap .user-style .btn-box {
+		margin: 0rpx 30rpx 10rpx 90rpx;
+	}
+
+	.info-wrap .user-style .btn-box .btn {
+		margin-right: 20rpx;
+	}
+
+	.tab-box {
+		margin-top: 30rpx;
+		margin-bottom: 30rpx;
+	}
+
+	.info-c {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.info-c>text {
+		margin-bottom: 20rpx;
+		color: #999;
+	}
+
+	.info-c .level-box {
+		margin-bottom: 20rpx;
+		display: flex;
+		align-items: center;
+		color: #999;
+
+		.level {
+			font-size: 20rpx;
+			color: #fff;
+			padding: 5rpx 10rpx;
+			background-color: #333333;
+			border-radius: 10rpx;
+			margin-right: 10rpx;
+		}
+	}
+
+	.title-desc {
+		// margin-left: 30rpx;
+		margin: auto;
+		font-size: 32rpx;
+		color: #565656;
+		font-weight: 500;
+	}
 </style>

From 73e3a7dc2f5adeb15d708444a2c7200013127d4e Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Sat, 4 Mar 2023 23:32:00 +0800
Subject: [PATCH 07/11] samll

---
 .../pages/user/home.vue                       | 584 +++++++++---------
 .../pages/user/user.vue                       | 500 +++++++--------
 2 files changed, 542 insertions(+), 542 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue
index 7b861fa..6279f55 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue
@@ -1,293 +1,293 @@
-<template>
-	<view>
-		<view style="position: absolute;">
-			<u-navbar :custom-back="onBack" back-icon-color="#0c0000" :background="background" :border-bottom="false">
-			</u-navbar>
-		</view>
-		<view class="container">
-			<view class="info-wrap">
-				<u-avatar class="avatar" :src="userInfo.avatar" :show-level='userInfo.type == 1'
-					level-bg-color="#8072f3" size="130"></u-avatar>
-				<view class="user-style">
-					<view class="username">{{userInfo.username}}
-						<text class="iconfont icon-nan kong" v-if="userInfo.gender=='男'"></text>
-						<text class="iconfont icon-nv kong" v-else-if="userInfo.gender=='女'"></text>
-					</view>
-
-					<text class="desc">{{userInfo.intro}}</text>
-					<text class="desc" v-if="userInfo.city">IP:{{userInfo.city}}</text>
-
-					<view class="btn-box" v-if="currUid!=uid">
-						<u-button v-show="!userInfo.isFollow" @click="follow" :custom-style="btnStyle" class="btn"
-							shape="circle" size="mini">
-							<u-icon name="plus"></u-icon>
-							<text>关注</text>
-						</u-button>
-						<u-button v-show="userInfo.isFollow" @click="cancelFollow" :custom-style="btnStyle2" class="btn"
-							shape="circle" size="mini">
-							<text>已关注</text>
-						</u-button>
-						<u-button :custom-style="btnStyle2" @click="chat" shape="circle" size="mini">
-							<text style="margin: 0 15rpx;">私信</text>
-						</u-button>
-					</view>
-				</view>
-			</view>
-			<!-- 帖子 -->
-			<view>
-				<view class="title-desc">发布的动态</view>
-				<post-list :list="postList" :loadStatus="loadStatus"></post-list>
-			</view>
-		</view>
-
-		<!-- 发贴入口 -->
-		<add-post-tag></add-post-tag>
-
-	</view>
-</template>
-
-<script>
-	import postList from '../../components/post-list/post-list.vue';
-	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
-	export default {
-		components: {
-			postList
-		},
-		data() {
-			return {
-				loading: true,
-				btnStyle: {
-					color: "#fff",
-					backgroundColor: '#000000'
-				},
-				btnStyle2: {
-					border: '1px solid #000000',
-					color: "#000000"
-				},
-				background: {
-					backgroundColor: 'unset'
-				},
-				tabs: [{
-					tab_name: '帖子'
-				}],
-				current: 1,
-				uid: 0,
-				postList: [],
-				topicList: [],
-				userInfo: {},
-				userJson: "",
-				loadStatus: "loading",
-				page: 1,
-				currUid: 0
-			};
-		},
-		onLoad(options) {
-			this.uid = options.uid;
-			this.getUserInfo();
-			this.getPostList();
-			if (uni.getStorageSync('userInfo').uid) {
-				this.currUid = uni.getStorageSync('userInfo').uid;
-			}
-		},
-		onReachBottom() {
-			this.page++;
-			this.getPostList();
-		},
-		methods: {
-			onBack() {
-				uni.navigateBack();
-			},
-			follow() {
-				this.$H.post('user/addFollow', {
-					id: this.userInfo.uid
-				}).then(res => {
-					if (res.code === 0) {
-						this.userInfo.isFollow = true;
-					} else {
-						this.$u.toast(res.msg);
-					}
-				})
-			},
-			cancelFollow() {
-				this.$H.post('user/cancelFollow', {
-					id: this.userInfo.uid
-				}).then(res => {
-					if (res.code === 0) {
-						this.userInfo.isFollow = false;
-					}
-				})
-			},
-
-			getPostList() {
-				this.loadStatus = "loading";
-				this.$H.post('post/list', {
-					page: this.page,
-					uid: this.uid
-				}).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.loadStatus = "nomore";
-					} else {
-						this.loadStatus = "loadmore"
-					}
-				})
-			},
-			chat() {
-				this.$u.toast('开源版暂未开放')
-			},
-			getUserInfo() {
-				this.$H.post('user/userInfoById', {
-					uid: this.uid
-				}).then(res => {
-					if (res.code == 0) {
-						this.userInfo = res.result;
-						if (res.result.gender === 1) {
-							this.userInfo.gender = '男'
-						} else if (res.result.gender === 2) {
-							this.userInfo.gender = '女'
-						} else {
-							this.userInfo.gender = '保密'
-						}
-
-						let user = {
-							uid: res.result.uid,
-							username: res.result.username,
-							avatar: res.result.avatar,
-						}
-						this.userJson = JSON.stringify(user)
-						uni.setNavigationBarTitle({
-							title: this.userInfo.username
-						});
-					} else {
-						setTimeout(function() {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-						}, 1500);
-					}
-
-
-					this.loading = false;
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: #f5f5f5;
-	}
-</style>
-<style lang="scss" scoped>
-	.container {
-		padding: 30rpx;
-		position: relative;
-		top: 100rpx;
-		width: 100%;
-	}
-
-	.info-wrap {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.avatar {
-		width: 130rpx;
-		height: 130rpx;
-		border-radius: 100rpx !important;
-		z-index: 999;
-		margin: 150rpx 550rpx 100rpx 50rpx;
-	}
-
-	.info-wrap .user-style {
-		background-color: #FFFFFF;
-		border-radius: 30rpx;
-		padding: 30rpx;
-		position: absolute;
-		top: 85rpx;
-		width: 100%;
-		box-shadow: 5rpx 10rpx 20rpx #e6e6e6;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.info-wrap .user-style .username {
-		font-size: 34rpx;
-		font-weight: bold;
-		margin: 10rpx 10rpx 10rpx 90rpx;
-
-		.kong {
-			margin-left: 25rpx;
-		}
-	}
-
-	.info-wrap .user-style .num-box {
-		font-size: 24rpx;
-		margin: 20rpx 0;
-		text-align: center;
-	}
-
-	.info-wrap .user-style .num-box .txt {
-		color: #999;
-		margin-left: 5rpx;
-	}
-
-	.info-wrap .user-style .num-box text {
-		margin-right: 30rpx;
-	}
-
-	.info-wrap .user-style .desc {
-		font-size: 28rpx;
-		color: #999;
-		margin: 1rpx 20rpx 20rpx 140rpx;
-	}
-
-	.info-wrap .user-style .btn-box {
-		margin: 0rpx 30rpx 10rpx 90rpx;
-	}
-
-	.info-wrap .user-style .btn-box .btn {
-		margin-right: 20rpx;
-	}
-
-	.tab-box {
-		margin-top: 30rpx;
-		margin-bottom: 30rpx;
-	}
-
-	.info-c {
-		display: flex;
-		flex-direction: column;
-	}
-
-	.info-c>text {
-		margin-bottom: 20rpx;
-		color: #999;
-	}
-
-	.info-c .level-box {
-		margin-bottom: 20rpx;
-		display: flex;
-		align-items: center;
-		color: #999;
-
-		.level {
-			font-size: 20rpx;
-			color: #fff;
-			padding: 5rpx 10rpx;
-			background-color: #333333;
-			border-radius: 10rpx;
-			margin-right: 10rpx;
-		}
-	}
-
-	.title-desc {
-		// margin-left: 30rpx;
-		margin: auto;
-		font-size: 32rpx;
-		color: #565656;
-		font-weight: 500;
-	}
+<template>
+	<view>
+		<view style="position: absolute;">
+			<u-navbar :custom-back="onBack" back-icon-color="#0c0000" :background="background" :border-bottom="false">
+			</u-navbar>
+		</view>
+		<view class="container">
+			<view class="info-wrap">
+				<u-avatar class="avatar" :src="userInfo.avatar" :show-level='userInfo.type == 1'
+					level-bg-color="#8072f3" size="130"></u-avatar>
+				<view class="user-style">
+					<view class="username">{{userInfo.username}}
+						<text class="iconfont icon-nan kong" v-if="userInfo.gender=='男'"></text>
+						<text class="iconfont icon-nv kong" v-else-if="userInfo.gender=='女'"></text>
+					</view>
+
+					<text class="desc">{{userInfo.intro}}</text>
+					<text class="desc" v-if="userInfo.city">IP:{{userInfo.city}}</text>
+
+					<view class="btn-box" v-if="currUid!=uid">
+						<u-button v-show="!userInfo.isFollow" @click="follow" :custom-style="btnStyle" class="btn"
+							shape="circle" size="mini">
+							<u-icon name="plus"></u-icon>
+							<text>关注</text>
+						</u-button>
+						<u-button v-show="userInfo.isFollow" @click="cancelFollow" :custom-style="btnStyle2" class="btn"
+							shape="circle" size="mini">
+							<text>已关注</text>
+						</u-button>
+						<u-button :custom-style="btnStyle2" @click="chat" shape="circle" size="mini">
+							<text style="margin: 0 15rpx;">私信</text>
+						</u-button>
+					</view>
+				</view>
+			</view>
+			<!-- 帖子 -->
+			<view>
+				<view class="title-desc">发布的动态</view>
+				<post-list :list="postList" :loadStatus="loadStatus"></post-list>
+			</view>
+		</view>
+
+		<!-- 发贴入口 -->
+		<add-post-tag></add-post-tag>
+
+	</view>
+</template>
+
+<script>
+	import postList from '../../components/post-list/post-list.vue';
+	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
+	export default {
+		components: {
+			postList
+		},
+		data() {
+			return {
+				loading: true,
+				btnStyle: {
+					color: "#fff",
+					backgroundColor: '#000000'
+				},
+				btnStyle2: {
+					border: '1px solid #000000',
+					color: "#000000"
+				},
+				background: {
+					backgroundColor: 'unset'
+				},
+				tabs: [{
+					tab_name: '帖子'
+				}],
+				current: 1,
+				uid: 0,
+				postList: [],
+				topicList: [],
+				userInfo: {},
+				userJson: "",
+				loadStatus: "loading",
+				page: 1,
+				currUid: 0
+			};
+		},
+		onLoad(options) {
+			this.uid = options.uid;
+			this.getUserInfo();
+			this.getPostList();
+			if (uni.getStorageSync('userInfo').uid) {
+				this.currUid = uni.getStorageSync('userInfo').uid;
+			}
+		},
+		onReachBottom() {
+			this.page++;
+			this.getPostList();
+		},
+		methods: {
+			onBack() {
+				uni.navigateBack();
+			},
+			follow() {
+				this.$H.post('user/addFollow', {
+					id: this.userInfo.uid
+				}).then(res => {
+					if (res.code === 0) {
+						this.userInfo.isFollow = true;
+					} else {
+						this.$u.toast(res.msg);
+					}
+				})
+			},
+			cancelFollow() {
+				this.$H.post('user/cancelFollow', {
+					id: this.userInfo.uid
+				}).then(res => {
+					if (res.code === 0) {
+						this.userInfo.isFollow = false;
+					}
+				})
+			},
+
+			getPostList() {
+				this.loadStatus = "loading";
+				this.$H.post('post/list', {
+					page: this.page,
+					uid: this.uid
+				}).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.loadStatus = "nomore";
+					} else {
+						this.loadStatus = "loadmore"
+					}
+				})
+			},
+			chat(){
+				this.$u.toast('开源版暂未开放')
+			},
+			getUserInfo() {
+				this.$H.post('user/userInfoById', {
+					uid: this.uid
+				}).then(res => {
+					if (res.code == 0) {
+						this.userInfo = res.result;
+						if (res.result.gender === 1) {
+							this.userInfo.gender = '男'
+						} else if (res.result.gender === 2) {
+							this.userInfo.gender = '女'
+						} else {
+							this.userInfo.gender = '保密'
+						}
+
+						let user = {
+							uid: res.result.uid,
+							username: res.result.username,
+							avatar: res.result.avatar,
+						}
+						this.userJson = JSON.stringify(user)
+						uni.setNavigationBarTitle({
+							title: this.userInfo.username
+						});
+					} else {
+						setTimeout(function() {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+						}, 1500);
+					}
+
+
+					this.loading = false;
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #f5f5f5;
+	}
+</style>
+<style lang="scss" scoped>
+	.container {
+		padding: 30rpx;
+		position: relative;
+		top: 100rpx;
+		width: 100%;
+	}
+
+	.info-wrap {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.avatar {
+		width: 130rpx;
+		height: 130rpx;
+		border-radius: 100rpx !important;
+		z-index: 999;
+		margin: 150rpx 550rpx 100rpx 50rpx;
+	}
+
+	.info-wrap .user-style {
+		background-color: #FFFFFF;
+		border-radius: 30rpx;
+		padding: 30rpx;
+		position: absolute;
+		top: 85rpx;
+		width: 100%;
+		box-shadow: 5rpx 10rpx 20rpx #e6e6e6;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.info-wrap .user-style .username {
+		font-size: 34rpx;
+		font-weight: bold;
+		margin: 10rpx 10rpx 10rpx 90rpx;
+
+		.kong {
+			margin-left: 25rpx;
+		}
+	}
+
+	.info-wrap .user-style .num-box {
+		font-size: 24rpx;
+		margin: 20rpx 0;
+		text-align: center;
+	}
+
+	.info-wrap .user-style .num-box .txt {
+		color: #999;
+		margin-left: 5rpx;
+	}
+
+	.info-wrap .user-style .num-box text {
+		margin-right: 30rpx;
+	}
+
+	.info-wrap .user-style .desc {
+		font-size: 28rpx;
+		color: #999;
+		margin: 1rpx 20rpx 20rpx 140rpx;
+	}
+
+	.info-wrap .user-style .btn-box {
+		margin: 0rpx 30rpx 10rpx 90rpx;
+	}
+
+	.info-wrap .user-style .btn-box .btn {
+		margin-right: 20rpx;
+	}
+
+	.tab-box {
+		margin-top: 30rpx;
+		margin-bottom: 30rpx;
+	}
+
+	.info-c {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.info-c>text {
+		margin-bottom: 20rpx;
+		color: #999;
+	}
+
+	.info-c .level-box {
+		margin-bottom: 20rpx;
+		display: flex;
+		align-items: center;
+		color: #999;
+
+		.level {
+			font-size: 20rpx;
+			color: #fff;
+			padding: 5rpx 10rpx;
+			background-color: #333333;
+			border-radius: 10rpx;
+			margin-right: 10rpx;
+		}
+	}
+
+	.title-desc {
+		// margin-left: 30rpx;
+		margin: auto;
+		font-size: 32rpx;
+		color: #565656;
+		font-weight: 500;
+	}
 </style>
diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/user.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/user.vue
index 1a0602e..7522b82 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/user.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/user.vue
@@ -1,251 +1,251 @@
-<template>
-	<view>
-		<view class="head">
-			<block v-if="hasLogin">
-				<view class="userinfo" @click="goUser">
-					<u-avatar :src="userInfo.avatar"></u-avatar>
-					<view class="username">
-						<text>{{ userInfo.username }}</text>
-						<text class="sub-txt">{{ userInfo.intro }}</text>
-					</view>
-					<u-icon name="arrow-right" class="arrow-right"></u-icon>
-				</view>
-			</block>
-			<block v-else>
-				<view class="btn-login">
-					<!-- #ifdef H5 -->
-					<u-button type="default" shape="circle" @click="phoneLogin" plain>登录</u-button>
-					<!-- #endif -->
-					<!-- #ifdef MP-WEIXIN -->
-					<u-button type="default" shape="circle" @click="wxLogin" plain>登录</u-button>
-					<!-- #endif -->
-				</view>
-			</block>
-			<u-grid :col="4" :border="false" style="margin: 20rpx 0;" @click="toNav">
-				<u-grid-item index="/pages/my/user?type=2">
-					<text>{{ userInfo.fans || 0}}</text>
-					<view class="grid-text">粉丝</view>
-				</u-grid-item>
-				<u-grid-item index="/pages/my/user?type=1">
-					<text>{{ userInfo.follow || 0 }}</text>
-					<view class="grid-text">关注</view>
-				</u-grid-item>
-				<u-grid-item index="/pages/my/post?type=2">
-					<text>{{ userInfo.postNum || 0 }}</text>
-					<view class="grid-text">帖子</view>
-				</u-grid-item>
-				<u-grid-item index="">
-					<text>{{ userInfo.integral || 0 }}</text>
-					<view class="grid-text">积分</view>
-				</u-grid-item>
-			</u-grid>
-		</view>
-		<!-- 我的服务 -->
-		<view class="block-wrap">
-			<view class="block-title">我的服务</view>
-			<u-grid :col="4" :border="false" style="margin: 20rpx 0;" @click="toNav">
-
-				<u-grid-item index="/pages/my/post?type=2">
-					<image class="gn-icon" src="/static/img/post.png"></image>
-					<view class="grid-text">我的帖子</view>
-				</u-grid-item>
-
-				<u-grid-item index="/pages/my/post?type=1">
-					<image class="gn-icon" src="/static/img/star.png"></image>
-					<view class="grid-text">我的点赞</view>
-				</u-grid-item>
-
-				<u-grid-item index="/pages/my/user?type=1">
-					<image class="gn-icon" src="/static/img/watch.png"></image>
-					<view class="grid-text">我的关注</view>
-				</u-grid-item>
-
-				<u-grid-item index="/pages/my/user?type=2">
-					<image class="gn-icon" src="/static/img/fans.png"></image>
-					<view class="grid-text">我的粉丝</view>
-				</u-grid-item>
-				<!-- #ifdef MP-WEIXIN -->
-				<u-grid-item>
-					<button open-type="contact" class="u-reset-button">
-						<image class="gn-icon" style="margin-bottom: unset;" src="/static/img/kefu.png"></image>
-						<view class="grid-text">客服</view>
-					</button>
-				</u-grid-item>
-				<!-- #endif -->
-			</u-grid>
-		</view>
-		<!-- 发贴入口 -->
-		<add-post-tag></add-post-tag>
-	</view>
-</template>
-
-<script>
-	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
-	export default {
-		components: {
-			addPostTag
-		},
-		data() {
-			return {
-				userInfo: '',
-				hasLogin: false
-			};
-		},
-		onLoad() {
-			//#ifdef MP-WEIXIN
-			wx.showShareMenu({
-				withShareTicket: true,
-				menus: ['shareAppMessage', 'shareTimeline']
-			});
-			//#endif
-		},
-		onShow() {
-			if (uni.getStorageSync('hasLogin')) {
-				this.getUserInfo();
-				this.hasLogin = true;
-			} else {
-				this.hasLogin = false;
-			}
-		},
-		onShareAppMessage(res) {
-			let imgURL = 'http://pic.linfeng.tech/logo.png';
-			return {
-				title: this.$c.miniappName,
-				path: '/pages/index/index',
-				imageUrl: imgURL
-			};
-		},
-		methods: {
-			phoneLogin() {
-				uni.navigateTo({
-					url: '/pages/login/login'
-				});
-			},
-			wxLogin() {
-				uni.navigateTo({
-					url: '/pages/login/weixin'
-				});
-			},
-			getUserInfo() {
-				this.$H.get('user/userInfo').then(res => {
-					this.userInfo = res.result;
-				});
-			},
-			goUser() {
-				uni.navigateTo({
-					url: '/pages/user/edit'
-				});
-			},
-			toNav(url) {
-				uni.navigateTo({
-					url: url
-				});
-			}
-		}
-	};
-</script>
-
-<style>
-	page {
-		background-color: #f5f5f5;
-	}
-</style>
-<style lang="scss" scoped>
-	.head {
-		padding: 20rpx;
-		background-color: #fff;
-	
-	.sub-txt {
-			font-size: 24rpx;
-			color: #616161;
-			display: block;
-			display: -webkit-box;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 1;
-			overflow: hidden;
-		}
-
-		margin-bottom: 20rpx;
-	}
-
-	.userinfo {
-		display: flex;
-		align-items: center;
-		padding: 20rpx;
-	}
-
-	.userinfo .username {
-		display: flex;
-		flex-direction: column;
-		margin-left: 20rpx;
-	}
-
-	.grid-text {
-		color: #999;
-		font-size: 12px;
-		margin-bottom: 20rpx;
-	}
-
-	.userinfo u-avatar {
-		margin-right: 20rpx;
-	}
-
-	.userinfo .arrow-right {
-		margin-left: auto;
-	}
-
-	.btn-login {
-		margin: 40rpx 0;
-	}
-
-	.gn-icon {
-		width: 60rpx;
-		height: 60rpx;
-		margin-bottom: 20rpx;
-	}
-
-	/*服务按钮*/
-	.btn-wrap {
-		display: flex;
-		margin-top: 30rpx;
-	}
-
-	.btn-wrap .btn-contact {
-		background-color: #fff;
-		margin-left: 15rpx;
-		margin-right: 15rpx;
-		padding: 20rpx;
-		line-height: unset;
-		font-size: 12px;
-		color: #999;
-	}
-
-	.btn-wrap .btn-contact:active {
-		background-color: #f5f5f5;
-	}
-
-	.btn-wrap .btn-contact .txt {
-		margin-top: 20rpx;
-	}
-
-	.btn-wrap .btn-contact::after {
-		border: unset;
-		position: unset;
-	}
-
-	.icon-size {
-		font-size: 50rpx;
-	}
-
-	.block-wrap {
-		background-color: #fff;
-		border-radius: 20rpx;
-		margin: 20rpx;
-		overflow: hidden;
-
-		.block-title {
-			background-color: #fff;
-			padding: 20rpx;
-		}
-	}
+<template>
+	<view>
+		<view class="head">
+			<block v-if="hasLogin">
+				<view class="userinfo" @click="goUser">
+					<u-avatar :src="userInfo.avatar"></u-avatar>
+					<view class="username">
+						<text>{{ userInfo.username }}</text>
+						<text class="sub-txt">{{ userInfo.intro }}</text>
+					</view>
+					<u-icon name="arrow-right" class="arrow-right"></u-icon>
+				</view>
+			</block>
+			<block v-else>
+				<view class="btn-login">
+					<!-- #ifdef H5 -->
+					<u-button type="default" shape="circle" @click="phoneLogin" plain>登录</u-button>
+					<!-- #endif -->
+					<!-- #ifdef MP-WEIXIN -->
+					<u-button type="default" shape="circle" @click="wxLogin" plain>登录</u-button>
+					<!-- #endif -->
+				</view>
+			</block>
+			<u-grid :col="4" :border="false" style="margin: 20rpx 0;" @click="toNav">
+				<u-grid-item index="/pages/my/user?type=2">
+					<text>{{ userInfo.fans || 0}}</text>
+					<view class="grid-text">粉丝</view>
+				</u-grid-item>
+				<u-grid-item index="/pages/my/user?type=1">
+					<text>{{ userInfo.follow || 0 }}</text>
+					<view class="grid-text">关注</view>
+				</u-grid-item>
+				<u-grid-item index="/pages/my/post?type=2">
+					<text>{{ userInfo.postNum || 0 }}</text>
+					<view class="grid-text">帖子</view>
+				</u-grid-item>
+				<u-grid-item index="">
+					<text>{{ userInfo.integral || 0 }}</text>
+					<view class="grid-text">积分</view>
+				</u-grid-item>
+			</u-grid>
+		</view>
+		<!-- 我的服务 -->
+		<view class="block-wrap">
+			<view class="block-title">我的服务</view>
+			<u-grid :col="4" :border="false" style="margin: 20rpx 0;" @click="toNav">
+
+				<u-grid-item index="/pages/my/post?type=2">
+					<image class="gn-icon" src="/static/img/post.png"></image>
+					<view class="grid-text">我的帖子</view>
+				</u-grid-item>
+
+				<u-grid-item index="/pages/my/post?type=1">
+					<image class="gn-icon" src="/static/img/star.png"></image>
+					<view class="grid-text">我的点赞</view>
+				</u-grid-item>
+
+				<u-grid-item index="/pages/my/user?type=1">
+					<image class="gn-icon" src="/static/img/watch.png"></image>
+					<view class="grid-text">我的关注</view>
+				</u-grid-item>
+
+				<u-grid-item index="/pages/my/user?type=2">
+					<image class="gn-icon" src="/static/img/fans.png"></image>
+					<view class="grid-text">我的粉丝</view>
+				</u-grid-item>
+				<!-- #ifdef MP-WEIXIN -->
+				<u-grid-item>
+					<button open-type="contact" class="u-reset-button">
+						<image class="gn-icon" style="margin-bottom: unset;" src="/static/img/kefu.png"></image>
+						<view class="grid-text">客服</view>
+					</button>
+				</u-grid-item>
+				<!-- #endif -->
+			</u-grid>
+		</view>
+		<!-- 发贴入口 -->
+		<add-post-tag></add-post-tag>
+	</view>
+</template>
+
+<script>
+	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
+	export default {
+		components: {
+			addPostTag
+		},
+		data() {
+			return {
+				userInfo: '',
+				hasLogin: false
+			};
+		},
+		onLoad() {
+			//#ifdef MP-WEIXIN
+			wx.showShareMenu({
+				withShareTicket: true,
+				menus: ['shareAppMessage', 'shareTimeline']
+			});
+			//#endif
+		},
+		onShow() {
+			if (uni.getStorageSync('hasLogin')) {
+				this.getUserInfo();
+				this.hasLogin = true;
+			} else {
+				this.hasLogin = false;
+			}
+		},
+		onShareAppMessage(res) {
+			let imgURL = 'http://pic.linfeng.tech/logo.png';
+			return {
+				title: this.$c.miniappName,
+				path: '/pages/index/index',
+				imageUrl: imgURL
+			};
+		},
+		methods: {
+			phoneLogin() {
+				uni.navigateTo({
+					url: '/pages/login/login'
+				});
+			},
+			wxLogin() {
+				uni.navigateTo({
+					url: '/pages/login/weixin'
+				});
+			},
+			getUserInfo() {
+				this.$H.get('user/userInfo').then(res => {
+					this.userInfo = res.result;
+				});
+			},
+			goUser() {
+				uni.navigateTo({
+					url: '/pages/user/edit'
+				});
+			},
+			toNav(url) {
+				uni.navigateTo({
+					url: url
+				});
+			}
+		}
+	};
+</script>
+
+<style>
+	page {
+		background-color: #f5f5f5;
+	}
+</style>
+<style lang="scss" scoped>
+	.head {
+		padding: 20rpx;
+		background-color: #fff;
+
+		.sub-txt {
+			font-size: 24rpx;
+			color: #616161;
+			display: block;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+			overflow: hidden;
+		}
+
+		margin-bottom: 20rpx;
+	}
+
+	.userinfo {
+		display: flex;
+		align-items: center;
+		padding: 20rpx;
+	}
+
+	.userinfo .username {
+		display: flex;
+		flex-direction: column;
+		margin-left: 20rpx;
+	}
+
+	.grid-text {
+		color: #999;
+		font-size: 12px;
+		margin-bottom: 20rpx;
+	}
+
+	.userinfo u-avatar {
+		margin-right: 20rpx;
+	}
+
+	.userinfo .arrow-right {
+		margin-left: auto;
+	}
+
+	.btn-login {
+		margin: 40rpx 0;
+	}
+
+	.gn-icon {
+		width: 60rpx;
+		height: 60rpx;
+		margin-bottom: 20rpx;
+	}
+
+	/*服务按钮*/
+	.btn-wrap {
+		display: flex;
+		margin-top: 30rpx;
+	}
+
+	.btn-wrap .btn-contact {
+		background-color: #fff;
+		margin-left: 15rpx;
+		margin-right: 15rpx;
+		padding: 20rpx;
+		line-height: unset;
+		font-size: 12px;
+		color: #999;
+	}
+
+	.btn-wrap .btn-contact:active {
+		background-color: #f5f5f5;
+	}
+
+	.btn-wrap .btn-contact .txt {
+		margin-top: 20rpx;
+	}
+
+	.btn-wrap .btn-contact::after {
+		border: unset;
+		position: unset;
+	}
+
+	.icon-size {
+		font-size: 50rpx;
+	}
+
+	.block-wrap {
+		background-color: #fff;
+		border-radius: 20rpx;
+		margin: 20rpx;
+		overflow: hidden;
+
+		.block-title {
+			background-color: #fff;
+			padding: 20rpx;
+		}
+	}
 </style>

From a762630b31fad4ed4ee1333858ef3a11ff2d749c Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Mon, 6 Mar 2023 11:37:38 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/post/category.vue                   | 140 +++++++++---------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/category.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/category.vue
index cb1cdc0..4371c45 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/category.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/category.vue
@@ -1,71 +1,71 @@
-<template>
-	<view class="container">
-		<view class="title">选择圈子类目</view>
-		<view class="class-wrap">
-			<view class="class-item u-line-1" @click="chooseClass(item.cateId,item.cateName)"
-				v-for="(item, index) in classList" :key="index">{{ item.cateName }}</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				classList: []
-			};
-		},
-		created() {
-			this.getClassList();
-		},
-		methods: {
-			getClassList() {
-				this.$H.get('topic/classList').then(res => {
-					this.classList = res.result
-				})
-			},
-			chooseClass(id, name) {
-				console.log('id:', id)
-				console.log('name:', name)
-				let pages = getCurrentPages();
-				let nowPage = pages[pages.length - 1];
-				let prevPage = pages[pages.length - 2];
-				prevPage.$vm.form.cut = id;
-				prevPage.$vm.cateName = name;
-				uni.navigateBack();
-
-			}
-
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	.title {
-		margin-bottom: 30rpx;
-	}
-
-	.class-wrap {
-		.class-item {
-			width: 30%;
-			display: inline-block;
-			border: 1px solid #999;
-			padding: 20rpx;
-			font-size: 24rpx;
-			color: #999;
-			text-align: center;
-			margin-bottom: 20rpx;
-			border-radius: 10rpx;
-
-			&:nth-child(3n + 2) {
-				margin-left: 5%;
-				margin-right: 5%;
-			}
-
-			&:active {
-				background-color: #333;
-				color: #fff;
-			}
-		}
-	}
+<template>
+	<view class="container">
+		<view class="title">选择圈子类目</view>
+		<view class="class-wrap">
+			<view class="class-item u-line-1" @click="chooseClass(item.cateId,item.cateName)"
+				v-for="(item, index) in classList" :key="index">{{ item.cateName }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				classList: []
+			};
+		},
+		created() {
+			this.getClassList();
+		},
+		methods: {
+			getClassList() {
+				this.$H.get('topic/classList').then(res => {
+					this.classList = res.result
+				})
+			},
+			chooseClass(id, name) {
+				console.log('id:', id)
+				console.log('name:', name)
+				let pages = getCurrentPages();
+				let nowPage = pages[pages.length - 1];
+				let prevPage = pages[pages.length - 2];
+				prevPage.$vm.form.cut = id;
+				prevPage.$vm.cateName = name;
+				uni.navigateBack();
+
+			}
+
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.title {
+		margin-bottom: 30rpx;
+	}
+
+	.class-wrap {
+		.class-item {
+			width: 30%;
+			display: inline-block;
+			border: 1px solid #999;
+			padding: 20rpx;
+			font-size: 24rpx;
+			color: #999;
+			text-align: center;
+			margin-bottom: 20rpx;
+			border-radius: 10rpx;
+
+			&:nth-child(3n + 2) {
+				margin-left: 5%;
+				margin-right: 5%;
+			}
+
+			&:active {
+				background-color: #333;
+				color: #fff;
+			}
+		}
+	}
 </style>

From 32341e345db55e91dc42395f9b055519b884a21a Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Mon, 6 Mar 2023 11:38:11 +0800
Subject: [PATCH 09/11] bug

---
 .../pages/post/post.vue                       | 1504 ++++++++---------
 1 file changed, 752 insertions(+), 752 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/post.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/post.vue
index f9b35e6..d2f2df1 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/post.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/post/post.vue
@@ -1,753 +1,753 @@
-<template>
-	<view>
-		<view>
-			<view class="detail-container">
-				<view class="user-item">
-					<image @click="jumpUser(postDetail.uid)" :src="postDetail.userInfo.avatar"></image>
-					<view class="user-item-user">
-						<text class="user-name">{{ postDetail.userInfo.username }}</text>
-						<view class="userIntro">{{ postDetail.userInfo.intro }}</view>
-					</view>
-					<u-button v-show="postDetail.isFollow" size="mini" style="float:right;font-size: 14px;"
-						@click="cancelFollow">已关注</u-button>
-					<u-button v-show="!postDetail.isFollow" size="mini" style="float:right;font-size: 14px;"
-						@click="follow">关注</u-button>
-				</view>
-				<view class="icon">
-					<text>{{ postDetail.createTime  }}</text>
-				</view>
-				<view class="hr"></view>
-				<view class="post-title">{{ postDetail.title }}</view>
-				<rich-text class="post-text" :nodes="postDetail.content"></rich-text>
-				<!-- 图片 -->
-				<block v-if="postDetail.type == 1">
-					<!--一张图片-->
-					<block v-if="postDetail.media.length == 1">
-						<image class="img-style-1" @tap.stop="previewImage" mode="aspectFill"
-							:data-current="postDetail.media[0]" :data-image="postDetail.media"
-							:src="postDetail.media[0]">
-						</image>
-					</block>
-					<!--二张图片-->
-					<block v-if="postDetail.media.length == 2">
-						<view class="img-style-2">
-							<image v-for="(mediaItem, index2) in postDetail.media" :key="index2"
-								@tap.stop="previewImage" mode="aspectFill" :data-current="mediaItem"
-								:data-image="postDetail.media" :src="mediaItem">
-							</image>
-						</view>
-					</block>
-					<!--三张图片-->
-					<block v-if="postDetail.media.length ==3">
-						<view class="img-style-3">
-							<image v-for="(mediaItem, index2) in postDetail.media" :key="index2"
-								@tap.stop="previewImage" mode="aspectFill" :data-current="mediaItem"
-								:data-image="postDetail.media" :src="mediaItem">
-							</image>
-						</view>
-					</block>
-					<!--四张图片-->
-					<block v-if="postDetail.media.length == 4">
-						<view class="img-style-4">
-							<image v-for="(mediaItem, index2) in postDetail.media" :key="index2"
-								@tap.stop="previewImage" mode="aspectFill" :data-current="mediaItem"
-								:data-image="postDetail.media" :src="mediaItem">
-							</image>
-						</view>
-					</block>
-
-				</block>
-			</view>
-
-			<!--点赞、分享、评论-->
-			<view class="menu-container">
-				<block v-if="postDetail.isCollection">
-					<view class="p-item" @click="cancelCollection">
-						<text class="iconfont icon-lujing" style="color: #d81e06;"></text>
-						<text>{{ postDetail.collectionCount }}</text>
-					</view>
-				</block>
-				<block v-else>
-					<view class="p-item" @click="addCollection">
-						<text class="iconfont icon-shoucang"></text>
-						<text>{{ postDetail.collectionCount }}</text>
-					</view>
-				</block>
-				<view class="p-item" @click="focus = true">
-					<text class="iconfont icon-pinglun"></text>
-					<text>{{ postDetail.commentCount }}</text>
-				</view>
-				<view class="p-item" @click="showShare = true">
-					<text class="iconfont icon-forward"></text>
-					<text>分享</text>
-				</view>
-			</view>
-		</view>
-		<u-line color="#d8d8d8"></u-line>
-		<view class="comment-box">
-			<view class="title">评论（{{ postDetail.commentCount }}）</view>
-			<view style="margin-bottom: 40rpx;" v-for="(item, index) in commentList" :key="index">
-				<view class="comment-item">
-					<image @click="jumpUser(item.userInfo.uid)" class="avatar" :src="item.userInfo.avatar"></image>
-					<view class="c-content">
-						<view class="user">
-							<text>{{ item.userInfo.username }}</text>
-							<block v-if="item.isThumbs">
-								<view @click.stop="cancelThumbs(item.id, index)" class="thumbs">
-									<text class="num">{{ item.thumbs }}</text>
-									<u-icon class="icon" size="40" name="heart-fill" color="#e62e00"></u-icon>
-								</view>
-							</block>
-							<block v-else>
-								<view @click.stop="onThumbs(item.id, index)" class="thumbs">
-									<text class="num">{{ item.thumbs }}</text>
-									<u-icon class="icon" size="40" name="heart-fill" color="#bfbfbf"></u-icon>
-								</view>
-							</block>
-						</view>
-						<text class="c-txt">{{ item.content }}</text>
-						<text class="time">{{ item.createTime  }}</text>
-					</view>
-				</view>
-			</view>
-			<!-- 加载状态 -->
-			<block v-if="commentList.length > 0">
-				<view style="margin: 30rpx;">
-					<u-loadmore :status="loadStatus" />
-				</view>
-			</block>
-			<block v-else>
-				<u-empty text="暂无评论" mode="message"></u-empty>
-			</block>
-		</view>
-		<view style="height: 100rpx;"></view>
-		<!-- 评论输入框 -->
-		<view class="comment-input">
-			<textarea :placeholder="placeholder" @blur="onBlur" :focus="focus" fixed="true" cursor-spacing="10"
-				v-model="form.content" auto-height="true" placeholder-class="txt-placeholder" confirm-type="send"
-				@confirm="addComment"></textarea>
-			<u-button @click="addComment" :disabled="canSunbmit" :custom-style="btnStyle" style="border-radius: 0;">发布
-			</u-button>
-		</view>
-		<!-- 分享选择弹窗 -->
-		<u-popup v-model="showShare" mode="bottom" height="240rpx">
-			<view class="post-share-container" @click="showShare = false">
-				<!-- #ifdef MP -->
-				<button open-type="share" class="share-item u-reset-button">
-					<image src="/static/img/wechat.png"></image>
-					<text>微信好友</text>
-				</button>
-				<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<view class="share-item2" @click="copyPageUrl">
-					<image src="/static/img/share.png"></image>
-					<text>分享链接</text>
-				</view>
-				<!-- #endif -->
-			</view>
-		</u-popup>
-
-	</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				btnStyle: {
-					color: "#fff",
-					backgroundColor: '#55aaff'
-				},
-				postId: 0,
-				postDetail: {
-					comment: [],
-					media: [],
-					commentList: {
-						data: []
-					},
-					topicInfo: {
-						topicName: ''
-					}
-				},
-				focus: false,
-				canSunbmit: false,
-				commentList: [],
-				placeholder: '文明发言哦',
-				form: {
-					pid: 0,
-					type: 1,
-					toUid: '',
-					postId: '',
-					content: ''
-				},
-				showShare: false,
-				shareBtnStyle: {
-					backgroundColor: '#333'
-				},
-				page: 1,
-				loadStatus: 'loadmore',
-
-			};
-		},
-		onLoad(options) {
-			this.postId = options.id;
-
-			if (options.scene) {
-				this.postId = options.scene;
-			}
-			if (options.mid) {
-				this.messageRead(options.mid);
-			}
-
-			this.form.postId = this.postId;
-			this.getPostDetail();
-			this.getCommentList();
-
-			//#ifdef MP-WEIXIN
-			wx.showShareMenu({
-				withShareTicket: true,
-				menus: ['shareAppMessage', 'shareTimeline']
-			});
-			//#endif
-		},
-		onReachBottom() {
-			this.page++;
-			this.getCommentList();
-		},
-		onShareAppMessage(res) {
-			let imgURL;
-			if (this.postDetail.media.length > 0) {
-				imgURL = this.postDetail.media[0];
-			}
-			return {
-				title: this.postDetail.content,
-				path: '/pages/post/post?id=' + this.postId,
-				imageUrl: imgURL
-			};
-		},
-		onShareTimeline() {
-			let imgURL = (imgURL = this.postDetail.media[0]);
-			return {
-				title: this.postDetail.content,
-				imageUrl: imgURL,
-				query: 'id=' + this.postId
-			};
-		},
-		methods: {
-			messageRead(mid) {
-				this.$H
-					.post('message/readMessage', {
-						postId: this.postId,
-						mid: mid
-					})
-					.then(res => {
-
-					});
-			},
-			copyPageUrl() {
-				let that = this;
-				uni.setClipboardData({
-					data: this.$c.shareH5Url + 'pages/post/detail?id=' + this.postId,
-					success: function() {
-						uni.hideToast();
-						uni.showToast({
-							title: '复制成功快分享给好友叭~',
-							icon: 'success',
-							duration: 2000,
-						})
-						that.showShare = false;
-					}
-				});
-			},
-			// 点赞
-			onThumbs(id, index, index2) {
-				this.$H
-					.post('comment/thumbs', {
-						id: id
-					})
-					.then(res => {
-						if (res.code == 0) {
-							if (index2 || index2 == 0) {
-								this.commentList[index].children[index2].isThumbs = true;
-								this.commentList[index].children[index2].thumbs++;
-							} else {
-								this.commentList[index].isThumbs = true;
-								this.commentList[index].thumbs++;
-							}
-						}
-					});
-			},
-			// 取消点赞
-			cancelThumbs(id, index, index2) {
-				this.$H
-					.post('comment/cancelThumbs', {
-						id: id
-					})
-					.then(res => {
-						if (res.code == 0) {
-							if (index2 || index2 == 0) {
-								this.commentList[index].children[index2].isThumbs = false;
-								this.commentList[index].children[index2].thumbs--;
-							} else {
-								this.commentList[index].isThumbs = false;
-								this.commentList[index].thumbs--;
-							}
-						}
-					});
-			},
-			// 输入框失去焦点时
-			onBlur() {
-				this.placeholder = '留下你的精彩评论...';
-				this.focus = false;
-				// #ifdef MP
-				this.form.pid = 0;
-				// #endif
-			},
-			// 获取评论列表
-			getCommentList() {
-				this.loadStatus = 'loading';
-				this.$H
-					.get('comment/list', {
-						postId: this.postId,
-						page: this.page
-					})
-					.then(res => {
-						if (res.code == 0) {
-							this.commentList = this.commentList.concat(res.result.data);
-
-							if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
-								this.loadStatus = 'nomore';
-							} else {
-								this.loadStatus = 'loadmore';
-							}
-						}
-					});
-			},
-			jumpUser(uid) {
-				uni.navigateTo({
-					url: '/pages/user/home?uid=' + uid
-				});
-			},
-			addComment() {
-				this.canSunbmit = true;
-				if (this.form.content == '') {
-					this.$u.toast('评论不能为空');
-					this.canSunbmit = false;
-					return;
-				}
-
-				uni.showLoading({
-					mask: true,
-					title: '发布中'
-				});
-				this.$H.post('post/addComment', this.form).then(res => {
-					if (res.code == 0) {
-						this.form.content = '';
-						this.$u.toast('评论成功');
-						this.page = 1;
-						this.commentList = [];
-						this.form.pid = 0;
-						this.getCommentList();
-					}
-					this.canSunbmit = false;
-					uni.hideLoading();
-				});
-			},
-			getPostDetail() {
-				this.$H
-					.get('post/detail', {
-						id: this.postId
-					})
-					.then(res => {
-						if (res.code == 500) {
-							this.$u.toast(res.msg);
-							setTimeout(function() {
-								uni.switchTab({
-									url: '/pages/index/index'
-								});
-							}, 1500);
-						}
-						this.postDetail = res.result;
-					});
-			},
-			cancelCollection() {
-				this.$H
-					.post('post/cancelCollection', {
-						id: this.postId
-					})
-					.then(res => {
-						if (res.code === 0) {
-							this.postDetail.isCollection = false;
-							this.postDetail.collectionCount--;
-						}
-					});
-			},
-			addCollection() {
-				this.$H
-					.post('post/addCollection', {
-						id: this.postId,
-						uid: this.postDetail.uid
-					})
-					.then(res => {
-						if (res.code === 0) {
-							this.postDetail.isCollection = true;
-							this.postDetail.collectionCount++;
-						}
-					});
-			},
-			addThumb() {
-				this.$H
-					.post('post/addThumb', {
-						id: this.postId
-					})
-					.then(res => {
-						if (res.code === 0) {
-							this.postDetail.isThumb = true;
-						}
-					});
-			},
-			cancelThumb() {
-				this.$H
-					.post('post/cancelThumb', {
-						id: this.postId,
-						uid: this.postDetail.uid
-					})
-					.then(res => {
-						if (res.code === 0) {
-							this.postDetail.isThumb = false;
-						}
-					});
-			},
-			follow() {
-				this.$H
-					.post('user/addFollow', {
-						id: this.postDetail.uid
-					})
-					.then(res => {
-						if (res.code === 0) {
-							this.postDetail.isFollow = true;
-						} else {
-							this.$refs.uToast.show({
-								title: res.msg,
-								type: 'error'
-							});
-						}
-					});
-			},
-			cancelFollow() {
-				this.$H
-					.post('user/cancelFollow', {
-						id: this.postDetail.uid
-					})
-					.then(res => {
-						if (res.code === 0) {
-							this.postDetail.isFollow = false;
-						}
-					});
-			},
-			previewImage(e) {
-				uni.previewImage({
-					current: e.currentTarget.dataset.current, // 当前显示图片的http链接
-					urls: e.currentTarget.dataset.image // 需要预览的图片http链接列表
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	.post-title {
-		margin: 20rpx 0;
-	}
-
-	.detail-container {
-		padding: 20rpx;
-		background-color: #ffffff;
-	}
-
-	.icon text {
-		font-size: 12px;
-		color: #999;
-		margin-right: 20rpx;
-	}
-
-	/*关注*/
-
-	.user-item {
-		display: flex;
-
-		.user-item-user {
-			flex: 1;
-
-			.userIntro {
-				font-size: 12px;
-				color: #999;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-				overflow: hidden;
-			}
-		}
-
-		image {
-			width: 80rpx;
-			height: 80rpx;
-			float: left;
-			margin-right: 10rpx;
-			border-radius: 50%;
-		}
-	}
-
-	.menu-container {
-		margin: 30rpx;
-		display: flex;
-		font-size: 24rpx;
-		color: #616161;
-
-		.p-item {
-			display: flex;
-			align-items: center;
-
-			.iconfont {
-				font-size: 40rpx;
-			}
-
-			&:nth-child(2) {
-				margin: 0 auto;
-			}
-
-			.iconfont {
-				margin-right: 10rpx;
-			}
-		}
-	}
-
-	/*评论列表*/
-	.comment-box {
-		background-color: #ffffff;
-		margin-top: 20rpx;
-		padding: 20rpx;
-	}
-
-	.comment-box>.title {
-		margin-bottom: 20rpx;
-	}
-
-	.comment-item {
-		display: flex;
-		padding: 20rpx;
-
-		&:active {
-			background-color: #F5F5F5;
-		}
-
-		.c-content {
-			display: flex;
-			flex-direction: column;
-			flex: 1;
-
-			.time {
-				color: #999;
-				font-size: 10px;
-			}
-
-			.user {
-				display: flex;
-
-				.thumbs {
-					margin-left: auto;
-					display: flex;
-					align-items: center;
-					color: #bfbfbf;
-
-					.num {
-						margin-right: 10rpx;
-					}
-				}
-			}
-		}
-
-		.avatar {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 50%;
-			margin-right: 20rpx;
-		}
-	}
-
-	.sub-comment-item {
-		margin-left: 100rpx;
-		padding: 20rpx;
-
-		&:active {
-			background-color: #F5F5F5;
-		}
-
-		.user {
-			display: flex;
-			align-items: center;
-
-			.name {
-				color: #616161;
-			}
-
-			.avatar {
-				margin-right: 10rpx;
-			}
-
-			.u-head {
-				flex: 1;
-				display: flex;
-
-				.thumbs {
-					margin-left: auto;
-					display: flex;
-					align-items: center;
-					color: #bfbfbf;
-
-					.num {
-						margin-right: 10rpx;
-					}
-				}
-			}
-		}
-
-		.reply {
-			.time {
-				margin-left: auto;
-				font-size: 20rpx;
-				color: #999;
-			}
-
-			.name {
-				display: inline-block;
-				color: #55aaff;
-				font-weight: 600;
-			}
-		}
-	}
-
-	.comment-input {
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		background-color: #fff;
-		padding: 20rpx;
-		display: flex;
-		z-index: 999;
-	}
-
-	.comment-input textarea {
-		background-color: #f5f5f5;
-		padding: 20rpx;
-		border-radius: 10rpx;
-		min-height: 40rpx;
-	}
-
-	.comment-input .u-btn {
-		margin-left: 10rpx;
-	}
-
-
-	.img-style-1 {
-		display: block;
-		width: 100%;
-		max-height: 600rpx;
-		border-radius: 5px;
-	}
-
-	.img-style-2 {
-		display: flex;
-	}
-
-	.img-style-2 image {
-		margin: 5rpx;
-		border-radius: 5px;
-		width: 100%;
-		height: 294rpx;
-	}
-
-	.img-style-3 {
-		display: flex;
-		flex-wrap: wrap;
-	}
-
-	.img-style-3 image {
-		width: 31.3%;
-		height: 200rpx;
-		margin: 1%;
-		border-radius: 5px;
-	}
-
-	.img-style-4 {
-		display: flex;
-		flex-wrap: wrap;
-	}
-
-	.img-style-4 image {
-		width: 48%;
-		height: 320rpx;
-		margin: 0.5%;
-	}
-
-
-	// 分享弹窗
-	.post-share-container {
-		display: flex;
-		padding: 30rpx;
-		width: 60%;
-		margin: 0 auto;
-
-		.share-item {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-
-			&:nth-child(1) {
-				margin-right: auto;
-			}
-
-			image {
-				width: 100rpx;
-				height: 100rpx;
-			}
-
-			text {
-				font-size: 24rpx;
-				margin-top: 20rpx;
-			}
-		}
-
-		.share-item2 {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-
-			&:nth-child(1) {
-				margin: auto;
-			}
-
-			image {
-				width: 100rpx;
-				height: 100rpx;
-			}
-
-			text {
-				font-size: 24rpx;
-				margin-top: 20rpx;
-			}
-		}
-	}
-
-
-	video {
-		width: 100%;
-	}
-
-	.post-text {
-		white-space: pre-wrap;
-	}
+<template>
+	<view>
+		<view>
+			<view class="detail-container">
+				<view class="user-item">
+					<image @click="jumpUser(postDetail.uid)" :src="postDetail.userInfo.avatar"></image>
+					<view class="user-item-user">
+						<text class="user-name">{{ postDetail.userInfo.username }}</text>
+						<view class="userIntro">{{ postDetail.userInfo.intro }}</view>
+					</view>
+					<u-button v-show="postDetail.isFollow" size="mini" style="float:right;font-size: 14px;"
+						@click="cancelFollow">已关注</u-button>
+					<u-button v-show="!postDetail.isFollow" size="mini" style="float:right;font-size: 14px;"
+						@click="follow">关注</u-button>
+				</view>
+				<view class="icon">
+					<text>{{ postDetail.createTime  }}</text>
+				</view>
+				<view class="hr"></view>
+				<view class="post-title">{{ postDetail.title }}</view>
+				<rich-text class="post-text" :nodes="postDetail.content"></rich-text>
+				<!-- 图片 -->
+				<block v-if="postDetail.type == 1">
+					<!--一张图片-->
+					<block v-if="postDetail.media.length == 1">
+						<image class="img-style-1" @tap.stop="previewImage" mode="aspectFill"
+							:data-current="postDetail.media[0]" :data-image="postDetail.media"
+							:src="postDetail.media[0]">
+						</image>
+					</block>
+					<!--二张图片-->
+					<block v-if="postDetail.media.length == 2">
+						<view class="img-style-2">
+							<image v-for="(mediaItem, index2) in postDetail.media" :key="index2"
+								@tap.stop="previewImage" mode="aspectFill" :data-current="mediaItem"
+								:data-image="postDetail.media" :src="mediaItem">
+							</image>
+						</view>
+					</block>
+					<!--三张图片-->
+					<block v-if="postDetail.media.length ==3">
+						<view class="img-style-3">
+							<image v-for="(mediaItem, index2) in postDetail.media" :key="index2"
+								@tap.stop="previewImage" mode="aspectFill" :data-current="mediaItem"
+								:data-image="postDetail.media" :src="mediaItem">
+							</image>
+						</view>
+					</block>
+					<!--四张图片-->
+					<block v-if="postDetail.media.length == 4">
+						<view class="img-style-4">
+							<image v-for="(mediaItem, index2) in postDetail.media" :key="index2"
+								@tap.stop="previewImage" mode="aspectFill" :data-current="mediaItem"
+								:data-image="postDetail.media" :src="mediaItem">
+							</image>
+						</view>
+					</block>
+
+				</block>
+			</view>
+
+			<!--点赞、分享、评论-->
+			<view class="menu-container">
+				<block v-if="postDetail.isCollection">
+					<view class="p-item" @click="cancelCollection">
+						<text class="iconfont icon-lujing" style="color: #d81e06;"></text>
+						<text>{{ postDetail.collectionCount }}</text>
+					</view>
+				</block>
+				<block v-else>
+					<view class="p-item" @click="addCollection">
+						<text class="iconfont icon-shoucang"></text>
+						<text>{{ postDetail.collectionCount }}</text>
+					</view>
+				</block>
+				<view class="p-item" @click="focus = true">
+					<text class="iconfont icon-pinglun"></text>
+					<text>{{ postDetail.commentCount }}</text>
+				</view>
+				<view class="p-item" @click="showShare = true">
+					<text class="iconfont icon-forward"></text>
+					<text>分享</text>
+				</view>
+			</view>
+		</view>
+		<u-line color="#d8d8d8"></u-line>
+		<view class="comment-box">
+			<view class="title">评论（{{ postDetail.commentCount }}）</view>
+			<view style="margin-bottom: 40rpx;" v-for="(item, index) in commentList" :key="index">
+				<view class="comment-item">
+					<image @click="jumpUser(item.userInfo.uid)" class="avatar" :src="item.userInfo.avatar"></image>
+					<view class="c-content">
+						<view class="user">
+							<text>{{ item.userInfo.username }}</text>
+							<block v-if="item.isThumbs">
+								<view @click.stop="cancelThumbs(item.id, index)" class="thumbs">
+									<text class="num">{{ item.thumbs }}</text>
+									<u-icon class="icon" size="40" name="heart-fill" color="#e62e00"></u-icon>
+								</view>
+							</block>
+							<block v-else>
+								<view @click.stop="onThumbs(item.id, index)" class="thumbs">
+									<text class="num">{{ item.thumbs }}</text>
+									<u-icon class="icon" size="40" name="heart-fill" color="#bfbfbf"></u-icon>
+								</view>
+							</block>
+						</view>
+						<text class="c-txt">{{ item.content }}</text>
+						<text class="time">{{ item.createTime  }}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 加载状态 -->
+			<block v-if="commentList.length > 0">
+				<view style="margin: 30rpx;">
+					<u-loadmore :status="loadStatus" />
+				</view>
+			</block>
+			<block v-else>
+				<u-empty text="暂无评论" mode="message"></u-empty>
+			</block>
+		</view>
+		<view style="height: 100rpx;"></view>
+		<!-- 评论输入框 -->
+		<view class="comment-input">
+			<textarea :placeholder="placeholder" @blur="onBlur" :focus="focus" fixed="true" cursor-spacing="10"
+				v-model="form.content" auto-height="true" placeholder-class="txt-placeholder" confirm-type="send"
+				@confirm="addComment"></textarea>
+			<u-button @click="addComment" :disabled="canSunbmit" :custom-style="btnStyle" style="border-radius: 0;">发布
+			</u-button>
+		</view>
+		<!-- 分享选择弹窗 -->
+		<u-popup v-model="showShare" mode="bottom" height="240rpx">
+			<view class="post-share-container" @click="showShare = false">
+				<!-- #ifdef MP -->
+				<button open-type="share" class="share-item u-reset-button">
+					<image src="/static/img/wechat.png"></image>
+					<text>微信好友</text>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<view class="share-item2" @click="copyPageUrl">
+					<image src="/static/img/share.png"></image>
+					<text>分享链接</text>
+				</view>
+				<!-- #endif -->
+			</view>
+		</u-popup>
+
+	</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				btnStyle: {
+					color: "#fff",
+					backgroundColor: '#55aaff'
+				},
+				postId: 0,
+				postDetail: {
+					comment: [],
+					media: [],
+					commentList: {
+						data: []
+					},
+					topicInfo: {
+						topicName: ''
+					}
+				},
+				focus: false,
+				canSunbmit: false,
+				commentList: [],
+				placeholder: '文明发言哦',
+				form: {
+					pid: 0,
+					type: 1,
+					toUid: '',
+					postId: '',
+					content: ''
+				},
+				showShare: false,
+				shareBtnStyle: {
+					backgroundColor: '#333'
+				},
+				page: 1,
+				loadStatus: 'loadmore',
+
+			};
+		},
+		onLoad(options) {
+			this.postId = options.id;
+
+			if (options.scene) {
+				this.postId = options.scene;
+			}
+			if (options.mid) {
+				this.messageRead(options.mid);
+			}
+
+			this.form.postId = this.postId;
+			this.getPostDetail();
+			this.getCommentList();
+
+			//#ifdef MP-WEIXIN
+			wx.showShareMenu({
+				withShareTicket: true,
+				menus: ['shareAppMessage', 'shareTimeline']
+			});
+			//#endif
+		},
+		onReachBottom() {
+			this.page++;
+			this.getCommentList();
+		},
+		onShareAppMessage(res) {
+			let imgURL;
+			if (this.postDetail.media.length > 0) {
+				imgURL = this.postDetail.media[0];
+			}
+			return {
+				title: this.postDetail.content,
+				path: '/pages/post/post?id=' + this.postId,
+				imageUrl: imgURL
+			};
+		},
+		onShareTimeline() {
+			let imgURL = (imgURL = this.postDetail.media[0]);
+			return {
+				title: this.postDetail.content,
+				imageUrl: imgURL,
+				query: 'id=' + this.postId
+			};
+		},
+		methods: {
+			messageRead(mid) {
+				this.$H
+					.post('message/readMessage', {
+						postId: this.postId,
+						mid: mid
+					})
+					.then(res => {
+
+					});
+			},
+			copyPageUrl() {
+				let that = this;
+				uni.setClipboardData({
+					data: this.$c.shareH5Url + 'pages/post/detail?id=' + this.postId,
+					success: function() {
+						uni.hideToast();
+						uni.showToast({
+							title: '复制成功快分享给好友叭~',
+							icon: 'success',
+							duration: 2000,
+						})
+						that.showShare = false;
+					}
+				});
+			},
+			// 点赞
+			onThumbs(id, index, index2) {
+				this.$H
+					.post('comment/thumbs', {
+						id: id
+					})
+					.then(res => {
+						if (res.code == 0) {
+							if (index2 || index2 == 0) {
+								this.commentList[index].children[index2].isThumbs = true;
+								this.commentList[index].children[index2].thumbs++;
+							} else {
+								this.commentList[index].isThumbs = true;
+								this.commentList[index].thumbs++;
+							}
+						}
+					});
+			},
+			// 取消点赞
+			cancelThumbs(id, index, index2) {
+				this.$H
+					.post('comment/cancelThumbs', {
+						id: id
+					})
+					.then(res => {
+						if (res.code == 0) {
+							if (index2 || index2 == 0) {
+								this.commentList[index].children[index2].isThumbs = false;
+								this.commentList[index].children[index2].thumbs--;
+							} else {
+								this.commentList[index].isThumbs = false;
+								this.commentList[index].thumbs--;
+							}
+						}
+					});
+			},
+			// 输入框失去焦点时
+			onBlur() {
+				this.placeholder = '留下你的精彩评论...';
+				this.focus = false;
+				// #ifdef MP
+				this.form.pid = 0;
+				// #endif
+			},
+			// 获取评论列表
+			getCommentList() {
+				this.loadStatus = 'loading';
+				this.$H
+					.get('comment/list', {
+						postId: this.postId,
+						page: this.page
+					})
+					.then(res => {
+						if (res.code == 0) {
+							this.commentList = this.commentList.concat(res.result.data);
+
+							if (res.result.current_page >= res.result.total || res.result.last_page === 0) {
+								this.loadStatus = 'nomore';
+							} else {
+								this.loadStatus = 'loadmore';
+							}
+						}
+					});
+			},
+			jumpUser(uid) {
+				uni.navigateTo({
+					url: '/pages/user/home?uid=' + uid
+				});
+			},
+			addComment() {
+				this.canSunbmit = true;
+				if (this.form.content == '') {
+					this.$u.toast('评论不能为空');
+					this.canSunbmit = false;
+					return;
+				}
+
+				uni.showLoading({
+					mask: true,
+					title: '发布中'
+				});
+				this.$H.post('post/addComment', this.form).then(res => {
+					if (res.code == 0) {
+						this.form.content = '';
+						this.$u.toast('评论成功');
+						this.page = 1;
+						this.commentList = [];
+						this.form.pid = 0;
+						this.getCommentList();
+					}
+					this.canSunbmit = false;
+					uni.hideLoading();
+				});
+			},
+			getPostDetail() {
+				this.$H
+					.get('post/detail', {
+						id: this.postId
+					})
+					.then(res => {
+						if (res.code == 500) {
+							this.$u.toast(res.msg);
+							setTimeout(function() {
+								uni.switchTab({
+									url: '/pages/index/index'
+								});
+							}, 1500);
+						}
+						this.postDetail = res.result;
+					});
+			},
+			cancelCollection() {
+				this.$H
+					.post('post/cancelCollection', {
+						id: this.postId
+					})
+					.then(res => {
+						if (res.code === 0) {
+							this.postDetail.isCollection = false;
+							this.postDetail.collectionCount--;
+						}
+					});
+			},
+			addCollection() {
+				this.$H
+					.post('post/addCollection', {
+						id: this.postId,
+						uid: this.postDetail.uid
+					})
+					.then(res => {
+						if (res.code === 0) {
+							this.postDetail.isCollection = true;
+							this.postDetail.collectionCount++;
+						}
+					});
+			},
+			addThumb() {
+				this.$H
+					.post('post/addThumb', {
+						id: this.postId
+					})
+					.then(res => {
+						if (res.code === 0) {
+							this.postDetail.isThumb = true;
+						}
+					});
+			},
+			cancelThumb() {
+				this.$H
+					.post('post/cancelThumb', {
+						id: this.postId,
+						uid: this.postDetail.uid
+					})
+					.then(res => {
+						if (res.code === 0) {
+							this.postDetail.isThumb = false;
+						}
+					});
+			},
+			follow() {
+				this.$H
+					.post('user/addFollow', {
+						id: this.postDetail.uid
+					})
+					.then(res => {
+						if (res.code === 0) {
+							this.postDetail.isFollow = true;
+						} else {
+							this.$refs.uToast.show({
+								title: res.msg,
+								type: 'error'
+							});
+						}
+					});
+			},
+			cancelFollow() {
+				this.$H
+					.post('user/cancelFollow', {
+						id: this.postDetail.uid
+					})
+					.then(res => {
+						if (res.code === 0) {
+							this.postDetail.isFollow = false;
+						}
+					});
+			},
+			previewImage(e) {
+				uni.previewImage({
+					current: e.currentTarget.dataset.current, // 当前显示图片的http链接
+					urls: e.currentTarget.dataset.image // 需要预览的图片http链接列表
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.post-title {
+		margin: 20rpx 0;
+	}
+
+	.detail-container {
+		padding: 20rpx;
+		background-color: #ffffff;
+	}
+
+	.icon text {
+		font-size: 12px;
+		color: #999;
+		margin-right: 20rpx;
+	}
+
+	/*关注*/
+
+	.user-item {
+		display: flex;
+
+		.user-item-user {
+			flex: 1;
+
+			.userIntro {
+				font-size: 12px;
+				color: #999;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+				overflow: hidden;
+			}
+		}
+
+		image {
+			width: 80rpx;
+			height: 80rpx;
+			float: left;
+			margin-right: 10rpx;
+			border-radius: 50%;
+		}
+	}
+
+	.menu-container {
+		margin: 30rpx;
+		display: flex;
+		font-size: 24rpx;
+		color: #616161;
+
+		.p-item {
+			display: flex;
+			align-items: center;
+
+			.iconfont {
+				font-size: 40rpx;
+			}
+
+			&:nth-child(2) {
+				margin: 0 auto;
+			}
+
+			.iconfont {
+				margin-right: 10rpx;
+			}
+		}
+	}
+
+	/*评论列表*/
+	.comment-box {
+		background-color: #ffffff;
+		margin-top: 20rpx;
+		padding: 20rpx;
+	}
+
+	.comment-box>.title {
+		margin-bottom: 20rpx;
+	}
+
+	.comment-item {
+		display: flex;
+		padding: 20rpx;
+
+		&:active {
+			background-color: #F5F5F5;
+		}
+
+		.c-content {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+
+			.time {
+				color: #999;
+				font-size: 10px;
+			}
+
+			.user {
+				display: flex;
+
+				.thumbs {
+					margin-left: auto;
+					display: flex;
+					align-items: center;
+					color: #bfbfbf;
+
+					.num {
+						margin-right: 10rpx;
+					}
+				}
+			}
+		}
+
+		.avatar {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			margin-right: 20rpx;
+		}
+	}
+
+	.sub-comment-item {
+		margin-left: 100rpx;
+		padding: 20rpx;
+
+		&:active {
+			background-color: #F5F5F5;
+		}
+
+		.user {
+			display: flex;
+			align-items: center;
+
+			.name {
+				color: #616161;
+			}
+
+			.avatar {
+				margin-right: 10rpx;
+			}
+
+			.u-head {
+				flex: 1;
+				display: flex;
+
+				.thumbs {
+					margin-left: auto;
+					display: flex;
+					align-items: center;
+					color: #bfbfbf;
+
+					.num {
+						margin-right: 10rpx;
+					}
+				}
+			}
+		}
+
+		.reply {
+			.time {
+				margin-left: auto;
+				font-size: 20rpx;
+				color: #999;
+			}
+
+			.name {
+				display: inline-block;
+				color: #55aaff;
+				font-weight: 600;
+			}
+		}
+	}
+
+	.comment-input {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		background-color: #fff;
+		padding: 20rpx;
+		display: flex;
+		z-index: 999;
+	}
+
+	.comment-input textarea {
+		background-color: #f5f5f5;
+		padding: 20rpx;
+		border-radius: 10rpx;
+		min-height: 40rpx;
+	}
+
+	.comment-input .u-btn {
+		margin-left: 10rpx;
+	}
+
+
+	.img-style-1 {
+		display: block;
+		width: 100%;
+		max-height: 600rpx;
+		border-radius: 5px;
+	}
+
+	.img-style-2 {
+		display: flex;
+	}
+
+	.img-style-2 image {
+		margin: 5rpx;
+		border-radius: 5px;
+		width: 100%;
+		height: 294rpx;
+	}
+
+	.img-style-3 {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.img-style-3 image {
+		width: 31.3%;
+		height: 200rpx;
+		margin: 1%;
+		border-radius: 5px;
+	}
+
+	.img-style-4 {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.img-style-4 image {
+		width: 48%;
+		height: 320rpx;
+		margin: 0.5%;
+	}
+
+
+	// 分享弹窗
+	.post-share-container {
+		display: flex;
+		padding: 30rpx;
+		width: 60%;
+		margin: 0 auto;
+
+		.share-item {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+
+			&:nth-child(1) {
+				margin-right: auto;
+			}
+
+			image {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			text {
+				font-size: 24rpx;
+				margin-top: 20rpx;
+			}
+		}
+
+		.share-item2 {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+
+			&:nth-child(1) {
+				margin: auto;
+			}
+
+			image {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			text {
+				font-size: 24rpx;
+				margin-top: 20rpx;
+			}
+		}
+	}
+
+
+	video {
+		width: 100%;
+	}
+
+	.post-text {
+		white-space: pre-wrap;
+	}
 </style>

From 9360e035846f12dc5d37cb1f0105c32b35ace988 Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Mon, 6 Mar 2023 11:38:46 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/user/home.vue                       | 584 +++++++++---------
 1 file changed, 292 insertions(+), 292 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue
index 6279f55..7b861fa 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/user/home.vue
@@ -1,293 +1,293 @@
-<template>
-	<view>
-		<view style="position: absolute;">
-			<u-navbar :custom-back="onBack" back-icon-color="#0c0000" :background="background" :border-bottom="false">
-			</u-navbar>
-		</view>
-		<view class="container">
-			<view class="info-wrap">
-				<u-avatar class="avatar" :src="userInfo.avatar" :show-level='userInfo.type == 1'
-					level-bg-color="#8072f3" size="130"></u-avatar>
-				<view class="user-style">
-					<view class="username">{{userInfo.username}}
-						<text class="iconfont icon-nan kong" v-if="userInfo.gender=='男'"></text>
-						<text class="iconfont icon-nv kong" v-else-if="userInfo.gender=='女'"></text>
-					</view>
-
-					<text class="desc">{{userInfo.intro}}</text>
-					<text class="desc" v-if="userInfo.city">IP:{{userInfo.city}}</text>
-
-					<view class="btn-box" v-if="currUid!=uid">
-						<u-button v-show="!userInfo.isFollow" @click="follow" :custom-style="btnStyle" class="btn"
-							shape="circle" size="mini">
-							<u-icon name="plus"></u-icon>
-							<text>关注</text>
-						</u-button>
-						<u-button v-show="userInfo.isFollow" @click="cancelFollow" :custom-style="btnStyle2" class="btn"
-							shape="circle" size="mini">
-							<text>已关注</text>
-						</u-button>
-						<u-button :custom-style="btnStyle2" @click="chat" shape="circle" size="mini">
-							<text style="margin: 0 15rpx;">私信</text>
-						</u-button>
-					</view>
-				</view>
-			</view>
-			<!-- 帖子 -->
-			<view>
-				<view class="title-desc">发布的动态</view>
-				<post-list :list="postList" :loadStatus="loadStatus"></post-list>
-			</view>
-		</view>
-
-		<!-- 发贴入口 -->
-		<add-post-tag></add-post-tag>
-
-	</view>
-</template>
-
-<script>
-	import postList from '../../components/post-list/post-list.vue';
-	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
-	export default {
-		components: {
-			postList
-		},
-		data() {
-			return {
-				loading: true,
-				btnStyle: {
-					color: "#fff",
-					backgroundColor: '#000000'
-				},
-				btnStyle2: {
-					border: '1px solid #000000',
-					color: "#000000"
-				},
-				background: {
-					backgroundColor: 'unset'
-				},
-				tabs: [{
-					tab_name: '帖子'
-				}],
-				current: 1,
-				uid: 0,
-				postList: [],
-				topicList: [],
-				userInfo: {},
-				userJson: "",
-				loadStatus: "loading",
-				page: 1,
-				currUid: 0
-			};
-		},
-		onLoad(options) {
-			this.uid = options.uid;
-			this.getUserInfo();
-			this.getPostList();
-			if (uni.getStorageSync('userInfo').uid) {
-				this.currUid = uni.getStorageSync('userInfo').uid;
-			}
-		},
-		onReachBottom() {
-			this.page++;
-			this.getPostList();
-		},
-		methods: {
-			onBack() {
-				uni.navigateBack();
-			},
-			follow() {
-				this.$H.post('user/addFollow', {
-					id: this.userInfo.uid
-				}).then(res => {
-					if (res.code === 0) {
-						this.userInfo.isFollow = true;
-					} else {
-						this.$u.toast(res.msg);
-					}
-				})
-			},
-			cancelFollow() {
-				this.$H.post('user/cancelFollow', {
-					id: this.userInfo.uid
-				}).then(res => {
-					if (res.code === 0) {
-						this.userInfo.isFollow = false;
-					}
-				})
-			},
-
-			getPostList() {
-				this.loadStatus = "loading";
-				this.$H.post('post/list', {
-					page: this.page,
-					uid: this.uid
-				}).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.loadStatus = "nomore";
-					} else {
-						this.loadStatus = "loadmore"
-					}
-				})
-			},
-			chat(){
-				this.$u.toast('开源版暂未开放')
-			},
-			getUserInfo() {
-				this.$H.post('user/userInfoById', {
-					uid: this.uid
-				}).then(res => {
-					if (res.code == 0) {
-						this.userInfo = res.result;
-						if (res.result.gender === 1) {
-							this.userInfo.gender = '男'
-						} else if (res.result.gender === 2) {
-							this.userInfo.gender = '女'
-						} else {
-							this.userInfo.gender = '保密'
-						}
-
-						let user = {
-							uid: res.result.uid,
-							username: res.result.username,
-							avatar: res.result.avatar,
-						}
-						this.userJson = JSON.stringify(user)
-						uni.setNavigationBarTitle({
-							title: this.userInfo.username
-						});
-					} else {
-						setTimeout(function() {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-						}, 1500);
-					}
-
-
-					this.loading = false;
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: #f5f5f5;
-	}
-</style>
-<style lang="scss" scoped>
-	.container {
-		padding: 30rpx;
-		position: relative;
-		top: 100rpx;
-		width: 100%;
-	}
-
-	.info-wrap {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.avatar {
-		width: 130rpx;
-		height: 130rpx;
-		border-radius: 100rpx !important;
-		z-index: 999;
-		margin: 150rpx 550rpx 100rpx 50rpx;
-	}
-
-	.info-wrap .user-style {
-		background-color: #FFFFFF;
-		border-radius: 30rpx;
-		padding: 30rpx;
-		position: absolute;
-		top: 85rpx;
-		width: 100%;
-		box-shadow: 5rpx 10rpx 20rpx #e6e6e6;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.info-wrap .user-style .username {
-		font-size: 34rpx;
-		font-weight: bold;
-		margin: 10rpx 10rpx 10rpx 90rpx;
-
-		.kong {
-			margin-left: 25rpx;
-		}
-	}
-
-	.info-wrap .user-style .num-box {
-		font-size: 24rpx;
-		margin: 20rpx 0;
-		text-align: center;
-	}
-
-	.info-wrap .user-style .num-box .txt {
-		color: #999;
-		margin-left: 5rpx;
-	}
-
-	.info-wrap .user-style .num-box text {
-		margin-right: 30rpx;
-	}
-
-	.info-wrap .user-style .desc {
-		font-size: 28rpx;
-		color: #999;
-		margin: 1rpx 20rpx 20rpx 140rpx;
-	}
-
-	.info-wrap .user-style .btn-box {
-		margin: 0rpx 30rpx 10rpx 90rpx;
-	}
-
-	.info-wrap .user-style .btn-box .btn {
-		margin-right: 20rpx;
-	}
-
-	.tab-box {
-		margin-top: 30rpx;
-		margin-bottom: 30rpx;
-	}
-
-	.info-c {
-		display: flex;
-		flex-direction: column;
-	}
-
-	.info-c>text {
-		margin-bottom: 20rpx;
-		color: #999;
-	}
-
-	.info-c .level-box {
-		margin-bottom: 20rpx;
-		display: flex;
-		align-items: center;
-		color: #999;
-
-		.level {
-			font-size: 20rpx;
-			color: #fff;
-			padding: 5rpx 10rpx;
-			background-color: #333333;
-			border-radius: 10rpx;
-			margin-right: 10rpx;
-		}
-	}
-
-	.title-desc {
-		// margin-left: 30rpx;
-		margin: auto;
-		font-size: 32rpx;
-		color: #565656;
-		font-weight: 500;
-	}
+<template>
+	<view>
+		<view style="position: absolute;">
+			<u-navbar :custom-back="onBack" back-icon-color="#0c0000" :background="background" :border-bottom="false">
+			</u-navbar>
+		</view>
+		<view class="container">
+			<view class="info-wrap">
+				<u-avatar class="avatar" :src="userInfo.avatar" :show-level='userInfo.type == 1'
+					level-bg-color="#8072f3" size="130"></u-avatar>
+				<view class="user-style">
+					<view class="username">{{userInfo.username}}
+						<text class="iconfont icon-nan kong" v-if="userInfo.gender=='男'"></text>
+						<text class="iconfont icon-nv kong" v-else-if="userInfo.gender=='女'"></text>
+					</view>
+
+					<text class="desc">{{userInfo.intro}}</text>
+					<text class="desc" v-if="userInfo.city">IP:{{userInfo.city}}</text>
+
+					<view class="btn-box" v-if="currUid!=uid">
+						<u-button v-show="!userInfo.isFollow" @click="follow" :custom-style="btnStyle" class="btn"
+							shape="circle" size="mini">
+							<u-icon name="plus"></u-icon>
+							<text>关注</text>
+						</u-button>
+						<u-button v-show="userInfo.isFollow" @click="cancelFollow" :custom-style="btnStyle2" class="btn"
+							shape="circle" size="mini">
+							<text>已关注</text>
+						</u-button>
+						<u-button :custom-style="btnStyle2" @click="chat" shape="circle" size="mini">
+							<text style="margin: 0 15rpx;">私信</text>
+						</u-button>
+					</view>
+				</view>
+			</view>
+			<!-- 帖子 -->
+			<view>
+				<view class="title-desc">发布的动态</view>
+				<post-list :list="postList" :loadStatus="loadStatus"></post-list>
+			</view>
+		</view>
+
+		<!-- 发贴入口 -->
+		<add-post-tag></add-post-tag>
+
+	</view>
+</template>
+
+<script>
+	import postList from '../../components/post-list/post-list.vue';
+	import addPostTag from '../../components/add-post-tag/add-post-tag.vue';
+	export default {
+		components: {
+			postList
+		},
+		data() {
+			return {
+				loading: true,
+				btnStyle: {
+					color: "#fff",
+					backgroundColor: '#000000'
+				},
+				btnStyle2: {
+					border: '1px solid #000000',
+					color: "#000000"
+				},
+				background: {
+					backgroundColor: 'unset'
+				},
+				tabs: [{
+					tab_name: '帖子'
+				}],
+				current: 1,
+				uid: 0,
+				postList: [],
+				topicList: [],
+				userInfo: {},
+				userJson: "",
+				loadStatus: "loading",
+				page: 1,
+				currUid: 0
+			};
+		},
+		onLoad(options) {
+			this.uid = options.uid;
+			this.getUserInfo();
+			this.getPostList();
+			if (uni.getStorageSync('userInfo').uid) {
+				this.currUid = uni.getStorageSync('userInfo').uid;
+			}
+		},
+		onReachBottom() {
+			this.page++;
+			this.getPostList();
+		},
+		methods: {
+			onBack() {
+				uni.navigateBack();
+			},
+			follow() {
+				this.$H.post('user/addFollow', {
+					id: this.userInfo.uid
+				}).then(res => {
+					if (res.code === 0) {
+						this.userInfo.isFollow = true;
+					} else {
+						this.$u.toast(res.msg);
+					}
+				})
+			},
+			cancelFollow() {
+				this.$H.post('user/cancelFollow', {
+					id: this.userInfo.uid
+				}).then(res => {
+					if (res.code === 0) {
+						this.userInfo.isFollow = false;
+					}
+				})
+			},
+
+			getPostList() {
+				this.loadStatus = "loading";
+				this.$H.post('post/list', {
+					page: this.page,
+					uid: this.uid
+				}).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.loadStatus = "nomore";
+					} else {
+						this.loadStatus = "loadmore"
+					}
+				})
+			},
+			chat() {
+				this.$u.toast('开源版暂未开放')
+			},
+			getUserInfo() {
+				this.$H.post('user/userInfoById', {
+					uid: this.uid
+				}).then(res => {
+					if (res.code == 0) {
+						this.userInfo = res.result;
+						if (res.result.gender === 1) {
+							this.userInfo.gender = '男'
+						} else if (res.result.gender === 2) {
+							this.userInfo.gender = '女'
+						} else {
+							this.userInfo.gender = '保密'
+						}
+
+						let user = {
+							uid: res.result.uid,
+							username: res.result.username,
+							avatar: res.result.avatar,
+						}
+						this.userJson = JSON.stringify(user)
+						uni.setNavigationBarTitle({
+							title: this.userInfo.username
+						});
+					} else {
+						setTimeout(function() {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+						}, 1500);
+					}
+
+
+					this.loading = false;
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #f5f5f5;
+	}
+</style>
+<style lang="scss" scoped>
+	.container {
+		padding: 30rpx;
+		position: relative;
+		top: 100rpx;
+		width: 100%;
+	}
+
+	.info-wrap {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.avatar {
+		width: 130rpx;
+		height: 130rpx;
+		border-radius: 100rpx !important;
+		z-index: 999;
+		margin: 150rpx 550rpx 100rpx 50rpx;
+	}
+
+	.info-wrap .user-style {
+		background-color: #FFFFFF;
+		border-radius: 30rpx;
+		padding: 30rpx;
+		position: absolute;
+		top: 85rpx;
+		width: 100%;
+		box-shadow: 5rpx 10rpx 20rpx #e6e6e6;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.info-wrap .user-style .username {
+		font-size: 34rpx;
+		font-weight: bold;
+		margin: 10rpx 10rpx 10rpx 90rpx;
+
+		.kong {
+			margin-left: 25rpx;
+		}
+	}
+
+	.info-wrap .user-style .num-box {
+		font-size: 24rpx;
+		margin: 20rpx 0;
+		text-align: center;
+	}
+
+	.info-wrap .user-style .num-box .txt {
+		color: #999;
+		margin-left: 5rpx;
+	}
+
+	.info-wrap .user-style .num-box text {
+		margin-right: 30rpx;
+	}
+
+	.info-wrap .user-style .desc {
+		font-size: 28rpx;
+		color: #999;
+		margin: 1rpx 20rpx 20rpx 140rpx;
+	}
+
+	.info-wrap .user-style .btn-box {
+		margin: 0rpx 30rpx 10rpx 90rpx;
+	}
+
+	.info-wrap .user-style .btn-box .btn {
+		margin-right: 20rpx;
+	}
+
+	.tab-box {
+		margin-top: 30rpx;
+		margin-bottom: 30rpx;
+	}
+
+	.info-c {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.info-c>text {
+		margin-bottom: 20rpx;
+		color: #999;
+	}
+
+	.info-c .level-box {
+		margin-bottom: 20rpx;
+		display: flex;
+		align-items: center;
+		color: #999;
+
+		.level {
+			font-size: 20rpx;
+			color: #fff;
+			padding: 5rpx 10rpx;
+			background-color: #333333;
+			border-radius: 10rpx;
+			margin-right: 10rpx;
+		}
+	}
+
+	.title-desc {
+		// margin-left: 30rpx;
+		margin: auto;
+		font-size: 32rpx;
+		color: #565656;
+		font-weight: 500;
+	}
 </style>

From d4506e33a79369f4c1d933c0fbfb32322baa860d Mon Sep 17 00:00:00 2001
From: HJ <2365331988@qq.com>
Date: Mon, 6 Mar 2023 11:39:18 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/css/iconfont.css                   | 355 +++++++++---------
 1 file changed, 180 insertions(+), 175 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/static/css/iconfont.css b/src/main/resources/static/linfeng-community-uniapp-ky/static/css/iconfont.css
index 2ccb486..5aaef8e 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/static/css/iconfont.css
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/static/css/iconfont.css
@@ -1,176 +1,181 @@
-@font-face {font-family: "iconfont";
-  src: url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.eot?t=1599975848801'); /* IE9 */
-  src: url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.eot?t=1599975848801#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
-  url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.woff?t=1599975848801') format('woff'),
-  url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.ttf?t=1599975848801') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.svg?t=1599975848801#iconfont') format('svg'); /* iOS 4.1- */
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-deliver:before {
-  content: "\e671";
-}
-
-.icon-pay:before {
-  content: "\e673";
-}
-
-.icon-send:before {
-  content: "\e675";
-}
-
-.icon-settings:before {
-  content: "\e68a";
-}
-
-.icon-forward:before {
-  content: "\e6eb";
-}
-
-.icon-service:before {
-  content: "\e700";
-}
-
-.icon-file:before {
-  content: "\e739";
-}
-
-.icon-deliver_fill:before {
-  content: "\e81f";
-}
-
-.icon-favorfill:before {
-  content: "\e64b";
-}
-
-.icon-favor:before {
-  content: "\e64c";
-}
-
-.icon-kefu1:before {
-  content: "\e60e";
-}
-
-.icon-daohangquanzi:before {
-  content: "\e6ec";
-}
-
-.icon-yaoqinghaoyou1:before {
-  content: "\e740";
-}
-
-.icon-kefu:before {
-  content: "\e6f1";
-}
-
-.icon-nan:before {
-  content: "\e68d";
-}
-
-.icon-nv:before {
-  content: "\e62f";
-}
-
-.icon-xiaoxi-tongzhi:before {
-  content: "\e69d";
-}
-
-.icon-xiaoxitongzhi:before {
-  content: "\e821";
-}
-
-.icon-shoucang2:before {
-  content: "\e688";
-}
-
-.icon-xinzengguanzhu:before {
-  content: "\e611";
-}
-
-.icon-leimupinleifenleileibie:before {
-  content: "\e600";
-}
-
-.icon-gengduo:before {
-  content: "\e6dc";
-}
-
-.icon-gengduo1:before {
-  content: "\e640";
-}
-
-.icon-tuijian:before {
-  content: "\e601";
-}
-
-.icon-delete:before {
-  content: "\e603";
-}
-
-.icon-dongtai:before {
-  content: "\e6a7";
-}
-
-.icon-quanzi:before {
-  content: "\e632";
-}
-
-.icon-huati:before {
-  content: "\e8c4";
-}
-
-.icon-shoucang1:before {
-  content: "\e60d";
-}
-
-.icon-unfold:before {
-  content: "\e661";
-}
-
-.icon-back:before {
-  content: "\e679";
-}
-
-.icon-right:before {
-  content: "\e6a3";
-}
-
-.icon-fold:before {
-  content: "\e6de";
-}
-
-.icon-shoucang:before {
-  content: "\e64f";
-}
-
-.icon-fenxiang:before {
-  content: "\e687";
-}
-
-.icon-lujing:before {
-  content: "\e621";
-}
-
-.icon-dianzan:before {
-  content: "\e60c";
-}
-
-.icon-yuedu:before {
-  content: "\e639";
-}
-
-.icon-dianzan1:before {
-  content: "\e64d";
-}
-
-.icon-pinglun:before {
-  content: "\e60b";
+@font-face {
+	font-family: "iconfont";
+	src: url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.eot?t=1599975848801');
+	/* IE9 */
+	src: url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.eot?t=1599975848801#iefix') format('embedded-opentype'),
+		/* IE6-IE8 */
+		url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+		url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.woff?t=1599975848801') format('woff'),
+		url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.ttf?t=1599975848801') format('truetype'),
+		/* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+		url('//at.alicdn.com/t/font_1817318_pgi7seo7tle.svg?t=1599975848801#iconfont') format('svg');
+	/* iOS 4.1- */
+}
+
+.iconfont {
+	font-family: "iconfont" !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-deliver:before {
+	content: "\e671";
+}
+
+.icon-pay:before {
+	content: "\e673";
+}
+
+.icon-send:before {
+	content: "\e675";
+}
+
+.icon-settings:before {
+	content: "\e68a";
+}
+
+.icon-forward:before {
+	content: "\e6eb";
+}
+
+.icon-service:before {
+	content: "\e700";
+}
+
+.icon-file:before {
+	content: "\e739";
+}
+
+.icon-deliver_fill:before {
+	content: "\e81f";
+}
+
+.icon-favorfill:before {
+	content: "\e64b";
+}
+
+.icon-favor:before {
+	content: "\e64c";
+}
+
+.icon-kefu1:before {
+	content: "\e60e";
+}
+
+.icon-daohangquanzi:before {
+	content: "\e6ec";
+}
+
+.icon-yaoqinghaoyou1:before {
+	content: "\e740";
+}
+
+.icon-kefu:before {
+	content: "\e6f1";
+}
+
+.icon-nan:before {
+	content: "\e68d";
+}
+
+.icon-nv:before {
+	content: "\e62f";
+}
+
+.icon-xiaoxi-tongzhi:before {
+	content: "\e69d";
+}
+
+.icon-xiaoxitongzhi:before {
+	content: "\e821";
+}
+
+.icon-shoucang2:before {
+	content: "\e688";
+}
+
+.icon-xinzengguanzhu:before {
+	content: "\e611";
+}
+
+.icon-leimupinleifenleileibie:before {
+	content: "\e600";
+}
+
+.icon-gengduo:before {
+	content: "\e6dc";
+}
+
+.icon-gengduo1:before {
+	content: "\e640";
+}
+
+.icon-tuijian:before {
+	content: "\e601";
+}
+
+.icon-delete:before {
+	content: "\e603";
+}
+
+.icon-dongtai:before {
+	content: "\e6a7";
+}
+
+.icon-quanzi:before {
+	content: "\e632";
+}
+
+.icon-huati:before {
+	content: "\e8c4";
+}
+
+.icon-shoucang1:before {
+	content: "\e60d";
+}
+
+.icon-unfold:before {
+	content: "\e661";
+}
+
+.icon-back:before {
+	content: "\e679";
+}
+
+.icon-right:before {
+	content: "\e6a3";
+}
+
+.icon-fold:before {
+	content: "\e6de";
+}
+
+.icon-shoucang:before {
+	content: "\e64f";
+}
+
+.icon-fenxiang:before {
+	content: "\e687";
+}
+
+.icon-lujing:before {
+	content: "\e621";
+}
+
+.icon-dianzan:before {
+	content: "\e60c";
+}
+
+.icon-yuedu:before {
+	content: "\e639";
+}
+
+.icon-dianzan1:before {
+	content: "\e64d";
+}
+
+.icon-pinglun:before {
+	content: "\e60b";
 }