From 8e35b74d861bd6b6da6981e74e033b3d90f430fc Mon Sep 17 00:00:00 2001
From: cs10086086 <1291454411@qq.com>
Date: Thu, 20 Mar 2025 19:32:09 +0800
Subject: [PATCH] info

---
 App.vue                                       |    5 +-
 main.js                                       |    3 +
 pages.json                                    |  676 ++++-----
 pages/my/my.vue                               |  149 +-
 .../arctcleCollectList/arctcleCollectList.vue |   10 +-
 pages2/historyList/historyList.vue            |   81 +-
 pages2/replyCommentList/replyCommentList.vue  |    7 +-
 uni.scss                                      |    4 +
 .../database/cms-articles-collect.schema.json |    2 +-
 .../components/hb-comment/hb-comment.vue      |   94 +-
 .../uni-cms-article/pages/detail/detail.uvue  |    2 +-
 .../uni-cms-article/pages/detail/detail.vue   |  872 ++++++++++--
 .../uni-cms-article/pages/list/list.nvue      |  139 +-
 .../uni-cms-article/pages/search/search.nvue  | 1217 +++++++++--------
 uni_modules/uni-id-pages/common/store.js      |    2 +-
 .../database/uni-id-users.schema.json         |  974 ++++++-------
 .../pages/personalpage/personalpage.vue       |  773 +++++++++--
 17 files changed, 3170 insertions(+), 1840 deletions(-)

diff --git a/App.vue b/App.vue
index d271472..fbc4eb0 100644
--- a/App.vue
+++ b/App.vue
@@ -15,6 +15,9 @@
 </script>
 
 
-<style>
+<style lang="scss">
+	@import "@/uni.scss";
+	@import '@/uni_modules/uview-ui/theme.scss';
+	@import '@/uni_modules/uview-ui/index.scss';
 	/*每个页面公共css */
 </style>
diff --git a/main.js b/main.js
index a652dbd..5f1f4be 100644
--- a/main.js
+++ b/main.js
@@ -1,5 +1,8 @@
 import App from './App'
 
+import uView from '@/uni_modules/uview-ui'
+Vue.use(uView)
+
 // ================== Vue2 逻辑 ================== //
 // #ifndef VUE3
 import Vue from 'vue'
diff --git a/pages.json b/pages.json
index 1f6e5fb..4848430 100644
--- a/pages.json
+++ b/pages.json
@@ -1,326 +1,352 @@
 {
-	"pages": [{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "首页"
-			}
-		},
-		{
-			"path": "pages/articleContentDetail/articleContentDetail",
-			"style": {
-				"navigationBarTitleText": "鱼水情"
-			}
-		},
-		{
-			"path": "pages/editor/editor",
-			"style": {
-				"navigationBarTitleText": "编辑文章"
-			}
-		},
-		{
-			"path": "pages/my/my",
-			"style": {
-				"navigationBarTitleText": "个人中心"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/register/register",
-			"style": {
-				"navigationBarTitleText": "注册"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/login/login-withoutpwd",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/login/login-withpwd",
-			"style": {
-				"navigationBarTitleText": "账号密码登录"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/login/login-smscode",
-			"style": {
-				"navigationBarTitleText": "手机验证码登录"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/userinfo",
-			"style": {
-				"navigationBarTitleText": "个人资料"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile",
-			"style": {
-				"navigationBarTitleText": "绑定手机号码"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/register/register-by-email",
-			"style": {
-				"navigationBarTitleText": "邮箱验证码注册"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/retrieve/retrieve",
-			"style": {
-				"navigationBarTitleText": "重置密码"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email",
-			"style": {
-				"navigationBarTitleText": "通过邮箱重置密码"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/common/webview/webview",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "修改密码"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/register/register-admin",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "注册管理员账号"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "设置密码"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate",
-			"style": {
-				"navigationBarTitleText": "注销账号"
-			}
-		},
-		{
-			"path": "uni_modules/uni-id-pages/pages/userinfo/realname-verify/realname-verify",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "实名认证"
-			}
-		},
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "login"
-			}
-		},
-		{
-			"path": "pages/test/test",
-			"style": {
-				"navigationBarTitleText": "test"
-			}
-		},
-		{
-			"path": "pages/preview/preview",
-			"style": {
-				"navigationBarTitleText": "preview"
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms/pages/article/list/list",
-			"style": {
-				"navigationBarTitleText": "文章列表"
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms/pages/article/add/add",
-			"style": {
-				"leftWindow": false,
-				"navigationBarTitleText": "新增文章",
-				"topWindow": true
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms/pages/article/edit/edit",
-			"style": {
-				"leftWindow": false,
-				"navigationBarTitleText": "编辑文章",
-				"topWindow": true
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms/pages/categories/list/list",
-			"style": {
-				"navigationBarTitleText": "分类列表"
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms/pages/categories/add/add",
-			"style": {
-				"navigationBarTitleText": "新增分类"
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms/pages/categories/edit/edit",
-			"style": {
-				"navigationBarTitleText": "编辑分类"
-			}
-		},
-		{
-			"path": "uni_modules/uni-media-library/pages/index/index",
-			"style": {
-				"navigationBarTitleText": "媒体库"
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms-article/pages/list/list",
-			"style": {
-				"backgroundColor": "#FFFFFF",
-				"disableScroll": true,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms-article/pages/list/slist",
-			"style": {
-				"backgroundColor": "#FFFFFF",
-				"disableScroll": true,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms-article/pages/search/search",
-			"style": {
-				"navigationBarTitleText": "搜索"
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms-article/pages/detail/detail",
-			"style": {
-				"backgroundColor": "#FFFFFF",
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms-article/pages/detail/preview",
-			"style": {
-				"backgroundColor": "#FFFFFF",
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "uni_modules/uni-cms-article/pages/webview/webview",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "uni_modules/uni-pay/pages/success/success",
-			"style": {
-				"backgroundColor": "#F8F8F8",
-				"navigationBarTitleText": "支付成功"
-			}
-		},
-		{
-			"path": "uni_modules/uni-pay/pages/ad-interactive-webview/ad-interactive-webview",
-			"style": {
-				"backgroundColor": "#F8F8F8",
-				"navigationBarTitleText": "ad"
-			}
-		},
-		{
-			"path": "uni_modules/uni-pay/pages/pay-desk/pay-desk",
-			"style": {
-				"backgroundColor": "#F8F8F8",
-				"navigationBarTitleText": "收银台"
-			}
-		},
-		{
-			"path": "uni_modules/zetank-personalpage/pages/personalpage/personalpage",
-			"style": {
-				"navigationBarTitleText": "个人主页",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom",
-				"app-plus": {
-					"bounce": "none" // 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
-				},
-				"mp-alipay": {
-					"allowsBounceVertical": "NO"
-				} // 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
-			}
-		
-		}
-	],
-	"subPackages": [{
-		"root": "pages2",
-		"pages": [{
-				"path": "historyList/historyList",
-				"style": {
-					"backgroundColor": "#F8F8F8",
-					"navigationBarTitleText": "历史浏览"
-				}
-			},
-			{
-				"path": "arctcleCollectList/arctcleCollectList",
-				"style": {
-					"navigationBarTitleText": "我的收藏"
-				}
-			},
-			{
-				"path": "arctcleLikeList/arctcleLikeList",
-				"style": {
-					"navigationBarTitleText": "我的喜欢"
-				}
-			},
-			{
-				"path": "replyCommentList/replyCommentList",
-				"style": {
-					"navigationBarTitleText": ""
-				}
-			}
-
-		]
-	}],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "军歌嘹亮",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	},
-	"uniIdRouter": {},
-	"tabBar": {
-		"color": "#7A7E83",
-		"selectedColor": "#3cc51f",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "uni_modules/uni-cms-article/pages/list/list",
-				"text": "首页"
-			},
-			{
-				"pagePath": "uni_modules/uni-cms-article/pages/list/slist",
-				"text": "搜索"
-			},
-			{
-				"pagePath": "pages/my/my",
-				"text": "我的"
-			}
-		]
-	}
-}
\ No newline at end of file
+    "easycom" : {
+        "^u-(.*)" : "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
+    },
+    "pages" : [
+        {
+            "path" : "pages/index/index",
+            "style" : {
+                "navigationBarTitleText" : "首页"
+            }
+        },
+        {
+            "path" : "pages/articleContentDetail/articleContentDetail",
+            "style" : {
+                "navigationBarTitleText" : "鱼水情"
+            }
+        },
+        {
+            "path" : "pages/editor/editor",
+            "style" : {
+                "navigationBarTitleText" : "编辑文章"
+            }
+        },
+        {
+            "path" : "pages/my/my",
+            "style" : {
+                "navigationBarTitleText" : "个人中心"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/register/register",
+            "style" : {
+                "navigationBarTitleText" : "注册"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/login/login-withoutpwd",
+            "style" : {
+                "navigationBarTitleText" : "登录"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/login/login-withpwd",
+            "style" : {
+                "navigationBarTitleText" : "账号密码登录"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/login/login-smscode",
+            "style" : {
+                "navigationBarTitleText" : "手机验证码登录"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/userinfo/userinfo",
+            "style" : {
+                "navigationBarTitleText" : "个人资料"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile",
+            "style" : {
+                "navigationBarTitleText" : "绑定手机号码"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage",
+            "style" : {
+                "navigationBarTitleText" : ""
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/register/register-by-email",
+            "style" : {
+                "navigationBarTitleText" : "邮箱验证码注册"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/retrieve/retrieve",
+            "style" : {
+                "navigationBarTitleText" : "重置密码"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email",
+            "style" : {
+                "navigationBarTitleText" : "通过邮箱重置密码"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/common/webview/webview",
+            "style" : {
+                "enablePullDownRefresh" : false,
+                "navigationBarTitleText" : ""
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd",
+            "style" : {
+                "enablePullDownRefresh" : false,
+                "navigationBarTitleText" : "修改密码"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/register/register-admin",
+            "style" : {
+                "enablePullDownRefresh" : false,
+                "navigationBarTitleText" : "注册管理员账号"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd",
+            "style" : {
+                "enablePullDownRefresh" : false,
+                "navigationBarTitleText" : "设置密码"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate",
+            "style" : {
+                "navigationBarTitleText" : "注销账号"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-id-pages/pages/userinfo/realname-verify/realname-verify",
+            "style" : {
+                "enablePullDownRefresh" : false,
+                "navigationBarTitleText" : "实名认证"
+            }
+        },
+        {
+            "path" : "pages/login/login",
+            "style" : {
+                "navigationBarTitleText" : "login"
+            }
+        },
+        {
+            "path" : "pages/test/test",
+            "style" : {
+                "navigationBarTitleText" : "test"
+            }
+        },
+        {
+            "path" : "pages/preview/preview",
+            "style" : {
+                "navigationBarTitleText" : "preview"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms/pages/article/list/list",
+            "style" : {
+                "navigationBarTitleText" : "文章列表"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms/pages/article/add/add",
+            "style" : {
+                "leftWindow" : false,
+                "navigationBarTitleText" : "新增文章",
+                "topWindow" : true
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms/pages/article/edit/edit",
+            "style" : {
+                "leftWindow" : false,
+                "navigationBarTitleText" : "编辑文章",
+                "topWindow" : true
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms/pages/categories/list/list",
+            "style" : {
+                "navigationBarTitleText" : "分类列表"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms/pages/categories/add/add",
+            "style" : {
+                "navigationBarTitleText" : "新增分类"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms/pages/categories/edit/edit",
+            "style" : {
+                "navigationBarTitleText" : "编辑分类"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-media-library/pages/index/index",
+            "style" : {
+                "navigationBarTitleText" : "媒体库"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms-article/pages/list/list",
+            "style" : {
+                "backgroundColor" : "#FFFFFF",
+                "disableScroll" : true,
+                "navigationStyle" : "custom"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms-article/pages/list/slist",
+            "style" : {
+                "backgroundColor" : "#FFFFFF",
+                "disableScroll" : true,
+                "navigationStyle" : "custom"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms-article/pages/search/search",
+            "style" : {
+                "navigationBarTitleText" : "搜索"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms-article/pages/detail/detail",
+            "style" : {
+                "backgroundColor" : "#FFFFFF",
+                "navigationBarTitleText" : ""
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms-article/pages/detail/preview",
+            "style" : {
+                "backgroundColor" : "#FFFFFF",
+                "navigationBarTitleText" : ""
+            }
+        },
+        {
+            "path" : "uni_modules/uni-cms-article/pages/webview/webview",
+            "style" : {
+                "navigationBarTitleText" : ""
+            }
+        },
+        {
+            "path" : "uni_modules/uni-pay/pages/success/success",
+            "style" : {
+                "backgroundColor" : "#F8F8F8",
+                "navigationBarTitleText" : "支付成功"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-pay/pages/ad-interactive-webview/ad-interactive-webview",
+            "style" : {
+                "backgroundColor" : "#F8F8F8",
+                "navigationBarTitleText" : "ad"
+            }
+        },
+        {
+            "path" : "uni_modules/uni-pay/pages/pay-desk/pay-desk",
+            "style" : {
+                "backgroundColor" : "#F8F8F8",
+                "navigationBarTitleText" : "收银台"
+            }
+        },
+        {
+            "path" : "uni_modules/zetank-personalpage/pages/personalpage/personalpage",
+            "style" : {
+                "app-plus" : {
+                    "bounce" : "none"
+                },
+                "enablePullDownRefresh" : false,
+                "mp-alipay" : {
+                    "allowsBounceVertical" : "NO"
+                },
+                "navigationBarTitleText" : "个人主页"
+            }
+        }
+    ],
+    "subPackages" : [
+        {
+            "root" : "pages2",
+            "easycom" : {
+                "^u-(.*)" : "../../uni_modules/uview-ui/components/u-$1/u-$1.vue"
+            },
+            "pages" : [
+                {
+                    "path" : "historyList/historyList",
+                    "style" : {
+                        "backgroundColor" : "#F8F8F8",
+                        "navigationBarTitleText" : "历史浏览"
+                    }
+                },
+                {
+                    "path" : "arctcleCollectList/arctcleCollectList",
+                    "style" : {
+                        "navigationBarTitleText" : "我的收藏"
+                    }
+                },
+                {
+                    "path" : "arctcleLikeList/arctcleLikeList",
+                    "style" : {
+                        "navigationBarTitleText" : "我的喜欢"
+                    }
+                },
+                {
+                    "path" : "replyCommentList/replyCommentList",
+                    "style" : {
+                        "navigationBarTitleText" : ""
+                    }
+                },
+                {
+                    "path" : "balance/balance",
+                    "style" : {
+                        "navigationBarTitleText" : ""
+                    }
+                },
+                {
+                    "path" : "withdraw/withdraw",
+                    "style" : {
+                        "navigationBarTitleText" : ""
+                    }
+                },
+                {
+                    "path" : "setting/setting",
+                    "style" : {
+                        "navigationBarTitleText" : ""
+                    }
+                }
+            ]
+        }
+    ],
+    "globalStyle" : {
+        "navigationBarTextStyle" : "black",
+        "navigationBarTitleText" : "军歌嘹亮",
+        "navigationBarBackgroundColor" : "#F8F8F8",
+        "backgroundColor" : "#F8F8F8"
+    },
+    "uniIdRouter" : {},
+    "tabBar" : {
+        "color" : "#7A7E83",
+        "selectedColor" : "#3cc51f",
+        "borderStyle" : "black",
+        "backgroundColor" : "#ffffff",
+        "list" : [
+            {
+                "pagePath" : "uni_modules/uni-cms-article/pages/list/list",
+                "text" : "首页"
+            },
+            {
+                "pagePath" : "uni_modules/uni-cms-article/pages/list/slist",
+                "text" : "搜索"
+            },
+            {
+                "pagePath" : "pages/my/my",
+                "text" : "我的"
+            }
+        ]
+    }
+}
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 213577b..03b612f 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -25,7 +25,7 @@
 				@click="toSetting()">
 			</image></view>
 		</view>
-		<view class="user" @click="toUserInfoPage()">
+		<view class="user" @click="toPersonalpage()">
 			<!-- <svg t="1739689350355" class="avatar" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4351" width="16" height="16"><path d="M499.952941 0c-144.564706 0-265.035294 123.482353-265.035294 268.047059 0 147.576471 120.470588 268.047059 265.035294 268.047059s268.047059-120.470588 268.047059-268.047059C764.988235 120.470588 644.517647 0 499.952941 0m189.741177 566.211765H334.305882C150.588235 566.211765 0 716.8 0 903.529412v21.082353C0 1024 147.576471 1024 334.305882 1024h352.376471c177.694118 0 334.305882 0 334.305882-96.376471v-21.082353c6.023529-189.741176-144.564706-340.329412-331.294117-340.329411" fill="#1296db" p-id="4352"></path></svg> -->
 <!-- 			<image class="avatar" 
 			:src="this.avatar_url" 
@@ -42,7 +42,7 @@
 			mode="" 
 			v-else></image>
 			<view class="name">
-				<text>{{userInfo?userInfo.nickname:"未登录"}}</text>
+				<text>{{userInfo.nickname?userInfo.nickname:"未登录"}}</text>
 				<text>个人签名</text>
 			</view>
 			<image class="right" src="/static/center/right.png"></image>
@@ -91,11 +91,17 @@
 							type: 'my_article'
 						},
 						{
-							name: '我的账户', 
+							name: '我的主页', 
 							icon: '/static/center/self.png', 
 							arrow: true,
 							type: 'my_account'
 						},
+						{
+							name: '提现', 
+							icon: '/static/center/withdraw.png', 
+							arrow: true,
+							type: 'withdraw'
+						},
 						{
 							name: '发布文章', 
 							icon: '/static/center/release.png', 
@@ -132,12 +138,6 @@
 							arrow: false,
 							type: 'recharge'
 						},
-						{
-							name: '打赏记录', 
-							icon: '/static/center/reward.png', 
-							arrow: false,
-							type: 'reward'
-						},
 					],
 					[
 						{
@@ -200,33 +200,89 @@
 			},
 			menuClick(e){
 				if (e.type === "my_article") {
-					uni.navigateTo({
-						// url: "/pages/editor/editor"
-						url:'/uni_modules/uni-cms/pages/article/list/list'
-					})
+					let token = uni.getStorageSync("uni_id_token");
+					console.log(token);
+					
+					if (!token) {
+						this.toLogin();
+					}
+					else {
+						uni.navigateTo({
+							// url: "/pages/editor/editor"
+							url:'/uni_modules/uni-cms/pages/article/list/list'
+						})
+
+					}
 				} 
 				else if (e.type === "my_account") {
-					this.inputDialogToggle();
-				} 
+					this.toPersonalpage();
+				} else if (e.type === "withdraw") {
+					
+					let token = uni.getStorageSync("uni_id_token");
+					console.log(token);
+					
+					if (!token) {
+						this.toLogin();
+					}
+					else {
+						uni.navigateTo({
+							url:"/pages2/balance/balance"
+						})
+					}
+				}
 				else if (e.type === "publish_article") {
-					uni.navigateTo({
-						url:'/uni_modules/uni-cms/pages/article/add/add'
-					})
+					let token = uni.getStorageSync("uni_id_token");
+					console.log(token);
+					
+					if (!token) {
+						this.toLogin();
+					}
+					else {
+						uni.navigateTo({
+							url:'/uni_modules/uni-cms/pages/article/add/add'
+						})
+					}
+
 				} 
 				else if (e.type === "my_reply") {
-					uni.navigateTo({
-						url:"/pages2/replyCommentList/replyCommentList"
-					})
+					let token = uni.getStorageSync("uni_id_token");
+					console.log(token);
+					
+					if (!token) {
+						this.toLogin();
+					} else {
+						uni.navigateTo({
+							url:"/pages2/replyCommentList/replyCommentList"
+						})
+					}
 				} 
 				else if (e.type === "my_collect") {
-					uni.navigateTo({
-						url:"/pages2/arctcleCollectList/arctcleCollectList"
-					})
+					let token = uni.getStorageSync("uni_id_token");
+					console.log(token);
+					
+					if (!token) {
+						this.toLogin();
+					}
+					else {
+						uni.navigateTo({
+							url:"/pages2/arctcleCollectList/arctcleCollectList"
+						})
+					}
+
 				} 
 				else if (e.type === "my_like") {
-					uni.navigateTo({
-						url:"/pages2/arctcleLikeList/arctcleLikeList"
-					})
+					let token = uni.getStorageSync("uni_id_token");
+					console.log(token);
+					
+					if (!token) {
+						this.toLogin();
+					}
+					else {
+						uni.navigateTo({
+							url:"/pages2/arctcleLikeList/arctcleLikeList"
+						})
+					}
+
 				}
 				else if (e.type === "customer_service") {
 					this.inputDialogToggle();
@@ -237,15 +293,25 @@
 				else if (e.type === "logout") {
 					mutations.logout()
 				} else if (e.type === "history" ) {
-					uni.navigateTo({
-						url: "/pages2/historyList/historyList"
-					})
+					let token = uni.getStorageSync("uni_id_token");
+					console.log(token);
+					
+					if (!token) {
+						this.toLogin();
+					}
+					else {
+						uni.navigateTo({
+							url: "/pages2/historyList/historyList"
+						})
+					}
+					
+
 				}
 				console.log(e);
 			},
 			toLogin() {
 				uni.navigateTo({
-					url:"/pages/login/login"
+					url:"/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=weixin"
 				})
 			},
 			toUserInfoPage() {
@@ -253,9 +319,7 @@
 				console.log(token);
 				
 				if (!token) {
-					uni.navigateTo({
-						url:"/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=weixin"
-					})
+					this.toLogin();
 				}
 				else {
 					uni.navigateTo({
@@ -264,11 +328,26 @@
 				}
 
 			},
+			toPersonalpage() {
+				let token = uni.getStorageSync("uni_id_token");
+				console.log(token);
+				if (!token) {
+					uni.navigateTo({
+						url:"/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=weixin"
+					})
+				} else {
+					uni.navigateTo({
+						url: "/uni_modules/zetank-personalpage/pages/personalpage/personalpage?uid=" + this.userInfo._id
+					})
+				}
+			},
 			toScan() {
 				this.inputDialogToggle();
 			},
 			toSetting() {
-				this.inputDialogToggle();
+				uni.navigateTo({
+					url:"/pages2/setting/setting"
+				})
 			},
 			
 		},
diff --git a/pages2/arctcleCollectList/arctcleCollectList.vue b/pages2/arctcleCollectList/arctcleCollectList.vue
index 21d4f3e..b70d2df 100644
--- a/pages2/arctcleCollectList/arctcleCollectList.vue
+++ b/pages2/arctcleCollectList/arctcleCollectList.vue
@@ -34,10 +34,6 @@
 							<three-cover v-else-if="item.thumbnail && item.thumbnail.length === 3" :ctype="'historyList'"
 								:data="getNewItem(item)"></three-cover>
 						</view>
-						<view class="" v-else>
-							111
-						</view>
-
 					</template>
 
                     <!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
@@ -157,7 +153,7 @@
 				return item;
 			},
 			async listLoad(data) {
-				if(data[0].article_id) {
+				if(data.length !== 0) {
 					const listData = data.map(item => {
 						if (typeof item.article_id.thumbnail === 'string') {
 							item.article_id[0].thumbnail = [item.article_id[0].thumbnail]
@@ -179,6 +175,10 @@
 					
 					this.listData = this.loadType === 'loadMore' ? this.listData.concat(listData) : listData
 					this.loadType = null
+				} else {
+					
+					this.listData = this.loadType === 'loadMore' ? this.listData.concat([]) : []
+					this.loadType = null
 				}
 					
 			},
diff --git a/pages2/historyList/historyList.vue b/pages2/historyList/historyList.vue
index 59992ac..4613aef 100644
--- a/pages2/historyList/historyList.vue
+++ b/pages2/historyList/historyList.vue
@@ -26,7 +26,18 @@
 
                     <!-- 列表渲染 -->
 					<template v-for="item in listData">
-						<view class="" v-if="item.article_status === 1">
+						<view class="" v-if="!item">
+						  <view class="main">
+							<view>
+							  <text class="title">该文章已被下架或删除</text>
+							</view>
+							<view class="info">
+							  <text class="publish_date">{{ "最近访问于：文章不存在"}}</text>
+							</view>
+						  </view>
+							
+						</view>
+						<view class="" v-else-if="item.article_status === 1">
 							<not-cover v-if="item.thumbnail && item.thumbnail.length === 0" :ctype="'historyList'"
 								:data="getNewItem(item)"></not-cover>
 							<right-small-cover v-else-if="item.thumbnail && item.thumbnail.length === 1" :ctype="'historyList'"
@@ -34,9 +45,7 @@
 							<three-cover v-else-if="item.thumbnail && item.thumbnail.length === 3" :ctype="'historyList'"
 								:data="getNewItem(item)"></three-cover>
 						</view>
-						<view class="" v-else>
-							111
-						</view>
+
 
 					</template>
 
@@ -159,13 +168,18 @@
 				return item;
 			},
 			async listLoad(data) {
+				if (data.lenght === 0) return;
+				console.log(data);
 				if(data[0].article_id) {
 					const listData = data.map(item => {
+						if (item.article_id.length === 0 ) return;
 						if (typeof item.article_id.thumbnail === 'string') {
 							item.article_id[0].thumbnail = [item.article_id[0].thumbnail]
 						}
-						item.article_id[0].user_id = item.user_id[0]; 
 						console.log(item);
+						item.article_id[0].user_id = item.user_id[0]; 
+						
+						
 						item.article_id[0].last_view_time = new Date(item.last_view_time).getTime();
 						return item.article_id[0];
 					})
@@ -174,6 +188,7 @@
 					
 					// 处理腾讯云文件链接
 					for (const article of listData) {
+						if (!article) continue;
 						const parseImages = await parseImageUrl(article.thumbnail)
 					
 						article.thumbnail = parseImages ? parseImages.map(image => image.src) : []
@@ -272,7 +287,8 @@
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+	
 	/* #ifndef APP-NVUE */
 	.pages view {
 		display: flex;
@@ -349,4 +365,57 @@
 	.pages .uni-list ::v-deep .uni-list--border:after {
 		background-color: #f5f5f5;
 	}
+	
+	.main {
+	  display: flex;
+	  justify-content: space-between;
+	  flex-direction: column;
+	  flex: 1;
+	  padding-left: 30rpx;
+	  padding-right: 30rpx;
+	  padding-top: 24rpx;
+	  padding-bottom: 24rpx;
+	  .title {
+	    font-size: 30rpx;
+	    color: #bbb;
+	  }
+	
+	  .thumbnails {
+	    margin: 20rpx 0;
+	    display: flex;
+	    align-items: center;
+	    flex-direction: row;
+	    .img {
+	      flex: 1;
+	      /* #ifndef APP-NVUE */
+	      width: auto;
+	      /* #endif */
+	      height: 200rpx;
+	      border-radius: 8rpx;
+	      margin: 0 10rpx;
+	      &:first-child {
+	        margin-left: 0;
+	      }
+	      &:last-child {
+	        margin-right: 0;
+	      }
+	    }
+	  }
+	
+	  .info {
+	    display: flex;
+	    flex-direction: row;
+		margin-top: 20rpx;
+	  }
+	
+	  .author,
+	  .publish_date {
+	    font-size: 24rpx;
+	    color: #bbbbbb;
+	  }
+	
+	  .publish_date {
+	    margin-left: 14rpx;
+	  }
+	}
 </style>
\ No newline at end of file
diff --git a/pages2/replyCommentList/replyCommentList.vue b/pages2/replyCommentList/replyCommentList.vue
index d02a2ce..52e096c 100644
--- a/pages2/replyCommentList/replyCommentList.vue
+++ b/pages2/replyCommentList/replyCommentList.vue
@@ -216,7 +216,9 @@
 						update_time: new Date().getTime(item.update_time)
 					})
 				})
-				this.listData = listData;
+				
+				this.listData = this.loadType === 'loadMore' ? this.listData.concat(listData) : listData
+				this.loadType = null
 			},
 			// 初始化导航栏大小
 			initNavBarSize() {
@@ -252,9 +254,12 @@
 			// 刷新
 			refresh() {
 				this.loadType = 'refresh'
+				console.log(this.$refs.udb);
 				this.$refs.udb.loadData({
 					clear: true
 				}, () => {
+					
+					console.log(1);
 					uni.stopPullDownRefresh()
 					// #ifdef APP-NVUE
 					this.showRefresh = false
diff --git a/uni.scss b/uni.scss
index b9249e9..004b7b5 100644
--- a/uni.scss
+++ b/uni.scss
@@ -14,6 +14,10 @@
 
 /* 颜色变量 */
 
+/* uni.scss */
+@import '@/uni_modules/uview-ui/theme.scss';
+@import '@/uni_modules/uview-ui/index.scss';
+
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;
diff --git a/uniCloud-alipay/database/cms-articles-collect.schema.json b/uniCloud-alipay/database/cms-articles-collect.schema.json
index 2dae666..ba3ed0b 100644
--- a/uniCloud-alipay/database/cms-articles-collect.schema.json
+++ b/uniCloud-alipay/database/cms-articles-collect.schema.json
@@ -2,7 +2,7 @@
     "bsonType": "object",
     "required": ["user_id", "article_id", "last_view_time", "first_view_time"],
     "permission": {
-        "read": "doc.user_id == auth.uid || 'admin' in auth.role", // 用户仅查看自己记录
+        "read": true, // 用户仅查看自己记录
         "create": "auth.uid != null", // 登录用户自动记录
         "update": "false", // 日志不可修改
         "delete": "'admin' in auth.role" // 仅管理员可删除
diff --git a/uni_modules/hb-comment/components/hb-comment/hb-comment.vue b/uni_modules/hb-comment/components/hb-comment/hb-comment.vue
index 0551d1b..09a95ee 100644
--- a/uni_modules/hb-comment/components/hb-comment/hb-comment.vue
+++ b/uni_modules/hb-comment/components/hb-comment/hb-comment.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="hb-comment">
 		<!-- 阅读数-start -->
-<!-- 		<view>
+		<!-- 		<view>
 			<img style="width: 14px; height: 14px;"
 				src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAA0tJREFUWEftVk2IHUUQ/qp311NOksRT8JBDkARCfrxEDyLK+pe/DQkmJpBlZ7ofDwQ15iRocjYSSWAzU/OWd4hCMJiQH43xBz2YXCRivIgHQQ8SRPGUU/btfNLPnuU5O7OZlWz2kobh8aq/qvq6qrq6BEu8ZIn94wGBBUWg3W6v6vV62wFsILlGRNYA6AH4AcCPJH8mebPT6dxomtpGBJxz4wD2kny2oWHN81ybEJmXQKvVWpfn+VsAXi45vgPgj/D5rUfC91AJ54m83el0PLZy1RKw1u4GkAB4OGj+LSJXRORMkiSXq6xFUfSUiHi93SKyImB+BeBU9fMqnUoCcRy/IiIfFAoicp7kYVX9pUkKrLWrReRdkjsLvNfPsuxYWX8OAWvtOwCODACPqOrRJo7LmApbe1T17CDuPwSccy2SpwZYj2VZdr7K+fj4+IqRkZFVIjJD8ndV/asKdzcSswTiON4iIlcBLPOGROTFNE0/rTHqQ3motHdWVffU1YYx5utizxjzXJIk3te/nbDdbi/r9XpesCWAasNureV86VDVurqKRUSD7k8zMzPPT01N/dYHW2uPA3gtnDxL09TWnPwjX+F+j+Q1EfkCwC0ALwHYGnTeU9U3q/Sdc0oyDnvnVHWXOOdeIPlJEN4E8ExVPq21ywH8GXCXVHXboJM4jr8VkSe8bHp6emW32y2ws7Bg40sA68NhD3gCXZIHA2q07r4659aT9C3XL3+vi3D2BaVi26Sq31dFIY7jgyLSDXs3xFp7rci9MebJJEn8/zlrMQj00+ic20/ydAjJhTRNd9Tk/56ngOT2ogg/BjAWHB9X1TfuQxG+r6qv9wlMTEw8OjQ0dAXAY8HxYl/D68PDw6OTk5O3Z+9sq9UazfP8s+Lki9iIbpMczbLsej/tg6F2zr1K8kQhI3n/WnHhdDEfI5L7syz7cPDQlW2zHIl78RwDqCzu2oEkiqKnjTFfDbD9vwOJb9vHsiw7XHWz5h3JoijaZIzxz/PjJeVGIxnJb4wxJ9M0PVflfE4R1oGcc2Mk9wHYVYcpyS8BuKiqnbvhG03FhRHn3GaSG0muM8as9b8AjB/HRcR/35G8oKr+hWy0FkSgkcUFgh4QWPII/ANy0cUvD9WbkgAAAABJRU5ErkJggg==" />
 			<span class="top-read">{{commentData.readNumer}}</span>
@@ -28,25 +28,20 @@
 			<view class="comment-box" v-for="(item, index) in commentData.comment" :key="index">
 				<view class="comment-box-item">
 					<view>
-						<cloud-image v-if="item.avatarUrl" 
-						height="70rpx"
-						width="70rpx"
-						borderRadius="50%"
-						:src="item.avatarUrl.url"></cloud-image>
-						<image class="avatar" 
-						:src="emptyAvatar"
-						mode="" 
-						v-else></image>
+						<cloud-image v-if="item.avatarUrl" height="70rpx" width="70rpx" borderRadius="50%"
+						@click="toCommentPersonalpage(item)"
+							:src="item.avatarUrl.url"></cloud-image>
 					</view>
 					<view class="comment-main">
 						<!-- 父评论体-start -->
 						<view class="comment-main-top">
-							<view class="nick-name-box">
-								<view class="comLogo com4" >{{index + 1}}楼</view>
+							<view class="nick-name-box" @click="toCommentPersonalpage(item)">
+								<view class="comLogo com4">{{index + 1}}楼</view>
 								<view class="nick-name">{{item.nickName}}</view>
 							</view>
 							<view class="zan-box" @click="like(item)">
-								<span :class="item.hasLike ? 'isLike' : 'notLike'">{{item.likeNum == 0 ? '抢首赞' : item.likeNum}}</span>
+								<span
+									:class="item.hasLike ? 'isLike' : 'notLike'">{{item.likeNum == 0 ? '抢首赞' : item.likeNum}}</span>
 								<img style="width: 14px; height: 14px;" v-if="!item.hasLike"
 									src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAApVJREFUWEfFlz9oFEEUxr93SWEhFkIaBUljo4WgATEaiI0GwVLBQg2EzLd3hSBqLI2lRgWLY+ftSSQgggoWNv5pImLUwjQBg1goqCCIIBqwueSeTLg7Ln9Mcmdub7vdnZnvN9+8fe+toMWXtFgfDQGMjo52zM7OHgMwIyLTg4ODk41upG4A7/0OEbkPYGdFVEQuOOeuNQJRN4CqBvGw+3dm9kZEBsrCPSRf1gvRCIAFETPrjqLodZIkY2Z2SkQmnHMHUgMgOQ8fx3FvJpMZB/CDZEfqACEgi8XidwA/SW5uKkCN2AzJTYscmCTZ1VQA7/2AiNwSkefOuYNBLEmSnJnlATwgebypAKr6CMBRANdJng9i3vu8iORE5Mrc3NyTlQDM7HMul/tYO2bNX0GhUDhRKpXumtlvAPuiKJouOzBuZr117HyBU6sCqOpeAH0AhssiwyQvVwTjOO5va2s7vRaAGtCrJC+GOVUAVb1UTjDVDLd4URHJOuf8WsSWG5MkSbeZTYR3lc+4CpAkyUpWht3fI/m+UfEwL5/Pb2xvb59ZFkBV5zNchazsSBBeYPn/ABQKhZ5SqfQCwBTJXYuPoOkAqnoGwE0Ad0ieTB3Ae39bRPoBDJEcSR1AVd8C2CMifc65p6kCmJkkSfIHwAYAW0h+SxVAVXcDmDSzL1EUbasEc20eaGoQVuoIgMckj6QOoKo3AJwFMEJyqBUAIegOAegnOdYKgK8AtmYyma7aLjqVGPDebxeRDwB+AeggWUzVAVV1ABTAK5L7l+0HVPUTgM7Q7VQGhPJZe99oHagpw4dJPvsXQPixONeoyErzRGTKzB7W9hFLjiA8iOO4M7iw3hDZbLbq6pIeY73F6l1v1Zas3gXrHf8XhhNvMGSmtPYAAAAASUVORK5CYII=" />
 								<img style="width: 14px; height: 14px;" v-else
@@ -55,17 +50,17 @@
 
 						</view>
 						<view class="comment-main-content">
-						
+
 							<view class="">
-								
+
 							</view>
-								<text>
-									{{ item.content }}
-									
-								</text>
+							<text>
+								{{ item.content }}
+
+							</text>
 
 							<!-- {{item.content.length > 60 && !item.hasShowMore ? item.content.slice(0, 59) : item.content}} -->
-<!-- 							<span class="foot-btn" @click="showMore(item.id)">
+							<!-- 							<span class="foot-btn" @click="showMore(item.id)">
 								{{item.hasShowMore ? '收起' : '展开'}}
 							</span> -->
 						</view>
@@ -83,21 +78,17 @@
 						<view class="comment-sub-box">
 							<view class="comment-sub-item" v-for="each in item.children">
 								<view>
-									<cloud-image v-if="each.avatarUrl" 
-									height="70rpx"
-									width="70rpx"
-									borderRadius="50%"
-									:src="each.avatarUrl.url"></cloud-image>
-									<image class="avatar" 
-									:src="emptyAvatar"
-									mode="" 
-									v-else></image>
+									<cloud-image v-if="each.avatarUrl" height="70rpx" width="70rpx" borderRadius="50%" 
+									
+									@click="toCommentPersonalpage(each)"
+										:src="each.avatarUrl.url"></cloud-image>
 								</view>
 								<view class="comment-main">
 									<view class="sub-comment-main-top">
-										<view class="nick-name">{{each.nickName}}</view>
+										<view class="nick-name" @click="toCommentPersonalpage(each)">{{each.nickName}}</view>
 										<view class="zan-box" @click="like(each)">
-											<span :class="each.hasLike ? 'isLike' : 'notLike'">{{each.likeNum == 0 ? '抢首赞' : each.likeNum}}</span>
+											<span
+												:class="each.hasLike ? 'isLike' : 'notLike'">{{each.likeNum == 0 ? '抢首赞' : each.likeNum}}</span>
 											<img style="width: 14px; height: 14px;" v-if="!each.hasLike"
 												src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAApVJREFUWEfFlz9oFEEUxr93SWEhFkIaBUljo4WgATEaiI0GwVLBQg2EzLd3hSBqLI2lRgWLY+ftSSQgggoWNv5pImLUwjQBg1goqCCIIBqwueSeTLg7Ln9Mcmdub7vdnZnvN9+8fe+toMWXtFgfDQGMjo52zM7OHgMwIyLTg4ODk41upG4A7/0OEbkPYGdFVEQuOOeuNQJRN4CqBvGw+3dm9kZEBsrCPSRf1gvRCIAFETPrjqLodZIkY2Z2SkQmnHMHUgMgOQ8fx3FvJpMZB/CDZEfqACEgi8XidwA/SW5uKkCN2AzJTYscmCTZ1VQA7/2AiNwSkefOuYNBLEmSnJnlATwgebypAKr6CMBRANdJng9i3vu8iORE5Mrc3NyTlQDM7HMul/tYO2bNX0GhUDhRKpXumtlvAPuiKJouOzBuZr117HyBU6sCqOpeAH0AhssiwyQvVwTjOO5va2s7vRaAGtCrJC+GOVUAVb1UTjDVDLd4URHJOuf8WsSWG5MkSbeZTYR3lc+4CpAkyUpWht3fI/m+UfEwL5/Pb2xvb59ZFkBV5zNchazsSBBeYPn/ABQKhZ5SqfQCwBTJXYuPoOkAqnoGwE0Ad0ieTB3Ae39bRPoBDJEcSR1AVd8C2CMifc65p6kCmJkkSfIHwAYAW0h+SxVAVXcDmDSzL1EUbasEc20eaGoQVuoIgMckj6QOoKo3AJwFMEJyqBUAIegOAegnOdYKgK8AtmYyma7aLjqVGPDebxeRDwB+AeggWUzVAVV1ABTAK5L7l+0HVPUTgM7Q7VQGhPJZe99oHagpw4dJPvsXQPixONeoyErzRGTKzB7W9hFLjiA8iOO4M7iw3hDZbLbq6pIeY73F6l1v1Zas3gXrHf8XhhNvMGSmtPYAAAAASUVORK5CYII=" />
 											<img style="width: 14px; height: 14px;" v-else
@@ -151,12 +142,9 @@
 						<view class="btn-click" @click="selectAdd()">发布</view>
 					</view>
 				</view>
-				<textarea class="textarea" 
-				v-model="commentReq.content" 
-				:placeholder="placeholder" 
-				:adjust-position="false" 
-				:show-confirm-bar="false"
-					@blur="blur" @focus="focusOn" :focus="focus" maxlength="800"></textarea>
+				<textarea class="textarea" v-model="commentReq.content" :placeholder="placeholder"
+					:adjust-position="false" :show-confirm-bar="false" @blur="blur" @focus="focusOn" :focus="focus"
+					maxlength="800"></textarea>
 			</view>
 		</view>
 		<!-- 新增评论-end -->
@@ -173,11 +161,11 @@
 					return null;
 				}
 			},
-			
+
 			articlesData: {
 				type: Object,
 				default: () => {
-					return{};
+					return {};
 				}
 			},
 			deleteTip: {
@@ -218,7 +206,12 @@
 			})
 		},
 		methods: {
-
+			toCommentPersonalpage(item) {
+				console.log(item);
+				uni.navigateTo({
+					url: "/uni_modules/zetank-personalpage/pages/personalpage/personalpage?uid=" + item.pl_user_id
+				})
+			},
 			commentInput_() {
 				this.commentReq = {
 					"pId": null, // 评论父id
@@ -243,7 +236,7 @@
 					});
 					return
 				}
-				
+
 				this.$emit('replyAdd', this.commentReq);
 				this.closeInput();
 			},
@@ -255,10 +248,10 @@
 			stopPrevent() {},
 			// 回复评论
 			reply(comment) {
-				
+
 				this.pUser = comment.nickName;
 				this.commentReq.pId = comment.id;
-				this.commentReq.root_id = comment.root_id === 0? comment.id : comment.root_id;
+				this.commentReq.root_id = comment.root_id === 0 ? comment.id : comment.root_id;
 				console.log(this.commentReq);
 				if (comment.nickName) {
 					this.commentReq.content = '@' + comment.nickName + ' ';
@@ -291,15 +284,15 @@
 					});
 					return
 				}
-				
+
 				this.$emit('add', this.commentReq.content);
 				this.closeInput();
 			},
 			// 获取父评论下的子评论
 			async getTreeComment(item) {
 				this.$emit('getTreeComment', item.id);
-				
-				
+
+
 			},
 			like(comment) {
 				if (comment.hasLike === true) {
@@ -320,7 +313,7 @@
 			likeComplete(comment) {
 				comment.hasLike = !comment.hasLike;
 				comment.likeNum += comment.hasLike ? 1 : -1;
-				
+
 			},
 			// 删除完成-本地删除评论
 			deleteComplete(commentId) {
@@ -347,7 +340,8 @@
 					}
 					for (var j in this.commentData.comment[i].children) {
 						if (this.commentData.comment[i].children[j].id == commentId) {
-							this.commentData.comment[i].children[j].hasShowMore = !this.commentData.comment[i].children[j].hasShowMore;
+							this.commentData.comment[i].children[j].hasShowMore = !this.commentData.comment[i].children[j]
+								.hasShowMore;
 							this.$forceUpdate();
 							return
 						}
@@ -592,10 +586,12 @@
 		justify-content: space-between;
 		align-items: center;
 	}
+
 	.font-size-20 {
 		font-size: 33rpx;
 	}
+
 	.color-bule {
 		color: #333;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-cms-article/pages/detail/detail.uvue b/uni_modules/uni-cms-article/pages/detail/detail.uvue
index 21dd99f..c476332 100644
--- a/uni_modules/uni-cms-article/pages/detail/detail.uvue
+++ b/uni_modules/uni-cms-article/pages/detail/detail.uvue
@@ -180,7 +180,7 @@ export default {
   },
   onReady() {
     // 开始加载数据，修改 where 条件后才开始去加载 clinetDB 的数据 ，需要等组件渲染完毕后才开始执行 loadData，所以不能再 onLoad 中执行
-    if (this.id) { // ID 不为空，则发起查询
+    if (this.id) { 
       this.$refs.detail.loadData()
     } else {
       uni.showToast({
diff --git a/uni_modules/uni-cms-article/pages/detail/detail.vue b/uni_modules/uni-cms-article/pages/detail/detail.vue
index f4cf81a..010a1aa 100644
--- a/uni_modules/uni-cms-article/pages/detail/detail.vue
+++ b/uni_modules/uni-cms-article/pages/detail/detail.vue
@@ -1,10 +1,35 @@
 <template>
 	<view class="">
+		<view>
+			<uni-popup ref="inputDialog" type="dialog">
+				<uni-popup-dialog type="info" cancelText="关闭" confirmText="继续" title="提示" content="该功能还在开发中!"
+					@confirm="dialogConfirm" @close="dialogClose">
+				</uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<view class="v-preview">
+			<image :src="templateSrc" alt="" class="img" mode="widthFix" />
+			<view class="btn-area">
+				<view class="red-btn-area">
+					<button class="red-btn" @click="btn(0)">老兵直播</button>
+					<button class="red-btn" @click="btn(1)">老兵故事</button>
+					<button class="red-btn" @click="btn(2)">在线注册</button>
+				</view>
+				<view class="red-btn-plain-area">
+					<view class="red-btn-plain" @click="btn(3)">新四军</view>
+					<view class="red-btn-plain" @click="btn(4)">抗美援朝</view>
+					<view class="red-btn-plain" @click="btn(5)">抗美援越</view>
+					<view class="red-btn-plain" @click="btn(6)">对越自卫反击战</view>
+					<view class="red-btn-plain" @click="btn(7)">和平时期退役兵</view>
+				</view>
+			</view>
+		</view>
+
 		<unicloud-db v-slot:default="{data, loading, error, options}" :collection="collection" :options="formData"
 			:getone="true" :where="where" :manual="true" ref="detail" foreignKey="uni-cms-articles.user_id"
 			@load="loadData" class="article">
 			<template v-if="!loading && data">
-				<view @click="toPersonalpage">
+				<view>
 					<view class="meta">
 						<view class="title">
 							<text class="text">{{ data.title }}</text>
@@ -12,9 +37,9 @@
 						<view class="excerpt">
 							<text class="text">{{ data.excerpt }}</text>
 						</view>
-					
-					
-						<view class="author">
+
+
+						<view class="author" @click="toPersonalpage()">
 							<template>
 								<cloud-image height="64rpx" width="64rpx" borderRadius="50%"
 									:src="data.user_id[0].avatar_file.url"></cloud-image>
@@ -22,7 +47,7 @@
 								<text class="split">·</text>
 							</template>
 							<text class="date">{{ publishTime( data.publish_date) }}</text>
-					
+
 						</view>
 					</view>
 				</view>
@@ -56,64 +81,207 @@
 					style="width: 64rpx;height: 64rpx;border-radius: 50%;"></image>
 
 			</view>
-
+			
+			
+			<view class="btn-gift-charts " @click="openGiftCharts()">
+				{{ "送礼榜单 >" }}
+			</view>
+			
+			
 
 			<!-- comment_count -->
 			<view class="comment-eg">
-				<hb-comment ref="hbComment" 
-				@add="add" @del="del" @like="like" 
-				@relike="relike" @focusOn="focusOn"
-					@replyAdd="replyAdd" 
-					@getTreeComment="getTreeComment" 
-					:deleteTip="'确认删除？'" :cmData="commentData"
+				<hb-comment ref="hbComment" @add="add" @del="del" @like="like" @relike="relike" @focusOn="focusOn"
+					@replyAdd="replyAdd" @getTreeComment="getTreeComment" :deleteTip="'确认删除？'" :cmData="commentData"
 					:articlesData="data" v-if="commentData">
 				</hb-comment>
 			</view>
 		</unicloud-db>
 		
-		<uni-popup ref="popup" background-color="#fff">
-			<view class="">
-				<uni-swiper-dot class="uni-swiper-dot-box"
-				
-				@clickItem=clickItem :info="info" 
-				:current="current" :mode="mode"
-					field="content">
-			<swiper class="swiper" :indicator-dots="true">
-				<swiper-item>
-					<uni-grid :column="3" :highlight="true" >
-						<uni-grid-item v-for="(item, index) in giftList" :index="index" :key="index">
-							<view class="grid-item-box">
-								<image :src="item.url" class="image" mode="aspectFill" />
-								<text class="text">{{ item.text }}</text>
-							</view>
-						</uni-grid-item>
-					</uni-grid>
-				</swiper-item>
-				<swiper-item>
-					<uni-grid :column="3" :highlight="true" >
-						<uni-grid-item v-for="(item, index) in giftList" :index="index" :key="index">
-							<view class="grid-item-box">
-								<image :src="item.url" class="image" mode="aspectFill" />
-								<text class="text">{{ item.text }}</text>
-							</view>
-						</uni-grid-item>
-					</uni-grid>
-				</swiper-item>
-				<swiper-item>
-					<uni-grid :column="3" :highlight="true" >
-						<uni-grid-item v-for="(item, index) in giftList" :index="index" :key="index">
-							<view class="grid-item-box">
-								<image :src="item.url" class="image" mode="aspectFill" />
-								<text class="text">{{ item.text }}</text>
-							</view>
-						</uni-grid-item>
-					</uni-grid>
-				</swiper-item>
-			</swiper>
-				</uni-swiper-dot>
+		<uni-popup ref="giftCharts" type="bottom" background-color="#fff" >
+		  <view class="tab-container">
+			  <view
+			    class="tab-item" 
+			    :class="{active: activeTab === 'monthly'}"
+			    @click="switchTab('monthly')">
+			    月度榜单
+			  </view>
+			<view 
+			  class="tab-item" 
+			  :class="{active: activeTab === 'total'}"
+			  @click="switchTab('total')">
+			  总榜单
 			</view>
+		  </view>
+		  <view class="totalGiftCharts" v-if="activeTab === 'total'">
+		  	<unicloud-db ref='totalGiftCharts' v-slot:default="{ pagination, hasMore, loading, error, options }" @error="onqueryerror"
+		  		@onPullDownRefresh="onPullDownRefresh" :collection="totalGiftChartsCollecttion" :page-size="20" orderby="publish_date desc"
+		  		@load="totalGiftChartsListLoad">
+		  		<!-- 基于 uni-list 的页面布局 field="user_id.nickname"-->
+		  		<!-- #ifdef APP-NVUE -->
+		  		<list class="uni-list giftCharts" :border="false" >
+		  		<!-- #endif -->
+		  			<!-- #ifndef APP-NVUE -->
+		  			<scroll-view scroll-y class="uni-list" refresher-enabled :refresher-triggered="loadType=== 'refresh'"
+		  			 @refresherrefresh="totalGiftChar_refresh" @scrolltolower="totalGiftChar_loadMore">
+		  			<!-- #endif -->
+		  				<!-- #ifdef APP-NVUE -->
+		  				<refresh-box :loading="loading" @refresh="totalGiftChar_refresh"></refresh-box>
+		  				<!-- #endif -->
+		  	
+		  				<!-- 列表渲染 -->
+		  				<template v-for="(item, index) in totalGiftChartsList">
+		  					  <view class="giftCharts-item">
+		  					    <!-- 序号列 -->
+		  					    <view class="order-index">
+		  					      {{ index + 1 }}
+		  					    </view>
+		  					    
+		  					    <!-- 头像列 -->
+		  					    <view class="avatar-column">
+								  <cloud-image v-if="item.user_id[0].avatar_file"
+								  	borderRadius="50%" :src="item.user_id[0].avatar_file.url"></cloud-image>
+								  <image class="avatar" :src="emptyAvatar" v-else></image>
+		  					    </view>
+		  					
+		  					    <!-- 昵称列 -->
+		  					    <view class="nickname-column">
+		  					      {{ item.user_id[0].nickname || '匿名用户' }}
+		  					    </view>
+		  					
+		  					    <!-- 礼物值列 -->
+		  					    <view class="gift-value">
+		  					      {{ item.gift_value }} 礼物值
+		  					    </view>
+		  					  </view>
+		  				</template>
+		  	
+		  				<!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
+		  				<!-- #ifdef APP-PLUS -->
+		  				<uni-list-item>
+		  					<template v-slot:body>
+		  					<!-- #endif -->
+		  						<uni-load-state @networkResume="totalGiftChar_refresh"
+		  							:state="{ data: totalGiftChartsList, pagination, hasMore, loading, error }" @loadMore="totalGiftChar_loadMore">
+		  						</uni-load-state>
+		  					<!-- #ifdef APP-PLUS -->
+		  					</template>
+		  				</uni-list-item>
+		  				<!-- #endif -->
+		  			<!-- #ifndef APP-NVUE -->
+		  			</scroll-view>
+		  			<!-- #endif -->
+		  		<!-- #ifdef APP-NVUE -->
+		  		</list>
+		  		<!-- #endif -->
+		  	</unicloud-db>
+		  </view>
+		  <view class="monthlyGiftCharts" v-if="activeTab === 'monthly'">
+		  	<unicloud-db ref='monthlyGiftCharts' v-slot:default="{ pagination, hasMore, loading, error, options }" @error="onqueryerror"
+		  		@onPullDownRefresh="onPullDownRefresh" :collection="monthlyGiftChartsCollecttion" :page-size="20" orderby="publish_date desc"
+		  		@load="monthlyGiftChartsListLoad">
+		  		<!-- 基于 uni-list 的页面布局 field="user_id.nickname"-->
+		  		<!-- #ifdef APP-NVUE -->
+		  		<list class="uni-list giftCharts" :border="false">
+		  		<!-- #endif -->
+		  			<!-- #ifndef APP-NVUE -->
+		  			<scroll-view scroll-y class="uni-list" refresher-enabled :refresher-triggered="loadType=== 'refresh'"
+		  				 @refresherrefresh="monthlyGiftCharts_refresh" @scrolltolower="monthlyGiftCharts_loadMore">
+		  			<!-- #endif -->
+		  				<!-- #ifdef APP-NVUE -->
+		  				<refresh-box :loading="loading" @refresh="monthlyGiftCharts_refresh"></refresh-box>
+		  				<!-- #endif -->
+		  	
+		  				<!-- 列表渲染 -->
+		  				<template v-for="(item, index) in monthlyGiftChartsList">
+		  					  <view class="giftCharts-item">
+		  					    <!-- 序号列 -->
+		  					    <view class="order-index">
+		  					      {{ index + 1 }}
+		  					    </view>
+		  					    
+		  					    <!-- 头像列 -->
+		  					    <view class="avatar-column">
+								  <cloud-image v-if="item.user_id[0].avatar_file"
+								  	borderRadius="50%" :src="item.user_id[0].avatar_file.url"></cloud-image>
+								  <image class="avatar" :src="emptyAvatar" v-else></image>
+		  					    </view>
+		  					
+		  					    <!-- 昵称列 -->
+		  					    <view class="nickname-column">
+		  					      {{ item.user_id[0].nickname || '匿名用户' }}
+		  					    </view>
+		  					
+		  					    <!-- 礼物值列 -->
+		  					    <view class="gift-value">
+		  					      {{ item.gift_value }} 礼物值
+		  					    </view>
+		  					  </view>
+		  				</template>
+		  	
+		  				<!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
+		  				<!-- #ifdef APP-PLUS -->
+		  				<uni-list-item>
+		  					<template v-slot:body>
+		  					<!-- #endif -->
+		  						<uni-load-state @networkResume="monthlyGiftCharts_refresh"
+		  							:state="{ data: monthlyGiftChartsList, pagination, hasMore, loading, error }" @loadMore="monthlyGiftCharts_loadMore">
+		  						</uni-load-state>
+		  					<!-- #ifdef APP-PLUS -->
+		  					</template>
+		  				</uni-list-item>
+		  				<!-- #endif -->
+		  			<!-- #ifndef APP-NVUE -->
+		  			</scroll-view>
+		  			<!-- #endif -->
+		  		<!-- #ifdef APP-NVUE -->
+		  		</list>
+		  		<!-- #endif -->
+		  	</unicloud-db>
+		  </view>
 		</uni-popup>
 
+		<uni-popup ref="popup" background-color="#fff" type="bottom">
+			
+			<view class="">
+				<uni-notice-bar text="本月送出 0 礼物值,快来支持作者" moreText="规则" show-get-more @getmore="getMore"/>
+				
+				<uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="info" :current="current"
+					:mode="mode" field="content">
+					<swiper class="swiper" :indicator-dots="true">
+						<swiper-item class="swiper-box">
+						  <view class="grid-container">
+							<view v-for="(item, index) in giftList" :key="index" :class="{
+								'grid-item': true, 
+								'select-gift': item.is_select_gift
+								}" 
+							@click="setGiftItem(item, index)">
+							  <view class="grid-item-box">
+							  	<image :src="item.url" class="image" mode="aspectFill" />
+							  	<text class="text">{{"￥ " + item.price }}</text>
+							  </view>
+							</view>
+
+						  </view>
+						</swiper-item>
+
+					</swiper>
+				</uni-swiper-dot>
+				<view class="wallet-container">
+					<view class="uni-px-5 uni-pb-5">
+						<uni-data-checkbox mode="list" multiple v-model="isBalance" :localdata="hobby"></uni-data-checkbox>
+					</view>
+					<view class=""></view>
+				  <view class="wallet-info">
+					钱包余额：{{ 0 }} 元
+				  </view>
+				  <button class="gift-btn" @tap="handleGift()">
+					赠送
+				  </button>
+				</view>
+				
+			</view>
+		</uni-popup>
 	</view>
 
 </template>
@@ -131,9 +299,18 @@
 
 
 	const db = uniCloud.database()
+	const _ = db.command;
+	
 	const articleDBName = 'uni-cms-articles'
 	const userDBName = 'uni-id-users'
-
+	
+	
+	
+	const date = new Date();
+	const nowMonths = (date.getUTCFullYear() - 1970)*12 + date.getUTCMonth() + 1; 
+	
+	console.log(nowMonths);
+	
 	export default {
 		components: {
 			uniNavBar,
@@ -141,26 +318,29 @@
 		},
 		data() {
 			return {
+				monthlyGiftChartsList:[],
+				totalGiftChartsList:[],
+				
+				emptyAvatar: "https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/center/avatar.png?expire_at=1741157497&er_sign=9b8381ae7875137d28c57d502762691b",
+				
+				showRefresh: false, // 是否显示刷新按钮
+				listHeight: 0, // 列表高度
+				mpButtonLeftPlaceholderSize: 0, // 小程序左侧icon占位大小
+				mpButtonPlaceholderSize: 87, // 小程序导航栏按钮占位大小
+				navBarHeight: 44, // 导航栏高度
+				refreshStatus: 0, // 刷新状态 0: 未刷新 1: 刷新中 2: 刷新完成
+				listData: [], // 列表数据
+				loadType: null,
+				
+				activeTab: 'monthly',
+				selectGift:{},
+				isBalance: [],
+				hobby: [{
+					text: '余额抵扣',
+					value: 0
+				}],
 				swiperDotIndex: 0,
-				giftList: [{
-						url: 'https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/static/center/avatar.png?expire_at=1741142218&er_sign=2f723854c2a07dcb5571d2ede5458f7f',
-						text: 'Grid 1',
-						badge: '0',
-						type: "primary"
-					},
-					{
-						url: 'https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/static/center/avatar.png?expire_at=1741142218&er_sign=2f723854c2a07dcb5571d2ede5458f7f',
-						text: 'Grid 2',
-						badge: '1',
-						type: "success"
-					},
-					{
-						url: 'https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/static/center/avatar.png?expire_at=1741142218&er_sign=2f723854c2a07dcb5571d2ede5458f7f',
-						text: 'Grid 2',
-						badge: '1',
-						type: "success"
-					}
-				],
+				giftList: [],
 				gridLst: [{
 						text: "点赞",
 						icon: "heart",
@@ -187,6 +367,7 @@
 				id: "", // 文章ID
 				title: "", // 文章标题
 				formData: {}, // 表单数据
+				user_id: {},
 
 				// 广告相关配置
 				adpId: "", // TODO: 请填写广告位ID
@@ -213,7 +394,6 @@
 				return this.userInfo.realNameAuth.authStatus
 			},
 			where() {
-				//拼接where条件 查询条件 ,更多详见 ：https://uniapp.dcloud.net.cn/uniCloud/unicloud-db?id=jsquery
 				return `_id =="${this.id}"`
 			},
 			collection() {
@@ -223,12 +403,45 @@
 					).getTemp(),
 					db.collection(userDBName).field('_id, nickname,avatar_file').getTemp()
 				]
+			},
+			// 总榜单为0 当前榜单为 时间撮对应的总月份数
+			monthlyGiftChartsCollecttion() {
+				return [
+					db.collection("users-give-gift")
+					.where({
+						months:nowMonths
+					})
+					.field(
+						'_id, gift_value,user_id,article_id,months'
+					)
+					.orderBy('gift_value', 'desc')
+					.getTemp(),
+					db.collection("uni-id-users").field('_id, nickname,avatar_file').getTemp()
+				]
+			},
+			totalGiftChartsCollecttion() {
+				return [
+					db.collection("users-give-gift")
+					.where({
+						months:0
+					})
+					.field(
+						'_id, gift_value,user_id,article_id,months'
+					)
+					.orderBy('gift_value', 'desc')
+					.getTemp(),
+					db.collection("uni-id-users").field('_id, nickname,avatar_file').getTemp()
+				]
 			}
+			
 		},
 		onReady() {
 			// 开始加载数据，修改 where 条件后才开始去加载 clinetDB 的数据 ，需要等组件渲染完毕后才开始执行 loadData，所以不能再 onLoad 中执行
 			if (this.id) { // ID 不为空，则发起查询
 				this.$refs.detail.loadData()
+				this.$refs.totalGiftCharts.totalGiftChartsListLoad();
+				this.$refs.monthlyGiftCharts.monthlyGiftChartsListLoad();
+				
 			} else {
 				uni.showToast({
 					icon: 'none',
@@ -265,14 +478,185 @@
 			}
 		},
 		async created() {
-
+			await this.getGiftList()
 		},
 		methods: {
-			toPersonalpage() {
-				uni.navigateTo({
-					url: "/uni_modules/zetank-personalpage/pages/personalpage/personalpage"
+			async monthlyGiftChartsListLoad(data) {
+				console.log(data);
+				
+				this.monthlyGiftChartsList = this.loadType === 'loadMore' ? this.monthlyGiftChartsList.concat(data) : data
+				this.loadType = null
+			},
+			async totalGiftChartsListLoad(data) {
+				console.log(data);
+				
+				this.totalGiftChartsList = this.loadType === 'loadMore' ? this.totalGiftChartsList.concat(data) : data
+				this.loadType = null
+			},
+			dialogConfirm() {
+				console.log('点击确认')
+			},
+			
+			dialogClose() {
+				console.log('点击关闭')
+			},
+			inputDialogToggle() {
+				this.$refs.inputDialog.open()
+			},
+			btn(item) {
+				if (item === 0) {
+					this.inputDialogToggle();
+				} if ([1, 3, 4, 5, 6, 7].indexOf(item) !== -1) {
+					uni.switchTab({
+						url: "/uni_modules/uni-cms-article/pages/list/slist"
+					})
+				} else if (item === 2) {
+					let token = uni.getStorageSync("uni_id_token");
+					console.log(token);
+					if (!token) {
+						uni.navigateTo({
+							url:"/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=weixin"
+						})
+					}
+					else {
+						uni.navigateTo({
+							url: "/uni_modules/uni-id-pages/pages/userinfo/userinfo?showLoginManage=true"
+						})
+					}
+				}
+			},
+
+			async listLoad(data) {
+				console.log(data);
+				const listData = data.map(item => {
+					if (typeof item.thumbnail === 'string') {
+						item.thumbnail = [item.thumbnail]
+					}
+			
+					return item
+				})
+			
+				// 处理腾讯云文件链接
+				for (const article of listData) {
+					const parseImages = await parseImageUrl(article.thumbnail)
+			
+					article.thumbnail = parseImages ? parseImages.map(image => image.src) : []
+				}
+			
+				this.listData = this.loadType === 'loadMore' ? this.listData.concat(listData) : listData
+				this.loadType = null
+			},
+			// 初始化导航栏大小
+			initNavBarSize() {
+				// 获取小程序导航栏按钮信息
+				// #ifdef MP-TOUTIAO
+				let menuButtonInfo = tt.getCustomButtonBoundingClientRect()
+				menuButtonInfo.width = menuButtonInfo.capsule.width //  小程序按钮区域中使用的按钮宽度
+				this.mpButtonLeftPlaceholderSize = menuButtonInfo.leftIcon.width + 10
+				// #endif
+				// #ifndef MP-TOUTIAO
+				let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+				// #endif
+				// 计算小程序导航栏按钮占位大小
+				this.mpButtonPlaceholderSize = menuButtonInfo.width + 10
+				// 获取系统信息，判断是否为 iOS 系统，设置导航栏高度
+				this.navBarHeight = uni.getSystemInfoSync().system.toLowerCase().includes('ios') ? 44 : 48
+			},
+			// 重试
+			retry() {
+				this.refresh()
+			},
+			// 刷新
+			async totalGiftChar_refresh() {
+				this.loadType = 'refresh'
+				
+				console.log(this.$refs.totalGiftCharts);
+				this.$refs.totalGiftCharts.loadData({
+					clear: true
+				}, () => {
+					uni.stopPullDownRefresh()
+					// #ifdef APP-NVUE
+					this.showRefresh = false
+					// #endif
 				})
 			},
+			async monthlyGiftCharts_refresh() {
+				this.loadType = 'refresh'
+				this.$refs.monthlyGiftCharts.loadData({
+					clear: true
+				}, () => {
+					uni.stopPullDownRefresh()
+					// #ifdef APP-NVUE
+					this.showRefresh = false
+					// #endif
+				})
+			},
+			// 加载更多
+			totalGiftChar_loadMore() {
+				this.loadType = 'loadMore'
+				this.$refs.totalGiftChar.loadMore();
+			},
+			monthlyGiftCharts_loadMore() {
+				this.loadType = 'loadMore'
+				this.$refs.monthlyGiftCharts.loadMore();
+			},
+			monthlyGiftCharts_data_clear() {
+				this.loadType = 'clear'
+				this.$refs.monthlyGiftCharts.clear();
+			},
+			
+			totalGiftChar__data_clear() {
+				this.loadType = 'clear'
+				this.$refs.totalGiftChar.clear();
+			},
+			// 查询出错
+			onqueryerror(e) {
+				console.error(e);
+			},
+			switchTab(tab) {
+			  this.activeTab = tab
+			  // 动态加载榜单数据...
+			},
+			openGiftCharts() {
+				this.$refs.giftCharts.open();
+			},
+			async getGiftList() {
+				try {
+					const res = await uniCloud.importObject("gift_info").getGiftList();
+					console.log(res);
+					this.giftList = res.data;
+				} catch(e) {
+					console.log(e);
+				}
+			},
+			async handleGift() {
+				try {
+					if (this.selectGift && this.selectGift !== {}) {
+						console.log(this.selectGift);
+					}
+				} catch(e) {
+					console.log(e)
+				} 
+			},
+			setGiftItem(item, index) {
+				for (let i = 0 ; i < this.giftList.length ; i ++ ) {
+					this.giftList[i].is_select_gift = false;
+				}
+				this.giftList[index].is_select_gift = true;
+				this.selectGift = item;
+				console.log(this.selectGift)
+				console.log(this.selectGift._id === item._id);
+			},
+			getMore() {
+				console.log("规则");
+			},
+			toPersonalpage() {
+				console.log(this.user_id);
+				uni.navigateTo({
+					url: "/uni_modules/zetank-personalpage/pages/personalpage/personalpage?uid=" + this.user_id._id
+				})
+			},
+
 			giftChange(e) {
 				console.log(e)
 			},
@@ -407,6 +791,7 @@
 				this.gridLst[1].value = data.collect_count
 				this.gridLst[2].value = data.gift_count
 				this.title = data.title
+				this.user_id = data.user_id[0]
 				this.setReadHistory()
 			},
 
@@ -579,14 +964,6 @@
 						});
 						this.commentData.comment.splice(0, 0, res.data);
 						this.commentData.commentSize++;
-						// 更新前端显示（示例）
-						// this.$refs.commentList.unshift({
-						//     _id: res.data.comment_id,
-						//     content: comment.content,
-						//     create_time: new Date().toISOString(),
-						//     depth: res.data.depth,
-						//     reply_count: 0
-						// });
 					}
 				} catch (e) {
 					console.error('评论失败:', e);
@@ -615,7 +992,7 @@
 
 				// 防抖处理（500ms间隔）
 				if (this._lastClickTime && Date.now() - this._lastClickTime < 500) {
-					uni.vibrateShort(); // 触觉反馈[2](@ref)
+					uni.vibrateShort();
 					return;
 				}
 				this._lastClickTime = Date.now();
@@ -652,7 +1029,7 @@
 
 				// 防抖处理（500ms间隔）
 				if (this._lastClickTime && Date.now() - this._lastClickTime < 500) {
-					uni.vibrateShort(); // 触觉反馈[2](@ref)
+					uni.vibrateShort();
 					return;
 				}
 				this._lastClickTime = Date.now();
@@ -728,19 +1105,10 @@
 							this.commentData.commentSize++;
 						}
 						console.log(this.commentData.comment);
-						// 更新前端显示（示例）
-						// this.$refs.commentList.unshift({
-						//     _id: res.data.comment_id,
-						//     content: comment.content,
-						//     create_time: new Date().toISOString(),
-						//     depth: res.data.depth,
-						//     reply_count: 0
-						// });
 					}
 				} catch (e) {
 					console.error('评论失败:', e);
 
-					// 错误分类处理（根据后端错误码映射）
 					const errorHandler = {
 						'PERMISSION_DENIED': '登录状态失效，请重新登录',
 						'INVALID_PARAMS': '评论内容不能为空',
@@ -754,10 +1122,8 @@
 					});
 				}
 			},
-			// 删除评论
 			async del(item) {
 				try {
-					// 1. 操作防抖与权限预校验
 					if (this.reqFlag) {
 						uni.showToast({
 							title: '操作受限',
@@ -771,13 +1137,12 @@
 
 					uni.hideToast();
 
-					// 2. 双重加载态管理
 					uni.showLoading({
 						title: '安全检查中...',
 						mask: true
 					});
 
-					// 3. 带权限校验的二次确认
+
 					const {
 						confirm
 					} = await uni.showModal({
@@ -795,14 +1160,10 @@
 
 					let commentId = item.id;
 
-					// // 4. 更新加载状态（网页1）
 					uni.showLoading({
 						title: '数据删除中...',
 						mask: true
 					});
-
-					// // 5. 带重试机制的请求（网页4扩展）
-					// 调用云对象方法
 					const commentObj = uniCloud.importObject("comments");
 					const res = await commentObj.deleteComment(commentId, item.root_id);
 
@@ -883,15 +1244,37 @@
 				console.log(error);
 				uni.showToast(errorConfig[error.code] || errorConfig.default);
 			},
+			inputDialogToggle() {
+				this.$refs.inputDialog.open()
+			},
+			btn(item) {
+				if (item === 0) {
+					this.inputDialogToggle();
+				} else if ([1, 3, 4, 5, 6, 7].indexOf(item)) {
+					uni.switchTab({
+						url: "/uni_modules/uni-cms-article/pages/list/slist"
+					})
+				} else if (item === 2) {
+					let token = uni.getStorageSync("uni_id_token");
+					console.log(token);
 
-			// 状态重置（网页4）
+					if (!token) {
+						uni.navigateTo({
+							url: "/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=weixin"
+						})
+					} else {
+						uni.navigateTo({
+							url: "/uni_modules/uni-id-pages/pages/userinfo/userinfo?showLoginManage=true"
+						})
+					}
+				}
+			},
 			_resetOperationState() {
 				try {
 					uni.hideLoading();
 				} catch (e) {}
 				this.reqFlag = false;
 			},
-			// 列表按照父子转换成树
 			getTree(data) {
 				let result = [];
 				let map = {};
@@ -1102,8 +1485,8 @@
 	}
 
 	.image {
-		width: 25px;
-		height: 25px;
+		width: 150rpx;
+		height: 150rpx;
 	}
 
 	.text {
@@ -1152,25 +1535,272 @@
 	}
 
 	.swiper {
-		height: 420px;
+		height: 600rpx;
 	}
 
 	.gifImage {
 		width: 100rpx;
 		height: 100rpx;
 	}
-		.swiper-box {
-			height: 200px;
-		}
+
+	.swiper-box {
+		height: 800rpx;
+	}
+
+	.swiper-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 200px;
+		color: #fff;
+	}
 	
-		.swiper-item {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			height: 200px;
-			color: #fff;
+	.grid-container {
+		.grid-item {
+		  width: calc(98% / 3); 
 		}
+		display: flex;          /* 启用 Flex 布局 */
+		flex-wrap: wrap;        /* 允许换行 */
+		box-sizing: border-box; /* 包含 padding 计算 */
+		padding: 10rpx;         /* 容器内边距（控制边缘间距） */
+		width: 100%;            /* 确保容器宽度占满父元素 */
+	}
+	
+	
+	/* 外层容器 */
+	.wallet-container {
+	  display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  padding: 20rpx 30rpx;
+	  background: #ffffff;
+	  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+	  border-radius: 16rpx;
+	  margin: 20rpx;
+	}
+	
+	/* 钱包信息 */
+	.wallet-info {
+	  font-size: 28rpx;
+	  color: #333;
+	  font-weight: 500;
+	  flex: 1; /* 允许内容区域自动扩展 */
+	}
+	
+	/* 按钮样式 */
+	.gift-btn {
+	  background: #2979ff;
+	  color: #fff;
+	  border-radius: 40rpx;
+	  padding: 12rpx 32rpx;
+	  font-size: 26rpx;
+	  margin-left: 20rpx;
+	  border: none;
+	  transition: all 0.2s;
+	}
+	
+	.select-gift {
+		border: #e80 solid 1rpx;
+	}
+	
+	
+	
+	
+	/* 处理iOS弹性盒bug */
+	.ios-fix {
+	  flex-shrink: 0;
+	}
+	
+	/* 微信小程序特殊适配 */
+	::v-deep .wx-comp {
+	  display: flex;
+	  box-sizing: border-box;
+	}
+	/* 点击态反馈 */
+	.btn:active {
+	  transform: scale(0.95);
+	  opacity: 0.8;
+	  transition: all 0.2s ease;
+	}
+	
+	
+	.active {
+		border-bottom: #3cc solid 5rpx;
+	}
+	
+	.tab-item {
+		  text-align: center;
+		  font-size: 32rpx;
+		  line-height: 100rpx;
+		  color: #c44;
+	}
+	/* 弹窗容器 */
+	.giftCharts {
+	  min-height: 800rpx;
+	  height: 100%;
+	  
+	  
+	}
+	
+	/* 弹性容器 */
+	.tab-container {
+	  display: flex;
+	  justify-content: space-around;
+	  position: relative;
+	  padding-bottom: 8rpx;
+	  border-bottom: 2rpx solid #eee;
+	}
+	
+	.btn-gift-charts {
+		text-align: center;
+		font-size: 32rpx;
+		line-height: 100rpx;
+		color: #c44;
+	}
+	
+	/* #ifndef APP-NVUE */
+	.pages view {
+		display: flex;
+		box-sizing: border-box;
+		flex-direction: column;
+	}
+	
+	/* #endif */
+	
+	.pages {
+		background-color: #FFFFFF;
+	}
+	
+	.refresh {
+		text-align: center;
+	}
+	
+	.nav-box {
+		background-color: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+	
+		/* #ifndef APP-PLUS */
+		z-index: 9;
+		/* #endif */
+	}
+	
+	.pages .nav {
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+	}
+	
+	.uni-search-box {
+		flex: 1;
+		padding: 0 10px;
+	}
+	
+	.uni-search-box ::v-deep .uni-searchbar {
+		padding: 0;
+	}
+	
+	.uni-search-box ::v-deep .uni-searchbar__box {
+		height: 32px;
+		flex-direction: row;
+	}
+	
+	.cover-search-bar {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		top: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+	
+	.pages .uni-list ::v-deep .uni-list-item__container {
+		flex-direction: row;
+		width: 100%;
+	}
+	
+	.pages .uni-list ::v-deep .uni-list-item {
+		align-items: flex-start;
+	}
+	
+	.pages .uni-list ::v-deep .uni-load-more {
+		display: flex;
+	}
+	
+	.pages .uni-list ::v-deep .uni-list--border:after {
+		background-color: #f5f5f5;
+	}
+	
+	.giftCharts-item {
+	  display: flex;
+	  align-items: center; /* 垂直居中 */
+	  padding: 20rpx;
+	  margin: 15rpx 0;
+	  background: #fff;
+	  border-radius: 12rpx;
+	  box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.05);
+	}
+	
+	/* 公共样式 */
+	[class$="-column"], 
+	.order-index, 
+	.gift-value {
+	  padding: 0 15rpx;
+	  font-size: 28rpx;
+	  color: #333;
+	}
+	
+	/* 比例分配 */
+	.order-index {
+	  flex: 1;  /* 占比1 */
+	  text-align: center;
+	  font-weight: bold;
+	  color: #666;
+	}
+	
+	.avatar-column {
+	  flex: 1;  /* 占比1 */
+	  display: flex;
+	  justify-content: center;
+	}
+	
+	.avatar-img {
+	  width: 80rpx;
+	  height: 80rpx;
+	  border-radius: 50%;
+	  border: 2rpx solid #f0f0f0;
+	}
+	
+	.nickname-column {
+	  flex: 4;  /* 占比4 */
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	  white-space: nowrap;
+	  padding-left: 20rpx;
+	}
+	
+	.gift-value {
+	  flex: 2;  /* 占比2 */
+	  text-align: right;
+	  color: #e6a23c;
+	  font-weight: 500;
+	}
+	
+	/* 响应式优化 */
+	@media (max-width: 480px) {
+	  .nickname-column {
+	    font-size: 24rpx;
+	  }
+	  
+	  .gift-value {
+	    font-size: 26rpx;
+	  }
+	}
 </style>
\ No newline at end of file
diff --git a/uni_modules/uni-cms-article/pages/list/list.nvue b/uni_modules/uni-cms-article/pages/list/list.nvue
index 418adae..72c9b9c 100644
--- a/uni_modules/uni-cms-article/pages/list/list.nvue
+++ b/uni_modules/uni-cms-article/pages/list/list.nvue
@@ -4,7 +4,19 @@
             <statusBar></statusBar>
             <view :style="{ height: `${navBarHeight}px` }"></view>
         </view> -->
-
+		<view>
+			<uni-popup ref="inputDialog" type="dialog">
+				<uni-popup-dialog 
+					type="info" 
+					cancelText="关闭" 
+					confirmText="继续" 
+					title="提示" 
+					content="该功能还在开发中!" 
+					@confirm="dialogConfirm"
+					@close="dialogClose">
+				</uni-popup-dialog>
+			</uni-popup>
+		</view>
 		<view class="v-preview">
 			<image :src="templateSrc" alt="" class="img" mode="widthFix" />
 			<view class="btn-area">
@@ -22,74 +34,52 @@
 				</view>
 			</view>
 		</view>
-		<uni-popup ref="inputDialog" type="dialog">
-			<uni-popup-dialog 
-				type="info" 
-				cancelText="关闭" 
-				confirmText="继续" 
-				title="提示" 
-				:content="content" 
-				@confirm="dialogConfirm"
-				@close="dialogClose">
-			</uni-popup-dialog>
-		</uni-popup>
 		<view class="">
 			<view class="" :style="{ height: listHeight, 'overflow-y': 'scroll' }">
-				<unicloud-db ref='udb' v-slot:default="{ pagination, hasMore, loading, error, options }"
-					@error="onqueryerror" :collection="colList" :page-size="page.pageSize"
-					:page-current="page.currentPage" orderby="publish_date desc" @load="listLoad">
-					<!-- 基于 uni-list 的页面布局 field="user_id.nickname"-->
+		<unicloud-db ref='udb' v-slot:default="{ pagination, hasMore, loading, error, options }" @error="onqueryerror"
+			@onPullDownRefresh="onPullDownRefresh" :collection="colList" :page-size="10" orderby="publish_date desc"
+			@load="listLoad">
+			<!-- 基于 uni-list 的页面布局 field="user_id.nickname"-->
+			<!-- #ifdef APP-NVUE -->
+			<list class="uni-list" :border="false" :style="{ height: listHeight }">
+			<!-- #endif -->
+				<!-- #ifndef APP-NVUE -->
+				<scroll-view scroll-y class="uni-list" refresher-enabled :refresher-triggered="loadType=== 'refresh'"
+					:style="{ height: listHeight }" @refresherrefresh="refresh" @scrolltolower="loadMore">
+				<!-- #endif -->
 					<!-- #ifdef APP-NVUE -->
-					<list class="uni-list" :border="false" :style="{ height: listHeight  }">
+					<refresh-box :loading="loading" @refresh="refresh"></refresh-box>
 					<!-- #endif -->
-						<!-- #ifndef APP-NVUE -->
-						<scroll-view scroll-y class="uni-list" refresher-enabled
-							:refresher-triggered="loadType=== 'refresh'" :style="{ height: listHeight }"
-							@refresherrefresh="refresh" @scrolltolower="loadMore">
+
+					<!-- 列表渲染 -->
+					<template v-for="item in listData">
+						<not-cover v-if="item.thumbnail && item.thumbnail.length === 0"
+							:data="getNewItem(item)"></not-cover>
+						<right-small-cover v-else-if="item.thumbnail && item.thumbnail.length === 1"
+							:data="getNewItem(item)"></right-small-cover>
+						<three-cover v-else-if="item.thumbnail && item.thumbnail.length === 3"
+							:data="getNewItem(item)"></three-cover>
+					</template>
+
+					<!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
+					<!-- #ifdef APP-PLUS -->
+					<uni-list-item>
+						<template v-slot:body>
 						<!-- #endif -->
-							<!-- #ifdef APP-NVUE -->
-							<!-- <refresh-box :loading="loading" @refresh="refresh"></refresh-box> -->
-							<!-- #endif -->
-
-							<!-- 列表渲染 -->
-							<template v-for="item in listData">
-								<not-cover v-if="item.thumbnail && item.thumbnail.length === 0"
-									:data="getNewItem(item)"></not-cover>
-								<right-small-cover v-else-if="item.thumbnail && item.thumbnail.length === 1"
-									:data="getNewItem(item)"></right-small-cover>
-								<three-cover v-else-if="item.thumbnail && item.thumbnail.length === 3"
-									:data="getNewItem(item)"></three-cover>
-							</template>
-
-							<!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
-							<!-- #ifdef APP-PLUS -->
-							<uni-list-item>
-								<template v-slot:body>
-								<!-- #endif -->
-									<uni-load-state @networkResume="refresh"
-										:state="{ data: listData, pagination, hasMore, loading, error }"
-										@loadMore="loadMore">
-									</uni-load-state>
-								<!-- #ifdef APP-PLUS -->
-								</template>
-							</uni-list-item>
-							<!-- #endif -->
-						<!-- #ifndef APP-NVUE -->
-						</scroll-view>
-						<!-- #endif -->
-
-					<!-- #ifdef APP-NVUE -->
-					</list>
-
+							<uni-load-state @networkResume="refresh"
+								:state="{ data: listData, pagination, hasMore, loading, error }" @loadMore="loadMore">
+							</uni-load-state>
+						<!-- #ifdef APP-PLUS -->
+						</template>
+					</uni-list-item>
 					<!-- #endif -->
-					<view class="content">
-						<page-pagination :total="page.total" :pageSize="page.pageSize" @change="change"
-						style="margin-bottom: 300rpx;"
-							layout="total,first,prev,page,next,last,jumper">
-						</page-pagination>
-					</view>
-
-				</unicloud-db>
+				<!-- #ifndef APP-NVUE -->
+				</scroll-view>
+				<!-- #endif -->
+			<!-- #ifdef APP-NVUE -->
+			</list>
+			<!-- #endif -->
+		</unicloud-db>
 			</view>
 
 
@@ -165,11 +155,6 @@
 		data() {
 			return {
 				content: "",
-				page: {
-					total: 0,
-					pageSize: 5,
-					currentPage: 1
-				},
 				templateSrc: "https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/static/bg.jpg?expire_at=1741142837&er_sign=291c5dab058782f6472cf8792735686d",
 				where: '"article_status" == 1', // 查询条件
 				showRefresh: false, // 是否显示刷新按钮
@@ -184,8 +169,6 @@
 			}
 		},
 		onLoad() {
-			console.log(5);
-			this.getPage();
 			
 		},
 		async onReady() {
@@ -204,18 +187,19 @@
 			dialogClose() {
 				console.log('点击关闭')
 			},
+			inputDialogToggle() {
+				this.$refs.inputDialog.open()
+			},
 			btn(item) {
-				if (item in [1, 3, 4, 5, 6, 7]) {
+				if (item === 0) {
+					this.inputDialogToggle();
+				} if ([1, 3, 4, 5, 6, 7].indexOf(item) !== -1) {
 					uni.switchTab({
 						url: "/uni_modules/uni-cms-article/pages/list/slist"
 					})
-				}
-				if (item === 0) {
-					this.content = "老兵直播";
 				} else if (item === 2) {
 					let token = uni.getStorageSync("uni_id_token");
 					console.log(token);
-					
 					if (!token) {
 						uni.navigateTo({
 							url:"/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=weixin"
@@ -236,11 +220,6 @@
 			  }
 			  return item;
 			},
-			async getPage() {
-				let res = await uniCloud.importObject("uni-cms-articles").getTotal();
-				console.log(res);
-				this.page.total = res.total;
-			},
 			change(currentPage, type) { // 当前页改变
 
 				this.page.currentPage = currentPage;
diff --git a/uni_modules/uni-cms-article/pages/search/search.nvue b/uni_modules/uni-cms-article/pages/search/search.nvue
index fb3a3a9..6ecb9da 100644
--- a/uni_modules/uni-cms-article/pages/search/search.nvue
+++ b/uni_modules/uni-cms-article/pages/search/search.nvue
@@ -10,7 +10,7 @@
 				<uni-search-bar ref="searchBar" style="flex:1;" radius="100" v-model="searchText" :focus="focus"
 					:placeholder="hotWorld" clearButton="auto" cancelButton="none" @clear="cancel" @confirm="confirm"
 					@cancel="cancel" />
-        <uni-icons class="scan-icons" :color="iconColor" size="22" type="scan" @click="scanEvent"></uni-icons>
+				<uni-icons class="scan-icons" :color="iconColor" size="22" type="scan" @click="scanEvent"></uni-icons>
 			</view>
 		</view>
 		<view class="search-body">
@@ -22,8 +22,9 @@
 					<view class="word-container" v-if="localSearchList.length">
 						<view class="word-container_header">
 							<text class="word-container_header-text">搜索历史</text>
-							<uni-icons v-if="!localSearchListDel" @click="localSearchListDel = true" class="search-icons"
-								style="padding-right: 0;" :color="iconColor" size="18" type="trash"></uni-icons>
+							<uni-icons v-if="!localSearchListDel" @click="localSearchListDel = true"
+								class="search-icons" style="padding-right: 0;" :color="iconColor" size="18"
+								type="trash"></uni-icons>
 							<view v-else class="flex-center flex-row"
 								style="font-weight: 500;justify-content: space-between;">
 								<text
@@ -64,8 +65,8 @@
 								<template v-if="!netHotListIsHide">
 									<text v-if="error" class="word-container_body-info">{{ error.message }}</text>
 									<template v-else>
-										<text v-for="(word, index) in data" class="word-container_body-text" :key="index"
-											@click="search(word.content)">{{ word.content }}</text>
+										<text v-for="(word, index) in data" class="word-container_body-text"
+											:key="index" @click="search(word.content)">{{ word.content }}</text>
 									</template>
 								</template>
 								<view v-else style="flex:1;">
@@ -101,11 +102,11 @@
 					<!-- #ifdef APP-PLUS -->
 					<uni-list-item>
 						<template v-slot:body>
-							<!-- #endif -->
-							<uni-load-state @networkResume="refresh" :state="{ data: searchList, pagination, hasMore, loading, error }"
-								@loadMore="loadMore">
+						<!-- #endif -->
+							<uni-load-state @networkResume="refresh"
+								:state="{ data: searchList, pagination, hasMore, loading, error }" @loadMore="loadMore">
 							</uni-load-state>
-							<!-- #ifdef APP-PLUS -->
+						<!-- #ifdef APP-PLUS -->
 						</template>
 					</uni-list-item>
 					<!-- #endif -->
@@ -115,8 +116,8 @@
 		<!-- 搜索联想 -->
 		<view class="search-associative" v-if="associativeShow">
 			<uni-list>
-				<uni-list-item v-for="(item, index) in associativeList" :key="item._id" :ellipsis="1" :title="item.title"
-					@click="associativeClick(item)" show-extra-icon clickable
+				<uni-list-item v-for="(item, index) in associativeList" :key="item._id" :ellipsis="1"
+					:title="item.title" @click="associativeClick(item)" show-extra-icon clickable
 					:extra-icon="{ size: 18, color: iconColor, type: 'search' }">
 				</uni-list-item>
 			</uni-list>
@@ -125,644 +126,654 @@
 </template>
 
 <script>
-/**
- * 云端一体搜索模板
- * @description uniCloud云端一体搜索模板，自带下拉候选、历史搜索、热搜。无需再开发服务器代码
- */
-
-import translatePublishTime from "@/uni_modules/uni-cms-article/common/publish-time";
-import parseScanResult from "@/uni_modules/uni-cms-article/common/parse-scan-result";
-import {parseImageUrl} from "@/uni_modules/uni-cms-article/common/parse-image-url";
-
-const searchLogDbName = 'opendb-search-log'; // 搜索记录数据库
-const articleDbName = 'uni-cms-articles'; // 文章数据库
-const associativeSearchField = 'title,excerpt'; // 联想时，搜索框值检索数据库字段名
-const associativeField = '_id,title,excerpt'; // 联想列表每一项携带的字段
-const localSearchListKey = '__local_search_history'; //	本地历史存储字段名
-
-const db = uniCloud.database();
-const articleDBName = 'uni-cms-articles'
-const userDBName = 'uni-id-users'
-
-// 数组去重
-const arrUnique = arr => {
-	for (let i = arr.length - 1; i >= 0; i--) {
-		const curIndex = arr.indexOf(arr[i]);
-		const lastIndex = arr.lastIndexOf(arr[i])
-		curIndex != lastIndex && arr.splice(lastIndex, 1)
-	}
-	return arr
-} // 节流
-// 防抖
-function debounce(fn, interval, isFirstAutoRun) {
 	/**
-	 *
-	 * @param {要执行的函数} fn
-	 * @param {在操作多长时间后可再执行，第一次立即执行} interval
+	 * 云端一体搜索模板
+	 * @description uniCloud云端一体搜索模板，自带下拉候选、历史搜索、热搜。无需再开发服务器代码
 	 */
-	var _self = fn;
-	var timer = null;
-	var first = true;
 
-	if (isFirstAutoRun) {
-		_self();
+	import translatePublishTime from "@/uni_modules/uni-cms-article/common/publish-time";
+	import parseScanResult from "@/uni_modules/uni-cms-article/common/parse-scan-result";
+	import {
+		parseImageUrl
+	} from "@/uni_modules/uni-cms-article/common/parse-image-url";
+
+	const searchLogDbName = 'opendb-search-log'; // 搜索记录数据库
+	const articleDbName = 'uni-cms-articles'; // 文章数据库
+	const associativeSearchField = 'title,excerpt'; // 联想时，搜索框值检索数据库字段名
+	const associativeField = '_id,title,excerpt'; // 联想列表每一项携带的字段
+	const localSearchListKey = '__local_search_history'; //	本地历史存储字段名
+
+	const db = uniCloud.database();
+	const articleDBName = 'uni-cms-articles'
+	const userDBName = 'uni-id-users'
+
+	// 数组去重
+	const arrUnique = arr => {
+		for (let i = arr.length - 1; i >= 0; i--) {
+			const curIndex = arr.indexOf(arr[i]);
+			const lastIndex = arr.lastIndexOf(arr[i])
+			curIndex != lastIndex && arr.splice(lastIndex, 1)
+		}
+		return arr
+	} // 节流
+	// 防抖
+	function debounce(fn, interval, isFirstAutoRun) {
+		/**
+		 *
+		 * @param {要执行的函数} fn
+		 * @param {在操作多长时间后可再执行，第一次立即执行} interval
+		 */
+		var _self = fn;
+		var timer = null;
+		var first = true;
+
+		if (isFirstAutoRun) {
+			_self();
+		}
+
+		return function() {
+			var args = arguments;
+			var _me = this;
+			if (first) {
+				first = false;
+				_self.apply(_me, args);
+			}
+
+			if (timer) {
+				clearTimeout(timer)
+				// return false;
+			}
+
+			timer = setTimeout(function() {
+				clearTimeout(timer);
+				timer = null;
+				_self.apply(_me, args);
+			}, interval || 200);
+		}
 	}
 
-	return function () {
-		var args = arguments;
-		var _me = this;
-		if (first) {
-			first = false;
-			_self.apply(_me, args);
-		}
-
-		if (timer) {
-			clearTimeout(timer)
-			// return false;
-		}
-
-		timer = setTimeout(function () {
-			clearTimeout(timer);
-			timer = null;
-			_self.apply(_me, args);
-		}, interval || 200);
-	}
-}
-
-export default {
-	// 组件数据
-	data() {
-		return {
-			// 文章数据库名称
-			articleDbName,
-			// 搜索记录数据库名称
-			searchLogDbName,
-			// 状态栏高度
-			statusBarHeight: '0px',
-			// 本地搜索列表
-			localSearchList: uni.getStorageSync(localSearchListKey),
-			// 是否删除本地搜索列表
-			localSearchListDel: false,
-			// 是否隐藏网络热搜列表
-			netHotListIsHide: false,
-			// 搜索文本
-			searchText: '',
-			// 图标颜色
-			iconColor: '#999999',
-			// 联想列表
-			associativeList: [],
-			// 是否弹出键盘
-			keyBoardPopup: false,
-			// 搜索热词
-			hotWorld: 'DCloud', //	搜索热词，如果没有输入即回车，则搜索热词，但是不会加入搜索记录
-			// 是否自动聚焦
-			focus: true,
-			// 语音识别引擎
-			speechEngine: 'iFly', //	语音识别引擎 iFly 讯飞 baidu 百度
-			// 是否正在加载数据
-			isLoadData: false,
-			// 数据库查询条件
-			where: '"article_status" == 1',
-			// 列表高度
-			listHeight: 0,
-			// 是否显示联想列表
-			associativeShow: false,
-			// 是否显示无联想列表
-			noAssociativeShow: false,
-      // 搜索结果列表
-      searchList: []
-		}
-	},
-	// 组件创建时执行
-	created() {
-		// 初始化数据库
-		this.db = uniCloud.database();
-		this.searchLogDb = this.db.collection(this.searchLogDbName);
-		this.articleDbName = this.db.collection(this.articleDbName);
-		// #ifndef H5
-		// 监听键盘高度变化
-		uni.onKeyboardHeightChange((res) => {
-			this.keyBoardPopup = res.height !== 0;
-		})
-		// #endif
-	},
-	// 计算属性
-	computed: {
-		colList() {
-			// 返回文章和用户列表
-			return [
-				db.collection(articleDBName).where(this.where).field('thumbnail,title,publish_date,user_id').getTemp(),
-				db.collection(userDBName).field('_id,nickname').getTemp()
-			]
-		}
-	},
-	// 页面初次渲染完成时执行
-	onReady() {
-		// #ifdef APP-NVUE
-		/* 可用窗口高度 - 搜索框高 - 状态栏高 */
-		this.listHeight = uni.getSystemInfoSync().windowHeight + 'px';
-		// #endif
-		// #ifndef APP-NVUE
-		this.listHeight = 'auto'
-		// #endif
-	},
-	// 页面加载时执行
-	onLoad() {
-		//#ifdef APP-PLUS
-		// 获取状态栏高度
-		this.statusBarHeight = `${uni.getSystemInfoSync().statusBarHeight}px`;
-		//#endif
-	},
-	// 组件方法
-	methods: {
-		// 清空搜索框
-		clear(res) {
-			console.log("res: ", res);
-		},
-		// 确认搜索
-		confirm(res) {
-			// 键盘确认
-			this.search(res.value);
-		},
-		// 取消搜索
-		cancel(res) {
-			uni.hideKeyboard();
-			this.searchText = '';
-			this.isLoadData = false
-			this.associativeShow = false
-			// this.loadList();
-		},
-		// 执行搜索
-		search(value) {
-			if (!value && !this.hotWorld) {
-				return;
+	export default {
+		// 组件数据
+		data() {
+			return {
+				// 文章数据库名称
+				articleDbName,
+				// 搜索记录数据库名称
+				searchLogDbName,
+				// 状态栏高度
+				statusBarHeight: '0px',
+				// 本地搜索列表
+				localSearchList: uni.getStorageSync(localSearchListKey),
+				// 是否删除本地搜索列表
+				localSearchListDel: false,
+				// 是否隐藏网络热搜列表
+				netHotListIsHide: false,
+				// 搜索文本
+				searchText: '',
+				// 图标颜色
+				iconColor: '#999999',
+				// 联想列表
+				associativeList: [],
+				// 是否弹出键盘
+				keyBoardPopup: false,
+				// 搜索热词
+				hotWorld: 'DCloud', //	搜索热词，如果没有输入即回车，则搜索热词，但是不会加入搜索记录
+				// 是否自动聚焦
+				focus: true,
+				// 语音识别引擎
+				speechEngine: 'iFly', //	语音识别引擎 iFly 讯飞 baidu 百度
+				// 是否正在加载数据
+				isLoadData: false,
+				// 数据库查询条件
+				where: '"article_status" == 1',
+				// 列表高度
+				listHeight: 0,
+				// 是否显示联想列表
+				associativeShow: false,
+				// 是否显示无联想列表
+				noAssociativeShow: false,
+				// 搜索结果列表
+				searchList: []
 			}
-			if (value) {
-				if (this.searchText !== value) {
-					this.searchText = value
-				}
-
-				this.localSearchListManage(value);
-
-				this.searchLogDbAdd(value)
-			} else if (this.hotWorld) {
-				this.searchText = this.hotWorld
-			}
-
-			uni.hideKeyboard();
-			this.loadList(this.searchText);
 		},
-		// 管理本地搜索列表
-		localSearchListManage(word) {
-			let list = uni.getStorageSync(localSearchListKey);
-			if (list.length) {
-				this.localSearchList.unshift(word);
-				arrUnique(this.localSearchList);
-				if (this.localSearchList.length > 10) {
-					this.localSearchList.pop();
-				}
-			} else {
-				this.localSearchList = [word];
-			}
-			uni.setStorageSync(localSearchListKey, this.localSearchList);
-		},
-		// 清空本地搜索列表
-		LocalSearchListClear() {
-			uni.showModal({
-				content: "确认清空搜索历史吗",
-				confirmText: "删除",
-				confirmColor: 'red',
-				cancelColor: '#808080',
-				success: res => {
-					if (res.confirm) {
-						this.localSearchListDel = false;
-						this.localSearchList = [];
-						uni.removeStorageSync(localSearchListKey)
-					}
-				}
-			});
-		},
-		// 点击本地搜索列表项
-		LocalSearchlistItemClick(word, index) {
-			if (this.localSearchListDel) {
-				this.localSearchList.splice(index, 1);
-				uni.setStorageSync(localSearchListKey, this.localSearchList);
-				if (!this.localSearchList.length) {
-					this.localSearchListDel = false;
-				}
-				return;
-			}
-			this.noAssociativeShow = true;
-			this.search(word);
-		},
-		// 刷新搜索热词
-		searchHotRefresh() {
-			this.$refs.udb.refresh();
-		},
-		// 语音搜索
-		speech() {
-			// #ifdef APP-PLUS
-			plus.speech.startRecognize({
-				engine: this.speechEngine,
-				punctuation: false, // 标点符号
-				timeout: 10000
-			}, word => {
-				word = word instanceof Array ? word[0] : word;
-				this.search(word)
-			}, err => {
-				console.error("语音识别错误: ", err);
-			});
+		// 组件创建时执行
+		created() {
+			// 初始化数据库
+			this.db = uniCloud.database();
+			this.searchLogDb = this.db.collection(this.searchLogDbName);
+			this.articleDbName = this.db.collection(this.articleDbName);
+			// #ifndef H5
+			// 监听键盘高度变化
+			uni.onKeyboardHeightChange((res) => {
+				this.keyBoardPopup = res.height !== 0;
+			})
 			// #endif
 		},
-		// 添加搜索记录
-		searchLogDbAdd(value) {
-			/*
-				在此处存搜索记录，如果登录则需要存 user_id，若未登录则存device_id
-			 */
-			this.getDeviceId().then(device_id => {
-				this.searchLogDb.add({
-					// user_id: device_id,
-					device_id,
-					content: value,
-					create_date: Date.now()
-				})
-			})
-		},
-		// 获取设备ID
-		getDeviceId() {
-			return new Promise((resolve, reject) => {
-				// 从本地缓存中获取uni_id
-				const uniId = uni.getStorageSync('uni_id');
-				// 如果uni_id不存在，则获取设备信息
-				if (!uniId) {
-					// #ifdef APP-PLUS
-					plus.device.getInfo({
-						success: (deviceInfo) => {
-							resolve(deviceInfo.uuid)
-						},
-						fail: () => {
-							// 如果获取设备信息失败，则返回一个随机字符串
-							resolve(uni.getSystemInfoSync().system + '_' + Math.random().toString(36).substr(2))
-						}
-					});
-					// #endif
-					// #ifndef APP-PLUS
-					// 如果不是APP-PLUS，则返回一个随机字符串
-					resolve(uni.getSystemInfoSync().system + '_' + Math.random().toString(36).substr(2))
-					// #endif
-				} else {
-					// 如果uni_id存在，则直接返回uni_id
-					resolve(uniId)
-				}
-			})
-		},
-		// 点击联想词
-		associativeClick(item) {
-			/**
-			 * 注意：这里用户根据自己的业务需要，选择跳转的页面即可
-			 */
-			console.log("associativeClick: ", item, item.title);
-			// 隐藏联想词
-			this.noAssociativeShow = true;
-			// 将搜索框的文本设置为联想词的标题
-			this.searchText = item.title;
-			// 加载列表
-			this.loadList(item.title);
-		},
-		// 加载列表
-		loadList(text = '') {
-			// 设置查询条件
-			let where = '"article_status" == 1 '
-			if (text) {
-				this.where = where + `&& /${text}/.test(title)`;
-			} else {
-				this.where = where;
+		// 计算属性
+		computed: {
+			colList() {
+				// 返回文章和用户列表
+				return [
+					db.collection(articleDBName).where(this.where).field('thumbnail,title,publish_date,user_id')
+					.getTemp(),
+					db.collection(userDBName).field('_id,nickname').getTemp()
+				]
 			}
+		},
+		// 页面初次渲染完成时执行
+		onReady() {
+			// #ifdef APP-NVUE
+			/* 可用窗口高度 - 搜索框高 - 状态栏高 */
+			this.listHeight = uni.getSystemInfoSync().windowHeight + 'px';
+			// #endif
+			// #ifndef APP-NVUE
+			this.listHeight = 'auto'
+			// #endif
+		},
+		// 页面加载时执行
+		onLoad() {
+			//#ifdef APP-PLUS
+			// 获取状态栏高度
+			this.statusBarHeight = `${uni.getSystemInfoSync().statusBarHeight}px`;
+			//#endif
+		},
+		// 组件方法
+		methods: {
+			// 清空搜索框
+			clear(res) {
+				console.log("res: ", res);
+			},
+			// 确认搜索
+			confirm(res) {
+				// 键盘确认
+				this.search(res.value);
+			},
+			// 取消搜索
+			cancel(res) {
+				uni.hideKeyboard();
+				this.searchText = '';
+				this.isLoadData = false
+				this.associativeShow = false
+				// this.loadList();
+			},
+			// 执行搜索
+			search(value) {
+				if (!value && !this.hotWorld) {
+					return;
+				}
+				if (value) {
+					if (this.searchText !== value) {
+						this.searchText = value
+					}
 
-			// 隐藏联想词
-			this.associativeList = [];
-			this.associativeShow = false;
+					this.localSearchListManage(value);
 
-      this.searchList = []
-      this.isLoadData = true
+					this.searchLogDbAdd(value)
+				} else if (this.hotWorld) {
+					this.searchText = this.hotWorld
+				}
 
-			// 延迟0ms后加载数据
-			setTimeout(() => {
+				uni.hideKeyboard();
+				this.loadList(this.searchText);
+			},
+			// 管理本地搜索列表
+			localSearchListManage(word) {
+				let list = uni.getStorageSync(localSearchListKey);
+				if (list.length) {
+					this.localSearchList.unshift(word);
+					arrUnique(this.localSearchList);
+					if (this.localSearchList.length > 10) {
+						this.localSearchList.pop();
+					}
+				} else {
+					this.localSearchList = [word];
+				}
+				uni.setStorageSync(localSearchListKey, this.localSearchList);
+			},
+			// 清空本地搜索列表
+			LocalSearchListClear() {
+				uni.showModal({
+					content: "确认清空搜索历史吗",
+					confirmText: "删除",
+					confirmColor: 'red',
+					cancelColor: '#808080',
+					success: res => {
+						if (res.confirm) {
+							this.localSearchListDel = false;
+							this.localSearchList = [];
+							uni.removeStorageSync(localSearchListKey)
+						}
+					}
+				});
+			},
+			// 点击本地搜索列表项
+			LocalSearchlistItemClick(word, index) {
+				if (this.localSearchListDel) {
+					this.localSearchList.splice(index, 1);
+					uni.setStorageSync(localSearchListKey, this.localSearchList);
+					if (!this.localSearchList.length) {
+						this.localSearchListDel = false;
+					}
+					return;
+				}
+				this.noAssociativeShow = true;
+				this.search(word);
+			},
+			// 刷新搜索热词
+			searchHotRefresh() {
+				this.$refs.udb.refresh();
+			},
+			// 语音搜索
+			speech() {
+				// #ifdef APP-PLUS
+				plus.speech.startRecognize({
+					engine: this.speechEngine,
+					punctuation: false, // 标点符号
+					timeout: 10000
+				}, word => {
+					word = word instanceof Array ? word[0] : word;
+					this.search(word)
+				}, err => {
+					console.error("语音识别错误: ", err);
+				});
+				// #endif
+			},
+			// 添加搜索记录
+			searchLogDbAdd(value) {
+				/*
+					在此处存搜索记录，如果登录则需要存 user_id，若未登录则存device_id
+				 */
+				this.getDeviceId().then(device_id => {
+					this.searchLogDb.add({
+						// user_id: device_id,
+						device_id,
+						content: value,
+						create_date: Date.now()
+					})
+				})
+			},
+			// 获取设备ID
+			getDeviceId() {
+				return new Promise((resolve, reject) => {
+					// 从本地缓存中获取uni_id
+					const uniId = uni.getStorageSync('uni_id');
+					// 如果uni_id不存在，则获取设备信息
+					if (!uniId) {
+						// #ifdef APP-PLUS
+						plus.device.getInfo({
+							success: (deviceInfo) => {
+								resolve(deviceInfo.uuid)
+							},
+							fail: () => {
+								// 如果获取设备信息失败，则返回一个随机字符串
+								resolve(uni.getSystemInfoSync().system + '_' + Math.random().toString(
+									36).substr(2))
+							}
+						});
+						// #endif
+						// #ifndef APP-PLUS
+						// 如果不是APP-PLUS，则返回一个随机字符串
+						resolve(uni.getSystemInfoSync().system + '_' + Math.random().toString(36).substr(2))
+						// #endif
+					} else {
+						// 如果uni_id存在，则直接返回uni_id
+						resolve(uniId)
+					}
+				})
+			},
+			// 点击联想词
+			associativeClick(item) {
+				/**
+				 * 注意：这里用户根据自己的业务需要，选择跳转的页面即可
+				 */
+				console.log("associativeClick: ", item, item.title);
+				// 隐藏联想词
+				this.noAssociativeShow = true;
+				// 将搜索框的文本设置为联想词的标题
+				this.searchText = item.title;
+				// 加载列表
+				this.loadList(item.title);
+			},
+			// 加载列表
+			loadList(text = '') {
+				// 设置查询条件
+				let where = '"article_status" == 1 '
+				if (text) {
+					this.where = where + `&& /${text}/.test(title)`;
+				} else {
+					this.where = where;
+				}
+
+				// 隐藏联想词
+				this.associativeList = [];
+				this.associativeShow = false;
+
+				this.searchList = []
+				this.isLoadData = true
+
+				// 延迟0ms后加载数据
+				setTimeout(() => {
+					this.$refs.listUdb.loadData({
+						clear: true
+					})
+				}, 0)
+			},
+			// 数据库加载完成
+			async onDbLoad(data) {
+				console.log('onDbLoad')
+				// 设置数据已加载标志
+				this.isLoadData = true
+				// 显示联想词
+				this.noAssociativeShow = false;
+
+				for (const article of data) {
+					const parseImages = await parseImageUrl(article.thumbnail)
+
+					article.thumbnail = parseImages ? parseImages.map(image => image.src) : []
+				}
+
+				this.searchList = data
+			},
+			// 查询错误
+			onqueryerror(e) {
+				console.error(e);
+			},
+			// 刷新
+			refresh() {
+				// 刷新数据
 				this.$refs.listUdb.loadData({
 					clear: true
+				}, () => {
+					// 停止下拉刷新
+					uni.stopPullDownRefresh()
+					// #ifdef APP-NVUE
+					// 隐藏刷新按钮
+					this.showRefresh = false
+					// #endif
+				})
+			},
+			// 加载更多
+			loadMore() {
+				// 加载更多数据
+				this.$refs.listUdb.loadMore()
+			},
+			// 格式化发布时间
+			publishTime(timestamp) {
+				return translatePublishTime(timestamp)
+			},
+			scanEvent() {
+				uni.scanCode({
+					onlyFromCamera: true,
+					scanType: ["qrCode"],
+					success: (e) => parseScanResult(e.result),
+					fail: (e) => {
+						console.error(e)
+					}
 				})
-			}, 0)
-		},
-		// 数据库加载完成
-		async onDbLoad(data) {
-			console.log('onDbLoad')
-			// 设置数据已加载标志
-			this.isLoadData = true
-			// 显示联想词
-			this.noAssociativeShow = false;
-
-      for (const article of data) {
-        const parseImages = await parseImageUrl(article.thumbnail)
-
-        article.thumbnail = parseImages ? parseImages.map(image => image.src): []
-      }
-
-      this.searchList = data
-		},
-		// 查询错误
-		onqueryerror(e) {
-			console.error(e);
-		},
-		// 刷新
-		refresh() {
-			// 刷新数据
-			this.$refs.listUdb.loadData({
-				clear: true
-			}, () => {
-				// 停止下拉刷新
-				uni.stopPullDownRefresh()
-				// #ifdef APP-NVUE
-				// 隐藏刷新按钮
-				this.showRefresh = false
-				// #endif
-			})
-		},
-		// 加载更多
-		loadMore() {
-			// 加载更多数据
-			this.$refs.listUdb.loadMore()
-		},
-		// 格式化发布时间
-		publishTime(timestamp) {
-			return translatePublishTime(timestamp)
-		},
-    scanEvent () {
-      uni.scanCode({
-        onlyFromCamera: true,
-        scanType: ["qrCode"],
-        success: (e) => parseScanResult(e.result),
-        fail: (e) => {
-          console.error(e)
-        }
-      })
-    }
-	},
-	onReachBottom() {
-		// 当滚动到底部时，加载更多数据
-		this.loadMore()
-	},
-	watch: {
-		searchText: debounce(function (value, oldValue) {
-			// 当搜索框的文本发生变化时，执行以下操作
-			if (value === oldValue) return
-			if (this.noAssociativeShow) return
-
-			if (value) {
-				// 根据搜索框的文本，查询联想词
-				const escapedValue = value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-				const _ = db.command;
-				this.articleDbName
-				  .where(
-					_.or(
-					[
-						{ title: escapedValue },
-						{ excerpt: escapedValue },
-					]
-					)
-				  )
-				  .field(associativeField)
-				  .get()
-				  .then(res => {
-					// 安全访问数据层级（可选链 + 空值合并）
-					this.associativeList = res?.result?.data || []; 
-					this.associativeShow = this.associativeList.length > 0;
-				  })
-				  .catch(e => { // 捕获所有异常
-					console.error('联想词查询失败:', e);
-					this.associativeList = [];
-					this.associativeShow = false;
-				  });
-			} else {
-				// 如果搜索框的文本为空，则清空联想词列表
-				this.associativeList = [];
 			}
+		},
+		onReachBottom() {
+			// 当滚动到底部时，加载更多数据
+			this.loadMore()
+		},
+		watch: {
+			searchText: debounce(function(value, oldValue) {
+				// 当搜索框的文本发生变化时，执行以下操作
+				if (value === oldValue) return
+				if (this.noAssociativeShow) return
+
+				if (value) {
+					// 根据搜索框的文本，查询联想词
+					const escapedValue = value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+					const _ = db.command;
+					this.articleDbName
+						.where(
+							_.or(
+								[{
+										title: escapedValue
+									},
+									{
+										excerpt: escapedValue
+									},
+								]
+							)
+						)
+						.field(associativeField)
+						.get()
+						.then(res => {
+							// 安全访问数据层级（可选链 + 空值合并）
+							this.associativeList = res?.result?.data || [];
+							this.associativeShow = this.associativeList.length > 0;
+						})
+						.catch(e => { // 捕获所有异常
+							console.error('联想词查询失败:', e);
+							this.associativeList = [];
+							this.associativeShow = false;
+						});
+				} else {
+					// 如果搜索框的文本为空，则清空联想词列表
+					this.associativeList = [];
+				}
+
+			}, 300)
+		}
 
-		}, 300)
 	}
-
-}
 </script>
 
 <style>
-/* #ifndef APP-NVUE */
-page {
-	height: 100%;
-	flex: 1;
-}
+	/* #ifndef APP-NVUE */
+	page {
+		height: 100%;
+		flex: 1;
+	}
 
-/* #endif */
+	/* #endif */
 </style>
 
 <style lang="scss" scoped>
-$search-bar-height: 52px;
-$word-container_header-height: 72rpx;
+	$search-bar-height: 52px;
+	$word-container_header-height: 72rpx;
 
-.status-bar {
-	background-color: #fff;
-}
-
-.container {
-	/* #ifndef APP-NVUE */
-	height: 100%;
-	/* #endif */
-	flex: 1;
-	background-color: #f7f7f7;
-}
-
-.search-body {
-	background-color: #fff;
-	border-bottom-right-radius: 10px;
-	border-bottom-left-radius: 10px;
-}
-
-@mixin uni-flex {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-}
-
-@mixin words-display {
-	font-size: 26rpx;
-	color: #666;
-}
-
-.flex-center {
-	@include uni-flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.flex-row {
-	@include uni-flex;
-	flex-direction: row;
-}
-
-/* #ifdef APP-PLUS */
-/* #ifndef APP-NVUE  || VUE3*/
-::v-deep
-
-/* #endif */
-.uni-searchbar {
-	padding-left: 0;
-}
-
-/* #endif */
-
-/* #ifndef APP-NVUE || VUE3*/
-::v-deep
-
-/* #endif */
-.uni-searchbar__box {
-	border-width: 0;
-}
-
-/* #ifndef APP-NVUE || VUE3 */
-::v-deep
-
-/* #endif */
-.uni-input-placeholder {
-	font-size: 28rpx;
-}
-
-.search-container {
-	height: $search-bar-height;
-	@include uni-flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	position: relative;
-	background-color: #fff;
-
-	@at-root {
-		#{&}-bar {
-			@include uni-flex;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-		}
+	.status-bar {
+		background-color: #fff;
 	}
-}
 
-.search-associative {
-	/* #ifndef APP-NVUE */
-	overflow-y: auto;
+	.container {
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		/* #endif */
+		flex: 1;
+		background-color: #f7f7f7;
+	}
+
+	.search-body {
+		background-color: #fff;
+		border-bottom-right-radius: 10px;
+		border-bottom-left-radius: 10px;
+	}
+
+	@mixin uni-flex {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	@mixin words-display {
+		font-size: 26rpx;
+		color: #666;
+	}
+
+	.flex-center {
+		@include uni-flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.flex-row {
+		@include uni-flex;
+		flex-direction: row;
+	}
+
+	/* #ifdef APP-PLUS */
+	/* #ifndef APP-NVUE  || VUE3*/
+	::v-deep
+
 	/* #endif */
-	position: absolute;
-	top: $search-bar-height;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background-color: #fff;
-	margin-top: 10rpx;
-	padding-left: 10rpx;
-	padding-right: 10rpx;
-}
+	.uni-searchbar {
+		padding-left: 0;
+	}
 
-.search-icons, .scan-icons {
-	padding: 16rpx;
-}
-.scan-icons {
-  padding-left: 0;
-}
-.word-display {
-	@include words-display;
-}
+	/* #endif */
 
-.word-container {
-	padding: 20rpx;
+	/* #ifndef APP-NVUE || VUE3*/
+	::v-deep
 
-	@at-root {
-		#{&}_header {
-			@include uni-flex;
-			height: $word-container_header-height;
-			line-height: $word-container_header-height;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
+	/* #endif */
+	.uni-searchbar__box {
+		border-width: 0;
+	}
 
-			@at-root {
-				#{&}-text {
-					color: #3e3e3e;
-					font-size: 30rpx;
-					font-weight: bold;
-				}
+	/* #ifndef APP-NVUE || VUE3 */
+	::v-deep
+
+	/* #endif */
+	.uni-input-placeholder {
+		font-size: 28rpx;
+	}
+
+	.search-container {
+		height: $search-bar-height;
+		@include uni-flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+		background-color: #fff;
+
+		@at-root {
+			#{&}-bar {
+				@include uni-flex;
+				flex-direction: row;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
 			}
 		}
+	}
 
-		#{&}_body {
-			@include uni-flex;
-			flex-wrap: wrap;
-			flex-direction: row;
+	.search-associative {
+		/* #ifndef APP-NVUE */
+		overflow-y: auto;
+		/* #endif */
+		position: absolute;
+		top: $search-bar-height;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #fff;
+		margin-top: 10rpx;
+		padding-left: 10rpx;
+		padding-right: 10rpx;
+	}
 
-			@at-root {
-				#{&}-text {
-					@include uni-flex;
-					@include words-display;
-					justify-content: center;
-					align-items: center;
-					background-color: #f6f6f6;
-					padding: 10rpx 20rpx;
-					margin: 20rpx 30rpx 0 0;
-					border-radius: 30rpx;
-					/* #ifndef APP-NVUE */
-					box-sizing: border-box;
-					/* #endif */
-					text-align: center;
+	.search-icons,
+	.scan-icons {
+		padding: 16rpx;
+	}
+
+	.scan-icons {
+		padding-left: 0;
+	}
+
+	.word-display {
+		@include words-display;
+	}
+
+	.word-container {
+		padding: 20rpx;
+
+		@at-root {
+			#{&}_header {
+				@include uni-flex;
+				height: $word-container_header-height;
+				line-height: $word-container_header-height;
+				flex-direction: row;
+				justify-content: space-between;
+				align-items: center;
+
+				@at-root {
+					#{&}-text {
+						color: #3e3e3e;
+						font-size: 30rpx;
+						font-weight: bold;
+					}
 				}
+			}
 
-				#{&}-info {
-					/* #ifndef APP-NVUE */
-					display: block;
-					/* #endif */
-					flex: 1;
-					text-align: center;
-					font-size: 26rpx;
-					color: #808080;
-					margin-top: 20rpx;
+			#{&}_body {
+				@include uni-flex;
+				flex-wrap: wrap;
+				flex-direction: row;
+
+				@at-root {
+					#{&}-text {
+						@include uni-flex;
+						@include words-display;
+						justify-content: center;
+						align-items: center;
+						background-color: #f6f6f6;
+						padding: 10rpx 20rpx;
+						margin: 20rpx 30rpx 0 0;
+						border-radius: 30rpx;
+						/* #ifndef APP-NVUE */
+						box-sizing: border-box;
+						/* #endif */
+						text-align: center;
+					}
+
+					#{&}-info {
+						/* #ifndef APP-NVUE */
+						display: block;
+						/* #endif */
+						flex: 1;
+						text-align: center;
+						font-size: 26rpx;
+						color: #808080;
+						margin-top: 20rpx;
+					}
 				}
 			}
 		}
 	}
-}
 
-.thumbnail {
-	width: 240rpx;
-	height: 160rpx;
-	margin-right: 20rpx;
-  border-radius: 8rpx;
-}
+	.thumbnail {
+		width: 240rpx;
+		height: 160rpx;
+		margin-right: 20rpx;
+		border-radius: 8rpx;
+	}
 
-.main {
-	justify-content: space-between;
-	flex: 1;
-}
+	.main {
+		justify-content: space-between;
+		flex: 1;
+	}
 
-.title {
-	font-size: 32rpx;
-}
+	.title {
+		font-size: 32rpx;
+	}
 
-.info {
-	flex-direction: row;
-	justify-content: space-between;
-}
+	.info {
+		flex-direction: row;
+		justify-content: space-between;
+	}
 
-.author,
-.publish_date {
-	font-size: 28rpx;
-	color: #999999;
-}
-</style>
+	.author,
+	.publish_date {
+		font-size: 28rpx;
+		color: #999999;
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/common/store.js b/uni_modules/uni-id-pages/common/store.js
index 70c1a2a..9481578 100644
--- a/uni_modules/uni-id-pages/common/store.js
+++ b/uni_modules/uni-id-pages/common/store.js
@@ -45,7 +45,7 @@ export const mutations = {
 			})
 			try {
 				let res = await usersTable.where("'_id' == $cloudEnv_uid")
-					.field('mobile,nickname,username,email,avatar_file')
+					.field('mobile,gender,nickname,username,email,avatar_file,available,frozen,total_recharge,total_withdraw')
 					.get()
 
 				const realNameRes = await uniIdCo.getRealNameInfo()
diff --git a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
index 6aea856..4072926 100644
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
@@ -2,488 +2,524 @@
 	"bsonType": "object",
 	"permission": {
 		"read": true,
-		"create": "'CREATE_UNI_ID_USERS' in auth.permission",
-		"update": "doc._id == auth.uid || 'UPDATE_UNI_ID_USERS' in auth.permission",
-		"delete": "'DELETE_UNI_ID_USERS' in auth.permission"
+		"create": "doc._id == auth.uid || 'admin' in auth.role",
+		"update": "doc._id == auth.uid ||  'admin' in auth.role",
+		"delete": "doc._id == auth.uid || 'admin' in auth.role"
 	},
+
 	"properties": {
 		"_id": {
 			"description": "存储文档 ID（用户 ID），系统自动生成"
 		},
-		"ali_openid": {
-			"bsonType": "string",
-			"description": "支付宝平台openid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"apple_openid": {
-			"bsonType": "string",
-			"description": "苹果登录openid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"avatar": {
-			"bsonType": "string",
-			"description": "头像地址",
-			"title": "头像地址",
-			"trim": "both",
-			"permission": {
-				"read": true,
-				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"avatar_file": {
-			"bsonType": "file",
-			"description": "用file类型方便使用uni-file-picker组件",
-			"title": "头像文件",
-			"permission": {
-				"read": true,
-				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"comment": {
-			"bsonType": "string",
-			"description": "备注",
-			"title": "备注",
-			"trim": "both",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"dcloud_appid": {
-			"bsonType": "array",
-			"description": "允许登录的客户端的appid列表",
-			"foreignKey": "opendb-app-list.appid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"department_id": {
-			"bsonType": "array",
-			"description": "部门ID",
-			"enum": {
-				"collection": "opendb-department",
-				"field": "_id as value, name as text",
-				"orderby": "name asc"
-			},
-			"enumType": "tree",
-			"title": "部门",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"email": {
-			"bsonType": "string",
-			"description": "邮箱地址",
-			"format": "email",
-			"title": "邮箱",
-			"trim": "both",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"email_confirmed": {
-			"bsonType": "int",
-			"defaultValue": 0,
-			"description": "邮箱验证状态：0 未验证 1 已验证",
-			"enum": [{
-					"text": "未验证",
-					"value": 0
-				},
-				{
-					"text": "已验证",
-					"value": 1
-				}
-			],
-			"title": "邮箱验证状态",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"gender": {
-			"bsonType": "int",
-			"defaultValue": 0,
-			"description": "用户性别：0 未知 1 男性 2 女性",
-			"enum": [{
-					"text": "未知",
-					"value": 0
-				},
-				{
-					"text": "男",
-					"value": 1
-				},
-				{
-					"text": "女",
-					"value": 2
-				}
-			],
-			"title": "性别",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"invite_time": {
-			"bsonType": "timestamp",
-			"description": "受邀时间",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"inviter_uid": {
-			"bsonType": "array",
-			"description": "用户全部上级邀请者",
-			"trim": "both",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"last_login_date": {
-			"bsonType": "timestamp",
-			"description": "最后登录时间",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"last_login_ip": {
-			"bsonType": "string",
-			"description": "最后登录时 IP 地址",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"mobile": {
-			"bsonType": "string",
-			"description": "手机号码",
-			"pattern": "^\\+?[0-9-]{3,20}$",
-			"title": "手机号码",
-			"trim": "both",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"mobile_confirmed": {
-			"bsonType": "int",
-			"defaultValue": 0,
-			"description": "手机号验证状态：0 未验证 1 已验证",
-			"enum": [{
-					"text": "未验证",
-					"value": 0
-				},
-				{
-					"text": "已验证",
-					"value": 1
-				}
-			],
-			"title": "手机号验证状态",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"my_invite_code": {
-			"bsonType": "string",
-			"description": "用户自身邀请码",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"nickname": {
-			"bsonType": "string",
-			"description": "用户昵称",
-			"title": "昵称",
-			"trim": "both",
-			"permission": {
-				"read": true,
-				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"password": {
-			"bsonType": "password",
-			"description": "密码，加密存储",
-			"title": "密码",
-			"trim": "both"
-		},
-		"password_secret_version": {
-			"bsonType": "int",
-			"description": "密码使用的passwordSecret版本",
-			"title": "passwordSecret",
-			"permission": {
-				"read": false,
-				"write": false
-			}
-		},
-		"realname_auth": {
-			"bsonType": "object",
-			"description": "实名认证信息",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			},
-			"properties": {
-				"auth_date": {
-					"bsonType": "timestamp",
-					"description": "认证通过时间"
-				},
-				"auth_status": {
-					"bsonType": "int",
-					"description": "认证状态：0 未认证 1 等待认证 2 认证通过 3 认证失败",
-					"maximum": 3,
-					"minimum": 0
-				},
-				"contact_email": {
-					"bsonType": "string",
-					"description": "联系人邮箱"
-				},
-				"contact_mobile": {
-					"bsonType": "string",
-					"description": "联系人手机号码"
-				},
-				"contact_person": {
-					"bsonType": "string",
-					"description": "联系人姓名"
-				},
-				"id_card_back": {
-					"bsonType": "string",
-					"description": "身份证反面照 URL"
-				},
-				"id_card_front": {
-					"bsonType": "string",
-					"description": "身份证正面照 URL"
-				},
-				"identity": {
-					"bsonType": "string",
-					"description": "身份证号码/营业执照号码"
-				},
-				"in_hand": {
-					"bsonType": "string",
-					"description": "手持身份证照片 URL"
-				},
-				"license": {
-					"bsonType": "string",
-					"description": "营业执照 URL"
-				},
-				"real_name": {
-					"bsonType": "string",
-					"description": "真实姓名/企业名称"
-				},
-				"type": {
-					"bsonType": "int",
-					"description": "用户类型：0 个人用户 1 企业用户",
-					"maximum": 1,
-					"minimum": 0
+		"bsonType": "object",
+		"properties": {
+			"available": {
+				"bsonType": "int",
+				"minimum": 0,
+				"description": "可用余额(分)",
+				"defaultValue":0,
+				"permission": {
+					"update": "'admin' in auth.role" // 仅管理员可直接修改
 				}
 			},
-			"required": [
-				"type",
-				"auth_status"
-			]
-		},
-		"register_date": {
-			"bsonType": "timestamp",
-			"description": "注册时间",
-			"forceDefaultValue": {
-				"$env": "now"
+			"frozen": {
+				"bsonType": "int",
+				"minimum": 0,
+				"defaultValue":0,
+				"description": "冻结金额"
 			},
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"register_ip": {
-			"bsonType": "string",
-			"description": "注册时 IP 地址",
-			"forceDefaultValue": {
-				"$env": "clientIP"
+			"total_recharge": {
+				"bsonType": "int",
+				"defaultValue":0,
+				"description": "累计充值"
 			},
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"role": {
-			"bsonType": "array",
-			"description": "用户角色",
-			"enum": {
-				"collection": "uni-id-roles",
-				"field": "role_id as value, role_name as text"
+			"total_withdraw": {
+				"bsonType": "int",
+				"defaultValue":0,
+				"description": "累计提现"
 			},
-			"foreignKey": "uni-id-roles.role_id",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			},
-			"title": "角色"
-		},
-		"tags":{
-			"bsonType": "array",
-			"description": "用户标签",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			},
-			"title": "标签"
-		},
-		"score": {
-			"bsonType": "int",
-			"description": "用户积分，积分变更记录可参考：uni-id-scores表定义",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"status": {
-			"bsonType": "int",
-			"defaultValue": 0,
-			"description": "用户状态：0 正常 1 禁用 2 审核中 3 审核拒绝",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			},
-			"enum": [{
-					"text": "正常",
-					"value": 0
-				},
-				{
-					"text": "禁用",
-					"value": 1
-				},
-				{
-					"text": "审核中",
-					"value": 2
-				},
-				{
-					"text": "审核拒绝",
-					"value": 3
-				}
-			],
-			"title": "用户状态"
-		},
-		"token": {
-			"bsonType": "array",
-			"description": "用户token",
-			"permission": {
-				"read": false,
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"username": {
-			"bsonType": "string",
-			"description": "用户名，不允许重复",
-			"title": "用户名",
-			"trim": "both",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"wx_openid": {
-			"bsonType": "object",
-			"description": "微信各个平台openid",
-			"properties": {
-				"app": {
-					"bsonType": "string",
-					"description": "app平台微信openid"
-				},
-				"mp": {
-					"bsonType": "string",
-					"description": "微信小程序平台openid"
-				},
-				"h5": {
-					"bsonType": "string",
-					"description": "微信公众号登录openid"
-				},
-				"web": {
-					"bsonType": "string",
-					"description": "PC页面扫码登录openid"
+			"ali_openid": {
+				"bsonType": "string",
+				"description": "支付宝平台openid",
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
 				}
 			},
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"wx_unionid": {
-			"bsonType": "string",
-			"description": "微信unionid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"qq_openid": {
-			"bsonType": "object",
-			"description": "QQ各个平台openid",
-			"properties": {
-				"app": {
-					"bsonType": "string",
-					"description": "app平台QQ openid"
-				},
-				"mp": {
-					"bsonType": "string",
-					"description": "QQ小程序平台openid"
+			"apple_openid": {
+				"bsonType": "string",
+				"description": "苹果登录openid",
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
 				}
 			},
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			"avatar": {
+				"bsonType": "string",
+				"description": "头像地址",
+				"title": "头像地址",
+				"trim": "both",
+				"permission": {
+					"read": true,
+					"create": "doc._id == auth.uid || 'admin' in auth.role",
+					"update": "doc._id == auth.uid ||  'admin' in auth.role",
+					"delete": "doc._id == auth.uid || 'admin' in auth.role"
+				}
+
+			},
+			"avatar_file": {
+				"bsonType": "file",
+				"description": "用file类型方便使用uni-file-picker组件",
+				"title": "头像文件",
+				"permission": {
+					"read": true,
+					"create": "doc._id == auth.uid || 'admin' in auth.role",
+					"update": "doc._id == auth.uid ||  'admin' in auth.role",
+					"delete": "doc._id == auth.uid || 'admin' in auth.role"
+				}
+
+			},
+			"comment": {
+				"bsonType": "string",
+				"description": "个人简介",
+				"title": "个人简介",
+				"trim": "both",
+				"permission": {
+					"read": true,
+					"create": "doc._id == auth.uid || 'admin' in auth.role",
+					"update": "doc._id == auth.uid ||  'admin' in auth.role",
+					"delete": "doc._id == auth.uid || 'admin' in auth.role"
+				}
+
+			},
+			"personal_profile": {
+				"bsonType": "string",
+				"description": "个人简介",
+				"title": "个人简介",
+				"trim": "both",
+				"defaultValue": ""
+			},
+			"gender": {
+				"bsonType": "int",
+				"description": "性别 0 未知 1 男 2 女",
+				"title": "性别",
+				"defaultValue": 0,
+				"permission": {
+					"read": true,
+					"create": "doc._id == auth.uid || 'admin' in auth.role",
+					"update": "doc._id == auth.uid ||  'admin' in auth.role",
+					"delete": "doc._id == auth.uid || 'admin' in auth.role"
+				}
+
+			},
+			"dcloud_appid": {
+				"bsonType": "array",
+				"description": "允许登录的客户端的appid列表",
+				"foreignKey": "opendb-app-list.appid",
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"department_id": {
+				"bsonType": "array",
+				"description": "部门ID",
+				"enum": {
+					"collection": "opendb-department",
+					"field": "_id as value, name as text",
+					"orderby": "name asc"
+				},
+				"enumType": "tree",
+				"title": "部门",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"email": {
+				"bsonType": "string",
+				"description": "邮箱地址",
+				"format": "email",
+				"title": "邮箱",
+				"trim": "both",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"email_confirmed": {
+				"bsonType": "int",
+				"defaultValue": 0,
+				"description": "邮箱验证状态：0 未验证 1 已验证",
+				"enum": [{
+						"text": "未验证",
+						"value": 0
+					},
+					{
+						"text": "已验证",
+						"value": 1
+					}
+				],
+				"title": "邮箱验证状态",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"invite_time": {
+				"bsonType": "timestamp",
+				"description": "受邀时间",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"inviter_uid": {
+				"bsonType": "array",
+				"description": "用户全部上级邀请者",
+				"trim": "both",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"last_login_date": {
+				"bsonType": "timestamp",
+				"description": "最后登录时间",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"last_login_ip": {
+				"bsonType": "string",
+				"description": "最后登录时 IP 地址",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"mobile": {
+				"bsonType": "string",
+				"description": "手机号码",
+				"pattern": "^\\+?[0-9-]{3,20}$",
+				"title": "手机号码",
+				"trim": "both",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"mobile_confirmed": {
+				"bsonType": "int",
+				"defaultValue": 0,
+				"description": "手机号验证状态：0 未验证 1 已验证",
+				"enum": [{
+						"text": "未验证",
+						"value": 0
+					},
+					{
+						"text": "已验证",
+						"value": 1
+					}
+				],
+				"title": "手机号验证状态",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"my_invite_code": {
+				"bsonType": "string",
+				"description": "用户自身邀请码",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"nickname": {
+				"bsonType": "string",
+				"description": "用户昵称",
+				"title": "昵称",
+				"trim": "both",
+				"permission": {
+					"read": true,
+					"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission",
+					"update": "doc._id == auth.uid || 'user_edit' in auth.permission"
+				}
+			},
+			"password": {
+				"bsonType": "password",
+				"description": "密码，加密存储",
+				"title": "密码",
+				"trim": "both"
+			},
+			"password_secret_version": {
+				"bsonType": "int",
+				"description": "密码使用的passwordSecret版本",
+				"title": "passwordSecret",
+				"permission": {
+					"read": false,
+					"write": false
+				}
+			},
+			"realname_auth": {
+				"bsonType": "object",
+				"description": "实名认证信息",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				},
+				"properties": {
+					"auth_date": {
+						"bsonType": "timestamp",
+						"description": "认证通过时间"
+					},
+					"auth_status": {
+						"bsonType": "int",
+						"description": "认证状态：0 未认证 1 等待认证 2 认证通过 3 认证失败",
+						"maximum": 3,
+						"minimum": 0
+					},
+					"contact_email": {
+						"bsonType": "string",
+						"description": "联系人邮箱"
+					},
+					"contact_mobile": {
+						"bsonType": "string",
+						"description": "联系人手机号码"
+					},
+					"contact_person": {
+						"bsonType": "string",
+						"description": "联系人姓名"
+					},
+					"id_card_back": {
+						"bsonType": "string",
+						"description": "身份证反面照 URL"
+					},
+					"id_card_front": {
+						"bsonType": "string",
+						"description": "身份证正面照 URL"
+					},
+					"identity": {
+						"bsonType": "string",
+						"description": "身份证号码/营业执照号码"
+					},
+					"in_hand": {
+						"bsonType": "string",
+						"description": "手持身份证照片 URL"
+					},
+					"license": {
+						"bsonType": "string",
+						"description": "营业执照 URL"
+					},
+					"real_name": {
+						"bsonType": "string",
+						"description": "真实姓名/企业名称"
+					},
+					"type": {
+						"bsonType": "int",
+						"description": "用户类型：0 个人用户 1 企业用户",
+						"maximum": 1,
+						"minimum": 0
+					}
+				},
+				"required": [
+					"type",
+					"auth_status"
+				]
+			},
+			"register_date": {
+				"bsonType": "timestamp",
+				"description": "注册时间",
+				"forceDefaultValue": {
+					"$env": "now"
+				},
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"register_ip": {
+				"bsonType": "string",
+				"description": "注册时 IP 地址",
+				"forceDefaultValue": {
+					"$env": "clientIP"
+				},
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"role": {
+				"bsonType": "array",
+				"description": "用户角色",
+				"enum": {
+					"collection": "uni-id-roles",
+					"field": "role_id as value, role_name as text"
+				},
+				"foreignKey": "uni-id-roles.role_id",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				},
+				"title": "角色"
+			},
+			"tags": {
+				"bsonType": "array",
+				"description": "用户标签",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				},
+				"title": "标签"
+			},
+			"score": {
+				"bsonType": "int",
+				"description": "用户积分，积分变更记录可参考：uni-id-scores表定义",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"status": {
+				"bsonType": "int",
+				"defaultValue": 0,
+				"description": "用户状态：0 正常 1 禁用 2 审核中 3 审核拒绝",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				},
+				"enum": [{
+						"text": "正常",
+						"value": 0
+					},
+					{
+						"text": "禁用",
+						"value": 1
+					},
+					{
+						"text": "审核中",
+						"value": 2
+					},
+					{
+						"text": "审核拒绝",
+						"value": 3
+					}
+				],
+				"title": "用户状态"
+			},
+			"token": {
+				"bsonType": "array",
+				"description": "用户token",
+				"permission": {
+					"read": false,
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"username": {
+				"bsonType": "string",
+				"description": "用户名，不允许重复",
+				"title": "用户名",
+				"trim": "both",
+				"permission": {
+					"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"wx_openid": {
+				"bsonType": "object",
+				"description": "微信各个平台openid",
+				"properties": {
+					"app": {
+						"bsonType": "string",
+						"description": "app平台微信openid"
+					},
+					"mp": {
+						"bsonType": "string",
+						"description": "微信小程序平台openid"
+					},
+					"h5": {
+						"bsonType": "string",
+						"description": "微信公众号登录openid"
+					},
+					"web": {
+						"bsonType": "string",
+						"description": "PC页面扫码登录openid"
+					}
+				},
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"wx_unionid": {
+				"bsonType": "string",
+				"description": "微信unionid",
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"qq_openid": {
+				"bsonType": "object",
+				"description": "QQ各个平台openid",
+				"properties": {
+					"app": {
+						"bsonType": "string",
+						"description": "app平台QQ openid"
+					},
+					"mp": {
+						"bsonType": "string",
+						"description": "QQ小程序平台openid"
+					}
+				},
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"qq_unionid": {
+				"bsonType": "string",
+				"description": "QQ unionid",
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"huawei_openid": {
+				"bsonType": "string",
+				"description": "Huawei openid",
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"huawei_unionid": {
+				"bsonType": "string",
+				"description": "Huawei unionid",
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
+			},
+			"third_party": {
+				"bsonType": "object",
+				"description": "三方平台凭证",
+				"permission": {
+					"read": false,
+					"write": false
+				}
+			},
+			"identities": {
+				"bsonType": "array",
+				"description": "三方平台身份信息；一个对象代表一个身份，参数支持: provider 身份源, userInfo 三方用户信息, openid 三方openid, unionid 三方unionid, uid 三方uid",
+				"permission": {
+					"read": "'READ_UNI_ID_USERS' in auth.permission",
+					"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+				}
 			}
 		},
-		"qq_unionid": {
-			"bsonType": "string",
-			"description": "QQ unionid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"huawei_openid": {
-			"bsonType": "string",
-			"description": "Huawei openid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"huawei_unionid": {
-			"bsonType": "string",
-			"description": "Huawei unionid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		},
-		"third_party": {
-			"bsonType": "object",
-			"description": "三方平台凭证",
-			"permission": {
-				"read": false,
-				"write": false
-			}
-		},
-		"identities": {
-			"bsonType": "array",
-			"description": "三方平台身份信息；一个对象代表一个身份，参数支持: provider 身份源, userInfo 三方用户信息, openid 三方openid, unionid 三方unionid, uid 三方uid",
-			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			}
-		}
-	},
-	"required": []
-}
+		"required": []
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/zetank-personalpage/pages/personalpage/personalpage.vue b/uni_modules/zetank-personalpage/pages/personalpage/personalpage.vue
index 8f61b6c..30c29af 100644
--- a/uni_modules/zetank-personalpage/pages/personalpage/personalpage.vue
+++ b/uni_modules/zetank-personalpage/pages/personalpage/personalpage.vue
@@ -3,84 +3,297 @@
 		<!-- 后台按钮组件 -->
 		<!-- <zetank-backBar textcolor="#000" :showLeft="true" :showTitle="false" navTitle='标题'></zetank-backBar> -->
 		<!-- 用户背景封面 -->
-		<z-paging ref="paging" :fixed="true" @scroll="scroll" @query="queryData" :hide-empty-view="true" >
-			<image class="info-cover" @tap="fnMainBgPic" src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-5d36bb3d-8e98-4f00-ab8b-b018dc4f5dc6/17b0292c-8a63-4b7b-a6a6-724f416a9958.jpg"
-			  mode="scaleToFill"></image>
-			 <!-- 用户头像关注 -->
-			 <view class="u-flex-wrap" style="padding-top: 18rpx;padding-bottom: 18rpx;position: relative;align-items: center;display: flex;flex-direction: row;justify-content: flex-end;">
-			   <view class="info-avatar">
-<!-- 				<image 
-					src="https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/static/center/avatar.png?expire_at=1741142218&er_sign=2f723854c2a07dcb5571d2ede5458f7f"
-					style="width: 135rpx;height: 135rpx;border-radius: 50%;"></image> -->
-			     <!-- <u-avatar :src="userinfo.avatar" size="135"></u-avatar> -->
-				 
-			   </view>
-				<view style="margin-right: 50rpx;">
-					<!-- <u-tag v-if='showedit' text="编辑信息" mode="dark" shape="" bg-color="#f5991e" @click="UserEdit" /> -->
+		<z-paging ref="paging" :fixed="true" @scroll="scroll" @query="queryData" :hide-empty-view="true">
+			<image class="info-cover" @tap="fnMainBgPic"
+				src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-5d36bb3d-8e98-4f00-ab8b-b018dc4f5dc6/17b0292c-8a63-4b7b-a6a6-724f416a9958.jpg"
+				mode="scaleToFill"></image>
+			<!-- 用户头像关注 -->
+			<view class="u-flex-wrap"
+				style="padding-top: 18rpx;padding-bottom: 18rpx;position: relative;align-items: center;display: flex;flex-direction: row;justify-content: flex-end;">
+				<view class="info-avatar">
+					<image
+						src="https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/static/center/avatar.png?expire_at=1741142218&er_sign=2f723854c2a07dcb5571d2ede5458f7f"
+						style="width: 135rpx;height: 135rpx;border-radius: 50%;"></image>
+
+				</view>
+				<view style="margin-right: 50rpx;" v-if="uid === userInfo._id">
+					<u-tag  v-if='showedit' text="编辑信息" mode="dark" shape="" bg-color="#f5991e" @click="UserEdit" />
 					<view v-if='!showedit' style="height: 45rpx;"></view>
 				</view>
-			 </view>
-			 <!-- 用户名 -->
-			  <view style="display: flex;align-items: center;margin-left: 50rpx;margin-top: 20rpx;" v-if="userinfo.length!=0">
-			    <text style="font-size: 32rpx;color: #111111;font-weight: bold;margin-right: 10rpx;">{{userinfo.nickname}}</text>
-				<!-- <u-icon :name="userinfo.gender===1?'man':'woman'" :color="userinfo.gender===1?'#4baed5':'#f5991e'" size="30"></u-icon> -->
-			  </view>
-			  
-			  <!-- 单位职务 -->
-			  <view class="u-flex">
-				  <view style="display: flex;align-items: center;margin-left: 50rpx;margin-top: 20rpx;" v-if="userinfo.length!=0">
-				      <!-- <u-icon name="map-fill" size="32" color="#4baed5"></u-icon> -->
-				      <text style="font-size: 24rpx;color: #555555;margin-left: 10rpx;">{{userinfo.city}}</text>
-				    </view>
-				  <view style="display: flex;align-items: center;margin-left: 50rpx;margin-top: 20rpx;" v-if="userinfo.length!=0">
-				    <!-- <u-icon name="man-add-fill" size="32" color="#4baed5"></u-icon> -->
+			</view>
+			<!-- 用户名 -->
+			<view style="display: flex;align-items: center;margin-left: 50rpx;margin-top: 20rpx;"
+				v-if="userinfo.length!=0">
+				<text
+					style="font-size: 32rpx;color: #111111;font-weight: bold;margin-right: 10rpx;">{{userinfo.nickname}}</text>
+				<u-icon v-if="userinfo.gender === 0" :name="userinfo.gender===1?'man':'woman'" :color="userinfo.gender===1?'#4baed5':'#f5991e'"
+					size="30"></u-icon>
+			</view>
+
+			<!-- 单位职务 -->
+			<view class="u-flex">
+				<view style="display: flex;align-items: center;margin-left: 50rpx;margin-top: 20rpx;"
+					v-if="userinfo.length!=0">
+					<u-icon name="map-fill" size="32" color="#4baed5"></u-icon>
+					<text style="font-size: 24rpx;color: #555555;margin-left: 10rpx;">{{userinfo.city}}</text>
+				</view>
+				<!-- 				  <view style="display: flex;align-items: center;margin-left: 50rpx;margin-top: 20rpx;" v-if="userinfo.length!=0">
+				    <u-icon name="man-add-fill" size="32" color="#4baed5"></u-icon>
 				    <text style="font-size: 24rpx;color: #555555;margin-left: 10rpx;">{{userinfo.jor}}</text>
-				  </view>
-			  </view>
-			  <!-- 简介-->
+				  </view> -->
+			</view>
+			<!-- 简介-->
 			<view style="font-size: 24rpx;color: #555555;margin:20rpx 50rpx;" v-if="userinfo.length!=0">
-				<!-- <u-tag v-if='membertype!=""' :text="membertype" mode="dark" shape="circle" bg-color="#4baed5" /> -->
+				<u-tag v-if='membertype!=""' :text="membertype" mode="dark" shape="circle" bg-color="#4baed5" />
 				<text style="margin-right: 20rpx;">{{Information==''?'暂无简介':Information}}</text>
 			</view>
-			<view style="display: flex;align-items: center;margin-left: 50rpx;margin-top: 20rpx;margin-bottom: 20rpx;" v-if="userinfo.length!=0">
+			<!-- 			<view style="display: flex;align-items: center;margin-left: 50rpx;margin-top: 20rpx;margin-bottom: 20rpx;" v-if="userinfo.length!=0">
 			  <text style="font-size: 32rpx;font-weight: bold;color: #555555;margin-right: 18rpx;">{{userinfo.good.length || 0}}</text><text style="font-size: 24rpx;color: gray;margin-right: 28rpx;">粉丝</text>
 				<text style="font-size: 32rpx;font-weight: bold;color: #555555;margin-right: 18rpx;">{{userinfo.good.length || 0}}</text><text style="font-size: 24rpx;color: gray;margin-right: 28rpx;">关注</text>
 				<text style="font-size: 32rpx;font-weight: bold;color: #555555;margin-right: 18rpx;">{{userinfo.good.length || 0}}</text><text style="font-size: 24rpx;color: gray;margin-right: 28rpx;">点赞</text>
-			</view>
-			
+			</view> -->
+
 			<!-- 选择导航 -->
-			<view v-if="isFixed" style="height: 90rpx;line-height: 90rpx;background-color: white;margin-bottom: 18rpx;"></view>
-			<view id="tabbar" :class="isFixed?'tabbar-fixed':''" style="border-bottom:18rpx #f8f8f8 solid ;align-items: stretch;height: 90rpx;line-height: 90rpx;background-color: white;margin-bottom: 18rpx; display: flex;flex-direction: row;justify-content: space-around;">
-			  <view style="font-size: 32rpx;font-weight: bold;text-align: center;width: 128rpx;" :class="current == 0?'tabbarsh':'notabbarsh'" @tap="fnBarClick(0)">导航一</view>
-			  <view style="font-size: 32rpx;font-weight: bold;text-align: center;width: 128rpx;" :class="current == 1?'tabbarsh':'notabbarsh'" @tap="fnBarClick(1)">导航二</view>
+			<view v-if="isFixed" style="height: 90rpx;line-height: 90rpx;background-color: white;margin-bottom: 18rpx;">
 			</view>
-			
+			<view id="tabbar" :class="isFixed?'tabbar-fixed':''"
+				style="border-bottom:18rpx #f8f8f8 solid ;align-items: stretch;height: 90rpx;line-height: 90rpx;background-color: white;margin-bottom: 18rpx; display: flex;flex-direction: row;justify-content: space-around;">
+				<view style="font-size: 32rpx;font-weight: bold;text-align: center;width: 128rpx;"
+					:class="current == 0?'tabbarsh':'notabbarsh'" @tap="fnBarClick(0)">动态</view>
+				<view style="font-size: 32rpx;font-weight: bold;text-align: center;width: 128rpx;"
+					:class="current == 1?'tabbarsh':'notabbarsh'" @tap="fnBarClick(1)">他的收藏</view>
+			</view>
+
 			<!-- 导航显示内容 -->
-			<view style="margin-top: 2500rpx;">
-				
+			<view v-if='current === 0'>
+				<unicloud-db ref='udb' v-slot:default="{ pagination, hasMore, loading, error, options }"
+					orderby="last_view_time desc" @error="onqueryerror" :page-size="10"
+					@onPullDownRefresh="onPullDownRefresh" @load="listLoad" :collection="colList">
+					<!-- 基于 uni-list 的页面布局 field="user_id.nickname"-->
+					<!-- #ifdef APP-NVUE -->
+					<list class="uni-list" :border="false" >
+					<!-- #endif -->
+						<!-- #ifndef APP-NVUE -->
+						<scroll-view scroll-y class="uni-list" refresher-enabled
+							:refresher-triggered="loadType=== 'refresh'"
+							@refresherrefresh="refresh" @scrolltolower="loadMore">
+						<!-- #endif -->
+							<!-- #ifdef APP-NVUE -->
+							<refresh-box :loading="loading" @refresh="refresh"></refresh-box>
+							<!-- #endif -->
+
+							<!-- 列表渲染 -->
+							<template v-for="item in listData">
+								<view class="" v-if="item.article_status === 1">
+									<not-cover v-if="item.thumbnail && item.thumbnail.length === 0"
+										:ctype="'historyList'" :data="getNewItem(item)"></not-cover>
+									<right-small-cover v-else-if="item.thumbnail && item.thumbnail.length === 1"
+										:ctype="'historyList'" :data="getNewItem(item)"></right-small-cover>
+									<three-cover v-else-if="item.thumbnail && item.thumbnail.length === 3"
+										:ctype="'historyList'" :data="getNewItem(item)"></three-cover>
+								</view>
+							</template>
+
+							<!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
+							<!-- #ifdef APP-PLUS -->
+							<uni-list-item>
+								<template v-slot:body>
+								<!-- #endif -->
+									<uni-load-state @networkResume="refresh"
+										:state="{ data: listData, pagination, hasMore, loading, error }"
+										@loadMore="loadMore">
+									</uni-load-state>
+								<!-- #ifdef APP-PLUS -->
+								</template>
+							</uni-list-item>
+							<!-- #endif -->
+						<!-- #ifndef APP-NVUE -->
+						</scroll-view>
+						<!-- #endif -->
+					<!-- #ifdef APP-NVUE -->
+					</list>
+					<!-- #endif -->
+				</unicloud-db>
+			</view>
+			<view v-if='current === 1'>
+				<unicloud-db ref='udb1' v-slot:default="{ pagination, hasMore, loading, error, options }"
+					orderby="last_view_time desc" @error="onqueryerror" :page-size="10"
+					@onPullDownRefresh="onPullDownRefresh" @load="listLoad1" :collection="colList1">
+
+					<!-- 基于 uni-list 的页面布局 field="user_id.nickname"-->
+					<!-- #ifdef APP-NVUE -->
+					<list class="uni-list" :border="false" :style="{ height: listHeight }">
+					<!-- #endif -->
+						<!-- #ifndef APP-NVUE -->
+						<scroll-view scroll-y class="uni-list" refresher-enabled @scrolltolower="loadMore1">
+						<!-- #endif -->
+							<!-- #ifdef APP-NVUE -->
+							<refresh-box :loading="loading" @refresh="refresh1"></refresh-box>
+							<!-- #endif -->
+
+							<!-- 列表渲染 -->
+
+							<template v-for="item in listData1">
+								<view class="" v-if="item.article_status === 1">
+									<not-cover v-if="item.thumbnail && item.thumbnail.length === 0"
+										:data="getNewItem(item)"></not-cover>
+									<right-small-cover v-else-if="item.thumbnail && item.thumbnail.length === 1"
+										:data="getNewItem(item)"></right-small-cover>
+									<three-cover v-else-if="item.thumbnail && item.thumbnail.length === 3"
+										:data="getNewItem(item)"></three-cover>
+								</view>
+							</template>
+
+							<!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
+							<!-- #ifdef APP-PLUS -->
+							<uni-list-item>
+								<template v-slot:body>
+								<!-- #endif -->
+									<uni-load-state @networkResume="refresh1"
+										:state="{ data: listData1, pagination, hasMore, loading, error }"
+										@loadMore="loadMore1">
+									</uni-load-state>
+								<!-- #ifdef APP-PLUS -->
+								</template>
+							</uni-list-item>
+							<!-- #endif -->
+						<!-- #ifndef APP-NVUE -->
+						</scroll-view>
+						<!-- #endif -->
+					<!-- #ifdef APP-NVUE -->
+					</list>
+					<!-- #endif -->
+				</unicloud-db>
 			</view>
 		</z-paging>
-		
-		
+
+
 	</view>
 </template>
 
 <script>
+	import statusBar from "@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar";
+	import translatePublishTime from "@/uni_modules/uni-cms-article/common/publish-time";
+	import refreshBox from "@/uni_modules/uni-cms-article/components/refresh-box/refreshBox.nvue";
+
+	import notCover from "@/uni_modules/uni-cms-article/components/list-template/not-cover.vue";
+	import rightSmallCover from "@/uni_modules/uni-cms-article/components/list-template/right-small-cover.vue";
+	import threeCover from "@/uni_modules/uni-cms-article/components/list-template/three-cover.vue";
+	import {
+		parseImageUrl
+	} from "@/uni_modules/uni-cms-article/common/parse-image-url";
+
+
+	const db = uniCloud.database();
+	const articleDBName = 'uni-cms-articles'
+	const userDBName = 'uni-id-users'
+
+	const uniIdCo = uniCloud.importObject("uni-id-co")
+	import {
+		store,
+		mutations
+	} from '@/uni_modules/uni-id-pages/common/store.js';
+
 	export default {
+		components: {
+			statusBar,
+			refreshBox,
+			notCover,
+			rightSmallCover,
+			threeCover
+		},
+		computed: {
+			userInfo() {
+				return store.userInfo
+			},
+			realNameStatus() {
+				if (!this.userInfo.realNameAuth) {
+					return 0
+				}
+
+				return this.userInfo.realNameAuth.authStatus
+			},
+			// 根据当前语言返回不同的搜索框占位符
+			inputPlaceholder(e) {
+				if (uni.getStorageSync('CURRENT_LANG') == "en") {
+					return 'Please enter the search content' // 英文
+				} else {
+					return '请输入搜索内容' // 中文
+				}
+			},
+			// 连表查询，返回两个集合的查询结果
+			colList() {
+				return [
+					db.collection(articleDBName).where(this.where).field(
+						'thumbnail,article_status,title,publish_date,user_id,excerpt').getTemp(), // 文章集合
+					db.collection(userDBName).field('_id,nickname').getTemp() // 用户集合
+				
+				];
+
+			},
+			colList1() {
+				if (this.where_flag === false) {
+					return [
+						db.collection("cms-articles-collect")
+						.where({
+							user_id: "xxxx"
+						})
+						.getTemp(),
+						db.collection(articleDBName)
+						.field('_id,thumbnail,title,publish_date,user_id, excerpt, article_status')
+						.getTemp(),
+						db.collection(userDBName)
+						.field('_id,nickname')
+						.getTemp()
+					
+					];
+				}
+				return [
+					db.collection("cms-articles-collect")
+					.where(this.where)
+					.getTemp(),
+					db.collection(articleDBName)
+					.field('_id,thumbnail,title,publish_date,user_id, excerpt, article_status')
+					.getTemp(),
+					db.collection(userDBName)
+					.field('_id,nickname')
+					.getTemp()
+
+				];
+			}
+		},
 		data() {
 			return {
-				uid:'',
-				userinfo:{
-					nickname:'zetank',
-					avatar:"https://vkceyugu.cdn.bspapp.com/VKCEYUGU-b9e817e6-7ee6-461f-8e66-4bed243cbe98/ad090f5f-2a0f-4ea8-a8b5-fc8dafa4039e.jpg",
-					gender:1,
-					city:'广州',
-					jor:'职务',
-					good:{}
+				tags_v: [],
+				tags: [
+
+				],
+				showRefresh: false, // 是否显示刷新按钮
+				listHeight: 0, // 列表高度
+				mpButtonLeftPlaceholderSize: 0, // 小程序左侧icon占位大小
+				mpButtonPlaceholderSize: 87, // 小程序导航栏按钮占位大小
+				navBarHeight: 44, // 导航栏高度
+				refreshStatus: 0, // 刷新状态 0: 未刷新 1: 刷新中 2: 刷新完成
+				listData: [], // 列表数据
+				listData1: [],
+				loadType: null,
+				historyList: [],
+
+				uid: '',
+				userinfo: {
+					nickname: 'zetank',
+					gender: 1,
+					city: '广州',
+					good: {}
 				},
-				Information:'本人性格热情开朗,待人友好,为人诚实谦虚。工作勤奋,认真负责,能吃苦耐劳,尽职 尽责,有耐心。具有亲和力,平易近人,善于与人沟通',
-				membertype:'',
-				showedit:true,//信息编辑按钮
+				
+				where_flag: false,
+				where:{
+					user_id: "xxxxxx"
+				},
+				Information: '本人性格热情开朗,待人友好,为人诚实谦虚。工作勤奋,认真负责,能吃苦耐劳,尽职 尽责,有耐心。具有亲和力,平易近人,善于与人沟通',
+				membertype: '',
+				showedit: true, //信息编辑按钮
 				// 是否固定导航
 				isFixed: false,
 				// 距离顶部达到导航距离
@@ -94,44 +307,238 @@
 				timeOutUserInfo: 0,
 				// 激活顶部导航关联页状态
 				status: {
-				  publish: true,
-				  praise: false,
+					publish: true,
+					praise: false,
 				},
 			}
 		},
-		onLoad(option) {
-			this.uid = option.uid
+		async onLoad(option) {
+			
+
 			// 等待0.3秒页面渲染,$nextTick使用不能准确
 			setTimeout(() => {
-			  uni.hideLoading()
-			  // 获取导航条距顶部高度
-			  this.setTabbarTop();
+				this.getInfo(option);
+				uni.hideLoading()
+				// 获取导航条距顶部高度
+				this.setTabbarTop();
 			}, 300);
-			let uid = uni.getStorageSync('uid')
-			if(uid === option.uid){
-				this.showedit=true
-			}
-			
-			
+
+
+		},
+		created() {
+
+		},
+		async onReady() {
+
+
 		},
 		methods: {
+			async getInfo(option) {
+				this.uid = option.uid;
+				if (this.uid) { // ID 不为空，则发起查询
+					console.log(this.uid);
+					this.where= {
+						user_id: this.uid
+					}
+					console.log(this.where)
+					this.where_flag = true;
+					
+					console.log(this.where)
+					
+					await uniCloud.importObject("user-info").get_user_info({
+							uid: this.uid
+						})
+						.then(res => {
+							console.log(res);
+							this.userinfo = res.data;
+							this.gender = res.data.gender;
+							this.userinfo.city = res.data.last_login_ip;
+							this.userinfo.nickname = res.data.nickname;
+							this.Information = res.data.personal_profile;
+							this.$refs.udb.loadData()
+						})
+					
+					
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: 'id 不能为空'
+					})
+				}
+			},
+			bt(t) {
+				console.log(t);
+			},
+			getNewItem(item) {
+				if (!item.excerpt) {
+					item.excerpt = "";
+				} else if (item.excerpt.length > 50) {
+					item.excerpt = item.excerpt.slice(0, 50) + " ... ...";
+				}
+				return item;
+			},
+			async listLoad(data) {
+				if (data.length !== 0) {
+					const listData = data.map(item => {
+						if (typeof item.thumbnail === 'string') {
+							item.thumbnail = [item.thumbnail]
+						}
+						return item
+					})
+					
+					// 处理腾讯云文件链接
+					for (const article of listData) {
+						const parseImages = await parseImageUrl(article.thumbnail)
+					
+						article.thumbnail = parseImages ? parseImages.map(image => image.src) : []
+					}
+					this.listData = this.loadType === 'loadMore' ? this.listData.concat(listData) : listData
+					this.loadType = null
+					console.log(111);
+				} else {
+					this.listData = this.loadType === 'loadMore' ? this.listData.concat([]) :[];
+					this.loadType = null
+					console.log(111);
+				}
+
+			},
+			async listLoad1(data) {
+				console.log(data)
+				if(data.lenght !== 0) {
+					const listData1 = data.map(item => {
+						if (typeof item.article_id.thumbnail === 'string') {
+							item.article_id[0].thumbnail = [item.article_id[0].thumbnail]
+						}
+						item.article_id[0].user_id = item.user_id[0]; 
+						console.log(item);
+						item.article_id[0].last_view_time = new Date(item.last_view_time).getTime();
+						return item.article_id[0];
+					})
+					
+					console.log(listData1);
+					
+					// 处理腾讯云文件链接
+					for (const article of listData1) {
+						const parseImages = await parseImageUrl(article.thumbnail)
+					
+						article.thumbnail = parseImages ? parseImages.map(image => image.src) : []
+					}
+					
+					this.listData1 = this.loadType === 'loadMore' ? this.listData1.concat(listData1) : listData1
+					this.loadType = null
+					console.log(111);
+				} else {
+					this.listData1 = this.loadType === 'loadMore' ? this.listData1.concat([]) : []
+					this.loadType = null;
+					console.log(111);
+				}
+					
+			},
+			// 初始化导航栏大小
+			initNavBarSize() {
+				// 获取小程序导航栏按钮信息
+				// #ifdef MP-TOUTIAO
+				let menuButtonInfo = tt.getCustomButtonBoundingClientRect()
+				menuButtonInfo.width = menuButtonInfo.capsule.width //  小程序按钮区域中使用的按钮宽度
+				this.mpButtonLeftPlaceholderSize = menuButtonInfo.leftIcon.width + 10
+				// #endif
+				// #ifndef MP-TOUTIAO
+				let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+				// #endif
+				// 计算小程序导航栏按钮占位大小
+				this.mpButtonPlaceholderSize = menuButtonInfo.width + 10
+				// 获取系统信息，判断是否为 iOS 系统，设置导航栏高度
+				this.navBarHeight = uni.getSystemInfoSync().system.toLowerCase().includes('ios') ? 44 : 48
+			},
+			// 格式化时间戳
+			publishTime(timestamp) {
+				return translatePublishTime(timestamp)
+			},
+			// 点击搜索框
+			searchClick(e) {
+				uni.hideKeyboard();
+				uni.navigateTo({
+					url: '/uni_modules/uni-cms-article/pages/search/search'
+				});
+			},
+			// 重试
+			retry() {
+				this.refresh()
+			},
+			// 刷新
+			refresh() {
+				this.loadType = 'refresh'
+				this.$refs.udb.loadData({
+					clear: true
+				}, () => {
+					uni.stopPullDownRefresh()
+					// #ifdef APP-NVUE
+					this.showRefresh = false
+					// #endif
+				})
+			},
+			refresh1() {
+				this.loadType = 'refresh'
+				this.$refs.udb1.loadData({
+					clear: true
+				}, () => {
+					uni.stopPullDownRefresh()
+					// #ifdef APP-NVUE
+					this.showRefresh = false
+					// #endif
+				})
+			},
+			// 加载更多
+			loadMore() {
+				this.loadType = 'loadMore'
+				this.$refs.udb.loadMore()
+			},
+			loadMore1() {
+				this.loadType = 'loadMore'
+				this.$refs.udb1.loadMore()
+			},
+			// 查询出错
+			onqueryerror(e) {
+				console.error(e);
+			},
+
+			// #ifdef H5
+			// 下拉刷新
+			onPullDownRefresh() {
+				this.refresh()
+			},
+			// #endif
+			change(currentPage, type) {
+				this.page.currentPage = currentPage;
+				console.log("点击了" + type + "，当前页：" + currentPage);
+				this.data_clear();
+			},
+			async getHistoryList() {
+				return uniCloud.importObject("cms-articles-log").getHistoryList({
+					user_id: this.userinfo._id
+				}).data.data;
+			},
+			async getHistory() {
+				console.log(this.userinfo._id);
+				return uniCloud.importObject("cms-articles-log").getHistory(this.userinfo._id);
+			},
 			// 滚动事件 (需在up配置onScroll:true才生效)
 			scroll(e) {
-			  this.topNum = e.detail.scrollTop
-			  if (e.detail.scrollTop >= this.tabbarTop) {
-			    this.isFixed = true // 显示悬浮菜单
-			  } else {
-			    this.isFixed = false // 隐藏悬浮菜单 
-			  }
+				this.topNum = e.detail.scrollTop
+				if (e.detail.scrollTop >= this.tabbarTop) {
+					this.isFixed = true // 显示悬浮菜单
+				} else {
+					this.isFixed = false // 隐藏悬浮菜单 
+				}
 			},
 			// 修改用户背景封面图
 			fnMainBgPic() {
-				
+
 			},
 			//编辑信息
-			UserEdit(){
+			UserEdit() {
 				uni.navigateTo({
-					url:""
+					url:"/pages2/setting/setting"
 				})
 			},
 			/// 顶部导航选项点击
@@ -139,39 +546,39 @@
 				// console.log(current);
 				// 是否当前项点击
 				if (this.current == current) {
-				  this.timeOutUserInfo += 1;
-				  // 是否为刷新值和连续点击2次
-				  // console.log('timeOutUserInfo',this.timeOutUserInfo);
-				  if (!this.clickRefresh && this.timeOutUserInfo >= 2) {
-				    // 刷新值开
-					// console.log('点击了两下');
-				    this.clickRefresh = true;
-				    // 获取新数据
-				    
-				    // 定时器重置
-				    this.timeOutUserInfo = setTimeout(() => {
-				      // 清除定时器
-					  // console.log('5秒后清除定时器');
-				      clearTimeout(this.timeOutUserInfo)
-				      // 连续触发记录重置
-				      this.timeOutUserInfo = 0;
-				      // 5秒后刷新值关
-				      this.clickRefresh = false;
-				    }, 5000);
-				  }
+					this.timeOutUserInfo += 1;
+					// 是否为刷新值和连续点击2次
+					// console.log('timeOutUserInfo',this.timeOutUserInfo);
+					if (!this.clickRefresh && this.timeOutUserInfo >= 2) {
+						// 刷新值开
+						// console.log('点击了两下');
+						this.clickRefresh = true;
+						// 获取新数据
+
+						// 定时器重置
+						this.timeOutUserInfo = setTimeout(() => {
+							// 清除定时器
+							// console.log('5秒后清除定时器');
+							clearTimeout(this.timeOutUserInfo)
+							// 连续触发记录重置
+							this.timeOutUserInfo = 0;
+							// 5秒后刷新值关
+							this.clickRefresh = false;
+						}, 5000);
+					}
 				} else {
-				  // 改变顶部导航选中
-				  this.current = current;
-				  // 首次选中激活顶部导航关联页状态
-				  if (!this.status.praise && this.current == 1) this.status.praise = true;
-				  // 获取新数据
-				  
-				  // 清除定时器
-				  clearTimeout(this.timeOutUserInfo)
-				  // 连续触发记录重置
-				  this.timeOutUserInfo = 0;
-				  // 刷新值关
-				  this.clickRefresh = false;
+					// 改变顶部导航选中
+					this.current = current;
+					// 首次选中激活顶部导航关联页状态
+					if (!this.status.praise && this.current == 1) this.status.praise = true;
+					// 获取新数据
+
+					// 清除定时器
+					clearTimeout(this.timeOutUserInfo)
+					// 连续触发记录重置
+					this.timeOutUserInfo = 0;
+					// 刷新值关
+					this.clickRefresh = false;
 				}
 				// 滚动上滑 
 				this.$refs.paging.scrollToY(this.tabbarTop);
@@ -179,13 +586,13 @@
 			},
 			// 设置nav到顶部的距离 (滚动条为0, 菜单顶部的数据加载完毕获取到的数值是最精确的)
 			setTabbarTop() {
-			  let view = uni.createSelectorQuery().in(this).select('#tabbar');
-			  view.boundingClientRect(data => {
-			    // 到屏幕顶部的距离
-			    this.tabbarTop = data.top
-			  }).exec();
+				let view = uni.createSelectorQuery().in(this).select('#tabbar');
+				view.boundingClientRect(data => {
+					// 到屏幕顶部的距离
+					this.tabbarTop = data.top
+				}).exec();
 			},
-			queryData(){
+			queryData() {
 				// this.$refs.paging.reload();
 				this.$refs.paging.complete([])
 			}
@@ -193,38 +600,120 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	.info-cover {
-		  display: block;
-		  width: 100%;
-		  height: 260rpx;
-		}
+		display: block;
+		width: 100%;
+		height: 260rpx;
+	}
+
 	.info-avatar {
-	  position: absolute;
-	  left: 0;
-	  top: -56rpx;
-	  margin-left: 50rpx;
+		position: absolute;
+		left: 0;
+		top: -56rpx;
+		margin-left: 50rpx;
 	}
+
 	.tabbarsh {
-	  color: #4baed5;
-	  border-bottom: 4rpx #4baed5 solid;
+		color: #4baed5;
+		border-bottom: 4rpx #4baed5 solid;
 	}
+
 	.notabbarsh {
-	  color: #555555;
+		color: #555555;
 	}
+
 	.tabbar-fixed {
-	  position: fixed;
-	  left: 0;
-	  right: 0;
-	  /* #ifdef H5 */
-	  top: 0rpx;
-	  /* #endif */
-	  /* #ifndef H5 */
-	  top: 0;
-	  /* #endif */
-	  z-index: 300;
-	  background: #FFFFFF;
-	  margin-bottom: 0;
-	  border-bottom: 2rpx #EEEEEE solid;
+		position: fixed;
+		left: 0;
+		right: 0;
+		/* #ifdef H5 */
+		top: 0rpx;
+		/* #endif */
+		/* #ifndef H5 */
+		top: 0;
+		/* #endif */
+		z-index: 300;
+		background: #FFFFFF;
+		margin-bottom: 0;
+		border-bottom: 2rpx #EEEEEE solid;
 	}
-</style>
+
+
+	/* #ifndef APP-NVUE */
+	.pages view {
+		display: flex;
+		box-sizing: border-box;
+		flex-direction: column;
+	}
+
+	/* #endif */
+
+	.pages {
+		background-color: #FFFFFF;
+	}
+
+	.refresh {
+		text-align: center;
+	}
+
+	.nav-box {
+		background-color: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+
+		/* #ifndef APP-PLUS */
+		z-index: 9;
+		/* #endif */
+	}
+
+	.pages .nav {
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+	}
+
+	.uni-search-box {
+		flex: 1;
+		padding: 0 10px;
+	}
+
+	.uni-search-box ::v-deep .uni-searchbar {
+		padding: 0;
+	}
+
+	.uni-search-box ::v-deep .uni-searchbar__box {
+		height: 32px;
+		flex-direction: row;
+	}
+
+	.cover-search-bar {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		top: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.pages .uni-list ::v-deep .uni-list-item__container {
+		flex-direction: row;
+		width: 100%;
+	}
+
+	.pages .uni-list ::v-deep .uni-list-item {
+		align-items: flex-start;
+	}
+
+	.pages .uni-list ::v-deep .uni-load-more {
+		display: flex;
+	}
+
+	.pages .uni-list ::v-deep .uni-list--border:after {
+		background-color: #f5f5f5;
+	}
+</style>
\ No newline at end of file