diff --git a/.gitignore b/.gitignore
index a98e9c4..e13eabe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,10 @@ unpackage/
 .hbuilderx/
 *.key
 package-lock.json
+HBuilderX/
+HBuilderX*.zip
+MuMuInstaller.exe
+android/
+.trae/
+hx_page.html
+git/gitea.txt
diff --git a/App.vue b/App.vue
index 3cb217d..10b2a2a 100644
--- a/App.vue
+++ b/App.vue
@@ -1,20 +1,23 @@
 <script>
-	// import uniIdPageInit from '@/pages3/uni_modules/uni-id-pages/init.js';
+	import { onLaunch, onShow, onHide } from 'uni-app'
 	import uniIdPageInit from '@/pages3/uni_modules/uni-id-pages/init.js'
-	export default {
-	onLaunch: async function() {
-	console.log('App Launch')
-	await uniIdPageInit()
-},
-	onShow: function() {
-	console.log('App Show')
-},
-	onHide: function() {
-	console.log('App Hide')
-}
-}
-</script>
 
+	export default {
+		setup() {
+			onLaunch(async () => {
+				console.log('App Launch')
+				await uniIdPageInit()
+			})
+			onShow(() => {
+				console.log('App Show')
+			})
+			onHide(() => {
+				console.log('App Hide')
+			})
+			return {}
+		}
+	}
+</script>
 
 <style lang="scss">
 	@import "@/uni.scss";
diff --git a/main.js b/main.js
index f060fe9..c51ac4f 100644
--- a/main.js
+++ b/main.js
@@ -1,12 +1,11 @@
 import App from './App'
 
-import uView from '@/uni_modules/uview-ui'
-Vue.use(uView)
-
 // ================== Vue2 逻辑 ================== //
 // #ifndef VUE3
 import Vue from 'vue'
 import './uni.promisify.adaptor'
+import uView from '@/uni_modules/uview-ui'
+Vue.use(uView)
 
 // 初始化 Vue2 配置
 Vue.config.productionTip = false
@@ -20,9 +19,11 @@ app.$mount()
 // ================== Vue3 逻辑 ================== //
 // #ifdef VUE3
 import { createSSRApp } from 'vue'
+import uView from '@/uni_modules/uview-ui'
 
 export function createApp() {
   const app = createSSRApp(App)
+  app.use(uView)
   return { app }
 }
 // #endif
diff --git a/manifest.json b/manifest.json
index a9ac5d9..1213886 100644
--- a/manifest.json
+++ b/manifest.json
@@ -73,7 +73,7 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2",
+    "vueVersion" : "3",
     "h5" : {
         "unipush" : {
             "enable" : true
diff --git a/package.json b/package.json
index 03a5224..37e58d8 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,10 @@
         }
     },
     "dependencies": {
+        "@dcloudio/uni-app": "^2.0.2-5010520260709001",
         "yarn": "^1.22.22"
+    },
+    "devDependencies": {
+        "@dcloudio/vue-cli-plugin-uni": "^2.0.2-5010520260709001"
     }
 }
diff --git a/pages/articleContentDetail/articleContentDetail.vue b/pages/articleContentDetail/articleContentDetail.vue
index 330ebce..4a381d5 100644
--- a/pages/articleContentDetail/articleContentDetail.vue
+++ b/pages/articleContentDetail/articleContentDetail.vue
@@ -30,7 +30,7 @@
 			</view>
 
 			<view class="tab">
-				住在大城市里，“军民鱼水情”只是句日常的用语，并没有真正切实的体会。
+				住在大城市里，"军民鱼水情"只是句日常的用语，并没有真正切实的体会。
 			</view>
 			<image
 				src="https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/static/wz1.png?expire_at=1741142112&er_sign=639352a13dd5bb04b7fa46bb8e3f5f93"
@@ -39,18 +39,18 @@
 				1952年的冬天，我团接到上级命令，前往朝鲜战场。这兴奋劲像个麻雀，跳跃不停。经过战前培训，我们坐着向北驰去的列车。一路上歌声不断，当列车到达山东济南时，站台上摆着热气腾腾的饭菜，我们狼吞虎咽地吃着可口的饭菜，这比在列车上吃饼干要好百倍了。经过一天多的劳累，在大年除夕的那天，我们到达了安东。快速转移到一个街坊后，多数人都安排好了住所，可我们班还剩六名战士没法安排，连长还在为难。
 			</view>
 			<view class="tab">
-				这时，一一间小屋走出了一对年轻夫妇，他们说:“志愿军同志，不要在外面过夜，零下三十度是冻不起的。我俩今晚到她娘家去，腾出这间屋，给志愿军战士住。”这是一对当天结婚的新婚夫妇，是第一夜，人生能有几个第一夜呢?一辈子，不就这一个吗?
+				这时，一一间小屋走出了一对年轻夫妇，他们说:"志愿军同志，不要在外面过夜，零下三十度是冻不起的。我俩今晚到她娘家去，腾出这间屋，给志愿军战士住。"这是一对当天结婚的新婚夫妇，是第一夜，人生能有几个第一夜呢?一辈子，不就这一个吗?
 
 			</view>
 			<image
 				src="https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/static/wz2.jpg?expire_at=1741142127&er_sign=05178b7851f3216a45b7badf85b1c7d3"
 				mode=""></image>
 			<view class="tab">
-				我们住进小屋，六个人挤在一张床上睡觉，可怎么都睡不着。平时说的“军民鱼水情”，今天真的出现了吗?老乡说:“志愿军出国作战，到了安东，哪能汽车16团汽车修理工叫他们在野外露营?我俩到我娘那里住一张建群宿就行。”这几句朴实无华的话，真是“鱼水情”的真实体验。
+				我们住进小屋，六个人挤在一张床上睡觉，可怎么都睡不着。平时说的"军民鱼水情"，今天真的出现了吗?老乡说:"志愿军出国作战，到了安东，哪能汽车16团汽车修理工叫他们在野外露营?我俩到我娘那里住一张建群宿就行。"这几句朴实无华的话，真是"鱼水情"的真实体验。
 
 			</view>
 			<view class="tab">
-				通过这一事件，我真心体会到，人民军队爱人民，人民爱护子弟兵的“鱼水情”。
+				通过这一事件，我真心体会到，人民军队爱人民，人民爱护子弟兵的"鱼水情"。
 			</view>
 		</view>
 		<view class="" style="font-size: 20rpx;color: #999;margin-left: 50rpx;margin-top: 20rpx;">
@@ -169,35 +169,23 @@
 </template>
 
 <script>
+	import { ref, onShow } from 'vue'
+
 	export default {
+		setup() {
+			const hbComment = ref(null)
+			const avatar = ref("")
+			const templateSrc = ref("https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/bg.jpg?expire_at=1741101988&er_sign=c9732cddaaead925cf110d9a11751231")
+			const commentData = ref(null)
+			const reqFlag = ref(false)
 
-		data() {
-			return {
-				avatar: "",
-				templateSrc: "https://env-00jxt5y29hrd.normal.cloudstatic.cn/static/bg.jpg?expire_at=1741101988&er_sign=c9732cddaaead925cf110d9a11751231",
-				"commentData": null,
-				"reqFlag": false,
+			onShow(() => {
+				getComment()
+			})
 
-			}
-
-		},
-		onLoad() {
-
-		},
-		onShow() {
-
-			this.getComment();
-
-		},
-
-		methods: {
-
-
-			// 登录校验
-			checkLogin() {
-				// TODO 此处填写登录校验逻辑
+			function checkLogin() {
 				if (true) {
-					return true;
+					return true
 				} else {
 					uni.showModal({
 						title: '提示',
@@ -207,109 +195,111 @@
 							if (res.confirm) {
 								uni.redirectTo({
 									url: '/pages/login/login'
-								});
+								})
 							}
 						}
-					});
-					return false;
+					})
+					return false
 				}
-			},
-			// 输入框聚焦
-			focusOn() {
-				this.checkLogin();
-			},
-			// 获取评论
-			getComment() {
+			}
 
-				// 下边假装请求成功
+			function focusOn() {
+				checkLogin()
+			}
+
+			function getComment() {
 				let res = {
 					"readNumer": 193,
 					"commentList": []
-				};
-				this.commentData = {
+				}
+				commentData.value = {
 					"readNumer": res.readNumer,
 					"commentSize": res.commentList.length,
-					"comment": this.getTree(res.commentList)
-				};
-			},
-			// 新增评论
-			add(req) {
-				if (!this.checkLogin()) {
-					return
+					"comment": getTree(res.commentList)
 				}
-				if (this.reqFlag) {
-					uni.showToast({
-						title: '操作频繁',
-						duration: 1000
-					});
-					return
-				}
-				console.log(111);
-				this.reqFlag = true;
-				// 下边假装请求成功
-				this.reqFlag = false;
-				this.$refs.hbComment.addComplete();
-				this.getComment();
-			},
-			// 点赞评论
-			like(commentId) {
-				if (!this.checkLogin()) {
-					return
-				}
-				if (this.reqFlag) {
-					uni.showToast({
-						title: '操作频繁',
-						duration: 1000
-					});
-					return
-				}
-				this.reqFlag = true;
-				// 下边假装请求成功
-				this.reqFlag = false;
-				this.$refs.hbComment.likeComplete(commentId);
-			},
-			// 删除评论
-			del(commentId) {
-				if (!this.checkLogin()) {
-					return
-				}
-				if (this.reqFlag) {
-					uni.showToast({
-						title: '操作频繁',
-						duration: 1000
-					});
-					return
-				}
-				this.reqFlag = true;
-				// TODO 接入真实接口
-				// this.$u.api.commentDelete(commentId).then(res => {
-				// 	this.reqFlag = false;
-				// 	this.$refs.hbComment.deleteComplete(commentId);
-				// }).catch(res => {
-				// 	this.reqFlag = false;
-				// })
-				// 下边假装请求成功
-				this.reqFlag = false;
-				this.$refs.hbComment.deleteComplete(commentId);
-			},
-			// 列表按照父子转换成树
-			getTree(data) {
-				let result = [];
-				let map = {};
-				data.forEach(item => {
-					map[item.id] = item;
-				});
-				data.forEach(item => {
-					let parent = map[item.parentId];
-					if (parent) {
-						(parent.children || (parent.children = [])).push(item);
-					} else {
-						result.push(item);
-					}
-				});
-				return result;
 			}
 
+			function add(req) {
+				if (!checkLogin()) return
+				if (reqFlag.value) {
+					uni.showToast({
+						title: '操作频繁',
+						duration: 1000
+					})
+					return
+				}
+				reqFlag.value = true
+				reqFlag.value = false
+				hbComment.value.addComplete()
+				getComment()
+			}
+
+			function like(commentId) {
+				if (!checkLogin()) return
+				if (reqFlag.value) {
+					uni.showToast({
+						title: '操作频繁',
+						duration: 1000
+					})
+					return
+				}
+				reqFlag.value = true
+				reqFlag.value = false
+				hbComment.value.likeComplete(commentId)
+			}
+
+			function del(commentId) {
+				if (!checkLogin()) return
+				if (reqFlag.value) {
+					uni.showToast({
+						title: '操作频繁',
+						duration: 1000
+					})
+					return
+				}
+				reqFlag.value = true
+				reqFlag.value = false
+				hbComment.value.deleteComplete(commentId)
+			}
+
+			function getTree(data) {
+				let result = []
+				let map = {}
+				data.forEach(item => {
+					map[item.id] = item
+				})
+				data.forEach(item => {
+					let parent = map[item.parentId]
+					if (parent) {
+						(parent.children || (parent.children = [])).push(item)
+					} else {
+						result.push(item)
+					}
+				})
+				return result
+			}
+
+			function toIndex() {
+				uni.switchTab({
+					url: '/uni_modules/uni-cms-article/pages/list/list'
+				})
+			}
+
+			return {
+				hbComment,
+				avatar,
+				templateSrc,
+				commentData,
+				reqFlag,
+				checkLogin,
+				focusOn,
+				getComment,
+				add,
+				like,
+				del,
+				getTree,
+				toIndex
+			}
 		}
 	}
 </script>
@@ -397,7 +387,6 @@
 					margin-left: 10rpx;
 
 					&::before {
-						// border-left: 2px solid #f44336;
 						content: "";
 						position: absolute;
 						left: 0;
@@ -411,4 +400,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 89b7fd8..467b147 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,23 +5,18 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		onLoad() {
-			setTimeout(function() {
-				uni.switchTab({
-					url:"/uni_modules/uni-cms-article/pages/list/list"
-				})
-			}, 1000);
-		},
-		methods: {
+	import { onLoad } from 'uni-app'
 
-		
-			
+	export default {
+		setup() {
+			onLoad(() => {
+				setTimeout(() => {
+					uni.switchTab({
+						url: "/uni_modules/uni-cms-article/pages/list/list"
+					})
+				}, 1000)
+			})
+			return {}
 		}
 	}
 </script>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c25fc74..5a21b86 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,62 +9,54 @@
 </template>
 
 <script>
+	import { ref, onMounted } from 'vue'
+
 	export default {
-		data() {
-			return {
-				loginType: "weixin",
-				loginTypeOption: [{
-					"value": "weixin",
-					"text": "微信"
-				}, {
-					"value": "univerify",
-					"text": "一键登录"
-				}, {
-					"value": "username",
-					"text": "账号密码"
-				}, {
-					"value": "smsCode",
-					"text": "手机验证码"
-				}, {
-					"value": "apple",
-					"text": "苹果登录"
-				}, {
-					"value": "weixinMobile",
-					"text": "微信手机号登录"
-				}, {
-					"value": "huawei",
-					"text": "华为登录"
-				}, {
-					"value": "huaweiMobile",
-					"text": "华为账号一键登录"
-				}]
-			}
-		},
-		onLoad() {
-			this.toLogin();
-		},
-		methods: {
-			toLogin() {
-				if (this.loginType == 'username') {
+		setup() {
+			const loginType = ref("weixin")
+			const loginTypeOption = ref([
+				{ value: "weixin", text: "微信" },
+				{ value: "univerify", text: "一键登录" },
+				{ value: "username", text: "账号密码" },
+				{ value: "smsCode", text: "手机验证码" },
+				{ value: "apple", text: "苹果登录" },
+				{ value: "weixinMobile", text: "微信手机号登录" },
+				{ value: "huawei", text: "华为登录" },
+				{ value: "huaweiMobile", text: "华为账号一键登录" }
+			])
+
+			onMounted(() => {
+				toLogin()
+			})
+
+			function toLogin() {
+				if (loginType.value === 'username') {
 					uni.navigateTo({
 						url: "/pages3/uni_modules/uni-id-pages/pages/login/login-withpwd"
 					})
 				} else {
 					uni.navigateTo({
-						url: "/pages3/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=" + this.loginType,
-						animationType:"none",
-						animationDuration:0
+						url: "/pages3/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=" + loginType.value,
+						animationType: "none",
+						animationDuration: 0
 					})
 				}
-			},
-			toUserInfoPage() {
+			}
+
+			function toUserInfoPage() {
 				uni.navigateTo({
 					url: "/pages3/uni_modules/uni-id-pages/pages/userinfo/userinfo?showLoginManage=true"
 				})
 			}
+
+			return {
+				loginType,
+				loginTypeOption,
+				toLogin,
+				toUserInfoPage
+			}
 		}
 	}
-	
 </script>
 
 <style lang="scss">
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 785fc9d..ca5b3ce 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -94,6 +94,7 @@
 </template>
 
 <script>
+	import { ref, computed } from 'vue'
 	import cloudImage from "@/components/cloud-image.vue"
 	import {
 		store,
@@ -104,186 +105,107 @@
 		components: {
 			cloudImage
 		},
-		computed: {
-			userInfo() {
-				return store.userInfo || {}
-			},
-			isLogin() {
-				return !!uni.getStorageSync('uni_id_token')
-			},
-			realNameStatus() {
-				if (!this.userInfo.realNameAuth) {
+		setup() {
+			const inputDialog = ref(null)
+
+			const userInfo = computed(() => store.userInfo || {})
+
+			const isLogin = computed(() => !!uni.getStorageSync('uni_id_token'))
+
+			const realNameStatus = computed(() => {
+				if (!userInfo.value.realNameAuth) {
 					return 0
 				}
+				return userInfo.value.realNameAuth.authStatus
+			})
 
-				return this.userInfo.realNameAuth.authStatus
-			},
-			profileDesc() {
-				if (!this.isLogin) {
+			const profileDesc = computed(() => {
+				if (!isLogin.value) {
 					return '登录后可同步查看收藏、历史与个人主页'
 				}
+				return userInfo.value.signature || '点击查看个人资料与账号设置'
+			})
 
-				return this.userInfo.signature || '点击查看个人资料与账号设置'
-			},
-			stats() {
-				return [{
-					label: '收藏',
-					value: this.getCount('my_collection_count'),
-					menu: this.findMenuItem('my_collect')
-				}, {
-					label: '喜欢',
-					value: this.getCount('like_count'),
-					menu: this.findMenuItem('my_like')
-				}, {
-					label: '历史',
-					value: this.getCount('read_history_count'),
-					menu: this.findMenuItem('history')
-				}, {
-					label: '关注',
-					value: this.getCount('following_count'),
-					menu: this.findMenuItem('my_follow')
-				}]
-			},
-			quickMenus() {
+			const stats = computed(() => {
 				return [
-					this.findMenuItem('my_collect'),
-					this.findMenuItem('history'),
-					this.findMenuItem('my_reply'),
-					this.findMenuItem('customer_service')
-				].filter(Boolean)
-			},
-			menuGroups() {
-				return [
-					['my_account', 'my_follow', 'edit_cms', 'cms_list'].map(this.findMenuItem).filter(Boolean),
-					['withdraw', 'recharge', 'sharing_app', 'customer_service'].map(this.findMenuItem).filter(Boolean)
+					{ label: '收藏', value: getCount('my_collection_count'), menu: findMenuItem('my_collect') },
+					{ label: '喜欢', value: getCount('like_count'), menu: findMenuItem('my_like') },
+					{ label: '历史', value: getCount('read_history_count'), menu: findMenuItem('history') },
+					{ label: '关注', value: getCount('following_count'), menu: findMenuItem('my_follow') }
 				]
+			})
+
+			const quickMenus = computed(() => {
+				return [
+					findMenuItem('my_collect'),
+					findMenuItem('history'),
+					findMenuItem('my_reply'),
+					findMenuItem('customer_service')
+				].filter(Boolean)
+			})
+
+			const menuGroups = computed(() => {
+				return [
+					['my_account', 'my_follow', 'edit_cms', 'cms_list'].map(findMenuItem).filter(Boolean),
+					['withdraw', 'recharge', 'sharing_app', 'customer_service'].map(findMenuItem).filter(Boolean)
+				]
+			})
+
+			const menuMap = {
+				my_account: { name: '我的主页', icon: '/static/center/self.png', desc: '查看个人主页与公开动态', type: 'my_account' },
+				my_follow: { name: '我的关注', icon: '/static/center/icon-follow.png', desc: '关注的人与内容动态', type: 'my_follow' },
+				edit_cms: { name: '新增文章', icon: '/static/center/release.png', desc: '快速发布新的文章内容', type: 'edit_cms' },
+				cms_list: { name: '文章管理', icon: '/static/center/book.png', desc: '编辑或管理已发布文章', type: 'cms_list' },
+				withdraw: { name: '提现中心', icon: '/static/center/withdraw.png', desc: '查看余额并申请提现', type: 'withdraw' },
+				reply: { name: '回复我的', icon: '/static/center/reply.png', desc: '查看收到的回复消息', type: 'my_reply' },
+				my_reply: { name: '回复我的', icon: '/static/center/reply.png', desc: '查看收到的回复消息', type: 'my_reply' },
+				my_like: { name: '我的喜欢', icon: '/static/center/like.png', desc: '收藏喜欢的内容足迹', type: 'my_like' },
+				history: { name: '浏览历史', icon: '/static/center/history.png', desc: '继续查看最近浏览记录', type: 'history' },
+				my_collect: { name: '我的收藏', icon: '/static/center/collect.png', desc: '集中管理收藏内容', type: 'my_collect' },
+				recharge: { name: '充值记录', icon: '/static/center/recharge.png', desc: '查看账户充值明细', type: 'recharge' },
+				customer_service: { name: '联系客服', icon: '/static/center/kefu.png', desc: '获取帮助与问题反馈', type: 'customer_service' },
+				sharing_app: { name: '分享应用', icon: '/static/center/share.png', desc: '把应用推荐给更多好友', type: 'sharing_app' },
+				logout: { name: '退出登录', icon: '/static/center/out.png', desc: '安全退出当前登录状态', type: 'logout' }
 			}
-		},
-		data() {
-			return {
-				menuMap: {
-					my_account: {
-						name: '我的主页',
-						icon: '/static/center/self.png',
-						desc: '查看个人主页与公开动态',
-						type: 'my_account'
-					},
-					my_follow: {
-						name: '我的关注',
-						icon: '/static/center/icon-follow.png',
-						desc: '关注的人与内容动态',
-						type: 'my_follow'
-					},
-					edit_cms: {
-						name: '新增文章',
-						icon: '/static/center/release.png',
-						desc: '快速发布新的文章内容',
-						type: 'edit_cms'
-					},
-					cms_list: {
-						name: '文章管理',
-						icon: '/static/center/book.png',
-						desc: '编辑或管理已发布文章',
-						type: 'cms_list'
-					},
-					withdraw: {
-						name: '提现中心',
-						icon: '/static/center/withdraw.png',
-						desc: '查看余额并申请提现',
-						type: 'withdraw'
-					},
-					reply: {
-						name: '回复我的',
-						icon: '/static/center/reply.png',
-						desc: '查看收到的回复消息',
-						type: 'my_reply'
-					},
-					my_reply: {
-						name: '回复我的',
-						icon: '/static/center/reply.png',
-						desc: '查看收到的回复消息',
-						type: 'my_reply'
-					},
-					my_like: {
-						name: '我的喜欢',
-						icon: '/static/center/like.png',
-						desc: '收藏喜欢的内容足迹',
-						type: 'my_like'
-					},
-					history: {
-						name: '浏览历史',
-						icon: '/static/center/history.png',
-						desc: '继续查看最近浏览记录',
-						type: 'history'
-					},
-					my_collect: {
-						name: '我的收藏',
-						icon: '/static/center/collect.png',
-						desc: '集中管理收藏内容',
-						type: 'my_collect'
-					},
-					recharge: {
-						name: '充值记录',
-						icon: '/static/center/recharge.png',
-						desc: '查看账户充值明细',
-						type: 'recharge'
-					},
-					customer_service: {
-						name: '联系客服',
-						icon: '/static/center/kefu.png',
-						desc: '获取帮助与问题反馈',
-						type: 'customer_service'
-					},
-					sharing_app: {
-						name: '分享应用',
-						icon: '/static/center/share.png',
-						desc: '把应用推荐给更多好友',
-						type: 'sharing_app'
-					},
-					logout: {
-						name: '退出登录',
-						icon: '/static/center/out.png',
-						desc: '安全退出当前登录状态',
-						type: 'logout'
-					}
-				}
-			}
-		},
-		methods: {
-			getCount(field) {
-				const value = Number(this.userInfo[field] || 0)
+
+			function getCount(field) {
+				const value = Number(userInfo.value[field] || 0)
 				return value > 99 ? '99+' : String(value)
-			},
-			findMenuItem(type) {
-				return this.menuMap[type]
-			},
-			dialogConfirm() {
+			}
+
+			function findMenuItem(type) {
+				return menuMap[type]
+			}
+
+			function dialogConfirm() {
 				console.log('点击确认')
-			},
-			inputDialogToggle() {
-				this.$refs.inputDialog.open()
-			},
-			dialogClose() {
+			}
+
+			function inputDialogToggle() {
+				inputDialog.value?.open()
+			}
+
+			function dialogClose() {
 				console.log('点击关闭')
-			},
-			requireLogin(next) {
+			}
+
+			function requireLogin(next) {
 				const token = uni.getStorageSync('uni_id_token')
 				if (!token) {
-					this.toLogin()
+					toLogin()
 					return false
 				}
-
 				next && next()
 				return true
-			},
-			menuClick(item) {
-				if (!item || !item.type) {
-					return
-				}
+			}
+
+			function menuClick(item) {
+				if (!item || !item.type) return
 
 				const routeMap = {
 					my_follow: '/pages2/follow/follow',
 					withdraw: '/pages2/balance/balance',
+					recharge: '/pages2/balance/balance',
 					my_reply: '/pages2/replyCommentList/replyCommentList',
 					cms_list: '/pages2/edit_list/edit_list',
 					edit_cms: '/pages2/editCms/editCms',
@@ -293,54 +215,74 @@
 				}
 
 				if (item.type === 'my_account') {
-					this.toPersonalpage()
+					toPersonalpage()
 					return
 				}
 
 				if (routeMap[item.type]) {
-					this.requireLogin(() => {
-						uni.navigateTo({
-							url: routeMap[item.type]
-						})
+					requireLogin(() => {
+						uni.navigateTo({ url: routeMap[item.type] })
 					})
 					return
 				}
 
-				if (item.type === 'customer_service' || item.type === 'sharing_app' || item.type === 'recharge') {
-					this.inputDialogToggle()
+				if (item.type === 'customer_service' || item.type === 'sharing_app') {
+					inputDialogToggle()
 					return
 				}
 
 				if (item.type === 'logout') {
 					mutations.logout()
 				}
-			},
-			toLogin() {
+			}
+
+			function toLogin() {
 				uni.navigateTo({
 					url: '../../pages3/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=weixin'
 				})
-			},
-			toUserInfoPage() {
-				this.requireLogin(() => {
+			}
+
+			function toUserInfoPage() {
+				requireLogin(() => {
 					uni.navigateTo({
 						url: '../../pages3/uni_modules/uni-id-pages/pages/userinfo/userinfo?showLoginManage=true'
 					})
 				})
-			},
-			toPersonalpage() {
-				this.requireLogin(() => {
+			}
+
+			function toPersonalpage() {
+				requireLogin(() => {
 					uni.navigateTo({
-						url: '/uni_modules/zetank-personalpage/pages/personalpage/personalpage?uid=' + this.userInfo._id
+						url: '/uni_modules/zetank-personalpage/pages/personalpage/personalpage?uid=' + userInfo.value._id
 					})
 				})
-			},
-			toScan() {
-				this.inputDialogToggle()
-			},
-			toSetting() {
-				uni.navigateTo({
-					url: '/pages2/setting/setting'
-				})
+			}
+
+			function toScan() {
+				inputDialogToggle()
+			}
+
+			function toSetting() {
+				uni.navigateTo({ url: '/pages2/setting/setting' })
+			}
+
+			return {
+				inputDialog,
+				userInfo,
+				isLogin,
+				realNameStatus,
+				profileDesc,
+				stats,
+				quickMenus,
+				menuGroups,
+				dialogConfirm,
+				dialogClose,
+				menuClick,
+				toLogin,
+				toUserInfoPage,
+				toPersonalpage,
+				toScan,
+				toSetting
 			}
 		}
 	}
diff --git a/pages/test/test.vue b/pages/test/test.vue
index fbcac46..50be127 100644
--- a/pages/test/test.vue
+++ b/pages/test/test.vue
@@ -1,6 +1,5 @@
 <template>
 	<view>
-		
 		<view class="">
 			<button @click="get()">get</button>
 			<button @click="del()">del</button>
@@ -14,118 +13,106 @@
 </template>
 
 <script>
+	import { onMounted } from 'vue'
+
 	export default {
-		data() {
-			return {
-				
+		setup() {
+			onMounted(() => {
+				// 模拟 onLoad
+			})
+
+			async function get() {
+				let query = { article_id: "1" }
+				const res = await uniCloud.importObject("comments").getComments(query)
+				console.log("成功获取评论：", res)
 			}
-		},
-		methods: {
-			async get() {
-				console.log();
-				let query ={article_id:"1"};
 
-				const res = await uniCloud.importObject("comments").getComments(query);
+			async function del() {
+				let id = "map[$oid:67b45c598a5c78c37f605029]"
+				const res = await uniCloud.importObject("comments").deleteComment(id)
+				console.log(res)
+			}
 
-				console.log("成功获取评论：", res);
-			},
-			async del() {
-				let id = "map[$oid:67b45c598a5c78c37f605029]";
-				const res = await uniCloud.importObject("comments").deleteComment(id);
-				console.log(res);
-			},
-async add() {
-    try {
-        // 获取当前用户信息（需确保已登录）
-        const uniIdToken = uni.getStorageSync('uni_id_token');
-        if (!uniIdToken) {
-            uni.showToast({ title: '请先登录', icon: 'none' });
-            return;
-        }
+			async function add() {
+				try {
+					const uniIdToken = uni.getStorageSync('uni_id_token')
+					if (!uniIdToken) {
+						uni.showToast({ title: '请先登录', icon: 'none' })
+						return
+					}
 
-        // 构建符合后端接口规范的评论对象
-        const comment = {
-            article_id: "67bbac72c6de56f8256d76b1",
-            content: "测试评论",
-            parent_id: 0,
-        };
+					const comment = {
+						article_id: "67bbac72c6de56f8256d76b1",
+						content: "测试评论",
+						parent_id: 0,
+					}
 
-        // 调用云对象方法
-        const commentObj = uniCloud.importObject("comments");
-        const res = await commentObj.addComment(comment);
-        
-        // 处理响应结果
-        if (res.code === 200) {
-            uni.showToast({ title: '评论成功' });
-            console.log('评论详情:', {
-                id: res.data.comment_id,
-                depth: res.data.depth,
-                rootComment: res.data.root_id || '一级评论'
-            });
-            
-            // 更新前端显示（示例）
-            // 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': '评论内容不能为空',
-            'CONTENT_BLOCKED': '包含违禁词汇: ' + e.message.split(':')[1],
-            'PARENT_COMMENT_NOT_FOUND': '回复的评论不存在'
-        };
-        
-        uni.showToast({
-            title: errorHandler[e.errorType] || '评论失败，请稍后重试',
-            icon: 'none'
-        });
-    }
-},
-			async update() {
-				let comment_id = "67bdf451dab53f685048dccc";
-				let comment = {
-					content: "修改后"
+					const commentObj = uniCloud.importObject("comments")
+					const res = await commentObj.addComment(comment)
+
+					if (res.code === 200) {
+						uni.showToast({ title: '评论成功' })
+						console.log('评论详情:', {
+							id: res.data.comment_id,
+							depth: res.data.depth,
+							rootComment: res.data.root_id || '一级评论'
+						})
+					}
+				} catch (e) {
+					console.error('评论失败:', e)
+					const errorHandler = {
+						'PERMISSION_DENIED': '登录状态失效，请重新登录',
+						'INVALID_PARAMS': '评论内容不能为空',
+						'CONTENT_BLOCKED': '包含违禁词汇: ' + e.message.split(':')[1],
+						'PARENT_COMMENT_NOT_FOUND': '回复的评论不存在'
+					}
+					uni.showToast({
+						title: errorHandler[e.errorType] || '评论失败，请稍后重试',
+						icon: 'none'
+					})
 				}
-				const res = await uniCloud.importObject("comments").updateComment(comment_id, comment);
-				console.log(res);
-			},
-			async relikeComment() {
-				let comment_like_id="67bdd9cd5a6f8bd7032c949a";
-				let comment_id="67b466c9ce5ec9e5aa41a25d";
-				
-				const res = await uniCloud.importObject("comments").relikeComment(comment_like_id, comment_id);
-				
-			},
-			async likeComment() {
-				let user_id="67b466c9ce5ec9e5aa41a25d";
-				let comment_id = "67b466c9ce5ec9e5aa41a25d";
-				
-				const res = await uniCloud.importObject("comments").likeComment(user_id, comment_id);
-			},
-				
-			to() {
-				uni.navigateTo({
-					url:"/uni_modules/uni-cms-article/pages/list/list"
-				})
-			},
-			to1() {
-				uni.navigateTo({
-					url:"/uni_modules/uni-cms-article/pages/detail/detail"
-				})
 			}
-			
+
+			async function update() {
+				let comment_id = "67bdf451dab53f685048dccc"
+				let comment = { content: "修改后" }
+				const res = await uniCloud.importObject("comments").updateComment(comment_id, comment)
+				console.log(res)
+			}
+
+			async function relikeComment() {
+				let comment_like_id = "67bdd9cd5a6f8bd7032c949a"
+				let comment_id = "67b466c9ce5ec9e5aa41a25d"
+				const res = await uniCloud.importObject("comments").relikeComment(comment_like_id, comment_id)
+			}
+
+			async function likeComment() {
+				let user_id = "67b466c9ce5ec9e5aa41a25d"
+				let comment_id = "67b466c9ce5ec9e5aa41a25d"
+				const res = await uniCloud.importObject("comments").likeComment(user_id, comment_id)
+			}
+
+			function to() {
+				uni.navigateTo({ url: "/uni_modules/uni-cms-article/pages/list/list" })
+			}
+
+			function to1() {
+				uni.navigateTo({ url: "/uni_modules/uni-cms-article/pages/detail/detail" })
+			}
+
+			return {
+				get,
+				del,
+				add,
+				update,
+				likeComment,
+				relikeComment,
+				to,
+				to1
+			}
 		}
 	}
 </script>
 
 <style>
-
 </style>
diff --git a/pages2/arctcleCollectList/arctcleCollectList.vue b/pages2/arctcleCollectList/arctcleCollectList.vue
index 5f46ddd..8b95cca 100644
--- a/pages2/arctcleCollectList/arctcleCollectList.vue
+++ b/pages2/arctcleCollectList/arctcleCollectList.vue
@@ -5,7 +5,6 @@
 		@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" :style="{ height: listHeight }">
                 <!-- #endif -->
@@ -60,27 +59,21 @@
 </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 { ref, computed, onReady, watch } from 'vue'
+	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";
+	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"
+	import { store } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
 
-	const db = uniCloud.database();
+	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 '@/pages3/uni_modules/uni-id-pages/common/store.js';
-
 	export default {
 		components: {
 			statusBar,
@@ -89,35 +82,32 @@
 			rightSmallCover,
 			threeCover
 		},
-		computed: {
-			userInfo() {
-				return store.userInfo
-			},
-			queryUserId() {
-				return this.userInfo && this.userInfo._id ? this.userInfo._id : '__empty__'
-			},
-			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() {
-				
+		setup() {
+			const udbRef = ref(null)
+			const showRefresh = ref(false)
+			const listHeight = ref(0)
+			const mpButtonLeftPlaceholderSize = ref(0)
+			const mpButtonPlaceholderSize = ref(87)
+			const navBarHeight = ref(44)
+			const listData = ref([])
+			const loadType = ref(null)
+			const historyList = ref([])
+
+			const userInfo = computed(() => store.userInfo)
+
+			const queryUserId = computed(() => {
+				return userInfo.value && userInfo.value._id ? userInfo.value._id : '__empty__'
+			})
+
+			const realNameStatus = computed(() => {
+				if (!userInfo.value.realNameAuth) return 0
+				return userInfo.value.realNameAuth.authStatus
+			})
+
+			const colList = computed(() => {
 				return [
 					db.collection("cms-articles-collect")
-					.where({
-						user_id: this.queryUserId,
-					})
+					.where({ user_id: queryUserId.value })
 					.getTemp(),
 					db.collection(articleDBName)
 					.field('_id,thumbnail,title,publish_date,user_id, excerpt, article_status')
@@ -125,158 +115,120 @@
 					db.collection(userDBName)
 					.field('_id,nickname')
 					.getTemp()
+				]
+			})
 
-				];
-			}
-		},
-		data() {
-			return {
-				tags_v: [],
-				tags: [
-
-				],
-				showRefresh: false, // 是否显示刷新按钮
-				listHeight: 0, // 列表高度
-				mpButtonLeftPlaceholderSize: 0, // 小程序左侧icon占位大小
-				mpButtonPlaceholderSize: 87, // 小程序导航栏按钮占位大小
-				navBarHeight: 44, // 导航栏高度
-				refreshStatus: 0, // 刷新状态 0: 未刷新 1: 刷新中 2: 刷新完成
-				listData: [], // 列表数据
-				loadType: null,
-				historyList: [],
-			}
-		},
-		methods: {
-			getNewItem(item) {
+			function getNewItem(item) {
 				if (!item.excerpt) {
-					item.excerpt = "";
+					item.excerpt = ""
 				} else if (item.excerpt.length > 50) {
-					item.excerpt = item.excerpt.slice(0, 50) + " ... ...";
+					item.excerpt = item.excerpt.slice(0, 50) + " ... ..."
 				}
-				return item;
-			},
-			async listLoad(data) {
-				if(data.length !== 0) {
-					const listData = data.map(item => {
+				return item
+			}
+
+			async function listLoad(data) {
+				if (data.length !== 0) {
+					const tempListData = 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];
+						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]
 					})
-					
-					console.log(listData);
-					
-					// 处理腾讯云文件链接
-					for (const article of listData) {
+
+					for (const article of tempListData) {
 						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
+
+					listData.value = loadType.value === 'loadMore' ? listData.value.concat(tempListData) : tempListData
+					loadType.value = null
 				} else {
-					
-					this.listData = this.loadType === 'loadMore' ? this.listData.concat([]) : []
-					this.loadType = null
+					listData.value = loadType.value === 'loadMore' ? listData.value.concat([]) : []
+					loadType.value = null
 				}
-					
-			},
-			// 初始化导航栏大小
-			initNavBarSize() {
-				// 获取小程序导航栏按钮信息
+			}
+
+			function initNavBarSize() {
 				// #ifdef MP-TOUTIAO
 				let menuButtonInfo = tt.getCustomButtonBoundingClientRect()
-				menuButtonInfo.width = menuButtonInfo.capsule.width //  小程序按钮区域中使用的按钮宽度
-				this.mpButtonLeftPlaceholderSize = menuButtonInfo.leftIcon.width + 10
+				menuButtonInfo.width = menuButtonInfo.capsule.width
+				mpButtonLeftPlaceholderSize.value = 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) {
+				mpButtonPlaceholderSize.value = menuButtonInfo.width + 10
+				navBarHeight.value = uni.getSystemInfoSync().system.toLowerCase().includes('ios') ? 44 : 48
+			}
+
+			function 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
-				}, () => {
+			}
+
+			function searchClick() {
+				uni.hideKeyboard()
+				uni.navigateTo({ url: '/uni_modules/uni-cms-article/pages/search/search' })
+			}
+
+			function refresh() {
+				loadType.value = 'refresh'
+				udbRef.value.loadData({ clear: true }, () => {
 					uni.stopPullDownRefresh()
 					// #ifdef APP-NVUE
-					this.showRefresh = false
+					showRefresh.value = false
 					// #endif
 				})
-			},
-			// 加载更多
-			loadMore() {
-				this.loadType = 'loadMore'
-				this.$refs.udb.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);
+			function loadMore() {
+				loadType.value = 'loadMore'
+				udbRef.value.loadMore()
 			}
-		},
-		watch: {
-			'userInfo._id'(val, oldVal) {
-				if (val && val !== oldVal && this.$refs.udb) {
-					this.refresh()
+
+			function onqueryerror(e) {
+				console.error(e)
+			}
+
+			onReady(() => {
+				// #ifdef MP
+				initNavBarSize()
+				// #endif
+				listHeight.value = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - navBarHeight.value + 'px'
+			})
+
+			watch(() => userInfo.value._id, (val, oldVal) => {
+				if (val && val !== oldVal && udbRef.value) {
+					refresh()
 				}
+			})
+
+			return {
+				udbRef,
+				showRefresh,
+				listHeight,
+				mpButtonLeftPlaceholderSize,
+				mpButtonPlaceholderSize,
+				navBarHeight,
+				listData,
+				loadType,
+				historyList,
+				userInfo,
+				queryUserId,
+				realNameStatus,
+				colList,
+				getNewItem,
+				listLoad,
+				initNavBarSize,
+				publishTime,
+				searchClick,
+				refresh,
+				loadMore,
+				onqueryerror
 			}
-		},
-		async onReady() {
-			// #ifdef MP
-			this.initNavBarSize() // 初始化导航栏大小
-			// #endif
-			/* 可用窗口高度 - 搜索框高 - 状态栏高 */
-			this.listHeight = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - this
-				.navBarHeight + 'px'; // 计算列表高度
-		},
-		onLoad() {
-			
-		},
+		}
 	}
 </script>
 
diff --git a/pages2/arctcleLikeList/arctcleLikeList.vue b/pages2/arctcleLikeList/arctcleLikeList.vue
index 705a44a..5aff453 100644
--- a/pages2/arctcleLikeList/arctcleLikeList.vue
+++ b/pages2/arctcleLikeList/arctcleLikeList.vue
@@ -5,7 +5,6 @@
 		@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" :style="{ height: listHeight }">
                 <!-- #endif -->
@@ -35,9 +34,12 @@
 								:data="getNewItem(item)"></three-cover>
 						</view>
 						<view class="" v-else>
-							111
+							<view class="main">
+								<view>
+									<text class="title">该文章已被下架或删除</text>
+								</view>
+							</view>
 						</view>
-
 					</template>
 
                     <!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
@@ -64,27 +66,21 @@
 </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 { ref, computed, onReady, watch } from 'vue'
+	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";
+	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"
+	import { store } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
 
-	const db = uniCloud.database();
+	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 '@/pages3/uni_modules/uni-id-pages/common/store.js';
-
 	export default {
 		components: {
 			statusBar,
@@ -93,36 +89,32 @@
 			rightSmallCover,
 			threeCover
 		},
-		computed: {
-			userInfo() {
-				return store.userInfo
-			},
-			queryUserId() {
-				return this.userInfo && this.userInfo._id ? this.userInfo._id : '__empty__'
-			},
-			realNameStatus() {
-				if (!this.userInfo.realNameAuth) {
-					return 0
-				}
+		setup() {
+			const udbRef = ref(null)
+			const showRefresh = ref(false)
+			const listHeight = ref(0)
+			const mpButtonLeftPlaceholderSize = ref(0)
+			const mpButtonPlaceholderSize = ref(87)
+			const navBarHeight = ref(44)
+			const listData = ref([])
+			const loadType = ref(null)
+			const historyList = ref([])
 
-				return this.userInfo.realNameAuth.authStatus
-			},
-			// 根据当前语言返回不同的搜索框占位符
-			inputPlaceholder(e) {
-				if (uni.getStorageSync('CURRENT_LANG') == "en") {
-					return 'Please enter the search content' // 英文
-				} else {
-					return '请输入搜索内容' // 中文
-				}
-			},
-			// 连表查询，返回两个集合的查询结果
-			colList() {
-				
+			const userInfo = computed(() => store.userInfo)
+
+			const queryUserId = computed(() => {
+				return userInfo.value && userInfo.value._id ? userInfo.value._id : '__empty__'
+			})
+
+			const realNameStatus = computed(() => {
+				if (!userInfo.value.realNameAuth) return 0
+				return userInfo.value.realNameAuth.authStatus
+			})
+
+			const colList = computed(() => {
 				return [
 					db.collection("cms-articles-like")
-					.where({
-						user_id: this.queryUserId,
-					})
+					.where({ user_id: queryUserId.value })
 					.getTemp(),
 					db.collection(articleDBName)
 					.field('_id,thumbnail,title,publish_date,user_id, excerpt, article_status')
@@ -130,155 +122,118 @@
 					db.collection(userDBName)
 					.field('_id,nickname')
 					.getTemp()
+				]
+			})
 
-				];
-			}
-		},
-		data() {
-			return {
-				tags_v: [],
-				tags: [
-
-				],
-				showRefresh: false, // 是否显示刷新按钮
-				listHeight: 0, // 列表高度
-				mpButtonLeftPlaceholderSize: 0, // 小程序左侧icon占位大小
-				mpButtonPlaceholderSize: 87, // 小程序导航栏按钮占位大小
-				navBarHeight: 44, // 导航栏高度
-				refreshStatus: 0, // 刷新状态 0: 未刷新 1: 刷新中 2: 刷新完成
-				listData: [], // 列表数据
-				loadType: null,
-				historyList: [],
-			}
-		},
-		methods: {
-			getNewItem(item) {
+			function getNewItem(item) {
 				if (!item.excerpt) {
-					item.excerpt = "";
+					item.excerpt = ""
 				} else if (item.excerpt.length > 50) {
-					item.excerpt = item.excerpt.slice(0, 50) + " ... ...";
+					item.excerpt = item.excerpt.slice(0, 50) + " ... ..."
 				}
-				return item;
-			},
-			async listLoad(data) {
-				if (data.length <= 0) return;
-				if(data[0].article_id) {
-					const listData = data.map(item => {
-						if (typeof item.article_id.thumbnail === 'string') {
+				return item
+			}
+
+			async function listLoad(data) {
+				if (data.length <= 0) return
+				if (data[0].article_id) {
+					const tempListData = data.map(item => {
+						if (item.article_id[0] && typeof item.article_id[0].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];
+						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]
 					})
-					
-					console.log(listData);
-					
-					// 处理腾讯云文件链接
-					for (const article of listData) {
+
+					for (const article of tempListData) {
 						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
+
+					listData.value = loadType.value === 'loadMore' ? listData.value.concat(tempListData) : tempListData
+					loadType.value = null
 				}
-					
-			},
-			// 初始化导航栏大小
-			initNavBarSize() {
-				// 获取小程序导航栏按钮信息
+			}
+
+			function initNavBarSize() {
 				// #ifdef MP-TOUTIAO
 				let menuButtonInfo = tt.getCustomButtonBoundingClientRect()
-				menuButtonInfo.width = menuButtonInfo.capsule.width //  小程序按钮区域中使用的按钮宽度
-				this.mpButtonLeftPlaceholderSize = menuButtonInfo.leftIcon.width + 10
+				menuButtonInfo.width = menuButtonInfo.capsule.width
+				mpButtonLeftPlaceholderSize.value = 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) {
+				mpButtonPlaceholderSize.value = menuButtonInfo.width + 10
+				navBarHeight.value = uni.getSystemInfoSync().system.toLowerCase().includes('ios') ? 44 : 48
+			}
+
+			function 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
-				}, () => {
+			}
+
+			function searchClick() {
+				uni.hideKeyboard()
+				uni.navigateTo({ url: '/uni_modules/uni-cms-article/pages/search/search' })
+			}
+
+			function refresh() {
+				loadType.value = 'refresh'
+				udbRef.value.loadData({ clear: true }, () => {
 					uni.stopPullDownRefresh()
 					// #ifdef APP-NVUE
-					this.showRefresh = false
+					showRefresh.value = false
 					// #endif
 				})
-			},
-			// 加载更多
-			loadMore() {
-				this.loadType = 'loadMore'
-				this.$refs.udb.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);
+			function loadMore() {
+				loadType.value = 'loadMore'
+				udbRef.value.loadMore()
 			}
-		},
-		watch: {
-			'userInfo._id'(val, oldVal) {
-				if (val && val !== oldVal && this.$refs.udb) {
-					this.refresh()
+
+			function onqueryerror(e) {
+				console.error(e)
+			}
+
+			onReady(() => {
+				// #ifdef MP
+				initNavBarSize()
+				// #endif
+				listHeight.value = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - navBarHeight.value + 'px'
+			})
+
+			watch(() => userInfo.value._id, (val, oldVal) => {
+				if (val && val !== oldVal && udbRef.value) {
+					refresh()
 				}
+			})
+
+			return {
+				udbRef,
+				showRefresh,
+				listHeight,
+				mpButtonLeftPlaceholderSize,
+				mpButtonPlaceholderSize,
+				navBarHeight,
+				listData,
+				loadType,
+				historyList,
+				userInfo,
+				queryUserId,
+				realNameStatus,
+				colList,
+				getNewItem,
+				listLoad,
+				initNavBarSize,
+				publishTime,
+				searchClick,
+				refresh,
+				loadMore,
+				onqueryerror
 			}
-		},
-		async onReady() {
-			// #ifdef MP
-			this.initNavBarSize() // 初始化导航栏大小
-			// #endif
-			/* 可用窗口高度 - 搜索框高 - 状态栏高 */
-			this.listHeight = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - this
-				.navBarHeight + 'px'; // 计算列表高度
-		},
-		onLoad() {
-			
-		},
+		}
 	}
 </script>
 
@@ -359,4 +314,20 @@
 	.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;
+		}
+	}
 </style>
diff --git a/pages2/balance/balance.vue b/pages2/balance/balance.vue
index deb558b..e65a292 100644
--- a/pages2/balance/balance.vue
+++ b/pages2/balance/balance.vue
@@ -44,7 +44,7 @@
 						<view class="palace-grid">
 							<view class="palace-grid-text">
 								<view class="palace-grid-text-data">
-									<text>{ 0 }}</text>
+									<text>{{ userInfo.available || 0 }}</text>
 									<text class="palace-grid-text-data-b">元</text>
 								</view>
 								<view class="palace-grid-text-name">剩余提现额度</view>
@@ -53,7 +53,7 @@
 						<view class="palace-grid">
 							<view class="palace-grid-text">
 								<view class="palace-grid-text-data">
-									<text>{{ 0 }}</text>
+									<text>{{ userInfo.total_recharge || 0 }}</text>
 									<text class="palace-grid-text-data-b">元</text>
 								</view>
 								<view class="palace-grid-text-name">累计收益</view>
@@ -79,7 +79,7 @@
 				</view>
 				<view class="list-view">
 					<view class="list-item" v-for="(item, index) in list" :key="index" hover-class="hover"
-						:hover-stay-time="150" bindtap="detail">
+						:hover-stay-time="150">
 						<view class="content-box">
 							<view class="des-box">
 								<view class="tit">
@@ -104,109 +104,110 @@
 </template>
 
 <script>
+	import { ref, computed, onMounted, onPullDownRefresh } from 'vue'
+	import { store } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
 	import uSubsection from "../../uni_modules/uview-ui/components/u-subsection/u-subsection.vue"
 	import uModal from "../../uni_modules/uview-ui/components/u-modal/u-modal.vue"
 
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-	import {
-		store,
-		mutations
-	} from '@/pages3/uni_modules/uni-id-pages/common/store.js';
-
 	export default {
 		components: {
 			uSubsection,
 			uModal
 		},
-		computed: {
-			userInfo() {
-				return store.userInfo
-			},
-			realNameStatus() {
-				if (!this.userInfo.realNameAuth) {
-					return 0
-				}
+		setup() {
+			const is_withdraw = ref(false)
+			const list = ref([])
+			const userData = ref({})
+			const showModal = ref(false)
+			const date = ref('incomeMonth')
+			const tabIndex = ref(0)
+			const tabs = ref(['本月收入', '今日收入', '昨日收入', '提现记录'])
 
-				return this.userInfo.realNameAuth.authStatus
-			}
-		},
-		data() {
-			return {
-				is_withdraw: false,
-				list: [],
-				userData: {},
-				showModal: false,
-				date: 'incomeMonth',
-				content: `<p><em style="font-style:normal;color:#ff1e0f">可提现余额：</em>当前可以提现的金额</p>
+			const content = ref(`<p><em style="font-style:normal;color:#ff1e0f">可提现余额：</em>当前可以提现的金额</p>
 				          <p><em style="font-style:normal;color:#ff1e0f">即将到账：</em>交易中的金额，交易成功后可提现</p>
 				          <p><em style="font-style:normal;color:#ff1e0f">累计到账：</em>累计交易成功的金额</p>
 				          <p><em style="font-style:normal;color:#ff1e0f">累计提现：</em>累计提现成功的金额</p>
 				          <p><em style="font-style:normal;color:#ff1e0f">*注：所有金额币种均为人民币，单位为元，符号￥</em></p>
-				         `,
-				tabs: ['本月收入', '今日收入', '昨日收入', '提现记录'],
-				tabIndex: 0
-			}
-		},
-		onLoad() {
-			uni.showLoading({
-				title: '加载中'
-			});
-			this.initData();
-			setTimeout(() => {
-				uni.hideLoading();
-			}, 500);
-		},
-		methods: {
-			async initData() {
-				this.tabIndex = 0;
-				// this.userData = await this.$api.mock('userData');
-				// this.list = await this.$api.mock('incomeMonth');
-			},
-			async getFundList() {
-				// this.list = await this.$api.mock(this.date);
-			},
-			changeTab(index) {
-				this.tabIndex = index;
-				this.list = []
-				if (this.tabIndex == 0) {
-					this.date = 'incomeMonth';
-					this.is_withdraw = false;
-				} else if (this.tabIndex == 1) {
-					this.date = 'incomeToday';
-					this.is_withdraw = false;
-				} else if (this.tabIndex == 2) {
-					this.date = 'incomeYesterday';
-					this.is_withdraw = false;
-				} else if (this.tabIndex == 3) {
-					this.date = 'incomeList';
-					this.is_withdraw = true;
-				}
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.getFundList();
+				         `)
+
+			const userInfo = computed(() => store.userInfo)
+
+			const realNameStatus = computed(() => {
+				if (!userInfo.value.realNameAuth) return 0
+				return userInfo.value.realNameAuth.authStatus
+			})
+
+			onMounted(() => {
+				uni.showLoading({ title: '加载中' })
+				initData()
 				setTimeout(() => {
-					uni.hideLoading();
-				}, 500);
-			},
-			navTo(url) {
-				uni.navigateTo({
-					url
-				});
+					uni.hideLoading()
+				}, 500)
+			})
+
+			onPullDownRefresh(() => {
+				uni.showLoading({ title: '加载中' })
+				showModal.value = false
+				initData()
+				setTimeout(() => {
+					uni.hideLoading()
+				}, 500)
+				setTimeout(() => {
+					uni.stopPullDownRefresh()
+				}, 500)
+			})
+
+			async function initData() {
+				tabIndex.value = 0
+			}
+
+			async function getFundList() {
+				// list.value = await this.$api.mock(date.value)
+			}
+
+			function changeTab(index) {
+				tabIndex.value = index
+				list.value = []
+				if (tabIndex.value === 0) {
+					date.value = 'incomeMonth'
+					is_withdraw.value = false
+				} else if (tabIndex.value === 1) {
+					date.value = 'incomeToday'
+					is_withdraw.value = false
+				} else if (tabIndex.value === 2) {
+					date.value = 'incomeYesterday'
+					is_withdraw.value = false
+				} else if (tabIndex.value === 3) {
+					date.value = 'incomeList'
+					is_withdraw.value = true
+				}
+				uni.showLoading({ title: '加载中' })
+				getFundList()
+				setTimeout(() => {
+					uni.hideLoading()
+				}, 500)
+			}
+
+			function navTo(url) {
+				uni.navigateTo({ url })
+			}
+
+			return {
+				is_withdraw,
+				list,
+				userData,
+				showModal,
+				date,
+				tabIndex,
+				tabs,
+				content,
+				userInfo,
+				realNameStatus,
+				initData,
+				getFundList,
+				changeTab,
+				navTo
 			}
-		},
-		onPullDownRefresh() {
-			uni.showLoading({
-				title: '加载中'
-			});
-			this.showModal = false
-			this.initData();
-			setTimeout(() => {
-				uni.hideLoading();
-			}, 500);
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 500);
 		}
 	}
 </script>
@@ -245,7 +246,6 @@
 		}
 	}
 
-
 	.ithui {
 		&-content {
 			.h5title {
@@ -360,20 +360,17 @@
 					background-color: #ff8440;
 					padding-bottom: 100rpx;
 
-
 					.userinfo-headimg {
 						width: 130rpx;
 						height: 130rpx;
 						overflow: hidden;
 						margin-right: 20rpx;
-
 					}
 
 					.borde-radius {
 						border-radius: 50%;
 					}
 
-
 					.arrow {
 						position: relative;
 						padding-right: 30rpx;
@@ -522,6 +519,5 @@
 				}
 			}
 		}
-
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages2/editCms/editCms.vue b/pages2/editCms/editCms.vue
index 01e8ccb..03bbb7a 100644
--- a/pages2/editCms/editCms.vue
+++ b/pages2/editCms/editCms.vue
@@ -39,7 +39,7 @@
 			</view>
 
 		</uni-popup>
-
+		
 		<uni-popup ref="popup" type='bottom'>
 			<view class="b_col_fff">
 				<view class="grid-container">
@@ -131,7 +131,6 @@
 								<cloud-image
 								mode="scaleToFill" 
 								width="100%" 
-								
 								height="150rpx"
 								:src="is_vote">
 								</cloud-image>
@@ -192,334 +191,165 @@
 </template>
 
 <script>
-	const uniCloudStorageExtCo = uniCloud.importObject("ext-storage-co");
+	import { ref, reactive, onShow, onReady, onHide, onUnload } from 'vue'
 	import cloudImage from "@/components/cloud-image.vue"
+
+	const uniCloudStorageExtCo = uniCloud.importObject("ext-storage-co")
+
 	export default {
 		components: {
 			cloudImage
 		},
-		onHide() {
-		  clearInterval(this.saveInterval);
-		},
-		onUnload() {
-		  clearInterval(this.saveInterval);
-		  clearTimeout(this.saveInterval);
-		},
-		onReady() {
-			this.$refs.alertDialog.open();
-			this.saveInterval = setInterval(this.saveCms, 10000);
-		},
-		onLoad(e) {
-			console.log(e)
+		setup() {
+			const alertDialog = ref(null)
+			const delPopup = ref(null)
+			const popup = ref(null)
+			const saveInterval = ref(null)
 
-			
-		},
-		onShow(e) {
-			console.log(e)
-			
-			let cms = uni.getStorageSync("cms");
-			if (cms) {
-				this.cms = cms;
-			}
-		},
-		data() {
-			return {
-				saveInterval: {},
-				
-				is_vote: "https://qnycdn.mymoyu.top/static/icon/is_vote.png",
-				not_image:"https://qnycdn.mymoyu.top/static/icon/not_image.png",
-				// cmsType: [{
-				// 		type: "text",
-				// 		text: "文字",
-				// 		src: "https://qnycdn.mymoyu.top/static/icon/text.png",
-				// 	},
-				// 	{
-				// 		type: "video",
-				// 		text: "视频",
-				// 		src: "https://qnycdn.mymoyu.top/static/icon/video.png",
-				// 	},
-				// 	{
-				// 		type: "image",
-				// 		text: "图片",
-				// 		src: "https://qnycdn.mymoyu.top/static/icon/image.png",
-				// 	},
-				// 	{
-				// 		type: "vote",
-				// 		text: "投票",
-				// 		src: "https://qnycdn.mymoyu.top/static/icon/vote.png",
-				// 	},
-				// 	{
-				// 		type: "position",
-				// 		text: "位置",
-				// 		src: "https://qnycdn.mymoyu.top/static/icon/position.png",
-				// 	},
-				// 	{
-				// 		type: "title",
-				// 		text: "标题",
-				// 		src: "https://qnycdn.mymoyu.top/static/icon/title.png",
-				// 	},
-				// ],
-				cmsType: [{
-						type: "text",
-						text: "文字",
-						src: "https://qnycdn.mymoyu.top/static/icon/text.png",
-					},
-					{
-						type: "video",
-						text: "视频",
-						src: "https://qnycdn.mymoyu.top/static/icon/video.png",
-					},
-					{
-						type: "image",
-						text: "图片",
-						src: "https://qnycdn.mymoyu.top/static/icon/image.png",
-					},
-					{
-						type: "vote",
-						text: "投票",
-						src: "https://qnycdn.mymoyu.top/static/icon/vote.png",
-					},
-					{
-						type: "title",
-						text: "小标题",
-						src: "https://qnycdn.mymoyu.top/static/icon/title.png",
-					},
-				],
-				cms: {
-					title_html: "",
-					title_delta: {
-						
-					},
-					title: "",
-					cmsLst: [
-					]
-				},
-				selectIndex: 0,
-			}
-		},
+			const is_vote = ref("https://qnycdn.mymoyu.top/static/icon/is_vote.png")
+			const not_image = ref("https://qnycdn.mymoyu.top/static/icon/not_image.png")
+			const selectIndex = ref(0)
 
-		methods: {
-			to(type, index) {
-				console.log(index)
-				if (type === 'vote') {
-					this.toVote(index);
-				} else {
-					this.toeditText(index);
+			const cmsType = ref([
+				{ type: "text", text: "文字", src: "https://qnycdn.mymoyu.top/static/icon/text.png" },
+				{ type: "video", text: "视频", src: "https://qnycdn.mymoyu.top/static/icon/video.png" },
+				{ type: "image", text: "图片", src: "https://qnycdn.mymoyu.top/static/icon/image.png" },
+				{ type: "vote", text: "投票", src: "https://qnycdn.mymoyu.top/static/icon/vote.png" },
+				{ type: "title", text: "小标题", src: "https://qnycdn.mymoyu.top/static/icon/title.png" },
+			])
+
+			const cms = reactive({
+				title_html: "",
+				title_delta: {},
+				title: "",
+				cmsLst: []
+			})
+
+			onHide(() => {
+				clearInterval(saveInterval.value)
+			})
+
+			onUnload(() => {
+				clearInterval(saveInterval.value)
+				clearTimeout(saveInterval.value)
+			})
+
+			onReady(() => {
+				let storedCms = uni.getStorageSync("cms")
+				if (storedCms && ((storedCms.cmsLst && storedCms.cmsLst.length > 0) || storedCms.title || storedCms.title_html)) {
+					alertDialog.value.open()
 				}
-			},
-			
-			toEditSetting() {
-				this.saveCms();
-				uni.navigateTo({
-					url:"/pages2/editCms/editSetting"
+				saveInterval.value = setInterval(saveCms, 10000)
+			})
+
+			onShow(() => {
+				let storedCms = uni.getStorageSync("cms")
+				if (storedCms) {
+					Object.assign(cms, storedCms)
+				}
+			})
+
+			function saveCms() {
+				uni.setStorageSync("cms", cms)
+			}
+
+			function open() {
+				popup.value.open()
+			}
+
+			function close() {
+				popup.value.close()
+			}
+
+			function confirm(value) {
+				popup.value.close()
+			}
+
+			function addEditItem(index) {
+				selectIndex.value = index
+				uni.setStorageSync("selectIndex", selectIndex.value)
+				open()
+			}
+
+			function getFileInfo(path) {
+				const parts = path.split('/').pop()
+				const [filename, ...extParts] = parts.split('.')
+				const ext = extParts.length ? extParts.pop() : ''
+				return { name: filename, extname: ext }
+			}
+
+			function formatBytes(bytes) {
+				if (bytes === 0) return '0 Bytes'
+				const k = 1024
+				const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB']
+				const i = Math.floor(Math.log(bytes) / Math.log(k))
+				if (i >= sizes.length) return '> 1 TB'
+				return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]
+			}
+
+			async function updateImage(index) {
+				uni.chooseImage({
+					sourceType: ["album", "camera"],
+					count: 1,
+					success: async (res) => {
+						if (cms.cmsLst[index] && cms.cmsLst[index].image.src) {
+							await uniCloudStorageExtCo.deleteFile({ fileList: [cms.cmsLst[index].image.src] })
+						}
+						if (res.tempFilePaths.length > 0) {
+							let filePath = res.tempFilePaths[0]
+							let { name, extname } = getFileInfo(filePath)
+							const uploadFileOptionsRes = await uniCloudStorageExtCo.getUploadFileOptions({
+								cloudPath: `cms/image/${name}_${Math.random().toString(36).substr(2,6)}`
+							})
+							await uniCloud.uploadFile({
+								...uploadFileOptionsRes.uploadFileOptions,
+								filePath: filePath,
+								cloudPath: uploadFileOptionsRes.cloudPath,
+								success: async () => {
+									const res2 = {
+										cloudPath: uploadFileOptionsRes.cloudPath,
+										fileID: uploadFileOptionsRes.fileID,
+										fileURL: uploadFileOptionsRes.fileURL
+									}
+									const selectedMedia = { src: res2.fileID, alt: name }
+									cms.cmsLst[index].image.src = selectedMedia.src
+								},
+								fail: (err) => {
+									console.log("上传失败", err)
+								}
+							})
+						}
+					}
 				})
-			},
-			saveCms() {
-				console.log(this.cms)
-				uni.setStorageSync("cms", this.cms);
-			},
-			open() {
+			}
 
-				this.$refs.popup.open()
-			},
-			/**
-			 * 点击取消按钮触发
-			 * @param {Object} done
-			 */
-			close() {
-				this.$refs.popup.close()
-			},
-			confirm(value) {
-				console.log(value)
-				this.$refs.popup.close()
-			},
-			async addEditItem(index) {
-				console.log(index)
-				this.selectIndex = index;
-				uni.setStorageSync("selectIndex", this.selectIndex);
-				this.open();
-			},
-			getFileInfo(path) {
-				const parts = path.split('/').pop();
-				const [filename, ...extParts] = parts.split('.');
-				const ext = extParts.length ? extParts.pop() : '';
-				return {
-					name: filename,
-					extname: ext
-				};
-			},
-			formatBytes(bytes) {
-				if (bytes === 0) return '0 Bytes';
-				const k = 1024;
-				const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-			
-				const i = Math.floor(Math.log(bytes) / Math.log(k));
-			
-				if (i >= sizes.length) return '> 1 TB';
-				return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
-			},
-			async updateImage(index) {
-				const that = this;
-				uni.chooseImage({
-					sourceType:["album","camera"],
-					count: 1,
-					success: async (res) => {
-						
-						console.log(res);
-						if (!this.cms.cmsLst[index] && this.cms.cmsLst[index].image.src) {
-							await uniCloudStorageExtCo.deleteFile({fileList: [this.cms.cmsLst[index].image.src]});
-						}
-						if (res.tempFilePaths.length > 0) {
-							let filePath = res.tempFilePaths[0];
-							let {
-								name,
-								extname
-							} = that.getFileInfo(filePath)
-							console.log(`cms/image/${name}_${Math.random().toString(36).substr(2,6)}`)
-							const uploadFileOptionsRes = await uniCloudStorageExtCo.getUploadFileOptions({
-								cloudPath: `cms/image/${name}_${Math.random().toString(36).substr(2,6)}`
-							});
-							console.log(uploadFileOptionsRes)
-			
-			
-							await uniCloud.uploadFile({
-								...uploadFileOptionsRes.uploadFileOptions,
-								filePath: filePath,
-								cloudPath: uploadFileOptionsRes.cloudPath,
-								success: async () => {
-									const res2 = {
-										cloudPath: uploadFileOptionsRes.cloudPath,
-										fileID: uploadFileOptionsRes.fileID,
-										fileURL: uploadFileOptionsRes.fileURL
-									};
-									console.log(res2)
-									
-									const selectedMedia = {
-										src: res2.fileID,
-										alt: name
-									}
-									console.log(selectedMedia)
-									
-									this.cms.cmsLst[index].image.src = selectedMedia.src;
-									console.log("上传成功", res2);
-								},
-								fail: (err) => {
-									console.log("上传失败", err);
-								}
-							});
-			
-						} else {
-							console.log("未选中文件")
-						}
-					}
-				});
-			},
-			async delItem() {
-				let index = this.selectIndex;
-				if (index >= 0 && this.cms.cmsLst.length >= 0) {
-					if (this.cms.cmsLst[index].type === "image" && this.cms.cmsLst[index].image.src) {
-						await uniCloudStorageExtCo.deleteFile({fileList: [this.cms.cmsLst[index].image.src]});
-					} else if (
-					this.cms.cmsLst[index].type === "video" && 
-						(
-						this.cms.cmsLst[index].video.src || 
-						this.cms.cmsLst[index].video.poster
-						)
-					) {
+			async function delItem() {
+				let index = selectIndex.value
+				if (index >= 0 && index < cms.cmsLst.length) {
+					if (cms.cmsLst[index].type === "image" && cms.cmsLst[index].image.src) {
+						await uniCloudStorageExtCo.deleteFile({ fileList: [cms.cmsLst[index].image.src] })
+					} else if (cms.cmsLst[index].type === "video" && (cms.cmsLst[index].video.src || cms.cmsLst[index].video.poster)) {
 						await uniCloudStorageExtCo.deleteFile({
-							fileList: [
-								this.cms.cmsLst[index].video.src, 
-								this.cms.cmsLst[index].video.poster
-							]
-						});
+							fileList: [cms.cmsLst[index].video.src, cms.cmsLst[index].video.poster]
+						})
 					}
-					console.log("success")
-					this.cms.cmsLst.splice(index, 1);
+					cms.cmsLst.splice(index, 1)
 				}
-				this.$refs.del_popup.close()
-			},
-			async updateImage(index) {
-				const that = this;
+				delPopup.value.close()
+			}
+
+			async function addImageItem() {
 				uni.chooseImage({
-					sourceType:["album","camera"],
-					count: 1,
-					success: async (res) => {
-						
-						console.log(res);
-						if (!this.cms.cmsLst[index] && this.cms.cmsLst[index].image.src) {
-							await uniCloudStorageExtCo.deleteFile({fileList: [this.cms.cmsLst[index].image.src]});
-						}
-						if (res.tempFilePaths.length > 0) {
-							let filePath = res.tempFilePaths[0];
-							let {
-								name,
-								extname
-							} = that.getFileInfo(filePath)
-							console.log(`cms/image/${name}_${Math.random().toString(36).substr(2,6)}`)
-							const uploadFileOptionsRes = await uniCloudStorageExtCo.getUploadFileOptions({
-								cloudPath: `cms/image/${name}_${Math.random().toString(36).substr(2,6)}`
-							});
-							console.log(uploadFileOptionsRes)
-			
-							await uniCloud.uploadFile({
-								...uploadFileOptionsRes.uploadFileOptions,
-								filePath: filePath,
-								cloudPath: uploadFileOptionsRes.cloudPath,
-								success: async () => {
-									const res2 = {
-										cloudPath: uploadFileOptionsRes.cloudPath,
-										fileID: uploadFileOptionsRes.fileID,
-										fileURL: uploadFileOptionsRes.fileURL
-									};
-									console.log(res2)
-									
-									const selectedMedia = {
-										src: res2.fileID,
-										alt: name
-									}
-									console.log(selectedMedia)
-									
-									this.cms.cmsLst[index].image.src = selectedMedia.src;
-									console.log("上传成功", res2);
-								},
-								fail: (err) => {
-									console.log("上传失败", err);
-								}
-							});
-			
-						} else {
-							console.log("未选中文件")
-						}
-					}
-				});
-			},
-			async addImageItem() {
-				const that = this;
-				uni.chooseImage({
-					sourceType:["album","camera"],
+					sourceType: ["album", "camera"],
 					count: 9,
 					success: async (res) => {
-						console.log(res);
 						if (res.tempFilePaths.length > 0) {
-							
-							for (let i = 0 ; i < res.tempFilePaths.length ; i ++ ) {
-
-								let filePath = res.tempFilePaths[i];
-								let {
-									name,
-									extname
-								} = that.getFileInfo(filePath)
-								
-								console.log(`cms/image/${name}_${Math.random().toString(36).substr(2,6)}`)
+							for (let i = 0; i < res.tempFilePaths.length; i++) {
+								let filePath = res.tempFilePaths[i]
+								let { name, extname } = getFileInfo(filePath)
 								const uploadFileOptionsRes = await uniCloudStorageExtCo.getUploadFileOptions({
 									cloudPath: `cms/image/${name}_${Math.random().toString(36).substr(2,6)}`
-								});
-								console.log(uploadFileOptionsRes)
-								const uploadRes = await uniCloud.uploadFile({
-									...uploadFileOptionsRes.uploadFileOptions,
-									filePath: filePath,
-									cloudPath: uploadFileOptionsRes.cloudPath
-								});
+								})
 								await uniCloud.uploadFile({
 									...uploadFileOptionsRes.uploadFileOptions,
 									filePath: filePath,
@@ -529,377 +359,259 @@
 											cloudPath: uploadFileOptionsRes.cloudPath,
 											fileID: uploadFileOptionsRes.fileID,
 											fileURL: uploadFileOptionsRes.fileURL
-										};
-										console.log(res2)
-										
-										const selectedMedia = {
-											src: res2.fileID,
-											alt: name
 										}
-										console.log(selectedMedia)
-										
+										const selectedMedia = { src: res2.fileID, alt: name }
 										let item = {
 											type: "image",
 											text: "",
-											image: {
-												src: selectedMedia.src,
-												html: "",
-												delta:{}
-											}
+											image: { src: selectedMedia.src, html: "", delta: {} }
 										}
-										console.log(this.selectIndex + i)
-										this.cms.cmsLst.splice(this.selectIndex + i, 0, item)
-										this.close()
-										
-											
-										console.log("上传成功", res2);
+										cms.cmsLst.splice(selectIndex.value + i, 0, item)
+										close()
 									},
 									fail: (err) => {
-										console.log("上传失败", err);
+										console.log("上传失败", err)
 									}
-								});
+								})
 							}
-
-			
-
-			
-						} else {
-							console.log("未选中文件")
 						}
 					}
-				});
-			},
-			async getSrc(src) {
-				if (src&&src.substring(0, 8) == "cloud://") {
-					uniCloud.getTempFileURL({
-						fileList: [src]
-					}).then(res=>{
-						return res.fileList[0].tempFileURL;
-					})
-				} else if (src&&src.substring(0, 8) == "qiniu://") {
-					const res = await uniCloudStorageExtCo.getTempFileURL({src: src});
-					return res.fileList[0].tempFileURL;
-					
-				} else {
-					return src
-				}
-			},
-			back() {
-				this.saveCms();
+				})
+			}
+
+			function back() {
+				saveCms()
 				try {
-					uni.navigateBack({delta: 1});
-				} catch(e) {
-					uni.switchTab({
-						url:"/pages/index/index"
-					})
+					uni.navigateBack({ delta: 1 })
+				} catch (e) {
+					uni.switchTab({ url: "/pages/index/index" })
 				}
-			},
-			toeditText(index) {
-				
+			}
+
+			function toeditText(index) {
 				if (index >= 0) {
-					uni.setStorageSync("selectIndex", index);
-					
+					uni.setStorageSync("selectIndex", index)
 				}
-				this.saveCms();
-				uni.navigateTo({
-					url: "/pages2/editCms/editText"
-				})
-			},
-			open_del_popup(index) {
-				this.selectIndex = index;
-				this.$refs.del_popup.open();
-			},
-			close_del_popup() {
-				this.$refs.del_popup.close();
-			},
-			toTitleStyle() {
-				this.saveCms();
-				uni.navigateTo({
-					url: "/pages2/editCms/titleStyle"
-				})
-			},
-			toVote(index) {
-				
-				console.log(index >= 0)
-				if(index >= 0 ) {
-					console.log(index)
-					uni.setStorageSync("selectIndex", index);
+				saveCms()
+				uni.navigateTo({ url: "/pages2/editCms/editText" })
+			}
+
+			function open_del_popup(index) {
+				selectIndex.value = index
+				delPopup.value.open()
+			}
+
+			function close_del_popup() {
+				delPopup.value.close()
+			}
+
+			function toTitleStyle() {
+				saveCms()
+				uni.navigateTo({ url: "/pages2/editCms/titleStyle" })
+			}
+
+			function toVote(index) {
+				if (index >= 0) {
+					uni.setStorageSync("selectIndex", index)
 				}
-				this.saveCms();
-				uni.navigateTo({
-					url: "/pages2/editCms/vote?type=edit"
+				saveCms()
+				uni.navigateTo({ url: "/pages2/editCms/vote?type=edit" })
+			}
+
+			function to(type, index) {
+				if (type === 'vote') {
+					toVote(index)
+				} else {
+					toeditText(index)
+				}
+			}
+
+			function toEditSetting() {
+				saveCms()
+				uni.navigateTo({ url: "/pages2/editCms/editSetting" })
+			}
+
+			function addTextItem() {
+				cms.cmsLst.splice(selectIndex.value, 0, {
+					type: "text",
+					text: "",
+					image: { src: "", html: "", delta: {} },
+					html: "",
+					delta: {}
 				})
-			},
-			async addItem(type) {
-				console.log(type)
-				if (type === "text") {
-					this.addTextItem();
-				} else if (type === "image") {
-					await this.addImageItem();
-				} else if (type === "video") {
-					await this.addVideoItem();
-				} else if (type === "title") {
-					this.addTitleItem();
-				} else if (type === "position") {
-					await this.addPositionItem();
-				} else if (type === "vote") {
-					this.addVoteItem();
-				} 
-			},
-			async dialogClose() {
-				await uni.setStorageSync("cms", {
-					cmsLst: [],
-					title: "",
-					title_html: "",
-					title_delta: {},
-				})
-				this.cms = uni.getStorageSync("cms");
-				this.$refs.alertDialog.close();
-				
-			},
-			async dialogConfirm() {
-				let cms = uni.getStorageSync("cms");
-				console.log(cms)
-				if (cms && cms.cmsLst) {
-					for (let i = i ; i <= cms.cmsLst.length ; i ++ ) {
-						if (this.cms.cmsLst[index].type === "image") {
-							await uniCloudStorageExtCo.deleteFile({fileList: [this.cms.cmsLst[index].image.src]});
-						} else if (this.cms.cmsLst[index].type === "video") {
-							await uniCloudStorageExtCo.deleteFile({
-							fileList: [
-								this.cms.cmsLst[index].video.src, 
-								this.cms.cmsLst[index].video.poster
-							]
-						});
+				toeditText()
+			}
+
+			function addVoteItem() {
+				saveCms()
+				uni.navigateTo({ url: "/pages2/editCms/vote?type=add" })
+			}
+
+			function addTitleItem() {
+				saveCms()
+				uni.navigateTo({ url: "/pages2/editCms/smallTitle" })
+			}
+
+			async function dialogClose() {
+				let storedCms = uni.getStorageSync("cms")
+				if (storedCms && storedCms.cmsLst) {
+					for (let i = 0; i < storedCms.cmsLst.length; i++) {
+						if (storedCms.cmsLst[i].type === "image" && storedCms.cmsLst[i].image && storedCms.cmsLst[i].image.src) {
+							await uniCloudStorageExtCo.deleteFile({ fileList: [storedCms.cmsLst[i].image.src] })
+						} else if (storedCms.cmsLst[i].type === "video" && storedCms.cmsLst[i].video) {
+							let fileList = [storedCms.cmsLst[i].video.src].filter(Boolean)
+							if (storedCms.cmsLst[i].video.poster) fileList.push(storedCms.cmsLst[i].video.poster)
+							if (fileList.length) await uniCloudStorageExtCo.deleteFile({ fileList })
 						}
 					}
 				}
-				this.$refs.alertDialog.close();
-				
-			},
-			openAlertDialog() {
-				this.$refs.alertDialog.open();
-			},
-			async addVideoItem() {
-				const that = this;
+				await uni.setStorageSync("cms", { cmsLst: [], title: "", title_html: "", title_delta: {} })
+				Object.assign(cms, uni.getStorageSync("cms"))
+				alertDialog.value.close()
+			}
+
+			async function dialogConfirm() {
+				alertDialog.value.close()
+			}
+
+			async function addItem(type) {
+				if (type === "text") {
+					addTextItem()
+				} else if (type === "image") {
+					await addImageItem()
+				} else if (type === "video") {
+					await addVideoItem()
+				} else if (type === "title") {
+					addTitleItem()
+				} else if (type === "vote") {
+					addVoteItem()
+				}
+			}
+
+			async function addVideoItem() {
 				uni.chooseVideo({
-					sourceType:['album', 'camera'],
+					sourceType: ['album', 'camera'],
 					success: async (res) => {
-						console.log(res);
-						let filePath = res.tempFilePath;
-						let {
-							name,
-							extname
-						} = that.getFileInfo(filePath)
-						
-						let duration = res.duration;
-						
-						console.log(`cms/video/${name}_${Math.random().toString(36).substr(2,6)}`)
+						let filePath = res.tempFilePath
+						let { name, extname } = getFileInfo(filePath)
+						let duration = res.duration
 						const uploadFileOptionsRes = await uniCloudStorageExtCo.getUploadFileOptions({
 							cloudPath: `cms/video/${name}_${Math.random().toString(36).substr(2,6)}`
-						});
-						console.log(uploadFileOptionsRes)
-						let lastUpdate = 0;
+						})
 						await uniCloud.uploadFile({
 							...uploadFileOptionsRes.uploadFileOptions,
 							filePath: filePath,
 							cloudPath: uploadFileOptionsRes.cloudPath,
-							onUploadProgress: (progressEvent) => {
-							  if (Date.now() - lastUpdate < 200) return;
-							  console.log(progressEvent)
-							  let loadingVisible = false;
-							  if (!loadingVisible) {
-								uni.showLoading({ title: '初始化上传...', mask: true });
-								loadingVisible = true;
-							  }
-							let progress = 
-							Math.round((progressEvent.loaded * 100) / progressEvent.total);
-							let remaining = this.formatBytes(progressEvent.total - progressEvent.loaded);
-							uni.hideLoading();
-							console.log(`进度: ${progress}%, 剩余 ${remaining}`)
-							uni.showLoading({
-								title: `进度: ${progress}%`
-							});
-							  
-							  lastUpdate = Date.now();
-							},
 							success: async () => {
 								const res2 = {
 									cloudPath: uploadFileOptionsRes.cloudPath,
 									fileID: uploadFileOptionsRes.fileID,
 									fileURL: uploadFileOptionsRes.fileURL
-								};
-								console.log(res2)
-								
-								const selectedMedia = {
-									src: res2.fileURL,
-									alt: name
 								}
-								console.log(selectedMedia)
+								const selectedMedia = { src: res2.fileURL, alt: name }
 								let poster = "vframe/jpg/offset/0/w/440/h/264/"
-								let cover = res2.fileURL + "?" + poster;
-								
+								let cover = res2.fileURL + "?" + poster
 								let item = {
 									type: "video",
 									text: "",
-									video: {
-										src: selectedMedia.src,
-										poster: cover,
-										duration: duration,
-										html: "",
-										delta:{}
-									}
+									video: { src: selectedMedia.src, poster: cover, duration: duration, html: "", delta: {} }
 								}
-								this.cms.cmsLst.splice(this.selectIndex, 0, item)
-								this.close()
-								console.log("上传成功", res2);
+								cms.cmsLst.splice(selectIndex.value, 0, item)
+								close()
 							},
 							fail: (err) => {
-								console.log("上传失败", err);
-								
-							},
-							complete() {
-								uni.hideLoading();
+								console.log("上传失败", err)
 							}
-						});
-						
-						
+						})
 					}
-				});
-			},
-			async updateVideoItem(index) {
-				const that = this;
+				})
+			}
+
+			async function updateVideoItem(index) {
 				uni.chooseVideo({
-					sourceType:['album', 'camera'],
+					sourceType: ['album', 'camera'],
 					success: async (res) => {
-						console.log(res);
-						if (!this.cms.cmsLst[index] && this.cms.cmsLst[index].video.src) {
-								await uniCloudStorageExtCo.deleteFile({
-									fileList:[
-									this.cms.cmsLst[index].video,
-									this.cms.cmsLst[index].poster
-								]
-								});
+						if (cms.cmsLst[index] && cms.cmsLst[index].video.src) {
+							await uniCloudStorageExtCo.deleteFile({
+								fileList: [cms.cmsLst[index].video.src, cms.cmsLst[index].video.poster]
+							})
 						}
-						let filePath = res.tempFilePath;
-						let {
-							name,
-							extname
-						} = that.getFileInfo(filePath)
-						
-						let duration = res.duration;
-						
-						console.log(`cms/video/${name}_${Math.random().toString(36).substr(2,6)}`)
+						let filePath = res.tempFilePath
+						let { name, extname } = getFileInfo(filePath)
+						let duration = res.duration
 						const uploadFileOptionsRes = await uniCloudStorageExtCo.getUploadFileOptions({
 							cloudPath: `cms/video/${name}_${Math.random().toString(36).substr(2,6)}`
-						});
-						let lastUpdate  = 0;
+						})
 						await uniCloud.uploadFile({
 							...uploadFileOptionsRes.uploadFileOptions,
 							filePath: filePath,
 							cloudPath: uploadFileOptionsRes.cloudPath,
-							onUploadProgress: (progressEvent) => {
-							  if (Date.now() - lastUpdate < 200) return;
-							  console.log(progressEvent)
-							  let loadingVisible = false;
-							  if (!loadingVisible) {
-								uni.showLoading({ title: '初始化上传...', mask: true });
-								loadingVisible = true;
-							  }
-							let progress = 
-							Math.round((progressEvent.loaded * 100) / progressEvent.total);
-							let remaining = this.formatBytes(progressEvent.total - progressEvent.loaded);
-							uni.hideLoading();
-							console.log(`进度: ${progress}%, 剩余 ${remaining}`)
-							uni.showLoading({
-								title: `进度: ${progress}%`
-							});
-							  
-							  lastUpdate = Date.now();
-							},
 							success: async () => {
 								const res2 = {
 									cloudPath: uploadFileOptionsRes.cloudPath,
 									fileID: uploadFileOptionsRes.fileID,
 									fileURL: uploadFileOptionsRes.fileURL
-								};
-								console.log(res2)
-								
-								const selectedMedia = {
-									src: res2.fileURL,
-									alt: name
 								}
-								console.log(selectedMedia)
+								const selectedMedia = { src: res2.fileURL, alt: name }
 								let poster = "vframe/jpg/offset/0/w/440/h/264/"
-								let cover = res2.fileURL + "?" + poster;
-								
-								let {
-									text,
-									html,
-									delta
-								} = {
-									text: this.cms.cmsLst[index].text,
-									html: this.cms.cmsLst[index].video.html,
-									delta: this.cms.cmsLst[index].video.delta
+								let cover = res2.fileURL + "?" + poster
+								let { text, html, delta } = {
+									text: cms.cmsLst[index].text,
+									html: cms.cmsLst[index].video.html,
+									delta: cms.cmsLst[index].video.delta
 								}
-								
 								let item = {
 									type: "video",
 									text: text,
-									video: {
-										src: selectedMedia.src,
-										poster: cover,
-										duration: duration,
-										html: html,
-										delta: delta
-									}
+									video: { src: selectedMedia.src, poster: cover, duration: duration, html: html, delta: delta }
 								}
-								this.cms.cmsLst[index] = item;
-								console.log(this.cms)
-								this.close()
-									
-								console.log("上传成功", res2);
+								cms.cmsLst[index] = item
+								close()
 							},
 							fail: (err) => {
-								console.log("上传失败", err);
-							},
-							complete() {
-								uni.hideLoading();
+								console.log("上传失败", err)
 							}
-						});
-						uni.hideLoading();
-						
-					}
-				});
-			},
-			addTitleItem() {
-				this.saveCms();
-				uni.navigateTo({
-					url: "/pages2/editCms/smallTitle"
-				})
-			},
-			addTextItem() {
-				console.log(this.selectIndex)
-				this.cms.cmsLst.splice(this.selectIndex, 0, {
-					type: "image",
-					text: "",
-					image: {
-						src: "",
-						html: "",
-						delta:{}
+						})
 					}
 				})
-				this.toeditText();
-			},
-			addVoteItem() {
-				this.saveCms();
-				uni.navigateTo({
-					url: "/pages2/editCms/vote?type=add"
-				})
-			},
-			
-			async addPositionItem() {
+			}
 
+			return {
+				alertDialog,
+				delPopup,
+				popup,
+				saveInterval,
+				is_vote,
+				not_image,
+				selectIndex,
+				cmsType,
+				cms,
+				saveCms,
+				open,
+				close,
+				confirm,
+				addEditItem,
+				getFileInfo,
+				formatBytes,
+				updateImage,
+				delItem,
+				addImageItem,
+				back,
+				toeditText,
+				open_del_popup,
+				close_del_popup,
+				toTitleStyle,
+				toVote,
+				to,
+				toEditSetting,
+				addTextItem,
+				addVoteItem,
+				addTitleItem,
+				dialogClose,
+				dialogConfirm,
+				addItem,
+				addVideoItem,
+				updateVideoItem
 			}
 		}
 	}
@@ -960,7 +672,6 @@
 	}
 
 	.add-button::before {
-		/* 水平线 */
 		width: 24rpx;
 		height: 4rpx;
 	}
@@ -970,16 +681,10 @@
 	}
 
 	.add-button::after {
-		/* 垂直线 */
 		width: 4rpx;
 		height: 24rpx;
 	}
 
-	// .add-button:hover {
-	//   transform: scale(1.1) rotate(90deg);
-	//   box-shadow: 0 4px 12px rgba(76, 175, 80, 0.3);
-	// }
-
 	.add-button:active {
 		transform: scale(0.95);
 	}
@@ -997,14 +702,12 @@
 				flex: 0 0 30%;
 			}
 
-			// 第二部分
 			&.part2 {
 				flex: 0 0 63%;
 				display: flex;
 				flex-direction: column;
 			}
 
-			// 第三部分
 			&.part3 {
 				flex: 0 0 7%;
 				display: flex;
@@ -1051,20 +754,14 @@
 		}
 
 		display: flex;
-		/* 启用 Flex 布局 */
 		flex-wrap: wrap;
-		/* 允许换行 */
 		box-sizing: border-box;
-		/* 包含 padding 计算 */
 		padding: 10rpx;
-		/* 容器内边距（控制边缘间距） */
 		width: 100%;
-		/* 确保容器宽度占满父元素 */
 	}
 
 	.grid-item-box {
 		flex: 1;
-		// position: relative;
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
@@ -1074,29 +771,10 @@
 		padding: 15px 0;
 	}
 
-	.grid-item-box-row {
-		flex: 1;
-		// position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		padding: 15px 0;
-	}
-	
 	.margin_4 {
 		margin-top: 4rpx;
 		margin-bottom: 4rpx;
 	}
-	
-
-	.grid-dot {
-		position: absolute;
-		top: 5px;
-		right: 15px;
-	}
 
 	.image {
 		width: 50rpx;
@@ -1112,12 +790,9 @@
 		  justify-content: center;
 		  align-items: center;
 		.not-image-icon {
-			  justify-content: center; /* 垂直居中 */
-			  align-items: center; /* 水平居中 */
+			  justify-content: center;
+			  align-items: center;
 			  text-align: center;
-			  // height: 100%; /* 确保容器有明确高度 */
-			  // display: flex;
-			  // flex-direction: column; /* 纵向排列图片和文字 */
 		}
 	}
 	.not-font {
@@ -1168,4 +843,4 @@
 	  width: 100%;
 	  height: 200rpx;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages2/editCms/editSetting.vue b/pages2/editCms/editSetting.vue
index d5316ad..098ad7b 100644
--- a/pages2/editCms/editSetting.vue
+++ b/pages2/editCms/editSetting.vue
@@ -29,14 +29,6 @@
 				disabled 
 				suffixIcon="arrow-right"/>
 			</view>
-
-			<!-- <uni-easyinput v-model="pItems[p_index].text" disabled @click="p_open()"></uni-easyinput> -->
-			<!-- <view class="" 
-			style="border: 2rpx solid #000;text-align: center;padding: 20rpx 0rpx;margin: 0 50rpx;border-radius: 10rpx;background-color: #efefef;font-size: 36rpx;" 
-			@click="p_open">
-				{{ pItems[0][p_index].text }}
-			</view> -->
-
 		</uni-forms-item>
 		
 		<uni-forms-item label="文章分类">
@@ -58,14 +50,6 @@
 				
 				suffixIcon="arrow-right"/>
 			</view>
-
-			<!-- <uni-easyinput v-model="pItems[p_index].text" disabled @click="p_open()"></uni-easyinput> -->
-			<!-- <view class="" 
-			style="border: 2rpx solid #000;text-align: center;padding: 20rpx 0rpx;margin: 0 50rpx;border-radius: 10rpx;background-color: #efefef;font-size: 36rpx;" 
-			@click="p_open">
-				{{ pItems[0][p_index].text }}
-			</view> -->
-		
 		</uni-forms-item>
 		
 		<uni-section title="文章封面" type="line">
@@ -77,7 +61,6 @@
 				</uni-data-checkbox>
 			</view>
 			<view class="" v-if="thumbMode === 1">
-				
 				<view class="container" @click="updateImage(0)">
 					<view v-if="!thumbnail[0]">
 						<view class="cross-line horizontal"></view>
@@ -90,390 +73,313 @@
 			
 			<view class="parent-container" v-if="thumbMode === 3">
 				<view class="container" 
-				
 				@click="updateImage(index)" 
 				v-for="(item, index) in thumbnail" :key="index">
 					<view v-if="!thumbnail[index] || !thumbnail[index]">
 						<view class="cross-line horizontal"></view>
 						<view class="cross-line vertical"></view>
 					</view>
-					<cloud-image v-else width="200rpx" 
-					height="200rpx" mode="scaleToFill" :src="thumbnail[index]">
+					<cloud-image v-else width="200rpx" height="200rpx" mode="scaleToFill" :src="thumbnail[index]">
 					</cloud-image>
 				</view>
 			</view>
-			
 		</uni-section>
 	</view>
 </template>
 
 <script>
-	import uPicker from "@/uni_modules/uview-ui/components/u-picker/u-picker.vue";
-	import uInput from "@/uni_modules/uview-ui/components/u-input/u-input.vue";
+	import { ref, reactive, onMounted, onHide, onUnload } from 'vue'
+	import uPicker from "@/uni_modules/uview-ui/components/u-picker/u-picker.vue"
+	import uInput from "@/uni_modules/uview-ui/components/u-input/u-input.vue"
 	import cloudImage from "@/components/cloud-image.vue"
+
 	export default {
 		components: {
 			uPicker,
 			uInput,
 			cloudImage
 		},
-		onHide() {
-		  clearInterval(this.saveInterval);
-		},
-		onUnload() {
-		  clearInterval(this.saveInterval);
-		  clearTimeout(this.saveInterval);
-		},
-		async onReady() {
-		},
-		async onShow() {
+		setup() {
+			const saveInterval = ref(null)
+			const tag_index = ref(0)
+			const category_id = ref("")
+			const tag_show = ref(false)
+			const tags = ref([])
+			const thumbMode = ref(0)
+			const p_show = ref(false)
+			const p_type = ref("1")
+			const p_index = ref(0)
 
-		},
-		async onLoad() {
-			this.saveInterval = setInterval(this.save, 10000);
-			let cms = uni.getStorageSync("cms");
-			
-			let res = await uniCloud.importObject("uni-cms-categories").getTags();
-			if (res.code === "200") {
-				this.tags = [res.tags];
-			}
-			
-			if (cms.category_id) {
-				this.category_id = cms.category_id;
-				for (let i = 0 ; i < this.tags[0].length ; i ++ ) {
-					if ( this.category_id === this.tags[0][i].value ) {
-						this.tag_index = i ;
-						break;
+			const thumbnailType = ref([
+				{ text: "无封面", value: 0 },
+				{ text: "单图模式", value: 1 },
+				{ text: "三图模式", value: 3 },
+			])
+
+			const thumbnail = reactive([
+				{ src: "" },
+				{ src: "" },
+				{ src: "" },
+			])
+
+			const pItems = ref([
+				[
+					{ text: "空军", value: "1" },
+					{ text: "海军", value: "2" },
+					{ text: "陆军", value: "3" },
+					{ text: "地勤保障", value: "4" },
+					{ text: "武警", value: "5" },
+				]
+			])
+
+			onHide(() => {
+				clearInterval(saveInterval.value)
+			})
+
+			onUnload(() => {
+				clearInterval(saveInterval.value)
+				clearTimeout(saveInterval.value)
+			})
+
+			onMounted(async () => {
+				saveInterval.value = setInterval(save, 10000)
+				let cms = uni.getStorageSync("cms")
+
+				let res = await uniCloud.importObject("uni-cms-categories").getTags()
+				if (res.code === "200") {
+					tags.value = [res.tags]
+				}
+
+				if (cms.category_id) {
+					category_id.value = cms.category_id
+					for (let i = 0; i < tags.value[0].length; i++) {
+						if (category_id.value === tags.value[0][i].value) {
+							tag_index.value = i
+							break
+						}
+					}
+				} else {
+					category_id.value = tags.value[0][0].value
+					tag_index.value = 0
+				}
+
+				if (cms.thumbnail) {
+					thumbMode.value = cms.thumbnail.length
+					if (thumbMode.value === 0) {
+						thumbnail[0] = { src: "" }
+						thumbnail[1] = { src: "" }
+						thumbnail[2] = { src: "" }
+						thumbMode.value = 0
+					} else if (thumbMode.value === 1) {
+						thumbnail[0] = cms.thumbnail[0]
+						thumbnail[1] = { src: "" }
+						thumbnail[2] = { src: "" }
+						thumbMode.value = 1
+					} else if (thumbMode.value === 3) {
+						thumbnail[0] = cms.thumbnail[0]
+						thumbnail[1] = cms.thumbnail[1]
+						thumbnail[2] = cms.thumbnail[2]
+						thumbMode.value = 3
 					}
 				}
-				
-			} else {
-				this.category_id = this.tags[0][0].value;
-				this.tag_index = 0;
-			}
-			console.log(this.category_id)
-			console.log(cms.thumbnail);
-			if ( cms.thumbnail ) {
-				this.thumbMode = cms.thumbnail.length;
-				if (this.thumbMode === 0) {
-					this.thumbnail = [
-					{
-						src: "",
-					},
-					{
-						src: "",
-					},
-					{
-						src: "",
-					},
-				];
-				this.thumbMode = 0;
-				
-				} else if (this.thumbMode === 1) {
-					this.thumbnail = [
-						cms.thumbnail[0],
-						{
-							src: "",
-						},
-						{
-							src: "",
-						},
-					];
-					this.thumbMode = 1;
-				} else if (this.thumbMode === 3) {
-					this.thumbnail = cms.thumbnail;
-					this.thumbMode = 3;
-				}
-			}
-			console.log(cms.p_type);
-			if (cms.p_type) {
-				this.p_type = cms.p_type;
-				
-				for (let i = 0 ; i < this.pItems[0].length ; i ++ ) {
-					console.log(": ", this.pItems[0][i].value,this.p_type );
-					if ( this.p_type === this.pItems[0][i].value ) {
-						this.p_index = i ; 
-						
-						break;
+
+				if (cms.p_type) {
+					p_type.value = cms.p_type
+					for (let i = 0; i < pItems.value[0].length; i++) {
+						if (p_type.value === pItems.value[0][i].value) {
+							p_index.value = i
+							break
+						}
 					}
 				}
+			})
+
+			function getFileInfo(path) {
+				const parts = path.split('/').pop()
+				const [filename, ...extParts] = parts.split('.')
+				const ext = extParts.length ? extParts.pop() : ''
+				return { name: filename, extname: ext }
 			}
-			console.log(this.p_type);
-		},
-		data() {
-			return {
-				saveInterval: {},
-				
-				tag_index: 0,
-				category_id: "",
-				tag_show: false,
-				tags: [],
-				
-				thumbnailType:[
-					{
-						text: "无封面",
-						value: 0,
-					},
-					{
-						text: "单图模式",
-						value: 1,
-					},
-					{
-						text: "三图模式",
-						value: 3,
-					},
-				],
-				thumbMode: 0,
-				thumbnail: [
-					{
-						src: "",
-					},
-					{
-						src: "",
-					},
-					{
-						src: "",
-					},
-				],
-				
-				p_show: false,
-				p_type: "1",
-				p_index: 0,
-				pItems: [
-					[
-						{
-							text: "空军",
-							value: "1"
-						},
-						{
-							text: "海军",
-							value: "2"
-						},
-						{
-							text: "陆军",
-							value: "3"
-						},
-						{
-							text: "地勤保障",
-							value: "4"
-						},
-						{
-							text: "武警",
-							value: "5"
-						},
-					]
-				],
+
+			function formatBytes(bytes) {
+				if (bytes === 0) return '0 Bytes'
+				const k = 1024
+				const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB']
+				const i = Math.floor(Math.log(bytes) / Math.log(k))
+				if (i >= sizes.length) return '> 1 TB'
+				return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]
 			}
-		},
-		methods: {
-			getFileInfo(path) {
-				const parts = path.split('/').pop();
-				const [filename, ...extParts] = parts.split('.');
-				const ext = extParts.length ? extParts.pop() : '';
-				return {
-					name: filename,
-					extname: ext
-				};
-			},
-			formatBytes(bytes) {
-				if (bytes === 0) return '0 Bytes';
-				const k = 1024;
-				const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-			
-				const i = Math.floor(Math.log(bytes) / Math.log(k));
-			
-				if (i >= sizes.length) return '> 1 TB';
-				return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
-			},
-			thumbnailChange(e) {
+
+			function thumbnailChange(e) {
 				console.log(e)
-				// this.thumbMode = e.detail.value;
-				
-			},
-			async updateImage(index) {
-				const that = this;
+			}
+
+			async function updateImage(index) {
 				uni.chooseImage({
 					type: "image",
 					count: 1,
 					success: async (res) => {
-						console.log(res);
 						if (res.tempFilePaths.length > 0) {
-							let filePath = res.tempFilePaths[0];
-							let {
-								name,
-								extname
-							} = that.getFileInfo(filePath)
-							const uniCloudStorageExtCo = uniCloud.importObject("ext-storage-co");
-							console.log(`thumbnail/${name}_${Math.random().toString(36).substr(2,6)}`)
+							let filePath = res.tempFilePaths[0]
+							let { name, extname } = getFileInfo(filePath)
+							const uniCloudStorageExtCo = uniCloud.importObject("ext-storage-co")
 							const uploadFileOptionsRes = await uniCloudStorageExtCo.getUploadFileOptions({
 								cloudPath: `thumbnail/${name}_${Math.random().toString(36).substr(2,6)}`
-							});
-							console.log(uploadFileOptionsRes)
+							})
 							await uniCloud.uploadFile({
 								...uploadFileOptionsRes.uploadFileOptions,
 								filePath: filePath,
 								cloudPath: uploadFileOptionsRes.cloudPath,
 								success: () => {
-									const res = {
+									const res2 = {
 										cloudPath: uploadFileOptionsRes.cloudPath,
 										fileID: uploadFileOptionsRes.fileID,
 										fileURL: uploadFileOptionsRes.fileURL
-									};
-									console.log(res)
-									console.log(this.thumbnail)
-									this.$set(this.thumbnail, index, res.fileID);
-									
-									console.log("上传成功", res);
+									}
+									thumbnail[index].src = res2.fileID
 								},
 								fail: (err) => {
-									console.log("上传失败", err);
+									console.log("上传失败", err)
 								}
-							});
-
-						} else {
-							console.log("未选中文件")
+							})
 						}
 					}
-				});
-			},
-			tag_close() {
-				this.tag_show = false;
-			},
-			tag_open() {
-				console.log(111)
-				this.tag_show = true;
-			},
-			tag_select(e) {
-				let index = e.indexs[0];
-				
-				let {
-					text,
-					value
-				} = e.value[0];
-				
-				this.tag_index = index;
-				this.category_id = value;
-				this.tag_close();
-			},
-			p_select(e) {
-				console.log(e)
-				let index = e.indexs[0];
-				let {
-					text,
-					value
-				} = e.value[0];
-				
-				this.p_index = index;
-				this.p_type = value;
-				this.p_close();
-			},
-			p_close() {
-				this.p_show = false;
-			},
-			p_open() {
-				this.p_show = true;
-			},
-			pItemChange(e) {
-				console.log(e)
-			},
-			getTexts(items) {
-				let lst = [];
-				for (let i = 0 ; i < items.length ; i ++ ) {
-					lst.push(items[i].text)
-				}
-				return lst;
-			},
-			bindPickerChange(e) {
-				console.log('picker发送选择改变，携带值为', e)
-				// this.index = e.detail.value
-			},
-			save() {
-				console.log(this.thumbMode,this.thumbnail)
-				let cms = uni.getStorageSync("cms");
+				})
+			}
 
-				cms.category_id = this.category_id;
-				
-				cms.p_type = this.p_type;
-				
-				if (this.thumbMode === 0) {
-					cms.thumbnail = [];
-				} else if (this.thumbMode === 1) {
-					let thumbnail = [this.thumbnail[0]];
-					cms.thumbnail = thumbnail;
-				} else if (this.thumbMode === 3) {
-					let thumbnail = thumbnail;
-					for (let i = 0 ; i < 3 ; i ++ ) {
-						if (this.thumbnail[i]) {
-							thumbnail.push(this.thumbnail[i])
+			function tag_close() {
+				tag_show.value = false
+			}
+
+			function tag_open() {
+				tag_show.value = true
+			}
+
+			function tag_select(e) {
+				let index = e.indexs[0]
+				let { text, value } = e.value[0]
+				tag_index.value = index
+				category_id.value = value
+				tag_close()
+			}
+
+			function p_select(e) {
+				let index = e.indexs[0]
+				let { text, value } = e.value[0]
+				p_index.value = index
+				p_type.value = value
+				p_close()
+			}
+
+			function p_close() {
+				p_show.value = false
+			}
+
+			function p_open() {
+				p_show.value = true
+			}
+
+			function save() {
+				let cms = uni.getStorageSync("cms")
+				cms.category_id = category_id.value
+				cms.p_type = p_type.value
+
+				if (thumbMode.value === 0) {
+					cms.thumbnail = []
+				} else if (thumbMode.value === 1) {
+					cms.thumbnail = [thumbnail[0]]
+				} else if (thumbMode.value === 3) {
+					let thumb = []
+					for (let i = 0; i < 3; i++) {
+						if (thumbnail[i]) {
+							thumb.push(thumbnail[i])
 						}
-					} 
-					cms.thumbnail = thumbnail;
+					}
+					cms.thumbnail = thumb
 				}
-				
-				console.log(cms)
-				
-			},
-			back() {
-				this.save();
+			}
+
+			function back() {
+				save()
 				try {
-					uni.navigateBack({delta: 1});
-				} catch(e) {
-					uni.switchTab({
-						url:"/pages/index/index"
-					})
+					uni.navigateBack({ delta: 1 })
+				} catch (e) {
+					uni.switchTab({ url: "/pages/index/index" })
 				}
-			},
-			toPreview() {
-				let flag = true;
-				
-				console.log(this.thumbMode,this.thumbnail)
-				let cms = uni.getStorageSync("cms");
-				
-				cms.category_id = this.category_id;
-				
-				cms.p_type = this.p_type;
-				
+			}
+
+			function toPreview() {
+				let flag = true
+				let cms = uni.getStorageSync("cms")
+
+				cms.category_id = category_id.value
+				cms.p_type = p_type.value
+
 				if (!cms.p_type) {
-					uni.showLoading({ title: `兵种不能为空` });
-					setTimeout(() => uni.hideLoading(), 1000);
-					flag = false;
+					uni.showLoading({ title: `兵种不能为空` })
+					setTimeout(() => uni.hideLoading(), 1000)
+					flag = false
 				} else if (!cms.category_id) {
-					uni.showLoading({ title: `分类不能为空` });
-					setTimeout(() => uni.hideLoading(), 1000);
-					flag = false;
+					uni.showLoading({ title: `分类不能为空` })
+					setTimeout(() => uni.hideLoading(), 1000)
+					flag = false
 				} else {
-					console.log(this.thumbMode, this.thumbnail)
-					if (this.thumbMode === 0) {
-						cms.thumbnail = [];
-					} else if (this.thumbMode === 1) {
-						let thumbnail = [this.thumbnail[0]];
-						cms.thumbnail = thumbnail;
-					} else if (this.thumbMode === 3) {
-						let thumbnail = thumbnail;
-						for (let i = 0 ; i < 3 ; i ++ ) {
-							if (this.thumbnail[i]) {
-								thumbnail.push(this.thumbnail[i])
+					if (thumbMode.value === 0) {
+						cms.thumbnail = []
+					} else if (thumbMode.value === 1) {
+						cms.thumbnail = [thumbnail[0]]
+					} else if (thumbMode.value === 3) {
+						let thumb = []
+						for (let i = 0; i < 3; i++) {
+							if (thumbnail[i]) {
+								thumb.push(thumbnail[i])
 							}
-						} 
-						cms.thumbnail = thumbnail;
+						}
+						cms.thumbnail = thumb
 					}
 				}
-				for(let i = 0 ; i < cms.thumbnail.length ; i ++ ) {
+
+				for (let i = 0; i < cms.thumbnail.length; i++) {
 					if (cms.thumbnail[i] === "") {
-						uni.showLoading({ title: `封面图不能为空` });
-						setTimeout(() => uni.hideLoading(), 1000);
-						flag = false;
+						uni.showLoading({ title: `封面图不能为空` })
+						setTimeout(() => uni.hideLoading(), 1000)
+						flag = false
 					}
 				}
 				uni.setStorageSync("cms", cms)
-				
-				if (flag) {
-					uni.navigateTo({
-						url:"/pages2/editCms/preview"
-					})
-				}
 
-			},
+				if (flag) {
+					uni.navigateTo({ url: "/pages2/editCms/preview" })
+				}
+			}
+
+			return {
+				saveInterval,
+				tag_index,
+				category_id,
+				tag_show,
+				tags,
+				thumbMode,
+				thumbnailType,
+				thumbnail,
+				p_show,
+				p_type,
+				p_index,
+				pItems,
+				getFileInfo,
+				formatBytes,
+				thumbnailChange,
+				updateImage,
+				tag_close,
+				tag_open,
+				tag_select,
+				p_select,
+				p_close,
+				p_open,
+				save,
+				back,
+				toPreview
+			}
 		}
 	}
 </script>
@@ -487,7 +393,7 @@
 	
 	.container {
 		position: relative;
-		flex-shrink: 0;        /* 禁止宽度压缩 */
+		flex-shrink: 0;
 		width: 200rpx;
 		height: 200rpx;
 		border: 1rpx solid #ccc;
diff --git a/pages2/editCms/editText.vue b/pages2/editCms/editText.vue
index 4f37e71..591f3ab 100644
--- a/pages2/editCms/editText.vue
+++ b/pages2/editCms/editText.vue
@@ -1,20 +1,18 @@
 <template>
 	<view class="container">
-		<view>
-			<uni-nav-bar 
-			title="编辑文字" 
-			leftText="取消" 
-			left-icon="left" 
-			right-text="完成" 
-			backgroundColor="#ffffff" 
-			color="#000000" 
-			@clickRight="toSuccess()" 
-			@clickLeft="back()">
-			</uni-nav-bar>
-		</view>
+		<uni-nav-bar 
+		title="编辑文字" 
+		leftText="取消" 
+		left-icon="left" 
+		right-text="完成" 
+		backgroundColor="#ffffff" 
+		color="#000000" 
+		@clickRight="toSuccess()" 
+		@clickLeft="back()">
+		</uni-nav-bar>
+
 		<view class="page-body">
 			<view class='wrapper'>
-
 				<view class="editor-wrapper">
 					<editor 
 					id="editor" 
@@ -29,7 +27,6 @@
 				</view>
 				<view class='toolbar' @tap="format">
 					<view class="item-wrap">
-						
 						<view class="iconfont icon-undo" @tap="undo"></view>
 						<view class="iconfont icon-redo" @tap="redo"></view>
 						
@@ -58,352 +55,90 @@
 								</view>
 							</template>
 						</zb-popover>
-						
-						<zb-popover
-							actionsDirection="horizontal"
-							@handleClick="handleFontSizeClick"
-							placement="top"
-							:options="actions"
-							@select="selectFontSizeItme"
-							ref="fontSize">
-							<view class="iconfont icon-fontsize"
-							></view>
-						</zb-popover>
-						
-						<zb-popover
-							@handleClick="handleFontAlignClick"
-							placement="top"
-							ref="fontAlign"
-							actionsDirection="horizontal">
-							<view class="iconfont icon-juzhongduiqi"></view>
-							<template #content>
-								<view 
-								:class="formats.align === 'left' ? 'ql-active' : ''" 
-								class="iconfont icon-zuoduiqi"
-								data-name="align" 
-								data-value="left">
-								</view>
-								
-								<view 
-								:class="formats.align === 'center' ? 'ql-active' : ''" 
-								class="iconfont icon-juzhongduiqi"
-								data-name="align" 
-								data-value="center">
-								</view>
-								
-								<view 
-								:class="formats.align === 'right' ? 'ql-active' : ''" 
-								class="iconfont icon-youduiqi"
-								data-name="align" 
-								data-value="right">
-								</view>
-								
-								<view 
-								:class="formats.align === 'justify' ? 'ql-active' : ''" 
-								class="iconfont icon-zuoyouduiqi"
-								data-name="align" 
-								data-value="justify">
-								</view>
-								
-								<view 
-								class="iconfont icon-indent" 
-								data-name="indent" 
-								data-value="+1">
-								</view>
-								
-							</template>
-						</zb-popover>
-						
-						<zb-popover
-							placement="top"
-							@handleClick="handleFontListClick"
-							ref="fontList"
-							actionsDirection="horizontal">
-							
-							<view 
-							class="iconfont icon-wuxupailie">
-							</view>
-							
-							<template #content>
-								<view 
-								:class="formats.list === 'ordered' ? 'ql-active' : ''" 
-								class="iconfont icon-youxupailie"
-								data-name="list" 
-								data-value="ordered">
-								</view>
-								
-								<view 
-								:class="formats.list === 'bullet' ? 'ql-active' : ''" 
-								class="iconfont icon-wuxupailie"
-								data-name="list" 
-								data-value="bullet">
-								</view>
-								
-							</template>
-						</zb-popover>
-						
-						<zb-popover
-							placement="top"
-							@handleClick="handleFontColorClick"
-							ref="fontColor"
-							actionsDirection="horizontal">
-							
-							<image class="iconfont" src="https://qnycdn.mymoyu.top/static/icon/colors.png" mode="scaleToFill" style="width: 24px;height: 24px;"></image>
-
-							<template #content>
-								<view
-								:class="{
-									'is-color': isColor('#000000'),
-									'not-color': !isColor('#000000')
-								}"
-								data-name="color" 
-								class="color-000000-item color-item"
-								data-value="#000000">
-								</view>
-								
-								<view
-								:class="{
-									'is-color': isColor('#7a7e83'),
-									'not-color': !isColor('#7a7e83')
-								}"
-								data-name="color" 
-								class="color-7a7e83-item color-item"
-								data-value="#7a7e83">
-								</view>
-								
-								<view
-								:class="{
-									'is-color': isColor('#ff0000'),
-									'not-color': !isColor('#ff0000')
-								}"
-								data-name="color" 
-								class="color-ff0000-item color-item"
-								data-value="#ff0000">
-								</view>
-								
-								<view
-								:class="{
-									'is-color': isColor('#ff9900'),
-									'not-color': !isColor('#ff9900')
-								}"
-								data-name="color" 
-								class="color-ff9900-item color-item"
-								data-value="#ff9900">
-								</view>
-								
-								<view
-								:class="{
-									'is-color': isColor('#1aad19'),
-									'not-color': !isColor('#1aad19')
-								}"
-								data-name="color" 
-								class="color-1aad19-item color-item"
-								data-value="#1aad19">
-								</view>
-								
-								<view
-								:class="{
-									'is-color': isColor('#1a73e8'),
-									'not-color': !isColor('#1a73e8')
-								}"
-								data-name="color" 
-								class="color-1a73e8-item color-item"
-								data-value="#1a73e8">
-								</view>
-								
-								<view
-								:class="{
-									'is-color': isColor('#cc00cc'),
-									'not-color': !isColor('#cc00cc')
-								}"
-								data-name="color" 
-								class="color-cc00cc-item color-item"
-								data-value="#cc00cc">
-								</view>
-								
-							</template>
-						</zb-popover>
 					</view>
 				</view>
 			</view>
 		</view>
 	</view>
-
 </template>
 
 <script>
-	import cloudImage from "@/components/cloud-image.vue";
-	export default {
-		components: {
-			cloudImage
-		},
-		data() {
-			return {
-				readOnly: false,
-				formats: {
-					
-					color: "#000000",
-					fontSize: "16px",
-					
-				},
-				actions: [
-					{ 
-						text: '小',
-						value: "16px"
-					},
-					{ 
-						text: '标准',
-						value: "20px"
-					},
-					{ 
-						text: '大',
-						value: "24px"
-					},
-					{ 
-						text: '超大',
-						value: "28px"
-					},
-				],
-			}
-		},
-		onshow() {
-			
-		},
-		onLoad(e) {
-	
-		},
-		onload(e) {
-			console.log(e)
-		},
+	import { ref, reactive } from 'vue'
 
-		methods: {
-			closeAllPopover(type) {
+	export default {
+		setup() {
+			const readOnly = ref(false)
+			const fontAttribute = ref(null)
+			
+			const formats = reactive({
+				color: "#000000",
+				fontSize: "16px",
+			})
+
+			const editorCtx = ref(null)
+
+			function closeAllPopover(type) {
 				if (type === "attribute") {
-					this.$refs.fontSize.close();
-					this.$refs.fontColor.close();
-					this.$refs.fontAlign.close();
-					this.$refs.fontList.close();
-				} else if (type === "size") {
-					this.$refs.fontAttribute.close();
-					this.$refs.fontColor.close();
-					this.$refs.fontAlign.close();
-					this.$refs.fontList.close();
-				} else if (type === "color") {
-					this.$refs.fontAttribute.close();
-					this.$refs.fontSize.close();
-					this.$refs.fontAlign.close();
-					this.$refs.fontList.close();
-				} else if (type === "align") {
-					this.$refs.fontAttribute.close();
-					this.$refs.fontSize.close();
-					this.$refs.fontColor.close();
-					this.$refs.fontList.close();
-				} else if(type === "list") {
-					this.$refs.fontAttribute.close();
-					this.$refs.fontSize.close();
-					this.$refs.fontColor.close();
-					this.$refs.fontAlign.close();
+					fontAttribute.value?.close()
 				}
-			},
-			handleFontColorClick(flag) {
-				this.closeAllPopover("color");
-			},
-			handleFontListClick(flag) {
-				this.closeAllPopover("list")
-			},
-			handleFontAlignClick(flag) {
-				this.closeAllPopover("align")
-			},
-			handleFontSizeClick(flag) {
-				this.closeAllPopover("size")
-			},
-			handleFontAttributeClick(flag) {
-				this.closeAllPopover("attribute")
-			},
-			selectFontSizeItme(item) {
-				console.log(item);
-				this.formats.fontSize = item.value;
-				this.editorCtx.format("fontSize", item.value)
-			},
-			isColor(color) {
-				console.log(color, this.formats.color)
-				if (color === this.formats.color) {
-					return true;
-				}
-				return false;
-			},
-			async toSuccess() {
-				let that = this;
-				let index = uni.getStorageSync("selectIndex");
-				let cms = uni.getStorageSync("cms");
-				console.log(cms)
+			}
+
+			function handleFontAttributeClick(flag) {
+				closeAllPopover("attribute")
+			}
+
+			function isColor(color) {
+				return color === formats.color
+			}
+
+			async function toSuccess() {
+				let index = uni.getStorageSync("selectIndex")
+				let cms = uni.getStorageSync("cms")
 				if (cms && cms.cmsLst && cms.cmsLst[index]) {
-					this.editorCtx.getContents({
+					editorCtx.value.getContents({
 						success: async (res) => {
-							console.log(res);
-							let {
-								html,
-								text,
-								delta
-							} = res;
-							console.log(cms)
+							let { html, text, delta } = res
 							cms.cmsLst[index] = {
 								image: cms.cmsLst[index].image,
 								type: cms.cmsLst[index].type,
 								text: text,
 								html: html,
-								delta:delta,
+								delta: delta,
 							}
-							await uni.setStorageSync("cms", cms);
-							await that.back();
+							await uni.setStorageSync("cms", cms)
+							await back()
 						},
 						fail: (err) => {
 							console.log(err)
-						},
-						complete: () => {
-							
 						}
-					});
+					})
 				}
-			},
-			async back() {
+			}
 
+			async function back() {
 				uni.navigateBack({
 					delta: 1,
 					fail: (err) => {
-						console.log('返回失败原因:', err),
-						uni.navigateTo({
-							url: "/pages2/editCms/editCms"
-						})
+						uni.navigateTo({ url: "/pages2/editCms/editCms" })
 					}
-				});
-			},
-			readOnlyChange() {
-				this.readOnly = !this.readOnly
-			},
-			onEditorReady() {
-				// #ifdef MP-BAIDU
-				this.editorCtx = requireDynamicLib('editorLib').createEditorContext('editor');
-				// #endif
+				})
+			}
 
+			function readOnlyChange() {
+				readOnly.value = !readOnly.value
+			}
+
+			function onEditorReady() {
 				// #ifdef APP-PLUS || MP-WEIXIN || H5
 				uni.createSelectorQuery().select('#editor').context((res) => {
-					this.editorCtx = res.context;
-					
-					let cms = uni.getStorageSync("cms");
-					let index = uni.getStorageSync("selectIndex");
-					
-					this.editorCtx.format("fontSize", this.formats.fontSize);
-					this.editorCtx.format("color", this.formats.color);
-					
+					editorCtx.value = res.context
+					let cms = uni.getStorageSync("cms")
+					let index = uni.getStorageSync("selectIndex")
+					editorCtx.value.format("fontSize", formats.fontSize)
+					editorCtx.value.format("color", formats.color)
 					if (index && cms && cms.cmsLst[index]) {
-						let {
-							html,
-							text,
-							delta
-						} = cms.cmsLst[index];
-						
-						this.editorCtx.setContents({
+						let { html, text, delta } = cms.cmsLst[index]
+						editorCtx.value.setContents({
 							html: html,
 							delta: delta,
 							success: () => {
@@ -411,77 +146,63 @@
 							},
 							fail: (err) => {
 								console.log(err)
-							},
-							complete: () => {
-								
 							}
-						});
+						})
 					}
-	
 				}).exec()
 				// #endif
-				
-				let cms = uni.getStorageSync("cms");
-				let index = uni.getStorageSync("selectIndex");
-				
+			}
 
-			},
-			undo() {
-				this.editorCtx.undo()
-			},
-			redo() {
-				this.editorCtx.redo()
-			},
-			format(e) {
-				let {
-					name,
-					value
-				} = e.target.dataset
+			function undo() {
+				editorCtx.value.undo()
+			}
+
+			function redo() {
+				editorCtx.value.redo()
+			}
+
+			function format(e) {
+				let { name, value } = e.target.dataset
 				if (!name) return
-				// console.log('format', name, value)
-				this.editorCtx.format(name, value)
-			},
-			onStatusChange(e) {
-				const formats = e.detail
-				this.formats = formats
-			},
-			insertDivider() {
-				this.editorCtx.insertDivider({
-					success: function() {
-						console.log('insert divider success')
-					}
-				})
-			},
-			clear() {
+				editorCtx.value.format(name, value)
+			}
+
+			function onStatusChange(e) {
+				const formatData = e.detail
+				Object.assign(formats, formatData)
+			}
+
+			function clear() {
 				uni.showModal({
 					title: '清空编辑器',
 					content: '确定清空编辑器全部内容？',
 					success: res => {
 						if (res.confirm) {
-							this.editorCtx.clear({
-								success: function(res) {
+							editorCtx.value.clear({
+								success: function() {
 									console.log("clear success")
 								}
 							})
 						}
 					}
 				})
-			},
-			removeFormat() {
-				this.editorCtx.removeFormat()
-			},
-			insertDate() {
+			}
+
+			function removeFormat() {
+				editorCtx.value.removeFormat()
+			}
+
+			function insertDate() {
 				const date = new Date()
 				const formatDate = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
-				this.editorCtx.insertText({
-					text: formatDate
-				})
-			},
-			insertImage() {
+				editorCtx.value.insertText({ text: formatDate })
+			}
+
+			function insertImage() {
 				uni.chooseImage({
 					count: 1,
 					success: (res) => {
-						this.editorCtx.insertImage({
+						editorCtx.value.insertImage({
 							src: res.tempFilePaths[0],
 							alt: '图像',
 							success: function() {
@@ -491,6 +212,36 @@
 					}
 				})
 			}
+
+			function insertDivider() {
+				editorCtx.value.insertDivider({
+					success: function() {
+						console.log('insert divider success')
+					}
+				})
+			}
+
+			return {
+				readOnly,
+				fontAttribute,
+				formats,
+				closeAllPopover,
+				handleFontAttributeClick,
+				isColor,
+				toSuccess,
+				back,
+				readOnlyChange,
+				onEditorReady,
+				undo,
+				redo,
+				format,
+				onStatusChange,
+				clear,
+				removeFormat,
+				insertDate,
+				insertImage,
+				insertDivider
+			}
 		}
 	}
 </script>
diff --git a/pages2/editCms/preview.vue b/pages2/editCms/preview.vue
index a2f44d3..a887882 100644
--- a/pages2/editCms/preview.vue
+++ b/pages2/editCms/preview.vue
@@ -13,20 +13,6 @@
 		
 		<view class="v-preview" v-if="temp && temp.temptele_src">
 			<image :src="temp.temptele_src" 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>
 		
 		<view class="" :style="backgrond_color">
@@ -34,19 +20,14 @@
 			
 			<view class="">
 				<view class="meta">
-				
 					<view class="author">
-					
 						<cloud-image
 							height="64rpx" width="64rpx" borderRadius="50%"
 							:src="userInfo.avatar_file.url"></cloud-image>
 						<text class="at" :style="color">{{ userInfo.nickname || '' }}</text>
 						<text class="split">·</text>
-					
 						<text class="date" :style="color">刚刚</text>
-					
 					</view>
-				
 				</view>
 				<view class="">
 					<view class="" v-for="(item, index) in cms.cmsLst" :key="index">
@@ -65,12 +46,6 @@
 						</view>
 						<view class="" v-if="item.type === 'video'" 
 						style="width: 100wv;margin-top: 30rpx;margin-bottom: 30rpx;">
-<!-- 							<cloud-image 
-							width="100%" 
-							height="500rpx" 
-							mode="aspectFit" 
-							:src="item.video.poster">
-							</cloud-image> -->
 							<video
 							style="width: 100%; height: 500rpx;"
 							:src="item.video.src"
@@ -78,7 +53,6 @@
 							danmu-btn 
 							controls>
 							</video>
-							
 						</view>
 						
 						<view class="" v-if="item.type === 'vote'">
@@ -145,8 +119,6 @@
 	
 										</u-checkbox-group>
 									</view>
-
-								
 									<view class="" 
 									v-if="isExpired"
 									:disabled="isExpired || !selectedValue"
@@ -162,20 +134,15 @@
 									text-align: center;;">
 										{{ isExpired ? '已截止' : '点击登录后投票' }}
 									</view>
-							
-								</view>
-							</uni-card>
+									</view>
+								</uni-card>
+							</view>
 						</view>
 					</view>
-
 				</view>
 			</view>
 		</view>
 		
-
-		
-
-		
 		<u-tabbar
 		  :value="tabbarValue"
 		>
@@ -185,48 +152,31 @@
 		  @click="tabbarClick"
 		  :text="item.text">
 		  </u-tabbar-item>
-
 		</u-tabbar>
 		
 		<hqs-popup :title="tabbarText[tabbarValue].text" :from="popFrom" :mask-click="maskClick"
 			@back="onBack"
 			v-model="showPop">
-			  <view class="page-container" v-if="tabbarText[tabbarValue].text === '模板'">
-			    <media-list 
-			      :dataType="'template'"
-			      :pageSize="12"
-				  :currentTemplate="updateTemplateConfig"
-				  @update="updateTemplate"
-			    />
-			  </view>
-			  
-			  <view class="page-container" v-if="tabbarText[tabbarValue].text === '音乐'">
-			    <media-list 
-			      :dataType="'music'"
-			      :pageSize="12"
-				  :currentTemplate="updateTemplateConfig"
-				  @update="updateTemplate"
-			    />
-			  </view>
-			  
-<!-- 			  <view class="page-container" v-if="tabbarText[tabbarValue].text === '字体'">
-			    <media-list 
-			      :dataType="'font'"
-			      :pageSize="12"
-				  :currentTemplate="updateTemplateConfig"
-				  @update="updateTemplate"
-			    />
-			  </view> -->
-			  
-			  <view class="page-container" v-if="tabbarText[tabbarValue].text === '排版'">
-<!-- 			    <media-list 
-			      :dataType="'font'"
-			      :pageSize="12"
-				  :currentTemplate="updateTemplateConfig"
-				  @update="updateTemplate"
-			    /> -->
-				
-			  </view>
+		  <view class="page-container" v-if="tabbarText[tabbarValue].text === '模板'">
+		    <media-list 
+		      :dataType="'template'"
+		      :pageSize="12"
+			  :currentTemplate="updateTemplateConfig"
+			  @update="updateTemplate"
+		    />
+		  </view>
+		  
+		  <view class="page-container" v-if="tabbarText[tabbarValue].text === '音乐'">
+		    <media-list 
+		      :dataType="'music'"
+		      :pageSize="12"
+			  :currentTemplate="updateTemplateConfig"
+			  @update="updateTemplate"
+		    />
+		  </view>
+		  
+		  <view class="page-container" v-if="tabbarText[tabbarValue].text === '排版'">
+		  </view>
 		</hqs-popup>
 		
 		<uni-grid :column="3" :highlight="true" @change="change" :show-border="false">
@@ -244,101 +194,19 @@
 </template>
 
 <script>
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-	
-	import {
-		store,
-		mutations
-	} from '@/pages3/uni_modules/uni-id-pages/common/store.js';
-	import uRadioGroup from "@/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue";
-	import uRadio from "@/uni_modules/uview-ui/components/u-radio/u-radio.vue";
-	import uParse from "@/uni_modules/uview-ui/components/u-parse/u-parse.vue";
-	import uTabbar from "@/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue";
-	import uTabbarItem from "@/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue";
-	import mediaList from "@/components/image-grid/media-list.vue";
-	import cloudImage from "@/components/cloud-image.vue";
-	import uCheckboxGroup from "@/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.vue";
-	import uCheckbox from "@/uni_modules/uview-ui/components/u-checkbox/u-checkbox.vue";
-	
+	import { ref, computed, onShow } from 'vue'
+	import { store } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
+	import uRadioGroup from "@/uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue"
+	import uRadio from "@/uni_modules/uview-ui/components/u-radio/u-radio.vue"
+	import uParse from "@/uni_modules/uview-ui/components/u-parse/u-parse.vue"
+	import uTabbar from "@/uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue"
+	import uTabbarItem from "@/uni_modules/uview-ui/components/u-tabbar-item/u-tabbar-item.vue"
+	import mediaList from "@/components/image-grid/media-list.vue"
+	import cloudImage from "@/components/cloud-image.vue"
+	import uCheckboxGroup from "@/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.vue"
+	import uCheckbox from "@/uni_modules/uview-ui/components/u-checkbox/u-checkbox.vue"
+
 	export default {
-		computed: {
-			btn_send_commends_color() {
-				if (!this.temp) {
-					return "";
-				}
-				return `background-color: ${this.temp.btn_send_commends_color};`
-			},
-			btn_send_commends_font_color() {
-				if (!this.temp) {
-					return "";
-				}
-				return `color: ${this.temp.btn_send_commends_font_color};`
-			},
-			btn_color() {
-				if (!this.temp) {
-					return "";
-				}
-				return `color: ${this.temp.btn_color}`
-			},
-			select_icon_color() {
-				if (!this.temp) {
-					return "";
-				}
-				return `${this.temp.select_icon_color};`
-			},
-			icon_color() {
-				if (!this.temp) {
-					return "";
-				}
-				return `${this.temp.icon_color};`
-			},
-			icon_font_color() {
-				if (!this.temp) {
-					return "";
-				}
-				return `color:${this.temp.icon_color};`
-			},
-			select_font_color() {
-				if (!this.temp) {
-					return "";
-				}
-				return `color: ${this.temp.select_icon_color};`
-			},
-			backgrond_color() {
-				if (!this.temp) {
-					return "";
-				}
-				return `background-color: ${this.temp.backgrond_color};`
-			},
-			color() {
-				if (!this.temp) {
-					return "";
-				}
-				return `color: ${this.temp.font_color};`
-			},
-			userInfo() {
-				return store.userInfo
-			},
-			realNameStatus() {
-				if (!this.userInfo.realNameAuth) {
-					return 0
-				}
-		
-				return this.userInfo.realNameAuth.authStatus
-			},
-			isExpired(voteEndTime) {
-				return new Date() > new Date(voteEndTime);
-			},
-
-		},
-		async onShow() {
-			let cms = uni.getStorageSync("cms");
-			this.titleContent = cms.title_html;
-			this.cms = cms;
-
-			await this.getTemp();
-			
-		},
 		components: {
 			uTabbar,
 			uTabbarItem,
@@ -350,216 +218,230 @@
 			uCheckboxGroup,
 			uCheckbox
 		},
-		data() {
-			return {
-				
-			voteType: [
-				"单选（默认)",
-				"多选，无限制",
-				"多选， 最多两项"
-			],
-			
-			
-				voteEndTime: '2025-04-20 23:59:59', // 截止时间
-				
-				cms:{},
-				
-				temp: {},
-				titleContent:"",
-				con: "<p>露从今夜白，月是故乡明</p>",
-				tabbarValue: 0,
-				tabbarText: [
-					{
-						text: "模板",
-						
-					},
-					{
-						text: "音乐"
-					},
-					{
-						text: "排版"
-					}
-				],
-				
-				currentTemplate: "",
-				templateConfig: [
-					
-				],
-				
-				showPop: false,
-				popFrom: 'bottom',
-				list: new Array(20).fill(0),
-				maskClick: true,
-			}
-		},
-		methods: {
-			isCheckboxDisabled(arr, name) {
-				console.log(arr, name)
-				if (arr.length < 2 || arr.includes(name)) {
-					return false;
+		setup() {
+			const voteType = ref(["单选（默认)", "多选，无限制", "多选， 最多两项"])
+			const voteEndTime = ref('2025-04-20 23:59:59')
+			const cms = ref({})
+			const temp = ref({})
+			const titleContent = ref("")
+			const tabbarValue = ref(0)
+			const showPop = ref(false)
+			const maskClick = ref(true)
+			const popFrom = ref('bottom')
+			const list = ref(new Array(20).fill(0))
+			const currentTemplate = ref("")
+
+			const tabbarText = ref([
+				{ text: "模板" },
+				{ text: "音乐" },
+				{ text: "排版" }
+			])
+
+			const userInfo = computed(() => store.userInfo)
+			const isExpired = computed(() => new Date() > new Date(voteEndTime.value))
+
+			const btn_send_commends_color = computed(() => {
+				if (!temp.value) return ""
+				return `background-color: ${temp.value.btn_send_commends_color};`
+			})
+
+			const backgrond_color = computed(() => {
+				if (!temp.value) return ""
+				return `background-color: ${temp.value.backgrond_color};`
+			})
+
+			const color = computed(() => {
+				if (!temp.value) return ""
+				return `color: ${temp.value.font_color};`
+			})
+
+			const select_icon_color = computed(() => {
+				if (!temp.value) return ""
+				return `${temp.value.select_icon_color};`
+			})
+
+			const icon_color = computed(() => {
+				if (!temp.value) return ""
+				return `${temp.value.icon_color};`
+			})
+
+			onShow(async () => {
+				let storedCms = uni.getStorageSync("cms")
+				titleContent.value = storedCms.title_html
+				cms.value = storedCms
+				await getTemp()
+			})
+
+			async function getTemp() {
+				if (currentTemplate.value === "not_image") {
+					temp.value = {}
 				}
-				return true;
-			},
-			checkboxChange(e) {
-				console.log(e)
-			},
-			  groupChange(n) {
-				console.log('groupChange', n);
-			  },
-			  radioChange(n) {
-				console.log('radioChange', n);
-			  },
-			  formatDate(date, format) {
-			    const map = {
-			      'yyyy': date.getFullYear(),
-			      'MM': String(date.getMonth() + 1).padStart(2, '0'),
-			      'dd': String(date.getDate()).padStart(2, '0'),
-			      'HH': String(date.getHours()).padStart(2, '0'),
-			      'mm': String(date.getMinutes()).padStart(2, '0'),
-			      'ss': String(date.getSeconds()).padStart(2, '0')
-			    };
-			    
-			    return format.replace(
-			      /yyyy|MM|dd|HH|mm|ss/g, 
-			      matched => map[matched]
-			    );
-			  },
-			  // 时间格式化
-			  formatTime() {
-			    return this.formatDate(new Date(), 'yyyy-MM-dd HH:mm');
-			  },
-			async getTemp() {
-				console.log(this.currentTemplate)
-				if (this.currentTemplate === "not_image") {
-					this.temp = {};
-				}
-				if (!this.currentTemplate) {
-					this.temp = {};
+				if (!currentTemplate.value) {
+					temp.value = {}
 					return
 				}
-				const temp = await uniCloud.importObject("uni-cms-articles").getTemp({
-					temp_id: this.currentTemplate
+				const res = await uniCloud.importObject("uni-cms-articles").getTemp({
+					temp_id: currentTemplate.value
 				})
-				console.log(temp);
-				if (temp.code === 200) {
-					this.temp = temp.data;
+				if (res.code === 200) {
+					temp.value = res.data
 				}
-			},
-			async updateTemplate(e) {
-				console.log(e);
-				this.currentTemplate = e;
-				await this.getTemp();
-			},
-			onBack() {
-				uni.showToast({
-					title: 'test',
-				})
-			},
-			onShowPopup(e) {
-				this.showPop = e.detail.value
-			},
-			onMaskClick(e) {
-				this.maskClick = e.detail.value
-			},
-			showPopupFrom(from) {
-				this.showPop = true
-			},
-			tabbarClick(e) {
+			}
+
+			async function updateTemplate(e) {
+				currentTemplate.value = e
+				await getTemp()
+			}
+
+			function onBack() {
+				uni.showToast({ title: 'test' })
+			}
+
+			function tabbarClick(e) {
+				tabbarValue.value = e
+				showPopupFrom()
+			}
+
+			function showPopupFrom() {
+				showPop.value = true
+			}
+
+			function isCheckboxDisabled(arr, name) {
+				if (arr.length < 2 || arr.includes(name)) {
+					return false
+				}
+				return true
+			}
+
+			function checkboxChange(e) {
 				console.log(e)
-				this.tabbarValue = e;
-				this.showPopupFrom();
-			},
-			async success() {
-				let cms = uni.getStorageSync("cms");
-				let id = cms._id;
-				let title = cms.title;
-				let title_html = cms.title_html;
-				let title_delta = cms.title_delta;
-				let temp_id = this.currentTemplate;
-				let music_url_id = "";
-				let edit_type = "mobile";
-				let view_count = 0;
-				let article_status = 1;
-				let user_id = this.userInfo._id;
-				let cmsLst = cms.cmsLst;
-				let excerpt = "";
-				// let publish_date = new Date();
-				// let last_modify_date = new Date();
-				let res = await uniCloud.importObject("user-info").getIP({uid: this.userInfo._id});
-				let last_modify_ip = res.code === 200 ? res.data.last_login_ip : "";
-				console.log(last_modify_ip)
-				console.log(this.userInfo)
-				console.log(cms);
-				console.log(id);
-				// return;
+			}
+
+			function groupChange(n) {
+				console.log('groupChange', n)
+			}
+
+			function radioChange(n) {
+				console.log('radioChange', n)
+			}
+
+			function formatDate(date, format) {
+				const map = {
+					'yyyy': date.getFullYear(),
+					'MM': String(date.getMonth() + 1).padStart(2, '0'),
+					'dd': String(date.getDate()).padStart(2, '0'),
+					'HH': String(date.getHours()).padStart(2, '0'),
+					'mm': String(date.getMinutes()).padStart(2, '0'),
+					'ss': String(date.getSeconds()).padStart(2, '0')
+				}
+				return format.replace(/yyyy|MM|dd|HH|mm|ss/g, matched => map[matched])
+			}
+
+			function formatTime() {
+				return formatDate(new Date(), 'yyyy-MM-dd HH:mm')
+			}
+
+			async function success() {
+				let storedCms = uni.getStorageSync("cms")
+				let id = storedCms._id
+				let title = storedCms.title
+				let title_html = storedCms.title_html
+				let title_delta = storedCms.title_delta
+				let temp_id = currentTemplate.value
+				let edit_type = "mobile"
+				let view_count = 0
+				let article_status = 1
+				let user_id = userInfo.value._id
+				let cmsLst = storedCms.cmsLst
+				let excerpt = ""
+				let res = await uniCloud.importObject("user-info").getIP({ uid: userInfo.value._id })
+				let last_modify_ip = res.code === 200 ? res.data.last_login_ip : ""
+
 				if (id) {
-					
-					let query = {};
-					query.id = id;
-					query.title = cms.title;
-					query.user_id = user_id;
-					query.title_html = cms.title_html;
-					query.title_delta = cms.title_delta;
-					query.thumbnail = cms.thumbnail;
-					query.p_type = cms.p_type;
-					query.category_id = cms.category_id;
-					query.temp_id = temp_id;
-					query.edit_type = edit_type;
-					query.view_count = view_count;
-					query.cmsLst = cms.cmsLst;
-					query.excerpt = excerpt;
-					// query.publish_date = publish_date;
-					// query.last_modify_date = last_modify_date;
-					query.last_modify_ip = last_modify_ip;
-					query.article_status = article_status;
-					
-					let r = await uniCloud.importObject("uni-cms-articles").update_cms_articles(query);
-					console.log(r)
-					
+					let query = {
+						id,
+						title: storedCms.title,
+						user_id,
+						title_html: storedCms.title_html,
+						title_delta: storedCms.title_delta,
+						thumbnail: storedCms.thumbnail,
+						p_type: storedCms.p_type,
+						category_id: storedCms.category_id,
+						temp_id,
+						edit_type,
+						view_count,
+						cmsLst: storedCms.cmsLst,
+						excerpt,
+						last_modify_ip,
+						article_status,
+					}
+					await uniCloud.importObject("uni-cms-articles").update_cms_articles(query)
 				} else {
-					let query = {};
-					query.title = cms.title;
-					query.user_id = user_id;
-					query.title_html = cms.title_html;
-					query.title_delta = cms.title_delta;
-					query.thumbnail = cms.thumbnail;
-					query.p_type = cms.p_type;
-					query.category_id = cms.category_id;
-					query.temp_id = temp_id;
-					query.edit_type = edit_type;
-					query.view_count = view_count;
-					query.cmsLst = cms.cmsLst;
-					query.excerpt = excerpt;
-					// query.publish_date = publish_date;
-					// query.last_modify_date = last_modify_date;
-					query.last_modify_ip = last_modify_ip;
-					query.article_status = article_status;
-					
-					console.log(query)
-					
-					let r = await uniCloud.importObject("uni-cms-articles").add_cms_articles(query);
-					console.log(r)
+					let query = {
+						title: storedCms.title,
+						user_id,
+						title_html: storedCms.title_html,
+						title_delta: storedCms.title_delta,
+						thumbnail: storedCms.thumbnail,
+						p_type: storedCms.p_type,
+						category_id: storedCms.category_id,
+						temp_id,
+						edit_type,
+						view_count,
+						cmsLst: storedCms.cmsLst,
+						excerpt,
+						last_modify_ip,
+						article_status,
+					}
+					await uniCloud.importObject("uni-cms-articles").add_cms_articles(query)
 				}
 
-				
-
-				
 				uni.setStorageSync("cms", "")
-				
-				uni.switchTab({
-					url:"/pages/my/my"
-				})
-				
-			},
-			async back() {
+				uni.switchTab({ url: "/pages/my/my" })
+			}
+
+			async function back() {
 				uni.navigateBack({
 					delta: 1,
 					fail: (err) => {
-						uni.navigateTo({
-							url:"/pages2/editCms/editCms"
-						})
+						uni.navigateTo({ url: "/pages2/editCms/editCms" })
 					}
-				});
+				})
+			}
+
+			return {
+				voteType,
+				voteEndTime,
+				cms,
+				temp,
+				titleContent,
+				tabbarValue,
+				showPop,
+				maskClick,
+				popFrom,
+				list,
+				currentTemplate,
+				tabbarText,
+				userInfo,
+				isExpired,
+				btn_send_commends_color,
+				backgrond_color,
+				color,
+				select_icon_color,
+				icon_color,
+				getTemp,
+				updateTemplate,
+				onBack,
+				tabbarClick,
+				showPopupFrom,
+				isCheckboxDisabled,
+				checkboxChange,
+				groupChange,
+				radioChange,
+				formatDate,
+				formatTime,
+				success,
+				back,
 			}
 		}
 	}
@@ -569,15 +451,15 @@
 	
 	.grid-container {
 	  display: flex;
-	  gap: 10px; /* 列间距 */
+	  gap: 10px;
 	  padding: 15px;
 	  background: #f5f5f5;
 	}
 
 	.grid-item {
-	  flex: 1; /* 等分容器宽度 */
-	  min-width: 0; /* 防止内容溢出 */
-	  aspect-ratio: 1; /* 默认正方形 */
+	  flex: 1;
+	  min-width: 0;
+	  aspect-ratio: 1;
 	  background: white;
 	  border-radius: 8px;
 	  overflow: hidden;
@@ -591,7 +473,7 @@
 	  width: 100%;
 	  height: 100%;
 	  object-fit: cover;
-	  aspect-ratio: 16/9; /* 设置长方形比例 */
+	  aspect-ratio: 16/9;
 	}
 	
 	.meta {
@@ -706,7 +588,6 @@
 					margin-left: 10rpx;
 	
 					&::before {
-						// border-left: 2px solid #f44336;
 						content: "";
 						position: absolute;
 						left: 0;
diff --git a/pages2/editCms/smallTitle.vue b/pages2/editCms/smallTitle.vue
index fe8d0fa..c464f59 100644
--- a/pages2/editCms/smallTitle.vue
+++ b/pages2/editCms/smallTitle.vue
@@ -14,8 +14,6 @@
 		</view>
 		<view class="page-body">
 			<view class='wrapper'>
-				
-
 				<view class="editor-wrapper">
 					<editor id="editor" class="ql-container" placeholder="开始输入..." show-img-size show-img-toolbar
 						show-img-resize @statuschange="onStatusChange" :read-only="readOnly" @ready="onEditorReady">
@@ -43,7 +41,7 @@
 						<zb-popover
 							placement="bottom-end"
 							:options="actions"
-							ref="Popover1"
+							ref="Popover2"
 							actions-direction="horizontal">
 							<view class="iconfont icon-juzhongduiqi"></view>
 							<template #content>
@@ -76,243 +74,113 @@
 								</view>
 							</template>
 						</zb-popover>
-						
-						
-						<view
-						:class="{
-							'is-color': isColor('#000000'),
-							'not-color': !isColor('#000000')
-						}"
-						data-name="color" 
-						class="color-000000-item color-item"
-						data-value="#000000">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#7a7e83'),
-							'not-color': !isColor('#7a7e83')
-						}"
-						data-name="color" 
-						class="color-7a7e83-item color-item"
-						data-value="#7a7e83">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#ff0000'),
-							'not-color': !isColor('#ff0000')
-						}"
-						data-name="color" 
-						class="color-ff0000-item color-item"
-						data-value="#ff0000">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#ff9900'),
-							'not-color': !isColor('#ff9900')
-						}"
-						data-name="color" 
-						class="color-ff9900-item color-item"
-						data-value="#ff9900">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#1aad19'),
-							'not-color': !isColor('#1aad19')
-						}"
-						data-name="color" 
-						class="color-1aad19-item color-item"
-						data-value="#1aad19">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#1a73e8'),
-							'not-color': !isColor('#1a73e8')
-						}"
-						data-name="color" 
-						class="color-1a73e8-item color-item"
-						data-value="#1a73e8">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#cc00cc'),
-							'not-color': !isColor('#cc00cc')
-						}"
-						data-name="color" 
-						class="color-cc00cc-item color-item"
-						data-value="#cc00cc">
-						</view>
-						
 					</view>
 				</view>
 			</view>
 		</view>
 	</view>
-
 </template>
 
-
 <script>
+	import { ref, reactive } from 'vue'
 
 	export default {
-		data() {
-			return {
-				readOnly: false,
-				formats: {
-					
-					color: "#000000",
-					//  fontSize 36 48 64
-					fontSize: "36rpx",
-					
-				},
-				actions: [
-					{ text: '选项一' },
-					{ text: '选项二' },
-					{ text: '选项三' },
-				],
-			}
-		},
-		onLoad() {
-			// #ifndef MP-BAIDU
-			// uni.loadFontFace({
-			// 	family: 'Pacifico',
-			// 	source: 'url("https://sungd.github.io/Pacifico.ttf")'
-			// })
-			// #endif
+		setup() {
+			const readOnly = ref(false)
+			const Popover1 = ref(null)
+			const Popover2 = ref(null)
 			
-			// uniCloud.downloadFile({
-			//   fileID: 'cloud://example.123/theme/blue-theme.css',
-			//   success: (res) => {
-			//     this.setDynamicStyle(res.tempFilePath);
-			//   }
-			// });
-		},
-		methods: {
-			isColor(color) {
-				console.log(color, this.formats.color)
-				if (color === this.formats.color) {
-					return true;
-				}
-				return false;
-			},
-			async toSuccess() {
-				// let that = this;
-				// let index = uni.getStorageSync("selectIndex");
-				// let cms = uni.getStorageSync("cms");
-				// console.log(cms)
-				// if (cms && cms.cmsLst && cms.cmsLst[index]) {
-				// 	this.editorCtx.getContents({
-				// 		success: async (res) => {
-				// 			console.log(res);
-				// 			let {
-				// 				html,
-				// 				text,
-				// 				delta
-				// 			} = res;
-				// 			console.log(cms)
-				// 			cms.cmsLst[index] = {
-				// 				image: cms.cmsLst[index].image,
-				// 				type: cms.cmsLst[index].type,
-				// 				text: text,
-				// 				html: html,
-				// 				delta:delta,
-				// 			}
-				// 			await uni.setStorageSync("cms", cms);
-				// 			await that.back();
-				// 		},
-				// 		fail: (err) => {
-				// 			console.log(err)
-				// 		},
-				// 		complete: () => {
-							
-				// 		}
-				// 	});
-				// }
-			},
-			async back() {
-				try {
-					uni.navigateBack({delta: 1});
-				} catch(e) {
-					uni.navigateTo({
-						url: "/pages2/editCms/editCms"
-					})
-				}
-			},
-			readOnlyChange() {
-				this.readOnly = !this.readOnly
-			},
-			onEditorReady() {
-				// #ifdef MP-BAIDU
-				this.editorCtx = requireDynamicLib('editorLib').createEditorContext('editor');
-				// #endif
+			const formats = reactive({
+				color: "#000000",
+				fontSize: "36rpx",
+			})
 
+			const actions = [
+				{ text: '选项一' },
+				{ text: '选项二' },
+				{ text: '选项三' },
+			]
+
+			const editorCtx = ref(null)
+
+			function isColor(color) {
+				return color === formats.color
+			}
+
+			async function toSuccess() {
+				// 保存逻辑
+			}
+
+			async function back() {
+				try {
+					uni.navigateBack({ delta: 1 })
+				} catch (e) {
+					uni.navigateTo({ url: "/pages2/editCms/editCms" })
+				}
+			}
+
+			function readOnlyChange() {
+				readOnly.value = !readOnly.value
+			}
+
+			function onEditorReady() {
 				// #ifdef APP-PLUS || MP-WEIXIN || H5
 				uni.createSelectorQuery().select('#editor').context((res) => {
-					this.editorCtx = res.context
+					editorCtx.value = res.context
 				}).exec()
 				// #endif
-			},
-			undo() {
-				this.editorCtx.undo()
-			},
-			redo() {
-				this.editorCtx.redo()
-			},
-			format(e) {
-				let {
-					name,
-					value
-				} = e.target.dataset
+			}
+
+			function undo() {
+				editorCtx.value.undo()
+			}
+
+			function redo() {
+				editorCtx.value.redo()
+			}
+
+			function format(e) {
+				let { name, value } = e.target.dataset
 				if (!name) return
-				// console.log('format', name, value)
-				this.editorCtx.format(name, value)
-			},
-			onStatusChange(e) {
-				const formats = e.detail
-				this.formats = formats
-			},
-			insertDivider() {
-				this.editorCtx.insertDivider({
-					success: function() {
-						console.log('insert divider success')
-					}
-				})
-			},
-			clear() {
+				editorCtx.value.format(name, value)
+			}
+
+			function onStatusChange(e) {
+				const formatData = e.detail
+				Object.assign(formats, formatData)
+			}
+
+			function clear() {
 				uni.showModal({
 					title: '清空编辑器',
 					content: '确定清空编辑器全部内容？',
 					success: res => {
 						if (res.confirm) {
-							this.editorCtx.clear({
-								success: function(res) {
+							editorCtx.value.clear({
+								success: function() {
 									console.log("clear success")
 								}
 							})
 						}
 					}
 				})
-			},
-			removeFormat() {
-				this.editorCtx.removeFormat()
-			},
-			insertDate() {
+			}
+
+			function removeFormat() {
+				editorCtx.value.removeFormat()
+			}
+
+			function insertDate() {
 				const date = new Date()
 				const formatDate = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
-				this.editorCtx.insertText({
-					text: formatDate
-				})
-			},
-			insertImage() {
+				editorCtx.value.insertText({ text: formatDate })
+			}
+
+			function insertImage() {
 				uni.chooseImage({
 					count: 1,
 					success: (res) => {
-						this.editorCtx.insertImage({
+						editorCtx.value.insertImage({
 							src: res.tempFilePaths[0],
 							alt: '图像',
 							success: function() {
@@ -322,6 +190,36 @@
 					}
 				})
 			}
+
+			function insertDivider() {
+				editorCtx.value.insertDivider({
+					success: function() {
+						console.log('insert divider success')
+					}
+				})
+			}
+
+			return {
+				readOnly,
+				Popover1,
+				Popover2,
+				formats,
+				actions,
+				isColor,
+				toSuccess,
+				back,
+				readOnlyChange,
+				onEditorReady,
+				undo,
+				redo,
+				format,
+				onStatusChange,
+				clear,
+				removeFormat,
+				insertDate,
+				insertImage,
+				insertDivider
+			}
 		}
 	}
 </script>
diff --git a/pages2/editCms/titleStyle.vue b/pages2/editCms/titleStyle.vue
index 59716d0..792140e 100644
--- a/pages2/editCms/titleStyle.vue
+++ b/pages2/editCms/titleStyle.vue
@@ -14,8 +14,6 @@
 		</view>
 		<view class="page-body">
 			<view class='wrapper'>
-				
-
 				<view class="editor-wrapper">
 					<editor id="editor" class="ql-container" placeholder="开始输入..." show-img-size show-img-toolbar
 						show-img-resize @statuschange="onStatusChange" :read-only="readOnly" @ready="onEditorReady">
@@ -59,285 +57,197 @@
 							<view class="iconfont icon-fontsize"
 							></view>
 						</zb-popover>
-						
-						<view
-						:class="{
-							'is-color': isColor('#000000'),
-							'not-color': !isColor('#000000')
-						}"
-						data-name="color" 
-						class="color-000000-item color-item"
-						data-value="#000000">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#7a7e83'),
-							'not-color': !isColor('#7a7e83')
-						}"
-						data-name="color" 
-						class="color-7a7e83-item color-item"
-						data-value="#7a7e83">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#ff0000'),
-							'not-color': !isColor('#ff0000')
-						}"
-						data-name="color" 
-						class="color-ff0000-item color-item"
-						data-value="#ff0000">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#ff9900'),
-							'not-color': !isColor('#ff9900')
-						}"
-						data-name="color" 
-						class="color-ff9900-item color-item"
-						data-value="#ff9900">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#1aad19'),
-							'not-color': !isColor('#1aad19')
-						}"
-						data-name="color" 
-						class="color-1aad19-item color-item"
-						data-value="#1aad19">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#1a73e8'),
-							'not-color': !isColor('#1a73e8')
-						}"
-						data-name="color" 
-						class="color-1a73e8-item color-item"
-						data-value="#1a73e8">
-						</view>
-						
-						<view
-						:class="{
-							'is-color': isColor('#cc00cc'),
-							'not-color': !isColor('#cc00cc')
-						}"
-						data-name="color" 
-						class="color-cc00cc-item color-item"
-						data-value="#cc00cc">
-						</view>
-						
 					</view>
 				</view>
 			</view>
 		</view>
 	</view>
-
 </template>
 
 <script>
-	
+	import { ref, reactive } from 'vue'
+
 	export default {
-		data() {
-			return {
-				readOnly: false,
-				formats: {
-					
-					color: "#000000",
-					//  fontSize 36 48 64
-					fontSize: "28px",
-					
-				},
-				actions: [
-					{ 
-						text: "标准",
-						value: "28px"
-					},
-					{ 
-						text: '大',
-						value: "32px"
-					},
-					{ 
-						text: '超大',
-						value: "36px"
-					},
-				],
+		setup() {
+			const readOnly = ref(false)
+			const Popover1 = ref(null)
+			const fontSize = ref(null)
+			
+			const formats = reactive({
+				color: "#000000",
+				fontSize: "28px",
+			})
+
+			const actions = [
+				{ text: "标准", value: "28px" },
+				{ text: '大', value: "32px" },
+				{ text: '超大', value: "36px" },
+			]
+
+			const editorCtx = ref(null)
+
+			function selectFontSizeItme(item) {
+				formats.fontSize = item.value
+				editorCtx.value.format("fontSize", item.value)
 			}
-		},
-		onShow() {
 
-		},
-		onLoad() {
+			function handleFontSizeClick(flag) {
+				Popover1.value?.close()
+			}
 
-		},
-		methods: {
-			selectFontSizeItme(item) {
-				console.log(item);
-				this.formats.fontSize = item.value;
-				this.editorCtx.format("fontSize", item.value)
-			},
-			handleFontSizeClick(flag) {
-				this.closeAllPopover("size")
-			},
-			isColor(color) {
-				console.log(color, this.formats.color)
-				if (color === this.formats.color) {
-					return true;
-				}
-				return false;
-			},
-			async toSuccess() {
-				let that = this;
-				let cms = uni.getStorageSync("cms");
-				console.log(cms)
+			function isColor(color) {
+				return color === formats.color
+			}
+
+			async function toSuccess() {
+				let cms = uni.getStorageSync("cms")
 				if (cms) {
-					this.editorCtx.getContents({
+					editorCtx.value.getContents({
 						success: async (res) => {
-							console.log(res);
-							let {
-								html,
-								text,
-								delta
-							} = res;
-							console.log(cms)
-							
-							cms.title = text;
-							cms.title_delta = delta;
-							cms.title_html = html;
-							console.log(cms)
-							await uni.setStorageSync("cms", cms);
-							await that.back();
+							let { html, text, delta } = res
+							cms.title = text
+							cms.title_delta = delta
+							cms.title_html = html
+							await uni.setStorageSync("cms", cms)
+							await back()
 						},
 						fail: (err) => {
 							console.log(err)
-						},
-						complete: () => {
-							
 						}
-					});
+					})
 				}
-			},
-			async back() {
+			}
+
+			async function back() {
 				uni.navigateBack({
 					delta: 1,
 					fail: (err) => {
-						console.log(err);
-						uni.navigateTo({
-							url: "/pages2/editCms/editCms"
-						})
+						uni.navigateTo({ url: "/pages2/editCms/editCms" })
 					}
-					});
-			},
-			readOnlyChange() {
-					this.readOnly = !this.readOnly
-				},
-				onEditorReady() {
-					// #ifdef MP-BAIDU
-					this.editorCtx = requireDynamicLib('editorLib').createEditorContext('editor');
-					// #endif
-			
-					// #ifdef APP-PLUS || MP-WEIXIN || H5
-					uni.createSelectorQuery().select('#editor').context((res) => {
-						this.editorCtx = res.context;
-						let cms = uni.getStorageSync("cms");
-						
-						let {
-							html,
-							text,
-							delta
-						} = {
-							html: cms.title_html,
-							title: cms.title,
-							delta: cms.title_delta
-						};
-						
-						this.editorCtx.setContents({
-							html:html,
-							delta: delta,
-							success: () => {
-								
-								this.editorCtx.format("fontSize", this.formats.fontSize)
-								this.editorCtx.format("color", this.formats.color)
-								console.log("设置编辑器成功")
-							},
-							fail: (err) => {
-								console.log(err)
-							},
-							complete: () => {
-								
-							}
-						})
-					}).exec()
-					// #endif
-				},
-				undo() {
-					this.editorCtx.undo()
-				},
-				redo() {
-					this.editorCtx.redo()
-				},
-				format(e) {
-					let {
-						name,
-						value
-					} = e.target.dataset
-					if (!name) return
-					// console.log('format', name, value)
-					this.editorCtx.format(name, value)
-				},
-				onStatusChange(e) {
-					const formats = e.detail
-					this.formats = formats
-				},
-				insertDivider() {
-					this.editorCtx.insertDivider({
-						success: function() {
-							console.log('insert divider success')
+				})
+			}
+
+			function readOnlyChange() {
+				readOnly.value = !readOnly.value
+			}
+
+			function onEditorReady() {
+				// #ifdef APP-PLUS || MP-WEIXIN || H5
+				uni.createSelectorQuery().select('#editor').context((res) => {
+					editorCtx.value = res.context
+					let cms = uni.getStorageSync("cms")
+					let { html, title, delta } = {
+						html: cms.title_html,
+						title: cms.title,
+						delta: cms.title_delta
+					}
+					editorCtx.value.setContents({
+						html: html,
+						delta: delta,
+						success: () => {
+							editorCtx.value.format("fontSize", formats.fontSize)
+							editorCtx.value.format("color", formats.color)
+							console.log("设置编辑器成功")
+						},
+						fail: (err) => {
+							console.log(err)
 						}
 					})
-				},
-				clear() {
-					uni.showModal({
-						title: '清空编辑器',
-						content: '确定清空编辑器全部内容？',
-						success: res => {
-							if (res.confirm) {
-								this.editorCtx.clear({
-									success: function(res) {
-										console.log("clear success")
-									}
-								})
-							}
-						}
-					})
-				},
-				removeFormat() {
-					this.editorCtx.removeFormat()
-				},
-				insertDate() {
-					const date = new Date()
-					const formatDate = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
-					this.editorCtx.insertText({
-						text: formatDate
-					})
-				},
-				insertImage() {
-					uni.chooseImage({
-						count: 1,
-						success: (res) => {
-							this.editorCtx.insertImage({
-								src: res.tempFilePaths[0],
-								alt: '图像',
+				}).exec()
+				// #endif
+			}
+
+			function undo() {
+				editorCtx.value.undo()
+			}
+
+			function redo() {
+				editorCtx.value.redo()
+			}
+
+			function format(e) {
+				let { name, value } = e.target.dataset
+				if (!name) return
+				editorCtx.value.format(name, value)
+			}
+
+			function onStatusChange(e) {
+				const formatData = e.detail
+				Object.assign(formats, formatData)
+			}
+
+			function clear() {
+				uni.showModal({
+					title: '清空编辑器',
+					content: '确定清空编辑器全部内容？',
+					success: res => {
+						if (res.confirm) {
+							editorCtx.value.clear({
 								success: function() {
-									console.log('insert image success')
+									console.log("clear success")
 								}
 							})
 						}
-					})
-				}
+					}
+				})
+			}
+
+			function removeFormat() {
+				editorCtx.value.removeFormat()
+			}
+
+			function insertDate() {
+				const date = new Date()
+				const formatDate = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
+				editorCtx.value.insertText({ text: formatDate })
+			}
+
+			function insertImage() {
+				uni.chooseImage({
+					count: 1,
+					success: (res) => {
+						editorCtx.value.insertImage({
+							src: res.tempFilePaths[0],
+							alt: '图像',
+							success: function() {
+								console.log('insert image success')
+							}
+						})
+					}
+				})
+			}
+
+			function insertDivider() {
+				editorCtx.value.insertDivider({
+					success: function() {
+						console.log('insert divider success')
+					}
+				})
+			}
+
+			return {
+				readOnly,
+				Popover1,
+				fontSize,
+				formats,
+				actions,
+				selectFontSizeItme,
+				handleFontSizeClick,
+				isColor,
+				toSuccess,
+				back,
+				readOnlyChange,
+				onEditorReady,
+				undo,
+				redo,
+				format,
+				onStatusChange,
+				clear,
+				removeFormat,
+				insertDate,
+				insertImage,
+				insertDivider
+			}
 		}
 	}
 </script>
diff --git a/pages2/editCms/vote.vue b/pages2/editCms/vote.vue
index 707b4e4..97ba9b2 100644
--- a/pages2/editCms/vote.vue
+++ b/pages2/editCms/vote.vue
@@ -68,178 +68,140 @@
 </template>
 
 <script>
+	import { ref, reactive, onMounted } from 'vue'
+
 	export default {
-		async onLoad(e) {
-			console.log(e);
-			this.pageType = e.type;
-			let cms = uni.getStorageSync("cms");
-			let index = uni.getStorageSync("selectIndex");
-			if (this.pageType === "edit") {
-				console.log(cms.cmsLst[index])
-				this.voteLst = cms.cmsLst[index].vote.voteLst;
-				this.voteTitle = cms.cmsLst[index].text;
-				this.birthday = cms.cmsLst[index].vote.datetime;
-				for (let i = 0 ; i < this.array.lenght; i ++ ) {
-					if (array[i] === cms.cmsLst[index].vote.type) {
-						this.select = i;
-					}
+		setup() {
+			const myPicker = ref(null)
+			const birthday = ref("")
+			const array = ref(["单选（默认)", "多选，无限制", "多选， 最多两项"])
+			const vote_id = ref('')
+			const select = ref(0)
+			const voteTitle = ref("")
+			const pageType = ref("add")
+			const voteLst = ref([
+				{ value: "" },
+				{ value: "" },
+				{ value: "" },
+			])
+
+			onMounted(() => {
+				// 模拟 onLoad
+			})
+
+			function generateRandomCode() {
+				const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+				let code = ''
+				for (let i = 0; i < 24; i++) {
+					code += chars.charAt(Math.floor(Math.random() * chars.length))
 				}
-				
-				if (!cms.cmsLst[index].vote.vote_id) {
-					let vote_id = this.generateRandomCode();
-					
-					this.vote_id = vote_id;
-					
-					cms.cmsLst[index].vote.vote_id = this.vote_id;
-					
-					uni.setStorageSync("cms", cms);
-					
-				}
-			} else if (this.pageType === "add") {
-				let vote_id = this.generateRandomCode();
-				this.vote_id = vote_id;
+				return code
 			}
-		},
-		data() {
-			return {
-				birthday: "",
-				array:[
-					"单选（默认)",
-					"多选，无限制",
-					"多选， 最多两项"
-				],
-				vote_id:'',
-				select: 0,
-				voteTitle: "",
-				voteLst: [
-				{
-					value:"",
-				},
-				{
-					value:"",
-				},
-				{
-					value:"",
-				},
-				],
-				pageType:"add",
+
+			function openDatetimePicker() {
+				myPicker.value.show()
 			}
-		},
-		methods: {
-			generateRandomCode() {
-			  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-			  let code = '';
-			  for (let i = 0; i < 24; i++) {
-			    code += chars.charAt(Math.floor(Math.random() * chars.length));
-			  }
-			  return code;
-			},
-			openDatetimePicker() {
-			  this.$refs.myPicker.show();
-			},
-			// 关闭picker
-			closeDatetimePicker() {
-			  this.$refs.myPicker.hide();
-			},
-			handleSubmit(e) {
-			    console.log(e);
-			    this.birthday = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
-			},
-			bindPickerChange(e) {
-				this.select = e.detail.value
-			},
-			del(index) {
-				if (this.voteLst.length >= 3) {
-					this.voteLst.splice(index, 1);
+
+			function handleSubmit(e) {
+				birthday.value = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`
+			}
+
+			function bindPickerChange(e) {
+				select.value = e.detail.value
+			}
+
+			function del(index) {
+				if (voteLst.value.length >= 3) {
+					voteLst.value.splice(index, 1)
 				} else {
-					uni.showLoading({ title: '投票最少保留两个选项...' });
-					setTimeout(() => uni.hideLoading(), 1000);
+					uni.showLoading({ title: '投票最少保留两个选项...' })
+					setTimeout(() => uni.hideLoading(), 1000)
 				}
-				
-			},
-			async toSuccess() {
-				if (!this.voteTitle) {
-					uni.showLoading({ title: '标题不能为空' });
-					setTimeout(() => uni.hideLoading(), 1000);
-					return;
+			}
+
+			async function toSuccess() {
+				if (!voteTitle.value) {
+					uni.showLoading({ title: '标题不能为空' })
+					setTimeout(() => uni.hideLoading(), 1000)
+					return
 				}
 
 				let vote = {
-					voteLst: this.voteLst,
-					vote_id: this.vote_id,
-					voteTitle: this.voteTitle,
-					type: this.array[this.select],
-					datetime: this.birthday,
-				}
-				if (!vote.type) {
-					uni.showLoading({ title: '投票类型不能为空' });
-					setTimeout(() => uni.hideLoading(), 1000);
-					return;
-				}
-				if (!vote.datetime) {
-					uni.showLoading({ title: '截止时间不能为空' });
-					setTimeout(() => uni.hideLoading(), 1000);
-					return;
-				}
-				if (!vote.datetime) {
-					let errIndex = -1;
-					for (let i = 0 ; i < vote.voteLst.length ; i ++ ) {
-						if (!vote.voteLst[i].value) {
-							errIndex = i;
-						}
-					}
-					if (errIndex !== 1) {
-						uni.showLoading({ title: `选项${ errIndex + 1 }不能为空` });
-						setTimeout(() => uni.hideLoading(), 1000);
-						return;
-					}
+					voteLst: voteLst.value,
+					vote_id: vote_id.value,
+					voteTitle: voteTitle.value,
+					type: array.value[select.value],
+					datetime: birthday.value,
 				}
 
-				let index = uni.getStorageSync("selectIndex");
-				let cms = uni.getStorageSync("cms");
-				if (vote.type === this.array[0]) {
-					vote.selectValue = "";
-				} else {
-					vote.selectValue = [];
+				if (!vote.type) {
+					uni.showLoading({ title: '投票类型不能为空' })
+					setTimeout(() => uni.hideLoading(), 1000)
+					return
 				}
-				vote.selectValu = false;
-				if (this.pageType === "add") {
+				if (!vote.datetime) {
+					uni.showLoading({ title: '截止时间不能为空' })
+					setTimeout(() => uni.hideLoading(), 1000)
+					return
+				}
+
+				let index = uni.getStorageSync("selectIndex")
+				let cms = uni.getStorageSync("cms")
+				if (vote.type === array.value[0]) {
+					vote.selectValue = ""
+				} else {
+					vote.selectValue = []
+				}
+				vote.selectValu = false
+				if (pageType.value === "add") {
 					cms.cmsLst.splice(index, 0, {
 						type: "vote",
-						text: this.voteTitle,
+						text: voteTitle.value,
 						vote: vote
 					})
-				} else if (this.pageType === "edit"){
+				} else if (pageType.value === "edit") {
 					cms.cmsLst.splice(index, 1, {
 						type: "vote",
-						text: this.voteTitle,
+						text: voteTitle.value,
 						vote: vote
 					})
 				}
 
-				uni.setStorageSync("cms", cms);
+				uni.setStorageSync("cms", cms)
+				await back()
+			}
 
-				await this.back();
-
-			},
-			async back() {
+			async function back() {
 				uni.navigateBack({
 					delta: 1,
 					fail: (err) => {
-						console.log(err);
-						uni.navigateTo({
-							url: "/pages2/editCms/editCms"
-						})
+						uni.navigateTo({ url: "/pages2/editCms/editCms" })
 					}
-				});
-			},
-			add() {
-				this.voteLst.push(
-					{
-						value:"",
-					}
-					)
-			},
+				})
+			}
+
+			function add() {
+				voteLst.value.push({ value: "" })
+			}
+
+			return {
+				myPicker,
+				birthday,
+				array,
+				vote_id,
+				select,
+				voteTitle,
+				pageType,
+				voteLst,
+				generateRandomCode,
+				openDatetimePicker,
+				handleSubmit,
+				bindPickerChange,
+				del,
+				toSuccess,
+				back,
+				add
+			}
 		}
 	}
 </script>
diff --git a/pages2/edit_list/edit_list.vue b/pages2/edit_list/edit_list.vue
index 72b1a86..e3fdee7 100644
--- a/pages2/edit_list/edit_list.vue
+++ b/pages2/edit_list/edit_list.vue
@@ -85,111 +85,113 @@
 </template>
 
 <script>
+	import { ref, computed, onMounted } from 'vue'
 	import cloudImage from "@/components/cloud-image.vue"
 	import uSubsection from "@/uni_modules/uview-ui/components/u-subsection/u-subsection.vue"
 	import uPopup from "@/uni_modules/uview-ui/components/u-popup/u-popup.vue"
-	
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-	import {
-		store,
-		mutations
-	} from '@/pages3/uni_modules/uni-id-pages/common/store.js'
+	import { store } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
 	
 	export default {
-		data() {
-			return {
-				list: ['动态', '作品', '相册', '收藏'],
-				current: 1,
-				show: false,
-				iconList: {
-					delete : {
-						color: '#f55',
-						size: '22',
-						type: 'closeempty'
-					},
-					setting: {
-						color: '#888',
-						size: '22',
-						type: 'gear-filled'
-					},
-					edit: {
-						color: '#888',
-						size: '22',
-						type: 'compose'
-					}
-				},
-				cms_list: [],
-				selectIndex: 0,
-			};
-		},
-		computed: {
-			userInfo() {
-				return store.userInfo
-			},
-			realNameStatus() {
-				if (!this.userInfo.realNameAuth) {
-					return 0
-				}
-			
-				return this.userInfo.realNameAuth.authStatus
-			},
-		},
-		components:{
+		components: {
 			uSubsection,
 			cloudImage,
 			uPopup
 		},
-		async onLoad() {
-			console.log(this.userInfo);
-			let res = await uniCloud.importObject("uni-cms-articles")
-			.get_cms_articles_for_userId({user_id: this.userInfo._id});
-			console.log(res);
-			this.cms_list = res.data;
-		},
-		methods:{
-			sectionChange(index) {
-				console.log(index)
-				this.current = index;
-			},
-			selectMore(index) {
-				console.log(index)
-				this.show = true;
-				this.selectIndex = index;
-			},
-			close() {
-				this.show = false;
-			},
-			open() {
-				this.show = true;
-			},
-			onClick(e) {
-				console.log(e)
-				
-			},
-			async deleteItem(index) {
-				console.log(index)
-				console.log(this.cms_list[index]);
-				let res = await uniCloud.importObject("uni-cms-articles").del_cms_articles({id: this.cms_list[index]._id});
-				console.log(res)
-				if (res.code === 200) {
-					this.cms_list.splice(index, 1)
+		setup() {
+			const list = ref(['动态', '作品', '相册', '收藏'])
+			const current = ref(1)
+			const show = ref(false)
+			const selectIndex = ref(0)
+			const cms_list = ref([])
+			
+			const iconList = {
+				delete: { color: '#f55', size: '22', type: 'closeempty' },
+				setting: { color: '#888', size: '22', type: 'gear-filled' },
+				edit: { color: '#888', size: '22', type: 'compose' }
+			}
+
+			const userInfo = computed(() => store.userInfo)
+
+			onMounted(async () => {
+				if (!userInfo.value._id) {
+					uni.showToast({ title: '请先登录', icon: 'none' })
+					setTimeout(() => uni.navigateBack(), 1000)
+					return
 				}
-				this.close()
-			},
-			async editItem(index) {
-				console.log(index);
-				let cms = this.cms_list[index];
-				console.log(cms);
-				uni.setStorageSync("cms", cms);
-				await this.toCmsEdit(cms.id);
-			},
-			async toCmsEdit(id) {
+				uni.showLoading({ title: '加载中' })
+				try {
+					let res = await uniCloud.importObject("uni-cms-articles")
+						.get_cms_articles_for_userId({ user_id: userInfo.value._id })
+					cms_list.value = res.data || []
+				} catch (e) {
+					console.error(e)
+					uni.showToast({ title: '加载失败，请重试', icon: 'none' })
+				} finally {
+					uni.hideLoading()
+				}
+			})
+
+			function sectionChange(index) {
+				current.value = index
+			}
+
+			function selectMore(index) {
+				show.value = true
+				selectIndex.value = index
+			}
+
+			function close() {
+				show.value = false
+			}
+
+			function open() {
+				show.value = true
+			}
+
+			async function deleteItem(index) {
+				let res = await uniCloud.importObject("uni-cms-articles").del_cms_articles({ id: cms_list.value[index]._id })
+				if (res.code === 200) {
+					cms_list.value.splice(index, 1)
+				}
+				close()
+			}
+
+			async function editItem(index) {
+				let cms = cms_list.value[index]
+				if (!cms) return
+				uni.setStorageSync("cms", cms)
+				await toCmsEdit(cms._id)
+			}
+
+			async function toCmsEdit(id) {
 				uni.navigateTo({
 					url: "/pages2/editCms/editCms?id=" + id
-				});
-			},
-			settingItem(index) {
-				console.log("setting")
+				})
+			}
+
+			function settingItem(index) {
+				let cms = cms_list.value[index]
+				if (!cms) return
+				uni.setStorageSync("cms", cms)
+				uni.navigateTo({ url: "/pages2/editCms/editSetting" })
+			}
+
+			return {
+				list,
+				current,
+				show,
+				selectIndex,
+				cms_list,
+				iconList,
+				userInfo,
+				sectionChange,
+				selectMore,
+				close,
+				open,
+				deleteItem,
+				editItem,
+				toCmsEdit,
+				settingItem
 			}
 		}
 	}
diff --git a/pages2/follow/follow.vue b/pages2/follow/follow.vue
index fc73d10..ace4bb6 100644
--- a/pages2/follow/follow.vue
+++ b/pages2/follow/follow.vue
@@ -5,7 +5,6 @@
 		@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" :style="{ height: listHeight }">
                 <!-- #endif -->
@@ -27,10 +26,9 @@
                     <!-- 列表渲染 -->
 					<template v-for="(item, index) in followLst">
 					  <view class="follow-item">
-						
 						<view class="avatar-container" @click="toPersonalpage(item)">
-						  <cloud-image 
-							:src="item.fid[0].avatar_file.url || 'https://qnycdn.mymoyu.top/static/avatar.jpg'"
+						  <cloud-image
+							:src="(item.fid[0].avatar_file && item.fid[0].avatar_file.url) || 'https://qnycdn.mymoyu.top/static/avatar.jpg'"
 							mode="aspectFill" border-radius="50%"
 							height="80rpx" width="80rpx"></cloud-image>
 						</view>
@@ -39,15 +37,10 @@
 						  	{{ item.fid[0].nickname }}
 						</view>
 
-						<view 
+						<view
 						  class="btn-container"
-						  :class="{ 
-							'followed': item.fid[0].isFollow,
-							
-						  }"
-						  
+						  :class="{ 'followed': item.fid[0].isFollow }"
 						>
-						  
 						  <view @click="toggleFollow(item, index)">{{ item.fid[0].isFollow ? '已关注' : '关注' }}</view>
 						</view>
 					  </view>
@@ -77,23 +70,13 @@
 </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 cloudImage from "../../components/cloud-image.vue"
-	import cloudImage from "../../components/cloud-image.vue";
-	import {
-		parseImageUrl
-	} from "@/uni_modules/uni-cms-article/common/parse-image-url";
+	import { ref, computed, onReady } from 'vue'
+	import statusBar from "@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar"
+	import refreshBox from "@/uni_modules/uni-cms-article/components/refresh-box/refreshBox.nvue"
+	import cloudImage from "../../components/cloud-image.vue"
 
-	const db = uniCloud.database();
-
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-	import {
-		store,
-		mutations
-	} from '@/pages3/uni_modules/uni-id-pages/common/store.js';
-import { follow } from "../../uniCloud-alipay/cloudfunctions/follow/index.obj";
+	const db = uniCloud.database()
+	import { store } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
 
 	export default {
 		components: {
@@ -101,204 +84,169 @@ import { follow } from "../../uniCloud-alipay/cloudfunctions/follow/index.obj";
 			refreshBox,
 			cloudImage
 		},
-		computed: {
-			userInfo() {
-				return store.userInfo
-			},
-			realNameStatus() {
-				if (!this.userInfo.realNameAuth) {
-					return 0
-				}
+		setup() {
+			const udbRef = ref(null)
+			const showRefresh = ref(false)
+			const listHeight = ref(0)
+			const mpButtonLeftPlaceholderSize = ref(0)
+			const mpButtonPlaceholderSize = ref(87)
+			const navBarHeight = ref(44)
+			const listData = ref([])
+			const loadType = ref(null)
+			const followLst = ref([])
 
-				return this.userInfo.realNameAuth.authStatus
-			},
-			// 根据当前语言返回不同的搜索框占位符
-			inputPlaceholder(e) {
-				if (uni.getStorageSync('CURRENT_LANG') == "en") {
-					return 'Please enter the search content' // 英文
-				} else {
-					return '请输入搜索内容' // 中文
-				}
-			},
-			// 连表查询，返回两个集合的查询结果
-			colList() {
-				
+			const userInfo = computed(() => store.userInfo)
+
+			const realNameStatus = computed(() => {
+				if (!userInfo.value.realNameAuth) return 0
+				return userInfo.value.realNameAuth.authStatus
+			})
+
+			const colList = computed(() => {
 				return [
 					db.collection("follow")
-					.where(this.followWhere)
+					.where(followWhere.value)
 					.field("_id,fid,create_time")
 					.getTemp(),
 					db.collection("uni-id-users")
 					.field('_id,nickname,avatar_file')
 					.getTemp()
+				]
+			})
 
-				];
-			},
-			followWhere() {
-				return this.userInfo && this.userInfo._id ? {
-					uid: this.userInfo._id
-				} : {
-					uid: '__empty__'
-				}
-			}
-		},
-		data() {
-			return {
-				tags_v: [],
-				tags: [
+			const followWhere = computed(() => {
+				return userInfo.value && userInfo.value._id
+					? { uid: userInfo.value._id }
+					: { uid: '__empty__' }
+			})
 
-				],
-				
-				showRefresh: false, // 是否显示刷新按钮
-				listHeight: 0, // 列表高度
-				mpButtonLeftPlaceholderSize: 0, // 小程序左侧icon占位大小
-				mpButtonPlaceholderSize: 87, // 小程序导航栏按钮占位大小
-				navBarHeight: 44, // 导航栏高度
-				refreshStatus: 0, // 刷新状态 0: 未刷新 1: 刷新中 2: 刷新完成
-				listData: [], // 列表数据
-				loadType: null,
-				
-				followLst: []
-			}
-		},
-		methods: {
-			toPersonalpage(item) {
-				console.log(item)
+			function toPersonalpage(item) {
 				uni.navigateTo({
 					url: "/uni_modules/zetank-personalpage/pages/personalpage/personalpage?uid=" + item.fid[0]._id
 				})
-			},
-			async toggleFollow(item, index) {
-				console.log(item)
+			}
+
+			async function toggleFollow(item, index) {
 				try {
-					
 					if (item.fid[0].isFollow === false) {
 						const res = await uniCloud.importObject("follow").follow({
-							uid: this.userInfo._id,
+							uid: userInfo.value._id,
 							fid: item.fid[0]._id
-						});
+						})
 						if (res.code === 200) {
-							console.log(res);
-							this.followLst[0].fid[index].isFollow = true;
+							followLst.value[index].fid[0].isFollow = true
 						} else {
-							console.log(res.msg);
+							console.log(res.msg)
 						}
-					}
-					else if (item.fid[0].isFollow === true) {
+					} else if (item.fid[0].isFollow === true) {
 						const res = await uniCloud.importObject("follow").reFollow({
-							uid: this.userInfo._id,
+							uid: userInfo.value._id,
 							fid: item.fid[0]._id
-						});
+						})
 						if (res.code === 200) {
-							if (res.code === 200) {
-								console.log(res);
-								this.followLst[index].fid[0].isFollow = false;
-							}
+							followLst.value[index].fid[0].isFollow = false
 						} else {
 							console.log(res.msg)
 						}
 					}
-				}catch(e) {
+				} catch (e) {
 					console.log(e.message)
 				}
-			},
-			async listLoad(data) {
-				if (!data || data.length === 0 ) return 0;
-				let followLst = [];
-				if (data[0].fid) {
-					let item = {...data[0]};
-					item.fid[0].isFollow = true;
-					followLst.push(item)
+			}
+
+			async function listLoad(data) {
+				if (!data || data.length === 0) {
+					loadType.value = null
+					return 0
 				}
-				console.log(followLst);
-				this.followLst = this.loadType === 'loadMore' ? this.followLst.concat(followLst) : followLst
-				this.loadType = null;
-					
-			},
-			// 初始化导航栏大小
-			initNavBarSize() {
-				// 获取小程序导航栏按钮信息
+				let tempFollowLst = []
+				data.forEach(item => {
+					if (item.fid && item.fid[0]) {
+						let newItem = {
+							_id: item._id,
+							create_time: item.create_time,
+							fid: [{
+								_id: item.fid[0]._id,
+								nickname: item.fid[0].nickname || '未知用户',
+								avatar_file: item.fid[0].avatar_file || {},
+								isFollow: true
+							}]
+						}
+						tempFollowLst.push(newItem)
+					}
+				})
+				followLst.value = loadType.value === 'loadMore' ? followLst.value.concat(tempFollowLst) : tempFollowLst
+				listData.value = followLst.value
+				loadType.value = null
+			}
+
+			function initNavBarSize() {
 				// #ifdef MP-TOUTIAO
 				let menuButtonInfo = tt.getCustomButtonBoundingClientRect()
-				menuButtonInfo.width = menuButtonInfo.capsule.width //  小程序按钮区域中使用的按钮宽度
-				this.mpButtonLeftPlaceholderSize = menuButtonInfo.leftIcon.width + 10
+				menuButtonInfo.width = menuButtonInfo.capsule.width
+				mpButtonLeftPlaceholderSize.value = 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
-				}, () => {
+				mpButtonPlaceholderSize.value = menuButtonInfo.width + 10
+				navBarHeight.value = uni.getSystemInfoSync().system.toLowerCase().includes('ios') ? 44 : 48
+			}
+
+			function refresh() {
+				loadType.value = 'refresh'
+				udbRef.value.loadData({ clear: true }, () => {
 					uni.stopPullDownRefresh()
 					// #ifdef APP-NVUE
-					this.showRefresh = false
+					showRefresh.value = false
 					// #endif
 				})
-			},
-			// 加载更多
-			loadMore() {
-				this.loadType = 'loadMore'
-				this.$refs.udb.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 onReady() {
-			// #ifdef MP
-			this.initNavBarSize() // 初始化导航栏大小
-			// #endif
-			/* 可用窗口高度 - 搜索框高 - 状态栏高 */
-			this.listHeight = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - this
-				.navBarHeight + 'px'; // 计算列表高度
-			
-			this.$refs.udb.loadData();
-			
-		},
-		onLoad() {
-			
-		},
+			function loadMore() {
+				loadType.value = 'loadMore'
+				udbRef.value.loadMore()
+			}
+
+			function onqueryerror(e) {
+				console.error(e)
+			}
+
+			onReady(() => {
+				// #ifdef MP
+				initNavBarSize()
+				// #endif
+				listHeight.value = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - navBarHeight.value + 'px'
+				udbRef.value.loadData()
+			})
+
+			return {
+				udbRef,
+				showRefresh,
+				listHeight,
+				mpButtonLeftPlaceholderSize,
+				mpButtonPlaceholderSize,
+				navBarHeight,
+				listData,
+				loadType,
+				followLst,
+				userInfo,
+				realNameStatus,
+				colList,
+				followWhere,
+				toPersonalpage,
+				toggleFollow,
+				listLoad,
+				initNavBarSize,
+				refresh,
+				loadMore,
+				onqueryerror
+			}
+		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
 	/* #ifndef APP-NVUE */
 	.pages view {
 		display: flex;
@@ -375,7 +323,7 @@ import { follow } from "../../uniCloud-alipay/cloudfunctions/follow/index.obj";
 	.pages .uni-list ::v-deep .uni-list--border:after {
 		background-color: #f5f5f5;
 	}
-	
+
 	.main {
 	  display: flex;
 	  justify-content: space-between;
@@ -389,7 +337,7 @@ import { follow } from "../../uniCloud-alipay/cloudfunctions/follow/index.obj";
 	    font-size: 30rpx;
 	    color: #bbb;
 	  }
-	
+
 	  .thumbnails {
 	    margin: 20rpx 0;
 	    display: flex;
@@ -411,19 +359,19 @@ import { follow } from "../../uniCloud-alipay/cloudfunctions/follow/index.obj";
 	      }
 	    }
 	  }
-	
+
 	  .info {
 	    display: flex;
 	    flex-direction: row;
 		margin-top: 20rpx;
 	  }
-	
+
 	  .author,
 	  .publish_date {
 	    font-size: 24rpx;
 	    color: #bbbbbb;
 	  }
-	
+
 	  .publish_date {
 	    margin-left: 14rpx;
 	  }
@@ -431,7 +379,7 @@ import { follow } from "../../uniCloud-alipay/cloudfunctions/follow/index.obj";
 
 	/* 父容器设置 */
 	.follow-item {
-	  will-change: transform; /* 启用GPU加速 */
+	  will-change: transform;
 	  display: flex;
 	  align-items: center;
 	  padding: 24rpx;
@@ -440,18 +388,18 @@ import { follow } from "../../uniCloud-alipay/cloudfunctions/follow/index.obj";
 	  border-radius: 16rpx;
 	  box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.05);
 	}
-	
+
 	/* 头像区块 (占1份) */
 	.avatar-container {
 	  flex: 1;
-	  min-width: 0; /* 防止内容溢出 */
+	  min-width: 0;
 	  margin-right: 20rpx;
 	}
-	
+
 	/* 信息区块 (占3份) */
 	.info-container {
 	  flex: 3;
-	  min-width: 0; /* 关键：允许文本截断 */
+	  min-width: 0;
 	  overflow: hidden;
 	}
 	.name {
@@ -459,10 +407,10 @@ import { follow } from "../../uniCloud-alipay/cloudfunctions/follow/index.obj";
 	  color: #333;
 	  display: -webkit-box;
 	  -webkit-box-orient: vertical;
-	  -webkit-line-clamp: 1; /* 单行显示 */
+	  -webkit-line-clamp: 1;
 	  overflow: hidden;
 	}
-	
+
 	/* 按钮区块 (占2份) */
 	.btn-container {
 	  flex:1.5;
@@ -478,5 +426,4 @@ import { follow } from "../../uniCloud-alipay/cloudfunctions/follow/index.obj";
 	  color: #666666;
 	  background: #F8F8F8;
 	}
-
 </style>
diff --git a/pages2/historyList/historyList.vue b/pages2/historyList/historyList.vue
index 88e9260..953dbdd 100644
--- a/pages2/historyList/historyList.vue
+++ b/pages2/historyList/historyList.vue
@@ -5,7 +5,6 @@
 		@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" :style="{ height: listHeight }">
                 <!-- #endif -->
@@ -35,7 +34,6 @@
 							  <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'"
@@ -45,8 +43,6 @@
 							<three-cover v-else-if="item.thumbnail && item.thumbnail.length === 3" :ctype="'historyList'"
 								:data="getNewItem(item)"></three-cover>
 						</view>
-
-
 					</template>
 
                     <!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
@@ -73,27 +69,21 @@
 </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 { ref, computed, onReady, watch } from 'vue'
+	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";
+	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"
+	import { store } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
 
-	const db = uniCloud.database();
+	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 '@/pages3/uni_modules/uni-id-pages/common/store.js';
-
 	export default {
 		components: {
 			statusBar,
@@ -102,35 +92,33 @@
 			rightSmallCover,
 			threeCover
 		},
-		computed: {
-			userInfo() {
-				return store.userInfo
-			},
-			queryUserId() {
-				return this.userInfo && this.userInfo._id ? this.userInfo._id : '__empty__'
-			},
-			realNameStatus() {
-				if (!this.userInfo.realNameAuth) {
-					return 0
-				}
+		setup() {
+			const udbRef = ref(null)
+			const showRefresh = ref(false)
+			const listHeight = ref(0)
+			const mpButtonLeftPlaceholderSize = ref(0)
+			const mpButtonPlaceholderSize = ref(87)
+			const navBarHeight = ref(44)
+			const listData = ref([])
+			const loadType = ref(null)
+			const historyList = ref([])
 
-				return this.userInfo.realNameAuth.authStatus
-			},
-			// 根据当前语言返回不同的搜索框占位符
-			inputPlaceholder(e) {
-				if (uni.getStorageSync('CURRENT_LANG') == "en") {
-					return 'Please enter the search content' // 英文
-				} else {
-					return '请输入搜索内容' // 中文
-				}
-			},
-			// 连表查询，返回两个集合的查询结果
-			colList() {
-				
+			const userInfo = computed(() => store.userInfo)
+
+			const queryUserId = computed(() => {
+				return userInfo.value && userInfo.value._id ? userInfo.value._id : '__empty__'
+			})
+
+			const realNameStatus = computed(() => {
+				if (!userInfo.value.realNameAuth) return 0
+				return userInfo.value.realNameAuth.authStatus
+			})
+
+			const colList = computed(() => {
 				return [
 					db.collection("cms-articles-log")
 					.where({
-						user_id: this.queryUserId,
+						user_id: queryUserId.value,
 						article_id: db.command.exists(true)
 					})
 					.getTemp(),
@@ -140,165 +128,118 @@
 					db.collection(userDBName)
 					.field('_id,nickname')
 					.getTemp()
+				]
+			})
 
-				];
-			}
-		},
-		data() {
-			return {
-				tags_v: [],
-				tags: [
-
-				],
-				showRefresh: false, // 是否显示刷新按钮
-				listHeight: 0, // 列表高度
-				mpButtonLeftPlaceholderSize: 0, // 小程序左侧icon占位大小
-				mpButtonPlaceholderSize: 87, // 小程序导航栏按钮占位大小
-				navBarHeight: 44, // 导航栏高度
-				refreshStatus: 0, // 刷新状态 0: 未刷新 1: 刷新中 2: 刷新完成
-				listData: [], // 列表数据
-				loadType: null,
-				historyList: [],
-			}
-		},
-		methods: {
-			getNewItem(item) {
+			function getNewItem(item) {
 				if (!item.excerpt) {
-					item.excerpt = "";
+					item.excerpt = ""
 				} else if (item.excerpt.length > 50) {
-					item.excerpt = item.excerpt.slice(0, 50) + " ... ...";
+					item.excerpt = item.excerpt.slice(0, 50) + " ... ..."
 				}
-				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;
+				return item
+			}
+
+			async function listLoad(data) {
+				if (data.length === 0) return
+				if (data[0].article_id) {
+					const tempListData = 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]
 						}
-						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];
+						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]
 					})
-					
-					console.log(listData);
-					
-					// 处理腾讯云文件链接
-					for (const article of listData) {
-						if (!article) continue;
+
+					for (const article of tempListData) {
+						if (!article) continue
 						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
+
+					listData.value = loadType.value === 'loadMore' ? listData.value.concat(tempListData) : tempListData
+					loadType.value = null
 				}
-					
-			},
-			// 初始化导航栏大小
-			initNavBarSize() {
-				// 获取小程序导航栏按钮信息
+			}
+
+			function initNavBarSize() {
 				// #ifdef MP-TOUTIAO
 				let menuButtonInfo = tt.getCustomButtonBoundingClientRect()
-				menuButtonInfo.width = menuButtonInfo.capsule.width //  小程序按钮区域中使用的按钮宽度
-				this.mpButtonLeftPlaceholderSize = menuButtonInfo.leftIcon.width + 10
+				menuButtonInfo.width = menuButtonInfo.capsule.width
+				mpButtonLeftPlaceholderSize.value = 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) {
+				mpButtonPlaceholderSize.value = menuButtonInfo.width + 10
+				navBarHeight.value = uni.getSystemInfoSync().system.toLowerCase().includes('ios') ? 44 : 48
+			}
+
+			function 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
-				}, () => {
+			}
+
+			function refresh() {
+				loadType.value = 'refresh'
+				udbRef.value.loadData({ clear: true }, () => {
 					uni.stopPullDownRefresh()
 					// #ifdef APP-NVUE
-					this.showRefresh = false
+					showRefresh.value = false
 					// #endif
 				})
-			},
-			// 加载更多
-			loadMore() {
-				this.loadType = 'loadMore'
-				this.$refs.udb.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);
+			function loadMore() {
+				loadType.value = 'loadMore'
+				udbRef.value.loadMore()
 			}
-		},
-		watch: {
-			'userInfo._id'(val, oldVal) {
-				if (val && val !== oldVal && this.$refs.udb) {
-					this.refresh()
+
+			function onqueryerror(e) {
+				console.error(e)
+			}
+
+			onReady(() => {
+				// #ifdef MP
+				initNavBarSize()
+				// #endif
+				listHeight.value = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - navBarHeight.value + 'px'
+			})
+
+			watch(() => userInfo.value._id, (val, oldVal) => {
+				if (val && val !== oldVal && udbRef.value) {
+					refresh()
 				}
+			})
+
+			return {
+				udbRef,
+				showRefresh,
+				listHeight,
+				mpButtonLeftPlaceholderSize,
+				mpButtonPlaceholderSize,
+				navBarHeight,
+				listData,
+				loadType,
+				historyList,
+				userInfo,
+				queryUserId,
+				realNameStatus,
+				colList,
+				getNewItem,
+				listLoad,
+				initNavBarSize,
+				publishTime,
+				refresh,
+				loadMore,
+				onqueryerror
 			}
-		},
-		async onReady() {
-			// #ifdef MP
-			this.initNavBarSize() // 初始化导航栏大小
-			// #endif
-			/* 可用窗口高度 - 搜索框高 - 状态栏高 */
-			this.listHeight = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - this
-				.navBarHeight + 'px'; // 计算列表高度
-		},
-		onLoad() {
-			
-		},
+		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
 	/* #ifndef APP-NVUE */
 	.pages view {
 		display: flex;
@@ -375,7 +316,7 @@
 	.pages .uni-list ::v-deep .uni-list--border:after {
 		background-color: #f5f5f5;
 	}
-	
+
 	.main {
 	  display: flex;
 	  justify-content: space-between;
@@ -389,7 +330,7 @@
 	    font-size: 30rpx;
 	    color: #bbb;
 	  }
-	
+
 	  .thumbnails {
 	    margin: 20rpx 0;
 	    display: flex;
@@ -411,19 +352,19 @@
 	      }
 	    }
 	  }
-	
+
 	  .info {
 	    display: flex;
 	    flex-direction: row;
 		margin-top: 20rpx;
 	  }
-	
+
 	  .author,
 	  .publish_date {
 	    font-size: 24rpx;
 	    color: #bbbbbb;
 	  }
-	
+
 	  .publish_date {
 	    margin-left: 14rpx;
 	  }
diff --git a/pages2/replyCommentList/replyCommentList.vue b/pages2/replyCommentList/replyCommentList.vue
index 3eba85d..c8c2afd 100644
--- a/pages2/replyCommentList/replyCommentList.vue
+++ b/pages2/replyCommentList/replyCommentList.vue
@@ -3,7 +3,6 @@
 		<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" :style="{ height: listHeight }">
 			<!-- #endif -->
@@ -16,15 +15,13 @@
 					<!-- #endif -->
 
 					<template v-for="item in listData">
-						<uni-card :title="item.author_id.nickname" :sub-title="item.update_time"
-							:thumbnail="'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png'">
+						<uni-card :title="item.author_id.nickname" :sub-title="item.update_time">
 							<template v-slot:title>
 								<view class="p_f">
 									<cloud-image v-if="item.author_id.avatar_file" height="80rpx" width="80rpx"
 										borderRadius="50%" :src="item.author_id.avatar_file.url"></cloud-image>
 									<image class="avatar" :src="emptyAvatar" v-else></image>
 
-
 									<view>
 										<view class="title">
 											{{ item.author_id.nickname }}
@@ -38,21 +35,20 @@
 										回复
 									</view>
 								</view>
-
 							</template>
 							<text class="uni-body" @click="toArticle(item)">
 								{{ item.author_id.nickname }}: {{ item.content }}
 							</text>
 							<uni-card :is-shadow="false" :isFull="true" @click="toArticle(item)">
 								<text class="uni-body">
-									{{ item.parent_author_id.nickname }}: 
+									{{ item.parent_author_id.nickname }}:
 								</text>
 								<text class="uni-body">{{ item.parent_author_content }}</text>
 							</uni-card>
 						</uni-card>
 					</template>
 
-					<!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
+					<!-- 加载状态 -->
 					<!-- #ifdef APP-PLUS -->
 					<uni-list-item>
 						<template v-slot:body>
@@ -71,7 +67,6 @@
 			</list>
 			<!-- #endif -->
 			<view class="comment-submit-box" v-if="submit" @click="closeInput">
-				<!-- 下边的click.stop.prevent用于让上边的click不传下去，以防点到下边的空白处触发closeInput方法 -->
 				<view class="comment-add" @click.stop.prevent="stopPrevent" :style="'bottom:' + KeyboardHeight + 'px'">
 					<view class="comment-submit">
 						<view class="btn-click cancel" @click="closeInput">取消</view>
@@ -86,7 +81,7 @@
 						</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>
+						@blur="blur" @focus="focusOnInput" :focus="focus" maxlength="800"></textarea>
 				</view>
 			</view>
 		</unicloud-db>
@@ -94,26 +89,19 @@
 </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 { ref, computed, reactive, onReady, watch } from 'vue'
+	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"
+	import { store } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
 
-	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 db = uniCloud.database()
 	const userDBName = 'uni-id-users'
-
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-	import {
-		store,
-		mutations
-	} from '@/pages3/uni_modules/uni-id-pages/common/store.js';
+	const articleDBName = 'uni-cms-articles'
 
 	export default {
 		components: {
@@ -123,35 +111,40 @@
 			rightSmallCover,
 			threeCover
 		},
-		computed: {
-			userInfo() {
-				return store.userInfo
-			},
-			queryUserId() {
-				return this.userInfo && this.userInfo._id ? this.userInfo._id : '__empty__'
-			},
-			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() {
+		setup() {
+			const udbRef = ref(null)
+			const emptyAvatar = ref("https://qnycdn.mymoyu.top/static/avatar.jpg")
+			const showRefresh = ref(false)
+			const listHeight = ref(0)
+			const mpButtonLeftPlaceholderSize = ref(0)
+			const mpButtonPlaceholderSize = ref(87)
+			const navBarHeight = ref(44)
+			const listData = ref([])
+			const loadType = ref(null)
+			
+			const placeholder = ref("请输入评论")
+			const commentReq = reactive({
+				pId: null,
+				article_id: null,
+				content: null,
+				root_id: null
+			})
+			const pUser = ref(null)
+			const showTag = ref(false)
+			const focus = ref(false)
+			const submit = ref(false)
+			const KeyboardHeight = ref(0)
 
+			const userInfo = computed(() => store.userInfo)
+
+			const queryUserId = computed(() => {
+				return userInfo.value && userInfo.value._id ? userInfo.value._id : '__empty__'
+			})
+
+			const colList = computed(() => {
 				return [
 					db.collection("comment")
-					.where({
-						parent_author_id: this.queryUserId,
-					})
+					.where({ parent_author_id: queryUserId.value })
 					.getTemp(),
 					db.collection("uni-id-users")
 					.field("_id,avatar_file,nickname")
@@ -159,275 +152,288 @@
 					db.collection("uni-cms-articles")
 					.field("_id,thumbnail,title,publish_date,user_id, excerpt, article_status")
 					.getTemp()
-				];
-			}
-		},
-		data() {
-			return {
-				emptyAvatar: "https://qnycdn.mymoyu.top/static/avatar.jpg",
-				tags_v: [],
-				tags: [
+				]
+			})
 
-				],
-				showRefresh: false, // 是否显示刷新按钮
-				listHeight: 0, // 列表高度
-				mpButtonLeftPlaceholderSize: 0, // 小程序左侧icon占位大小
-				mpButtonPlaceholderSize: 87, // 小程序导航栏按钮占位大小
-				navBarHeight: 44, // 导航栏高度
-				refreshStatus: 0, // 刷新状态 0: 未刷新 1: 刷新中 2: 刷新完成
-				listData: [], // 列表数据
-				loadType: null,
-				historyList: [],
-				
-				placeholder: "请输入评论",
-				commentReq: {
-					pId: null, // 评论父id
-					content: null, // 评论内容
-					root_id: null
-				},
-				pUser: null, // 标签-回复人
-				showTag: false, // 标签展示与否
-				focus: false, // 输入框自动聚焦
-				submit: false, // 弹出评论
-				KeyboardHeight: 0 // 键盘高度
-			}
-		},
-		methods: {
-			stopPrevent() {},
-			getNewItem(item) {
+			function getNewItem(item) {
 				if (!item.excerpt) {
-					item.excerpt = "";
+					item.excerpt = ""
 				} else if (item.excerpt.length > 50) {
-					item.excerpt = item.excerpt.slice(0, 50) + " ... ...";
+					item.excerpt = item.excerpt.slice(0, 50) + " ... ..."
 				}
-				return item;
-			},
-			async listLoad(data) {
-				console.log(data);
+				return item
+			}
 
-				const listData = [];
+			async function listLoad(data) {
+				const tempListData = []
 				data.map(item => {
-					listData.push({
+					tempListData.push({
 						article_id: item.article_id[0],
 						author_id: item.author_id[0],
 						content: item.content,
 						parent_author_id: item.parent_author_id[0],
 						parent_author_content: item.parent_author_content,
-						root_id:item.root_id,
+						root_id: item.root_id,
 						_id: item._id,
-						
-						update_time: new Date().getTime(item.update_time)
+						update_time: item.update_time
 					})
 				})
-				
-				this.listData = this.loadType === 'loadMore' ? this.listData.concat(listData) : listData
-				this.loadType = null
-			},
-			// 初始化导航栏大小
-			initNavBarSize() {
-				// 获取小程序导航栏按钮信息
+
+				listData.value = loadType.value === 'loadMore' ? listData.value.concat(tempListData) : tempListData
+				loadType.value = null
+			}
+
+			function initNavBarSize() {
 				// #ifdef MP-TOUTIAO
 				let menuButtonInfo = tt.getCustomButtonBoundingClientRect()
-				menuButtonInfo.width = menuButtonInfo.capsule.width //  小程序按钮区域中使用的按钮宽度
-				this.mpButtonLeftPlaceholderSize = menuButtonInfo.leftIcon.width + 10
+				menuButtonInfo.width = menuButtonInfo.capsule.width
+				mpButtonLeftPlaceholderSize.value = 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) {
+				mpButtonPlaceholderSize.value = menuButtonInfo.width + 10
+				navBarHeight.value = uni.getSystemInfoSync().system.toLowerCase().includes('ios') ? 44 : 48
+			}
+
+			function 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'
-				console.log(this.$refs.udb);
-				this.$refs.udb.loadData({
-					clear: true
-				}, () => {
-					
-					console.log(1);
+			}
+
+			function refresh() {
+				loadType.value = 'refresh'
+				udbRef.value.loadData({ clear: true }, () => {
 					uni.stopPullDownRefresh()
 					// #ifdef APP-NVUE
-					this.showRefresh = false
+					showRefresh.value = false
 					// #endif
 				})
-			},
-			// 加载更多
-			loadMore() {
-				this.loadType = 'loadMore'
-				this.$refs.udb.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);
-			},
-			closeInput() {
-				this.focus = false;
-				this.submit = false;
-			},
-			tagClose() {
-				this.showTag = false;
-				this.pUser = null;
-				this.commentReq.pId = null;
-			},
-			selectAdd() {
-				if (this.showTag === true) {
-					this.replyAdd()
+			function loadMore() {
+				loadType.value = 'loadMore'
+				udbRef.value.loadMore()
+			}
+
+			function onqueryerror(e) {
+				console.error(e)
+			}
+
+			function closeInput() {
+				focus.value = false
+				submit.value = false
+			}
+
+			function tagClose() {
+				showTag.value = false
+				pUser.value = null
+				commentReq.pId = null
+			}
+
+			function selectAdd() {
+				if (showTag.value === true) {
+					replyAdd()
 				} else {
-					this.add();
+					add()
 				}
-			},
-			async replyAdd() {
-				if (this.commentReq.content == null || this.commentReq.content.length < 0) {
+			}
+
+			async function replyAdd() {
+				if (!commentReq.content || !commentReq.content.trim()) {
 					uni.showToast({
 						title: '评论内容不能为空',
+						icon: 'none',
 						duration: 2000
-					});
+					})
 					return
 				}
-				
+
 				try {
-					let content = this.commentReq.content;
-				
-					// 获取当前用户信息（需确保已登录）
-					const uniIdToken = uni.getStorageSync('uni_id_token');
+					const uniIdToken = uni.getStorageSync('uni_id_token')
 					if (!uniIdToken) {
 						uni.showToast({
 							title: '请先登录',
 							icon: 'none'
-						});
-						return;
+						})
+						return
 					}
-					// return;
-					// 构建符合后端接口规范的评论对象
-				
+
 					const comment = {
-						article_id: this.id,
-						root_id: this.commentReq.root_id,
-						content: this.commentReq.content,
-						parent_id: this.commentReq.pId
-					};
-					console.log(comment)
-					// 调用云对象方法
-					const commentObj = uniCloud.importObject("comments");
-					const res = await commentObj.replyComment(comment);
-				
-					// 处理响应结果
+						article_id: commentReq.article_id,
+						root_id: commentReq.root_id,
+						content: commentReq.content,
+						parent_id: commentReq.pId
+					}
+
+					const commentObj = uniCloud.importObject("comments")
+					const res = await commentObj.replyComment(comment)
+
 					if (res.code === 200) {
 						uni.showToast({
 							title: '评论成功'
-						});
+						})
+					} else {
+						uni.showToast({
+							title: res.message || '评论失败，请稍后重试',
+							icon: 'none'
+						})
 					}
 				} catch (e) {
-					console.error('评论失败:', e);
-				
-					// 错误分类处理（根据后端错误码映射）
+					console.error('评论失败:', e)
 					const errorHandler = {
 						'PERMISSION_DENIED': '登录状态失效，请重新登录',
 						'INVALID_PARAMS': '评论内容不能为空',
 						'CONTENT_BLOCKED': '包含违禁词汇: ' + e.message.split(':')[1],
 						'PARENT_COMMENT_NOT_FOUND': '回复的评论不存在'
-					};
-				
+					}
 					uni.showToast({
 						title: errorHandler[e.errorType] || '评论失败，请稍后重试',
 						icon: 'none'
-					});
+					})
 				}
-				this.closeInput();
-			},
-			reply(comment) {
-				console.log(comment);
-				this.pUser = comment.author_id.nickname;
-				this.commentReq.pId = comment._id;
-				this.commentReq.root_id = comment.root_id === 0? comment._id : comment.root_id;
-				console.log(comment.author_id.nickname);
+				commentReq.content = ''
+				closeInput()
+			}
+
+			async function add() {
+				if (!commentReq.content || !commentReq.content.trim()) {
+					uni.showToast({
+						title: '评论内容不能为空',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
+
+				try {
+					const uniIdToken = uni.getStorageSync('uni_id_token')
+					if (!uniIdToken) {
+						uni.showToast({
+							title: '请先登录',
+							icon: 'none'
+						})
+						return
+					}
+
+					const comment = {
+						article_id: commentReq.article_id,
+						content: commentReq.content,
+						parent_id: 0,
+						root_id: 0
+					}
+
+					const commentObj = uniCloud.importObject("comments")
+					const res = await commentObj.addComment(comment)
+
+					if (res.code === 200) {
+						uni.showToast({
+							title: '评论成功'
+						})
+					} else {
+						uni.showToast({
+							title: res.message || '评论失败，请稍后重试',
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					console.error('评论失败:', e)
+					uni.showToast({
+						title: '评论失败，请稍后重试',
+						icon: 'none'
+					})
+				}
+				commentReq.content = ''
+				closeInput()
+			}
+
+			function reply(comment) {
+				pUser.value = comment.author_id.nickname
+				commentReq.pId = comment._id
+				commentReq.article_id = comment.article_id._id
+				commentReq.root_id = comment.root_id === 0 ? comment._id : comment.root_id
 				if (comment.author_id.nickname) {
-					this.commentReq.content = '@' + comment.author_id.nickname + ' ';
+					commentReq.content = '@' + comment.author_id.nickname + ' '
 				} else {
-					this.commentReq.content = '';
+					commentReq.content = ''
 				}
-				this.showTag = true;
-				this.commentInput();
-			},
-			// 输入评论
-			commentInput() {
-				// TODO 调起键盘方法
-				this.submit = true;
+				showTag.value = true
+				commentInput()
+			}
+
+			function commentInput() {
+				submit.value = true
 				setTimeout(() => {
-					this.focus = true;
+					focus.value = true
 				}, 50)
-			},
-			// 输入框失去焦点
-			blur() {
-				this.focus = false;
-			},
-			// 输入框聚焦
-			focusOn() {
-				
-			},
-			toArticle(item) {
+			}
+
+			function blur() {
+				focus.value = false
+			}
+
+			function focusOnInput() {
+				// 输入框聚焦
+			}
+
+			function toArticle(item) {
 				uni.navigateTo({
-					url:'/uni_modules/uni-cms-article/pages/detail/detail?id=' + item.article_id._id
+					url: '/uni_modules/uni-cms-article/pages/detail/detail?id=' + item.article_id._id
 				})
 			}
-		},
-		watch: {
-			'userInfo._id'(val, oldVal) {
-				if (val && val !== oldVal && this.$refs.udb) {
-					this.refresh()
-				}
-			}
-		},
-		async onReady() {
-			// #ifdef MP
-			this.initNavBarSize() // 初始化导航栏大小
-			// #endif
-			/* 可用窗口高度 - 搜索框高 - 状态栏高 */
-			this.listHeight = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - this
-				.navBarHeight + 'px'; // 计算列表高度
-		},
-		onLoad() {
 
-		},
+			function stopPrevent() {}
+
+			onReady(() => {
+				// #ifdef MP
+				initNavBarSize()
+				// #endif
+				// #ifdef MP
+				uni.onKeyboardHeightChange(res => {
+					KeyboardHeight.value = res.height
+				})
+				// #endif
+				listHeight.value = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - navBarHeight.value + 'px'
+			})
+
+			watch(() => userInfo.value._id, (val, oldVal) => {
+				if (val && val !== oldVal && udbRef.value) {
+					refresh()
+				}
+			})
+
+			return {
+				udbRef,
+				emptyAvatar,
+				showRefresh,
+				listHeight,
+				listData,
+				loadType,
+				placeholder,
+				commentReq,
+				pUser,
+				showTag,
+				focus,
+				submit,
+				KeyboardHeight,
+				userInfo,
+				queryUserId,
+				colList,
+				getNewItem,
+				listLoad,
+				publishTime,
+				refresh,
+				loadMore,
+				onqueryerror,
+				closeInput,
+				tagClose,
+				selectAdd,
+				replyAdd,
+				reply,
+				blur,
+				toArticle,
+				stopPrevent
+			}
+		}
 	}
 </script>
 
@@ -540,9 +546,8 @@
 
 	.p_f {
 		display: flex;
-
 	}
-	
+
 	.comment-add {
 		position: fixed;
 		background-color: #FFFFFF;
@@ -552,7 +557,7 @@
 		transition: .3s;
 		-webkit-transition: .3s;
 	}
-	
+
 	.comment-submit-box {
 		position: fixed;
 		display: flex;
diff --git a/pages2/setting/setting.vue b/pages2/setting/setting.vue
index d8d5214..a6fb6ef 100644
--- a/pages2/setting/setting.vue
+++ b/pages2/setting/setting.vue
@@ -5,8 +5,8 @@
 				<view class="tui-item-box align-center">
 					<view class="tui-list-cell_name">头像</view>
 					<view class="tui-right">
-						<cloud-image
-							class="avatar" :src="userInfo.avatar_file.url"></cloud-image>
+						<cloud-image class="avatar"
+							:src="(userInfo.avatar_file && userInfo.avatar_file.url) || 'https://qnycdn.mymoyu.top/static/avatar.jpg'"></cloud-image>
 					</view>
 				</view>
 			</tui-list-cell>
@@ -19,15 +19,13 @@
 			<tui-list-cell :arrow="true" @click="handleShowModal(2)">
 				<view class="tui-item-box">
 					<view class="tui-list-cell_name">性别</view>
-					<view class="tui-right">
-						{{renderGener()}}
-					</view>
+					<view class="tui-right">{{ renderGender() }}</view>
 				</view>
 			</tui-list-cell>
 			<tui-list-cell :arrow="true" @click="handleShowModal(1)">
 				<view class="tui-item-box">
 					<view class="tui-list-cell_name">个人简介</view>
-					<view class="tui-right">{{'' || '这个人很神秘，什么都没写'}}</view>
+					<view class="tui-right">{{ userInfo.signature || '这个人很神秘，什么都没写' }}</view>
 				</view>
 			</tui-list-cell>
 		</tui-list-view>
@@ -36,21 +34,19 @@
 			<tui-list-cell>
 				<view class="tui-item-box">
 					<view class="tui-list-cell_name">邮箱</view>
-					<view class="tui-right">{{userInfo.email || '暂无'}}</view>
+					<view class="tui-right">{{ userInfo.email || '暂无' }}</view>
 				</view>
 			</tui-list-cell>
 			<tui-list-cell :arrow="true" @click="handleBindMobile">
 				<view class="tui-item-box">
 					<view class="tui-list-cell_name">手机号</view>
-					<view class="tui-right">{{userInfo.mobile || '暂无'}}</view>
+					<view class="tui-right">{{ userInfo.mobile || '暂无' }}</view>
 				</view>
 			</tui-list-cell>
 			<tui-list-cell>
 				<view class="tui-item-box">
 					<view class="tui-list-cell_name">UID</view>
-					<view class="tui-right">
-						{{userInfo._id}}
-					</view>
+					<view class="tui-right">{{ userInfo._id }}</view>
 				</view>
 			</tui-list-cell>
 		</tui-list-view>
@@ -91,22 +87,17 @@
 </template>
 
 <script>
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-	import {
-		store,
-		mutations
-	} from '@/pages3/uni_modules/uni-id-pages/common/store.js';
-
-	import tuiListView from "@/components/thorui/tui-list-view/tui-list-view.vue";
-	import tuiListCell from "@/components/thorui/tui-list-cell/tui-list-cell.vue";
-	import tuiButton from "@/components/thorui/tui-button/tui-button.vue";
-	import tuiModal from "@/components/thorui/tui-modal/tui-modal.vue";
+	import { ref, computed, reactive } from 'vue'
+	import { store, mutations } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
+	import tuiListView from "@/components/thorui/tui-list-view/tui-list-view.vue"
+	import tuiListCell from "@/components/thorui/tui-list-cell/tui-list-cell.vue"
+	import tuiButton from "@/components/thorui/tui-button/tui-button.vue"
+	import tuiModal from "@/components/thorui/tui-modal/tui-modal.vue"
 	import cloudImage from "@/components/cloud-image.vue"
-	
-import { onUpdated } from "vue";
 
-	const db = uniCloud.database();
+	const db = uniCloud.database()
 	const usersTable = db.collection('uni-id-users')
+
 	export default {
 		components: {
 			tuiButton,
@@ -115,220 +106,191 @@ import { onUpdated } from "vue";
 			tuiModal,
 			cloudImage
 		},
-		computed: {
-			
-			userInfo() {
-				return store.userInfo
-			},
-			realNameStatus() {
-				if (!this.userInfo.realNameAuth) {
-					return 0
-				}
+		setup() {
+			const statusBarHeight = ref(uni.getSystemInfoSync()['statusBarHeight'])
+			const windowHeight = ref(uni.getSystemInfoSync().windowHeight)
+			const modal1 = ref(false)
+			const currentEdit = ref(0)
+			const updateForm = reactive({
+				nickname: '',
+				gender: '',
+				comment: ''
+			})
 
-				return this.userInfo.realNameAuth.authStatus
+			const userInfo = computed(() => store.userInfo)
+
+			const realNameStatus = computed(() => {
+				if (!userInfo.value.realNameAuth) return 0
+				return userInfo.value.realNameAuth.authStatus
+			})
+
+			function getFileInfo(path) {
+				const parts = path.split('/').pop()
+				const [filename, ...extParts] = parts.split('.')
+				const ext = extParts.length ? extParts.pop() : ''
+				return { name: filename, extname: ext }
 			}
-		},
-		data() {
-			return {
-				statusBarHeight: uni.getSystemInfoSync()['statusBarHeight'],
-				windowHeight: uni.getSystemInfoSync().windowHeight,
-				modal1: false,
-				currentEdit: 0,
-				updateForm: {
-					nickname: '',
-					gender: '',
-					comment: ''
-				}
+
+			function formatBytes(bytes) {
+				if (bytes === 0) return '0 Bytes'
+				const k = 1024
+				const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB']
+				const i = Math.floor(Math.log(bytes) / Math.log(k))
+				if (i >= sizes.length) return '> 1 TB'
+				return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]
 			}
-		},
-		mounted() {
-			// this.updateForm.gender = this.loginUser.gender;
-		},
-		methods: {
-			getFileInfo(path) {
-				const parts = path.split('/').pop(); 
-				const [filename, ...extParts] = parts.split('.');
-				const ext = extParts.length ? extParts.pop() : ''; 
-				return {
-					name: filename,
-					extname: ext
-				};
-			},
-			formatBytes(bytes) {
-				if (bytes === 0) return '0 Bytes'; 
-				const k = 1024;
-				const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB']; 
 
-				const i = Math.floor(Math.log(bytes) / Math.log(k));
-
-				if (i >= sizes.length) return '> 1 TB';
-				return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
-			},
-			async updateUserAvatat() {
-				const that = this;
+			async function updateUserAvatat() {
 				uni.chooseImage({
 					type: "image",
 					count: 1,
 					async success(res) {
-						console.log(res);
 						if (res.tempFilePaths.length > 0) {
-							let filePath = res.tempFilePaths[0];
-							let {
-								name,
-								extname
-							} = that.getFileInfo(filePath)
-							const uniCloudStorageExtCo = uniCloud.importObject("ext-storage-co");
-							console.log(`avatar/${name}`)
+							let filePath = res.tempFilePaths[0]
+							let { name, extname } = getFileInfo(filePath)
+							const uniCloudStorageExtCo = uniCloud.importObject("ext-storage-co")
 							const uploadFileOptionsRes = await uniCloudStorageExtCo.getUploadFileOptions({
 								cloudPath: `avatar/${name}`
-							});
-							console.log({...uploadFileOptionsRes})
-							console.log(uploadFileOptionsRes.uploadFileOptions)
+							})
 							await uniCloud.uploadFile({
 								...uploadFileOptionsRes.uploadFileOptions,
 								filePath: filePath,
 								cloudPath: uploadFileOptionsRes.cloudPath,
 								success: () => {
-									const res = {
+									const result = {
 										cloudPath: uploadFileOptionsRes.cloudPath,
 										fileID: uploadFileOptionsRes.fileID,
 										fileURL: uploadFileOptionsRes.fileURL
-									};
-									
-									let updates = {
-										avatar_file: {
-											name: name,
-											extname: extname,
-											url: res.fileID
-										}
 									}
-									
-									usersTable.where({
-										_id: that.userInfo._id
-									}).update(updates).then(e => {
+									let updates = {
+										avatar_file: { name, extname, url: result.fileID }
+									}
+									usersTable.where({ _id: userInfo.value._id }).update(updates).then(e => {
 										if (e.result.updated) {
-											uni.showToast({
-												title: '更新成功',
-												icon: 'none'
-											});
-											mutations.setUserInfo(updates);
+											uni.showToast({ title: '更新成功', icon: 'none' })
+											mutations.setUserInfo(updates)
 										} else {
-											uni.showToast({
-												title: '没有变化',
-												icon: 'none'
-											});
+											uni.showToast({ title: '没有变化', icon: 'none' })
 										}
 									})
-									this.modal1 = false;
-									
-									console.log("上传成功", res);
+									modal1.value = false
 								},
 								fail: (err) => {
-									console.log("上传失败", err);
+									console.log("上传失败", err)
 								}
-							});
-							
-
-							
-						} else {
-							console.log("未选中文件")
+							})
 						}
 					}
-				});
-			},
-			checkUrlProtocol(url) {
-				try {
-					const protocolSeparatorIndex = url.indexOf('://');
-					if (protocolSeparatorIndex === -1) {
-						return 'invalid';
-					}
-					const protocol = url.substring(0, protocolSeparatorIndex).toLowerCase();
+				})
+			}
 
-					if (protocol === 'http' || protocol === 'https') {
-						return 'http/https';
-					} else if (protocol === 'cloud') {
-						return 'cloud';
-					} else {
-						return 'other';
-					}
+			function checkUrlProtocol(url) {
+				try {
+					const protocolSeparatorIndex = url.indexOf('://')
+					if (protocolSeparatorIndex === -1) return 'invalid'
+					const protocol = url.substring(0, protocolSeparatorIndex).toLowerCase()
+					if (protocol === 'http' || protocol === 'https') return 'http/https'
+					else if (protocol === 'cloud') return 'cloud'
+					else return 'other'
 				} catch (error) {
-					return 'invalid';
+					return 'invalid'
 				}
-			},
-			getMessage(currentEdit) {
-				if (currentEdit === 0) {
-					return "请输入你的昵称";
-				} else if (currentEdit === 1) {
-					return "请填写你的个人简介";
-				} else if (currentEdit === 2) {
-					return "请选择你的性别";
-				}
-			},
-			handleToRepassword() {
-				if (!this.userInfo.mobile) {
-					console.log("需要绑定手机号!");
-					return;
+			}
+
+			function getMessage(editIndex) {
+				if (editIndex === 0) return "请输入你的昵称"
+				else if (editIndex === 1) return "请填写你的个人简介"
+				else if (editIndex === 2) return "请选择你的性别"
+			}
+
+			function handleToRepassword() {
+				if (!userInfo.value.mobile) {
+					uni.showModal({
+						title: '提示',
+						content: '修改密码需要先绑定手机号，是否前往绑定？',
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: `../../pages3/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile`
+								})
+							}
+						}
+					})
+					return
 				}
 				uni.navigateTo({
 					url: `../../pages3/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd`
 				})
-			},
-			handleShowModal(index) {
-				this.currentEdit = index
-				this.modal1 = true;
-			},
-			updateUserInfo() {
-				let updates = {};
-				if (this.updateForm.nickname) updates.nickname = this.updateForm.nickname;
-				if (this.updateForm.gender || this.updateForm.gender === 0) updates.gender = this.updateForm.gender;
-				if (this.updateForm.comment) updates.comment = this.updateForm.comment;
-				usersTable.where({
-					_id: this.userInfo._id
-				}).update(updates).then(e => {
+			}
+
+			function handleShowModal(index) {
+				currentEdit.value = index
+				modal1.value = true
+			}
+
+			function updateUserInfo() {
+				let updates = {}
+				if (updateForm.nickname) updates.nickname = updateForm.nickname
+				if (updateForm.gender || updateForm.gender === 0) updates.gender = updateForm.gender
+				if (updateForm.comment) updates.signature = updateForm.comment
+				usersTable.where({ _id: userInfo.value._id }).update(updates).then(e => {
 					if (e.result.updated) {
-						uni.showToast({
-							title: '更新成功',
-							icon: 'none'
-						});
-						mutations.setUserInfo(updates);
+						uni.showToast({ title: '更新成功', icon: 'none' })
+						mutations.setUserInfo(updates)
 					} else {
-						uni.showToast({
-							title: '没有变化',
-							icon: 'none'
-						});
+						uni.showToast({ title: '没有变化', icon: 'none' })
 					}
 				})
-				this.modal1 = false;
-			},
-			handleLogout() {
+				modal1.value = false
+			}
 
+			function handleLogout() {
 				uni.showModal({
 					title: '提示',
 					content: '确定退出登录吗？',
 					success: (res) => {
 						if (res.confirm) {
 							mutations.logout()
-							uni.switchTab({
-								url: '/pages/my/my'
-							})
+							uni.switchTab({ url: '/pages/my/my' })
 						}
 					}
-				});
-			},
-			renderGener() {
-				console.log(this.userInfo);
-				if (!this.userInfo) return "保密";
-				if (this.userInfo.gender === 0) return '保密';
-				if (this.userInfo.gender === 1) return '男';
-				if (this.userInfo.gender === 2) return '女';
-				return '保密';
-			},
-			// 绑定手机号
-			handleBindMobile() {
+				})
+			}
+
+			function renderGender() {
+				if (!userInfo.value) return "保密"
+				if (userInfo.value.gender === 0) return '保密'
+				if (userInfo.value.gender === 1) return '男'
+				if (userInfo.value.gender === 2) return '女'
+				return '保密'
+			}
+
+			function handleBindMobile() {
 				uni.navigateTo({
 					url: `../../pages3/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile`
 				})
-			},
+			}
+
+			return {
+				statusBarHeight,
+				windowHeight,
+				modal1,
+				currentEdit,
+				updateForm,
+				userInfo,
+				realNameStatus,
+				getFileInfo,
+				formatBytes,
+				updateUserAvatat,
+				checkUrlProtocol,
+				getMessage,
+				handleToRepassword,
+				handleShowModal,
+				updateUserInfo,
+				handleLogout,
+				renderGender,
+				handleBindMobile
+			}
 		}
 	}
 </script>
@@ -404,11 +366,9 @@ import { onUpdated } from "vue";
 		width: 120rpx;
 		height: 120rpx;
 		border-radius: 12rpx;
-		// border: 3px solid #3a5fb6;
 	}
 
 	.text-center {
-
 		text-align: center;
 	}
 
@@ -417,4 +377,4 @@ import { onUpdated } from "vue";
 		margin-top: 50rpx;
 		padding: 20rpx
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages2/withdraw/withdraw.vue b/pages2/withdraw/withdraw.vue
index 69bc934..900aadc 100644
--- a/pages2/withdraw/withdraw.vue
+++ b/pages2/withdraw/withdraw.vue
@@ -53,126 +53,153 @@
 </template>
 
 <script>
+	import { ref, onMounted, onPullDownRefresh } from 'vue'
+	import { store } from '@/pages3/uni_modules/uni-id-pages/common/store.js'
+
 	export default {
-		data() {
-			return {
-				pool: 0,
-				extract: '',
-				service_fee: 0.0,
-				showModal: false,
-				is_out: false,
-				is_lowest: false,
-				is_post: false,
-				lowest: 0,
-				fee: 0,
-				money: '',
-				real_money: '',
-				keyboradShow: false,
-				isIphoneX: false,
-				isRefuse: false,
-				content: ""
-			};
-		},
-		watch: {
-			extract(oldVal, newVal) {}
-		},
-		onLoad() {
-			uni.showLoading({
-				title: '加载中'
-			});
-			// this.initData();
-			setTimeout(() => {
-				uni.hideLoading();
-			}, 500);
-		},
-		methods: {
-			async initData() {
-				// const res = await this.$api.mock('pool');
-				this.lowest = res.least_money;
-				this.fee = res.fee;
-				this.pool = res.pool;
-				this.$nextTick(() => {
-					this.keyboradShow = true;
-				});
-			},
-			stopKeyborad() {
-				uni.hideKeyboard();
-			},
-			keyboradKey(key) {
-				this.extract = this.extract * 10 + key;
-				this.checkMoney();
-			},
-			keyboradDel() {
-				if (this.extract && this.extract > 0) {
-					let val = parseInt(this.extract / 10);
-					if (val == 0) val = '';
-					this.extract = val;
-					this.checkMoney();
+		setup() {
+			const pool = ref(0)
+			const extract = ref('')
+			const service_fee = ref(0.0)
+			const showModal = ref(false)
+			const is_out = ref(false)
+			const is_lowest = ref(false)
+			const is_post = ref(false)
+			const lowest = ref(1)
+			const fee = ref(0)
+			const money = ref('')
+			const real_money = ref('')
+			const keyboradShow = ref(true)
+			const isIphoneX = ref(false)
+			const isRefuse = ref(false)
+			const content = ref("")
+
+			onMounted(() => {
+				uni.showLoading({ title: '加载中' })
+				initData()
+				setTimeout(() => {
+					uni.hideLoading()
+				}, 500)
+			})
+
+			onPullDownRefresh(() => {
+				extract.value = ''
+				is_out.value = false
+				is_lowest.value = false
+				is_post.value = false
+				initData()
+				setTimeout(() => {
+					uni.stopPullDownRefresh()
+				}, 500)
+			})
+
+			function initData() {
+				const info = store.userInfo || {}
+				pool.value = Number(info.available) || 0
+				lowest.value = 1
+				fee.value = 0
+				keyboradShow.value = true
+			}
+
+			function stopKeyborad() {
+				uni.hideKeyboard()
+			}
+
+			function keyboradKey(key) {
+				extract.value = extract.value * 10 + key
+				checkMoney()
+			}
+
+			function keyboradDel() {
+				if (extract.value && extract.value > 0) {
+					let val = parseInt(extract.value / 10)
+					if (val === 0) val = ''
+					extract.value = val
+					checkMoney()
 				}
-			},
-			getAll() {
-				this.extract = parseInt(this.pool);
-				this.checkMoney();
-			},
-			checkMoney() {
-				if (!this.extract || this.extract < this.lowest) {
-					this.is_lowest = true;
-					this.is_post = false;
-				} else if (this.extract > this.pool) {
-					this.is_out = true;
-					this.is_lowest = false;
-					this.is_post = false;
+			}
+
+			function getAll() {
+				extract.value = parseInt(pool.value)
+				checkMoney()
+			}
+
+			function checkMoney() {
+				if (!extract.value || extract.value < lowest.value) {
+					is_lowest.value = true
+					is_post.value = false
+				} else if (extract.value > pool.value) {
+					is_out.value = true
+					is_lowest.value = false
+					is_post.value = false
 				} else {
-					this.is_out = false;
-					this.is_lowest = false;
-					this.is_post = true;
+					is_out.value = false
+					is_lowest.value = false
+					is_post.value = true
 				}
-				if (parseFloat(this.extract).toString() == 'NaN') {
-					this.is_post = false;
-					this.$api.msg('输入金额不合法');
+				if (parseFloat(extract.value).toString() === 'NaN') {
+					is_post.value = false
 				}
-			},
-			handleShowModel() {
-				if (this.isRefuse) return;
-				this.checkMoney();
-				if (!this.is_post) return;
-				this.money = this.extract;
-				this.service_fee = Number((this.extract * (this.fee / 100)).toString().match(/^\d+(?:\.\d{0,2})?/));
-				this.real_money = Number((this.extract - this.service_fee).toString().match(/^\d+(?:\.\d{0,2})?/));
-				this.content = `<p>提现金额：<em style="font-style:normal;color:#ff1e0f">${this.money} 元</p>
-				          <p>实际到账：<em style="font-style:normal;color:#ff1e0f">${this.real_money} 元</em></p>
-				          <p>服务费用：<em style="font-style:normal;color:#ff1e0f">${this.service_fee} 元</em></p>
-				          <p>服务费率：<em style="font-style:normal;color:#ff1e0f">${this.fee}%</em></p>
+			}
+
+			function handleShowModel() {
+				if (isRefuse.value) return
+				checkMoney()
+				if (!is_post.value) return
+				money.value = extract.value
+				service_fee.value = Number((extract.value * (fee.value / 100)).toString().match(/^\d+(?:\.\d{0,2})?/))
+				real_money.value = Number((extract.value - service_fee.value).toString().match(/^\d+(?:\.\d{0,2})?/))
+				content.value = `<p>提现金额：<em style="font-style:normal;color:#ff1e0f">${money.value} 元</p>
+				          <p>实际到账：<em style="font-style:normal;color:#ff1e0f">${real_money.value} 元</em></p>
+				          <p>服务费用：<em style="font-style:normal;color:#ff1e0f">${service_fee.value} 元</em></p>
+				          <p>服务费率：<em style="font-style:normal;color:#ff1e0f">${fee.value}%</em></p>
 				         `
-				this.showModal = true;
-			},
-			getMoney() {
-				this.showModal = false;
-				if (this.isRefuse) return;
-				this.isRefuse = true;
+				showModal.value = true
+			}
+
+			function getMoney() {
+				showModal.value = false
+				if (isRefuse.value) return
+				isRefuse.value = true
 				setTimeout(() => {
 					uni.showToast({
 						title: "提现申请已提交，等待审核",
 						mask: false,
 						icon: 'none'
-					});
-				}, 500);
+					})
+				}, 500)
 				setTimeout(() => {
-					uni.navigateBack();
-				}, 1000);
+					uni.navigateBack()
+				}, 1000)
+			}
+
+			return {
+				pool,
+				extract,
+				service_fee,
+				showModal,
+				is_out,
+				is_lowest,
+				is_post,
+				lowest,
+				fee,
+				money,
+				real_money,
+				keyboradShow,
+				isIphoneX,
+				isRefuse,
+				content,
+				initData,
+				stopKeyborad,
+				keyboradKey,
+				keyboradDel,
+				getAll,
+				checkMoney,
+				handleShowModel,
+				getMoney
 			}
-		},
-		onPullDownRefresh() {
-			this.extract = '';
-			// this.initData();
-			this.is_out = false;
-			this.is_lowest = false;
-			this.is_post = false;
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 500);
 		}
-	};
+	}
 </script>
 
 <style>
diff --git a/pages3/uni_modules/uni-id-pages/common/store.js b/pages3/uni_modules/uni-id-pages/common/store.js
index a312731..71f17d5 100644
--- a/pages3/uni_modules/uni-id-pages/common/store.js
+++ b/pages3/uni_modules/uni-id-pages/common/store.js
@@ -50,7 +50,7 @@ export const mutations = {
 			try {
 				let res = await usersTable.where("'_id' == $cloudEnv_uid")
 					.field(
-						'mobile,gender,nickname,username,email,avatar_file,available,frozen,total_recharge,total_withdraw'
+						'mobile,gender,nickname,username,email,avatar_file,signature,available,frozen,total_recharge,total_withdraw'
 						)
 					.get()
 
diff --git a/uni_modules/uni-cms-article/pages/detail/detail.vue b/uni_modules/uni-cms-article/pages/detail/detail.vue
index cd2957e..5527c29 100644
--- a/uni_modules/uni-cms-article/pages/detail/detail.vue
+++ b/uni_modules/uni-cms-article/pages/detail/detail.vue
@@ -536,7 +536,6 @@
 			cloudImage,
 			mediaList,
 			uParse,
-			cloudImage,
 			uRadioGroup,
 			uRadio,
 			uCheckboxGroup,