fix: 修复投票状态显示问题

* fix(提交链接): 修复博客 logo 显示问题
* feat(plugin): 重构友链提交插件配置
* feat(api): 为 restrict-read 请求添加微信会话 ID 并支持自定义验证码类型

.gitignore

@@ -2,8 +2,3 @@ node_modules/
 unpackage/
 package-lock.json
 .idea
-
-config/halo.config.js 
-config/love.config.js
-config/token.config.js
-config/plugins.config.js

App.vue

@@ -1,66 +1,60 @@
 <script>
-	import HaloTokenConfig from '@/config/token.config.js';
+import HaloTokenConfig from '@/config/uhalo.config.js';
 
-	// app升级检测（搭配：https://ext.dcloud.net.cn/plugin?id=4470 升级中心）
-	import CheckAppUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
-	import {
-		CheckWxUpdate
-	} from '@/utils/update.js';
-	export default {
-		globalData: {
-			baseApiUrl: HaloTokenConfig.BASE_API
-		},
-		onLaunch: function() {
-			console.log('App Launch');
+// app升级检测（搭配：https://ext.dcloud.net.cn/plugin?id=4470 升级中心）
+import CheckAppUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
+import {CheckWxUpdate} from '@/utils/update.js';
 
-			// #ifdef APP-PLUS
-			CheckAppUpdate();
-			// #endif
+export default {
+    globalData: {
+        baseApiUrl: HaloTokenConfig.BASE_API
+    },
+    onLaunch: function () {
 
-			// #ifdef MP-WEIXIN
-			CheckWxUpdate();
-			// #endif
+        // #ifdef APP-PLUS
+        CheckAppUpdate();
+        // #endif
 
-			uni.$tm.vx.actions('config/fetchConfigs').then((res) => {
-				console.log('正常：', res)
-				// #ifdef MP-WEIXIN
-				uni.$tm.vx.commit('setWxShare', res.shareConfig);
-				// #endif
-			})
-			// 启动检查app的配置是否已经就绪，若未就绪则设置默认的
-			uni.$tm.vx.actions('setting/checkAndSetDefaultAppSettings');
-		},
-		onShow: function() {
-			console.log('App Show');
-		},
-		onHide: function() {
-			console.log('App Hide');
-		}
-	};
+        // #ifdef MP-WEIXIN
+        CheckWxUpdate();
+        // #endif
+
+        uni.$tm.vx.actions('config/fetchConfigs').then((res) => {
+        })
+        // 启动检查app的配置是否已经就绪，若未就绪则设置默认的
+        uni.$tm.vx.actions('setting/checkAndSetDefaultAppSettings');
+    },
+    onShow: function () {
+        console.log('App Show');
+    },
+    onHide: function () {
+        console.log('App Hide');
+    }
+};
 </script>
 
 <style lang="scss">
-	// 基础样式
-	@import './common/styles/app.theme.scss';
-	@import './common/styles/app.base.scss';
+// 基础样式
+@import './common/styles/app.theme.scss';
+@import './common/styles/app.base.scss';
 
-	// 引入tmUI2.x样式
-	@import './tm-vuetify/mian.min.css';
-	// 引入tmUI2.x主题包
-	@import './tm-vuetify/scss/theme.css';
-	// 引入tmUI2.x预置图标
-	@import './tm-vuetify/scss/fonts/fontawesome_base64.css';
+// 引入tmUI2.x样式
+@import './tm-vuetify/mian.min.css';
+// 引入tmUI2.x主题包
+@import './tm-vuetify/scss/theme.css';
+// 引入tmUI2.x预置图标
+@import './tm-vuetify/scss/fonts/fontawesome_base64.css';
 
-	// 自定义图标
-	@import './common/icons/halocoloriconfont.css';
-	@import './common/icons/haloiconfont.css';
-	@import './common/icons/mphtmliconfont.css';
+// 自定义图标
+@import './common/icons/halocoloriconfont.css';
+@import './common/icons/haloiconfont.css';
+@import './common/icons/mphtmliconfont.css';
 
-	/* #ifndef MP-WEIXIN */
-	@import './common/markdown/markdown.scss';
-	/* #endif */
+/* #ifndef MP-WEIXIN */
+@import './common/markdown/markdown.scss';
+/* #endif */
 
-	page {
-		background-color: #fafafa;
-	}
-</style>
+page {
+    background-color: #fafafa;
+}
+</style>

README.md

@@ -1,6 +1,6 @@
 <p align="center">
     <a href="https://uni-halo.925i.cn" target="_blank" rel="noopener noreferrer">
-        <img width="100" src="https://b.925i.cn/uni_halo/uni_halo_logo.png" alt="uni-halo logo" />
+        <img width="100" src="https://uni-halo.925i.cn/logo.png" alt="uni-halo logo" />
     </a>
 </p>
 
@@ -10,10 +10,10 @@
 
 <br />
 <p align="center">
-	<a href="https://b.925i.cn">作者博客</a>
-	<a href="https://uni-halo.925i.cn">文档地址（等待更新v2版本说明）</a>
-	<a href="https://gitee.com/ialley-workshop-open/uni-halo">Gitee仓库</a>
-	<a href="https://github.com/ialley-workshop-open/uni-halo">Github仓库</a>
+	<a href="https://www.xiaoxiaomo.cn">作者主页</a>
+	<a href="https://uni-halo.925i.cn">官方文档</a> 
+	<a href="https://github.com/ialley-workshop-open/uni-halo">仓库地址</a>
+	<a href="https://github.com/ialley-workshop-open/plugin-uni-halo">插件仓库</a>
 </p>
 
 ---
@@ -22,81 +22,80 @@
 
 |                支付宝												                 |                微信												                 |                QQ												                 |
 |:----------------------------------------------:|:---------------------------------------------:|:---------------------------------------------:|
-| ![支付宝赞赏](https://b.925i.cn/skm/zf_zfb_skm.png) | ![微信赞赏](https://b.925i.cn/skm/zf_wx_zsm.png)	 | ![QQ赞赏](https://b.925i.cn/skm/zf_qq_skm.png)	 |
+| ![支付宝赞赏](https://blog.xiaoxiaomo.cn/upload/zf_zfb_skm.png) | ![微信赞赏](https://blog.xiaoxiaomo.cn/upload/zf_wx_zsm.png)	 | ![QQ赞赏](https://blog.xiaoxiaomo.cn/upload/zf_qq_skm.png)	 |
+
+## 一、项目介绍
+
+基于 Halo 2.x 提供的 API 接口，为微信小程序提供的一套开源的博客应用。
+
+- 完全免费开源，包括程序源码、插件源码
+- 页面支持插件配置
+- 使用最新流行的技术栈
+- 支持特色功能，恋爱日记
+- 理论支持编译为 小程序（推荐）、APP
 
 
-## 🧐 功能介绍
+### 在线预览（小莫唐尼）
 
-#### 🍻 基础功能
+微信内容扫描下方二维码，即可在线预览小程序。
 
-`重要说明：2.0版本 暂时去掉后台管理功能。`
+![QQ交流群](https://blog.xiaoxiaomo.cn/upload/xiaochengxu.gif)
 
-- 用户端：文章列表、文章分类、文章详情、图库、友链、瞬间等
 
-<br/>
-
-#### 💞 特色功能
-
-- 恋爱日记：精心为您设计了秀恩爱的模块，秀出关于你们的故事、情侣甜蜜相册、恋爱记录清单，为您的恋爱保驾护航。
-
-<br/>
-
-#### 😘 插件配置
-
-已支持通过插件配置，插件地址 [plugin-uni-halo](https://github.com/ialley-workshop-open/plugin-uni-halo)
-
-<br/>
-
-## 😎 文档源码
-
-- 作者博客：[https://b.925i.cn/](https://b.925i.cn/)
-- 官方文档（待更新v2版本说明）：[https://uni-halo.925i.cn/](https://uni-halo.925i.cn/)
-- Gitee ：[https://gitee.com/ialley-workshop-open/uni-halo](https://gitee.com/ialley-workshop-open/uni-halo)
-- Github ：[https://github.com/ialley-workshop-open/uni-halo](https://github.com/ialley-workshop-open/uni-halo)
-
-  <br/>
-
-## 😏 在线体验
-
-说明：微信扫码、或搜索【小莫唐尼】即可在线体验已上线小程序！！！
-
-![https://img.925i.cn/file/a0c1a95b49b5db7f78248.png](https://img.925i.cn/file/a0c1a95b49b5db7f78248.png)
-
-<br/>
-## 😘 界面预览
-
-##### 📱 用户端
-
-说明：以下仅为部分截图
+### 部分截图
 
 |首页|分类|图库|
 |:--:|:--:|:--:|
-|![首页](https://blog.925i.cn/upload/39789CF4434C9CD6A6289D7209AF6EEF.jpg)|![分类](https://blog.925i.cn/upload/19CB6B66F40200045B6F572A9C28C5E8.jpg)|![图库](https://blog.925i.cn/upload/464F22FDB216CE802653A5F03BE34351.jpg)|
+|![首页](https://blog.xiaoxiaomo.cn/upload/39789CF4434C9CD6A6289D7209AF6EEF.jpg)|![分类](https://blog.xiaoxiaomo.cn/upload/19CB6B66F40200045B6F572A9C28C5E8.jpg)|![图库](https://blog.xiaoxiaomo.cn/upload/464F22FDB216CE802653A5F03BE34351.jpg)|
 
 |瞬间|我的|
 |:--:|:--:|
-|![瞬间](https://blog.925i.cn/upload/41EE8ADBFAE709A483A6E5F814C6A6E4.jpg)|![我的](https://blog.925i.cn/upload/9AEFE8DA4671A3C7F20F76FF3F9D15C9.jpg)|
+|![瞬间](https://blog.xiaoxiaomo.cn/upload/41EE8ADBFAE709A483A6E5F814C6A6E4.jpg)|![我的](https://blog.xiaoxiaomo.cn/upload/9AEFE8DA4671A3C7F20F76FF3F9D15C9.jpg)|
 
 
-##### 📱 恋爱日记
+### 恋爱日记
 
-说明：以下仅为部分截图
+- 在 uni-halo 中，我们为您准备了一个恋爱日记的模块，您可以在其中记录您的恋爱故事，分享给您的朋友们，请扫示例小程序，在线体验恋爱日记的功能。
 
-|主页|恋爱清单|
-|:--:|:--:|
-|![主页](https://uni-halo.925i.cn/assets/love_001.6bf8b4e9.jpg)|![恋爱清单](https://uni-halo.925i.cn/assets/love_002.a08bd8d6.jpg)|
 <br/>
 
-## 🙋 使用交流
+
+### 功能介绍
+
+- 基础功能：文章列表、文章分类、文章详情、个人图库、友情链接、我的瞬间
+
+- 特色功能：恋爱日记，精心为您设计了秀恩爱的模块，秀出关于你们的故事、情侣甜蜜相册、恋爱记录清单，为您的恋爱保驾护航。
+
+
+## 二、配套插件
+
+### 下载地址
+- 代码仓库：[https://github.com/ialley-workshop-open/plugin-uni-halo](https://github.com/ialley-workshop-open/plugin-uni-halo)
+- 仓库版本：[https://github.com/ialley-workshop-open/plugin-uni-halo/releases](https://github.com/ialley-workshop-open/plugin-uni-halo/releases)
+- 应用市场：[https://www.halo.run/store/apps/app-ryemX](https://www.halo.run/store/apps/app-ryemX)
+
+### 使用方式
+
+直接下载安装插件，在插件市场安装即可，安装完成后，需要配置插件，配置完成后，即可使用插件提供的功能。
+
+
+## 三、相关文档
+
+- 作者主页：[https://www.xiaoxiaomo.cn/](https://www.xiaoxiaomo.cn/)
+- 作者博客：[https://blog.xiaoxiaomo.cn/](https://blog.xiaoxiaomo.cn/)
+- 官方文档：[https://uni-halo.925i.cn/](https://uni-halo.925i.cn/)
+- 代码仓库：[https://github.com/ialley-workshop-open/uni-halo](https://github.com/ialley-workshop-open/uni-halo)
+- 插件地址：[https://github.com/ialley-workshop-open/plugin-uni-halo](https://github.com/ialley-workshop-open/uni-halo)
+- 应用市场：[https://www.halo.run/store/apps/app-ryemX](https://www.halo.run/store/apps/app-ryemX)
+
+
+## 四、使用交流
 
 - 提交 issues：[Github Issues](https://github.com/ialley-workshop-open/uni-halo/issues)
-  丨 [Gitee Issues](https://gitee.com/ialley-workshop-open/uni-halo/issues)
-- 微信交流群：由于微信交流群时效性太短，所以有需要的话可以先加入QQ群，再邀请进微信群
 - QQ 交流群：632969367
--
-快速加群：[![632969367](https://pub.idqqimg.com/wpa/images/group.png)](https://qm.qq.com/cgi-bin/qm/qr?k=cuam7lhrB_vHuvjw2mzUO1sOKdF9KRyM&jump_from=webapi&authKey=d6bJhNaqupTTfoMDWDIeYUTAs44Ax7p64SsM/5NRtFhXE09YexDO15Izuyth6XAi)
+- 微信交流群：由于微信交流群时效性太短，所以有需要的话可以先加入QQ群，再邀请进微信群
 
-![QQ群号：632969367](https://img.925i.cn/file/b83b9e79695779c4344f3.png)
+![QQ交流群](https://blog.xiaoxiaomo.cn/upload/qun.png)
 
 <br/>
 
@@ -108,6 +107,16 @@ uni-halo 还在持续更新中，本项目欢迎您的参与，共同维护，
 
 <br/>
 
+## 💪 贡献者们
+
+感谢以下所有给 uni-halo 贡献过代码的 [开发者](https://github.com/ialley-workshop-open/uni-halo/graphs/contributors)。
+
+<a href="https://github.com/ialley-workshop-open/uni-halo/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=ialley-workshop-open/uni-halo" />
+</a>
+
+<br/>
+
 ## 🔍 开源许可
 
 uni-halo 使用 AGPL-3.0 协议开源，请遵守开源协议。

api/v2/all.api.js

@@ -1,8 +1,11 @@
 /**
  * 所有的接口
  */
-import HaloTokenConfig from '@/config/token.config.js'
+import {
+	getPersonalToken
+} from '@/utils/token.js'
 import HttpHandler from '@/common/http/request.js'
+import qs from 'qs'
 
 import {
 	getAppConfigs
@@ -34,7 +37,8 @@ export default {
 	 * @param {Object} params 数据
 	 */
 	getPostListByKeyword: (params) => {
-		return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/indices/post`, params)
+		// return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/indices/post`, params)
+		return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/indices/-/search`, params)
 	},
 
 	/**
@@ -42,7 +46,14 @@ export default {
 	 * @param {Object} params  查询参数
 	 */
 	getCategoryList: (params) => {
-		return HttpHandler.Get('/apis/api.content.halo.run/v1alpha1/categories', params)
+		const param = qs.stringify(params, {
+			allowDots: true,
+			encodeValuesOnly: true,
+			skipNulls: true,
+			encode: false,
+			arrayFormat: 'repeat'
+		})
+		return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/categories?${param}`, {})
 	},
 	/**
 	 * 查询分类下的文章
@@ -77,7 +88,7 @@ export default {
 	},
 	// 提交回复
 	addPostCommentReply: (commentName, data) => {
-		return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/comments/${commentName}/replay`, data)
+		return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/comments/${commentName}/reply`, data)
 	},
 
 	/**
@@ -103,7 +114,19 @@ export default {
 	getMomentList: (params) => {
 		return HttpHandler.Get(`/apis/moment.halo.run/v1alpha1/moments`, params, {
 			custom: {
-				systemToken: HaloTokenConfig.systemToken
+				personalToken: getPersonalToken()
+			}
+		})
+	},
+
+	/**
+	 * 获取瞬间详情
+	 * @param {String} name 瞬间id
+	 */
+	getMomentByName: (name) => {
+		return HttpHandler.Get(`/apis/moment.halo.run/v1alpha1/moments/${name}`, {}, {
+			custom: {
+				personalToken: getPersonalToken()
 			}
 		})
 	},
@@ -122,7 +145,7 @@ export default {
 	getPhotoGroupList: (params) => {
 		return HttpHandler.Get(`/apis/core.halo.run/v1alpha1/photogroups`, params, {
 			custom: {
-				systemToken: HaloTokenConfig.systemToken
+				personalToken: getPersonalToken()
 			}
 		})
 	},
@@ -134,7 +157,7 @@ export default {
 	getPhotoListByGroupName: (params) => {
 		return HttpHandler.Get(`/apis/console.api.photo.halo.run/v1alpha1/photos`, params, {
 			custom: {
-				systemToken: HaloTokenConfig.systemToken
+				personalToken: getPersonalToken()
 			}
 		})
 	},
@@ -143,9 +166,9 @@ export default {
 	 * 获取友链分组
 	 */
 	getFriendLinkGroupList: (params) => {
-		return HttpHandler.Get(`/apis/core.halo.run/v1alpha1/linkgroups`, params,{
+		return HttpHandler.Get(`/apis/core.halo.run/v1alpha1/linkgroups`, params, {
 			custom: {
-				systemToken: HaloTokenConfig.systemToken
+				personalToken: getPersonalToken()
 			}
 		})
 	},
@@ -157,30 +180,24 @@ export default {
 		return HttpHandler.Get(`/apis/api.plugin.halo.run/v1alpha1/plugins/PluginLinks/links`, params)
 	},
 
-
 	/**
-	 * 校验文章访问密码
+	 * 限制阅读校验
+	 * @param restrictType
+	 * @param code
+	 * @param keyId
+	 * @returns {HttpPromise<any>}
 	 */
-	checkPostVerifyCode: (verifyCode, postId) => {
-		return HttpHandler.Get(`/apis/tools.muyin.site/v1alpha1/verificationCode/check?code=${verifyCode}`, null, {
+	requestRestrictReadCheck: (restrictType, code, keyId) => {
+		const params = {
+			code: code,
+			templateType: 'post',
+			restrictType: restrictType,
+			keyId: keyId
+		}
+		return HttpHandler.Post(`/apis/tools.muyin.site/v1alpha1/restrict-read/check`, params, {
 			header: {
 				'Authorization': getAppConfigs().pluginConfig.toolsPlugin?.Authorization,
 				'Wechat-Session-Id': uni.getStorageSync('openid'),
-				'Post-Id': postId
-			}
-		})
-	},
-
-	/**
-	 * 校验文章访问密码
-	 */
-	checkPostPasswordAccess: (password, postId) => {
-		return HttpHandler.Get(`/apis/tools.muyin.site/v1alpha1/visitPassword/checkPost?password=${password}`,
-		null, {
-			header: {
-				'Authorization': getAppConfigs().pluginConfig.toolsPlugin?.Authorization,
-				'Wechat-Session-Id': uni.getStorageSync('openid'),
-				'Post-Id': postId
 			}
 		})
 	},
@@ -188,17 +205,87 @@ export default {
 	/**
 	 * 获取文章验证码
 	 */
-	getPostVerifyCode: () => {
-		return HttpHandler.Get(`/apis/tools.muyin.site/v1alpha1/verificationCode/create`, null, {
+	createVerificationCode: () => {
+		return HttpHandler.Get(`/apis/tools.muyin.site/v1alpha1/restrict-read/create`, null, {
 			header: {
 				'Authorization': getAppConfigs().pluginConfig.toolsPlugin?.Authorization,
+				'Wechat-Session-Id': uni.getStorageSync('openid'),
 			}
 		})
 	},
+
 	/**
 	 * 提交友情链接
 	 */
 	submitLink(form) {
-		return HttpHandler.Post(`/apis/linksSubmit.muyin.site/v1alpha1/submit`, form, null)
-	}
-}
+		return HttpHandler.Post(`/apis/linksSubmit.muyin.site/v1alpha1/submit`, form, {
+			header: {
+				'Authorization': getAppConfigs().pluginConfig.linksSubmitPlugin?.Authorization,
+				'Wechat-Session-Id': uni.getStorageSync('openid'),
+			}
+		})
+	},
+	/**
+	 * 获取二维码信息
+	 */
+	getQRCodeInfo: (key) => {
+		return HttpHandler.Get(`/apis/api.uni.uhalo.pro/v1alpha1/plugins/plugin-uni-halo/getQRCodeInfo/${key}`,
+			null, {})
+	},
+	/**
+	 * 获取二维码图片
+	 */
+	getQRCodeImg: (postId) => {
+		return HttpHandler.Get(`/apis/api.uni.uhalo.pro/v1alpha1/plugins/plugin-uni-halo/getQRCodeImg/${postId}`,
+			null, {})
+	},
+	/**
+	 * 点赞
+	 * @param {*} data ={group, plural, name}
+	 */
+	submitUpvote(data) {
+		return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/trackers/upvote`, data, {})
+	},
+
+	//----------- 投票 -----------------
+	/**
+	 * 获取投票列表
+	 */
+	getVoteList: (params) => {
+		return HttpHandler.Get(`/apis/api.vote.kunkunyu.com/v1alpha1/votes`, params)
+	},
+	/**
+	 * 获取投票详情
+	 * @param {String} name id 
+	 */
+	getVoteDetail: (name) => {
+		return HttpHandler.Get(`/apis/api.vote.kunkunyu.com/v1alpha1/votes/${name}/detail`, {})
+	},
+	/**
+	 * 获取投票用户列表
+	 * @param {String} name id 
+	 */
+	getVoteUserList: (name) => {
+		return HttpHandler.Get(`/apis/api.vote.kunkunyu.com/v1alpha1/votes/${name}/user-list`, {})
+	},
+	/**
+	 * 提交投票
+	 * @param {String} name id
+	 * @param {Object} { voteData:["选项ID"] } 提交的数据
+	 * @param {Boolean} canAnonymously 是否匿名 默认匿名
+	 */
+	submitVote: (name, data, canAnonymously = true) => {
+		return HttpHandler.Post(`/apis/api.vote.kunkunyu.com/v1alpha1/votes/${name}/submit`, data, {
+			custom: {
+				personalToken: canAnonymously ? undefined : getPersonalToken()
+			}
+		})
+	},
+	/**
+	 * 检查是否安装启用插件
+	 * @param {String} name 插件id 
+	 */
+	checkPluginAvailable: (name) => {
+		return HttpHandler.Get(`/apis/api.plugin.halo.run/v1alpha1/plugins/${name}/available`, {})
+	},
+}

common/http/index.js

@@ -10,7 +10,7 @@
  *  修改时间：
  */
 
-import HaloTokenConfig from '@/config/token.config.js'
+import HaloTokenConfig from '@/config/uhalo.config.js'
 import {
 	setInterceptors
 } from "./interceptors.js";

common/http/interceptors.js

@@ -9,149 +9,133 @@
  *  修改人员：
  *  修改时间：
  */
-import {
-	getAdminAccessToken
-} from "@/utils/auth.js";
-import {
-	delCache,
-	setCache
-} from "@/utils/storage";
+import {delCache, setCache} from "@/utils/storage";
 
 const getCategoryNameByUrl = (url) => {
-	const reg = '(?<=/api/content/categories/).+(?=/posts)'
-	return url.match(reg)[0] || '无分类名'
+    const reg = '(?<=/api/content/categories/).+(?=/posts)'
+    return url.match(reg)[0] || '无分类名'
 }
 const showCategoryInputPasswordModal = (response, category) => {
-	uni.showModal({
-		title: `[ ${category} ] 分类已加密`, // TODO 这里应该获取分类的名字，可以在弹窗之前请求后台拿到所有分类根据分类code拿到名称，但是不会在这之前发送请求
-		content: '',
-		editable: true,
-		placeholderText: '请输入分类密码后访问',
-		confirmText: '验证密码',
-		cancelText: '暂不访问',
-		showCancel: true,
-		cancelColor: '#999999',
-		confirmColor: '#03a9f4',
-		success: (res) => {
-			if (res.confirm) {
-				// TODO 这里如果没有输入密码点击确认应该阻止窗口关闭，但是没找到方法
-				if (!res.content) {
-					uni.showToast({
-						title: '提示：请输入密码',
-						icon: 'none',
-						success: () => {
-							setTimeout(() => {
-								showCategoryInputPasswordModal(response, category);
-							}, 800)
-						}
-					})
-					return;
-				}
-				// 根据请求URL正则匹配分类code，然后把输入的密码根据分类code放入缓存，然后在category.getCategoryPostList中获取，解决多个分类加密输入密码后点错的问题
-				// 目前存在一个问题，比如前两个都需要密码，如果先输入第二个的密码之后，重新进来默认打开第一个还会弹窗，所以想在弹窗标题上增加分类名字
-				// 另外有以下两种方式科技解决
-				// TODO 1.其实这里获取到密码之后可以直接发送一个请求追加上password参数，因为后台会缓存权限，后续不输入密码也可以访问,可惜不会
-				// TODO 2.另外也可以拿到密码之后，直接选中该分类追加password参数，重新请求，可惜也不会
-				setCache('APP_CATEGORY_PWD_' + category, res.content)
-				uni.reLaunch({
-					url: '/pages/tabbar/category/category'
-				});
-			} else if (res.cancel) {}
-		},
-	})
+    uni.showModal({
+        title: `[ ${category} ] 分类已加密`, // TODO 这里应该获取分类的名字，可以在弹窗之前请求后台拿到所有分类根据分类code拿到名称，但是不会在这之前发送请求
+        content: '',
+        editable: true,
+        placeholderText: '请输入分类密码后访问',
+        confirmText: '验证密码',
+        cancelText: '暂不访问',
+        showCancel: true,
+        cancelColor: '#999999',
+        confirmColor: '#03a9f4',
+        success: (res) => {
+            if (res.confirm) {
+                // TODO 这里如果没有输入密码点击确认应该阻止窗口关闭，但是没找到方法
+                if (!res.content) {
+                    uni.showToast({
+                        title: '提示：请输入密码', icon: 'none', success: () => {
+                            setTimeout(() => {
+                                showCategoryInputPasswordModal(response, category);
+                            }, 800)
+                        }
+                    })
+                    return;
+                }
+                // 根据请求URL正则匹配分类code，然后把输入的密码根据分类code放入缓存，然后在category.getCategoryPostList中获取，解决多个分类加密输入密码后点错的问题
+                // 目前存在一个问题，比如前两个都需要密码，如果先输入第二个的密码之后，重新进来默认打开第一个还会弹窗，所以想在弹窗标题上增加分类名字
+                // 另外有以下两种方式科技解决
+                // TODO 1.其实这里获取到密码之后可以直接发送一个请求追加上password参数，因为后台会缓存权限，后续不输入密码也可以访问,可惜不会
+                // TODO 2.另外也可以拿到密码之后，直接选中该分类追加password参数，重新请求，可惜也不会
+                setCache('APP_CATEGORY_PWD_' + category, res.content)
+                uni.reLaunch({
+                    url: '/pages/tabbar/category/category'
+                });
+            } else if (res.cancel) {
+            }
+        },
+    })
 }
 
 export const setInterceptors = (http) => {
-	http.interceptors.request.use(
-		(config) => {
-			console.log("config", config)
+    http.interceptors.request.use((config) => {
+        console.log("config", config)
 
-			// 可使用async await 做异步操作
-			config.header = {
-				...config.header
-				// ... 可以直接加参数
-			};
-			if (config.custom.systemToken) {
-				config.header['Authorization'] = `Bearer ${config.custom.systemToken}`
-			}
-			return config;
-		},
-		(config) => {
-			// 可使用async await 做异步操作
-			return Promise.reject(config);
-		}
-	);
+        // 可使用async await 做异步操作
+        config.header = {
+            ...config.header
+            // ... 可以直接加参数
+        };
+        if (config.custom.personalToken) {
+            config.header['Authorization'] = `Bearer ${config.custom.personalToken}`
+        }
+        return config;
+    }, (config) => {
+        // 可使用async await 做异步操作
+        return Promise.reject(config);
+    });
 
-	http.interceptors.response.use(
-		(response) => {
-			/* 对响应成功做点什么 可使用async await 做异步操作*/
-			//  if (response.data.code !== 200) { // 服务端返回的状态码不等于200，则reject()
-			//    return Promise.reject(response) // return Promise.reject 可使promise状态进入catch
-			// if (response.config.custom.verification) { // 演示自定义参数的作用
-			//   return response.data
-			// } 
+    http.interceptors.response.use((response) => {
+        /* 对响应成功做点什么 可使用async await 做异步操作*/
+        //  if (response.data.code !== 200) { // 服务端返回的状态码不等于200，则reject()
+        //    return Promise.reject(response) // return Promise.reject 可使promise状态进入catch
+        // if (response.config.custom.verification) { // 演示自定义参数的作用
+        //   return response.data
+        // }
 
-			if (response.statusCode == 200) {
-				return response.data;
-			} else {
-				return Promise.reject(response);
-			}
-		},
-		(response) => {
-			/*  对响应错误做点什么 （statusCode !== 200）*/
-			if (!response.data) {
-				return Promise.reject({
-					status: 500,
-					message: 'API接口服务异常！'
-				})
-			} else if (response.data.status == 401) {
-				uni.$tm.toast(response.data.message);
-				// 如果是请求分类之后报401说明密码错误，那么清除该密码，下次点击会报403弹窗再次输入密码
-				if (response.config.url.indexOf('/api/content/categories') >= 0) {
-					const category = getCategoryNameByUrl(response.config.url)
-					delCache('APP_CATEGORY_PWD_' + category);
-					uni.showToast({
-						title: '提示：密码不正确',
-						icon: 'none',
-						success: () => {
-							setTimeout(() => {
-								showCategoryInputPasswordModal(response, category);
-							}, 800)
-						}
-					})
-				} else {
-					// 其他情况维持原来的逻辑
-					delCache('APP_ADMIN_LOGIN_TOKEN');
-					uni.$eShowModal({
-						title: '提示',
-						content: '您未登录超管账号或登录已过期，是否重新登录？',
-						showCancel: true,
-						cancelText: '否',
-						cancelColor: '#999999',
-						confirmText: '是',
-						confirmColor: '#03a9f4'
-					}).then(res => {
-						uni.navigateTo({
-							url: '/pagesB/login/login'
-						})
-					}).catch(err => {
-						uni.switchTab({
-							url: '/pages/tabbar/about/about'
-						})
-					})
-				}
-				return Promise.reject(response.data);
-			} else if (response.data.status == 403) {
-				// 如果报403是请求分类文章接口（您没有该分类的访问权限）的话说明是私密分类，需要输入密码请求
-				if (response.config.url.indexOf('/api/content/categories') >= 0) {
-					const category = getCategoryNameByUrl(response.config.url);
-					showCategoryInputPasswordModal(response, category);
-				}
-				return Promise.reject(response.data);
-			} else {
-				return Promise.reject(response.data);
-			}
+        if (response.statusCode == 200) {
+            return response.data;
+        } else {
+            return Promise.reject(response);
+        }
+    }, (response) => {
+        /*  对响应错误做点什么 （statusCode !== 200）*/
+        if (!response.data) {
+            return Promise.reject({
+                status: 500, message: 'API接口服务异常！'
+            })
+        } else if (response.data.status == 401) {
+            uni.$tm.toast(response.data.message);
+            // 如果是请求分类之后报401说明密码错误，那么清除该密码，下次点击会报403弹窗再次输入密码
+            if (response.config.url.indexOf('/api/content/categories') >= 0) {
+                const category = getCategoryNameByUrl(response.config.url)
+                delCache('APP_CATEGORY_PWD_' + category);
+                uni.showToast({
+                    title: '提示：密码不正确', icon: 'none', success: () => {
+                        setTimeout(() => {
+                            showCategoryInputPasswordModal(response, category);
+                        }, 800)
+                    }
+                })
+            } else {
+                // 其他情况维持原来的逻辑
+                delCache('APP_ADMIN_LOGIN_TOKEN');
+                uni.$eShowModal({
+                    title: '提示',
+                    content: '您未登录超管账号或登录已过期，是否重新登录？',
+                    showCancel: true,
+                    cancelText: '否',
+                    cancelColor: '#999999',
+                    confirmText: '是',
+                    confirmColor: '#03a9f4'
+                }).then(res => {
+                    uni.navigateTo({
+                        url: '/pagesB/login/login'
+                    })
+                }).catch(err => {
+                    uni.switchTab({
+                        url: '/pages/tabbar/about/about'
+                    })
+                })
+            }
+            return Promise.reject(response.data);
+        } else if (response.data.status == 403) {
+            // 如果报403是请求分类文章接口（您没有该分类的访问权限）的话说明是私密分类，需要输入密码请求
+            if (response.config.url.indexOf('/api/content/categories') >= 0) {
+                const category = getCategoryNameByUrl(response.config.url);
+                showCategoryInputPasswordModal(response, category);
+            }
+            return Promise.reject(response.data);
+        } else {
+            return Promise.reject(response.data);
+        }
 
-		}
-	);
-};
+    });
+};

common/markdown/markdown.config.js

@@ -2,14 +2,14 @@
  * markdown配置
  */
 
-import {
-	getAppConfigs
-} from '@/config/index.js'
-import HaloTokenConfig from '@/config/token.config.js'
+import {getAppConfigs} from '@/config/index.js'
+import HaloTokenConfig from '@/config/uhalo.config.js'
+import utils from '@/utils/index.js'
+
 export default {
-	domain: HaloTokenConfig.BASE_API,
-	tagStyle: {
-		table: ` 
+    domain: HaloTokenConfig.BASE_API,
+    tagStyle: {
+        table: ` 
 			table-layout: fixed;
 			border-collapse:collapse;
 			margin-bottom: 18px;
@@ -20,17 +20,17 @@ export default {
 			border: 1px solid #dcdcdc;
 			border-radius: 4px;
 		`,
-		th: `
+        th: `
 			padding: 8px;
 			border-right: 1px solid var(--classE);
 			border-bottom: 1px solid var(--classE);
 		`,
-		td: `
+        td: `
 			padding: 8px;
 			border-right: 1px solid var(--classE);
 			border-bottom: 1px solid var(--classE);
 		`,
-		blockquote: `
+        blockquote: `
 			padding: 8px 15px;
 		    color: #606266;
 		    background: #f2f6fc;
@@ -39,62 +39,62 @@ export default {
 			line-height: 26px;
 			margin-bottom: 18px;
 		`,
-		ul: 'padding-left: 15px;line-height: 1.85;',
-		ol: 'padding-left: 15px;line-height: 1.85;',
-		li: 'margin-bottom: 12px;line-height: 1.85;',
-		h1: `
+        ul: 'padding-left: 15px;line-height: 1.85;',
+        ol: 'padding-left: 15px;line-height: 1.85;',
+        li: 'margin-bottom: 12px;line-height: 1.85;',
+        h1: `
 			margin: 30px 0 20px;
 			color: var(--main);
 			line-height: 24px;
 			position: relative;
 			font-size:1.2em;
 			`,
-		h2: `
+        h2: `
 			color: var(--main);
 			line-height: 24px;
 			position: relative;
 			margin: 22px 0 16px;
 			font-size: 1.16em;
 		`,
-		h3: `
+        h3: `
 		    color: var(--main);
 		    line-height: 24px;
 		    position: relative;
 			margin: 26px 0 18px;
 			font-size: 1.14em;
 		`,
-		h4: `
+        h4: `
 			color: var(--main);
 		    line-height: 24px;
 		    margin-bottom: 18px;
 		    position: relative;
 			font-size: 1.12em;
 		`,
-		h5: `
+        h5: `
 			color: var(--main);
 		    line-height: 24px;
 		    margin-bottom: 14px;
 		    position: relative;
 			font-size: 1.1em;
 		`,
-		h6: `
+        h6: `
 			color: #303133;
 			line-height: 24px;
 			margin-bottom: 14px;
 			position: relative;
 			font-size: 14px;
 		`,
-		p: `
+        p: `
 		    line-height: 1.65;
 		    margin-bottom: 14px;
 			font-size: 14px;
 		`,
-		'code': `  `,
-		strong: 'font-weight: 700;color: rgb(248, 57, 41);',
-		video: 'width: 100%',
-	},
-	containStyle: 'font-family: Optima-Regular, Optima, PingFangSC-light, PingFangTC-light, "PingFang SC", Cambria, Cochin, Georgia, Times, "Times New Roman", serif;padding:12px;font-size: 14px;color: #606266;word-spacing: 0.8px;letter-spacing: 0.8px;border-radius: 6px;background-color:#FFFFFF;',
+        'code': `  `,
+        strong: 'font-weight: 700;color: rgb(248, 57, 41);',
+        video: 'width: 100%',
+    },
+    containStyle: 'font-family: Optima-Regular, Optima, PingFangSC-light, PingFangTC-light, "PingFang SC", Cambria, Cochin, Georgia, Times, "Times New Roman", serif;padding:12px;font-size: 14px;color: #606266;word-spacing: 0.8px;letter-spacing: 0.8px;border-radius: 6px;background-color:#FFFFFF;',
 
-	loadingGif: getAppConfigs().imagesConfig.loadingGifUrl,
-	emptyGif: getAppConfigs().imagesConfig.loadingEmptyUrl,
-}
+    loadingGif: utils.checkImageUrl(getAppConfigs().imagesConfig.loadingGifUrl),
+    emptyGif: utils.checkImageUrl(getAppConfigs().imagesConfig.loadingEmptyUrl),
+}

common/mixins/index.js

@@ -42,18 +42,6 @@ export default {
                     }
                 }
             },
-            watch: {
-                haloConfig: {
-                    deep: true,
-                    immediate: true,
-                    handler(newVal) {
-                        if (!newVal) return;
-                        // #ifdef MP-WEIXIN
-                        uni.$tm.vx.commit('setWxShare', newVal.shareConfig);
-                        // #endif
-                    }
-                }
-            },
             onLoad() {
                 this.fnResetSetAniWaitIndex()
             },
@@ -72,7 +60,7 @@ export default {
                 // 设置页面标题
                 fnSetPageTitle(title) {
                     uni.setNavigationBarTitle({
-                        title: title || (this.haloConfig && this.haloConfig.startConfig.title) || "uni-halo",
+                        title: title || this.haloConfig?.appConfig?.startConfig?.title || "uni-halo",
                     })
                 },
 

common/mixins/pluginAvailable.js

@@ -0,0 +1,55 @@
+/**
+ *  功能：插件检查
+ */
+import {
+	NeedPluginIds,
+	NeedPlugins,
+	checkNeedPluginAvailable
+} from "@/utils/plugin.js"
+
+const HaloPluginAvailableMixin = {
+	data() {
+		return {
+			NeedPluginIds,
+			NeedPlugins,
+			uniHaloPluginAvailableError: "",
+			uniHaloPluginAvailable: true,
+			uniHaloPluginPageClass: "",
+			uniHaloPluginId: "", // 当前需要的插件
+			uniHaloPluginInfo: "" // 当前插件信息
+		};
+	},
+	watch: {
+		uniHaloPluginAvailable: {
+			immediate: true,
+			handler(val) {
+				if (val) {
+					this.uniHaloPluginPageClass = ""
+				} else {
+					this.uniHaloPluginPageClass = "box-border items-center justify-center"
+				}
+			}
+		}
+	},
+	methods: {
+		/** 设置插件ID */
+		setPluginId(pluginId) {
+			this.uniHaloPluginId = pluginId
+			this.uniHaloPluginInfo = NeedPlugins.get(pluginId)
+		},
+		/** 检查插件状态 */
+		async checkPluginAvailable(pluginId) {
+			pluginId = pluginId ?? this.uniHaloPluginId
+			if (!pluginId) return false;
+			const available = await checkNeedPluginAvailable(pluginId)
+			this.uniHaloPluginAvailable = available
+			return available
+		},
+		/** 设置错误信息 */
+		setPluginError(text) {
+			this.uniHaloPluginAvailableError = text
+		}
+	},
+}
+
+export default HaloPluginAvailableMixin;

common/mixins/wxshare.mixin.js

@@ -1,65 +0,0 @@
-// 微信分享配置
-import HaloTokenConfig from '@/config/token.config.js'
-import {jsonToUrlParams2} from '@/utils/url.params.js'
-
-export const haloWxShareMixin = {
-    computed: {
-        haloWxShareData() {
-            const configs = this.$tm.vx.getters().getConfigs;
-            return configs?.shareConfig || {}
-        }
-    },
-    //#ifdef MP-WEIXIN
-    onShareAppMessage(res) {
-        return {
-            ...this.haloWxShareData,
-            success: res => {
-            }
-        }
-    },
-    //#endif
-    /* 分享到微信好友 */
-    onShareAppMessage(res) {
-        const promise = new Promise(resolve => {
-            setTimeout(() => {
-                resolve({
-                    title: this.haloWxShareData.title,
-                    path: this.haloWxShareData.path,
-                })
-            }, 2000)
-        })
-        return {
-            title: this.haloWxShareData.title,
-            path: '',
-            promise
-        }
-    },
-
-    // 分享到朋友圈-这里封装不够，在页面还要声明一次，否则是拿不到参数的，被分享者在朋友圈打开链接是空的
-    onShareTimeline: function () {
-        return {
-            title: this.haloWxShareData.title,
-            query: {},
-            imageUrl: this.haloWxShareData.imageUrl,
-        }
-    },
-    methods: {
-        // 设置分享信息（需要在页面调用）
-        fnSetWxShareConfig(config = {}) {
-            let currentRoutes = getCurrentPages(); // 获取当前打开过的页面路由数组
-            let currentRoute = currentRoutes[currentRoutes.length - 1].route; //获取当前页面路由(分销思路，分享者点开使用的小程序将获取到分享者的id)
-            let sharePath = currentRoutes
-            if (config.params) {
-                const URLParams = config.params ? jsonToUrlParams2(config.params) : {};
-                sharePath += URLParams
-            }
-            let _config = Object.assign({}, {
-                path: sharePath,
-                copyLink: HaloTokenConfig.BASE_API,
-                query: {}
-            }, config)
-
-            uni.$tm.vx.commit('setWxShare', _config);
-        }
-    }
-}

common/styles/app.base.scss

@@ -172,3 +172,178 @@
 }
 
 /* 文本省略样式 结束 */
+
+.box-border{
+	box-sizing: border-box;
+}
+
+// 定义尺寸变量（单位：rpx）
+$spacing-sizes: (
+        0: 0,
+        2: 4rpx,
+        4: 8rpx,
+        8: 16rpx,
+        12: 24rpx,
+        24: 48rpx,
+        48: 96rpx
+);
+
+// 内边距类
+@each $name, $size in $spacing-sizes {
+  // 全方向内边距：p-{size}
+  .uh-p-#{$name} {
+    padding: $size !important;
+  }
+
+  // 水平方向内边距：px-{size}
+  .uh-px-#{$name} {
+    padding-left: $size !important;
+    padding-right: $size !important;
+  }
+
+  // 垂直方向内边距：py-{size}
+  .uh-py-#{$name} {
+    padding-top: $size !important;
+    padding-bottom: $size !important;
+  }
+
+  // 上内边距：pt-{size}
+  .uh-pt-#{$name} {
+    padding-top: $size !important;
+  }
+
+  // 右内边距：pr-{size}
+  .uh-pr-#{$name} {
+    padding-right: $size !important;
+  }
+
+  // 下内边距：pb-{size}
+  .uh-pb-#{$name} {
+    padding-bottom: $size !important;
+  }
+
+  // 左内边距：pl-{size}
+  .uh-pl-#{$name} {
+    padding-left: $size !important;
+  }
+}
+
+//外边距工具类
+@each $name, $size in $spacing-sizes {
+  // 全方向外边距：m-{size}
+  .uh-m-#{$name} {
+    margin: $size !important;
+  }
+
+  // 水平方向外边距：mx-{size}
+  .uh-mx-#{$name} {
+    margin-left: $size !important;
+    margin-right: $size !important;
+  }
+
+  // 垂直方向外边距：my-{size}
+  .uh-my-#{$name} {
+    margin-top: $size !important;
+    margin-bottom: $size !important;
+  }
+
+  // 上外边距：mt-{size}
+  .uh-mt-#{$name} {
+    margin-top: $size !important;
+  }
+
+  // 右外边距：mr-{size}
+  .uh-mr-#{$name} {
+    margin-right: $size !important;
+  }
+
+  // 下外边距：mb-{size}
+  .uh-mb-#{$name} {
+    margin-bottom: $size !important;
+  }
+
+  // 左外边距：ml-{size}
+  .uh-ml-#{$name} {
+    margin-left: $size !important;
+  }
+}
+
+// gap 类
+@each $name, $size in $spacing-sizes {
+  // 全方向gap：gap-{size}
+  .uh-gap-#{$name} {
+    gap: $size !important;
+  }
+
+  // 水平方向gap：gap-x-{size}
+  .uh-gap-x-#{$name} {
+    column-gap: $size !important;
+  }
+
+  // 垂直方向gap：gap-y-{size}
+  .uh-gap-y-#{$name} {
+    row-gap: $size !important;
+  }
+}
+
+
+.w-full {
+  width: 100%;
+}
+
+.h-full {
+  height: 100%;
+}
+
+.flex {
+  display: flex;
+}
+
+.flex-col {
+  flex-direction: column;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.flex-shrink-0 {
+  flex-shrink: 0;
+}
+
+.items-center {
+  align-items: center;
+}
+
+.items-start {
+  align-items: flex-start;
+}
+
+.items-end {
+  align-items: flex-end;
+}
+
+.justify-between {
+  justify-content: space-between;
+}
+
+.justify-around {
+  justify-content: space-around;
+}
+
+.justify-end {
+  justify-content: flex-end;
+}
+
+.justify-start {
+  justify-content: flex-start;
+}
+
+.justify-center {
+	justify-content: center;
+}
+
+.text-break {
+	overflow-wrap: break-word;
+	word-break: break-all;
+}

components/article-card/article-card.vue

@@ -66,7 +66,7 @@
 		display: flex;
 		box-sizing: border-box;
 		margin: 0 24rpx;
-		padding: 24rpx;
+		padding:22rpx 24rpx;
 		border-radius: 12rpx;
 		background-color: #ffff;
 		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);

components/article-min-card/article-min-card.vue

@@ -1,220 +1,222 @@
 <template>
-	<view class="article-min-card" :class="[globalAppSettings.layout.cardType]" @click="fnClickEvent('card')">
-		<view class="left">
-			<cache-image class="thumbnail" radius="6rpx" :url="$utils.checkThumbnailUrl(article.thumbnail)" :fileMd5="$utils.checkThumbnailUrl(article.thumbnail)" mode="aspectFill"></cache-image>
-		</view>
-		<view class="right">
-			<view class="title text-overflow">{{ article.title }}</view>
-			<view class="content text-overflow">{{ article.summary }}</view>
-			<view class="foot">
-				<view class="create-time">
-					<!-- <text class="icon iconfont icon-clock"></text> -->
-					<text class="time-label">发布时间：</text>
-					{{ { d: article.createTime, f: 'yyyy-MM-dd' } | formatTime }}
-				</view>
-				<view class="visits">
-					<!-- <text class="icon iconfont icon-eye"></text> -->
-					浏览
-					<text class="number">{{ article.visits }}</text>
-					次
-				</view>
-			</view>
-		</view>
-	</view>
+    <view class="article-min-card" @click="fnClickEvent('card')">
+        <view class="left">
+            <cache-image class="thumbnail" radius="6rpx" :url="$utils.checkThumbnailUrl(article.spec.cover)" :fileMd5="article.spec.cover"
+                         mode="aspectFill"></cache-image>
+        </view>
+        <view class="right">
+            <view class="title text-overflow">{{ article.spec.title }}</view>
+            <view class="content text-overflow">{{ article.status.excerpt }}</view>
+            <view class="foot">
+                <view class="create-time">
+                    <text class="time-label">发布时间：</text>
+                    {{ {d: article.spec.publishTime, f: 'yyyy-MM-dd'} | formatTime }}
+                </view>
+                <view class="visits">
+                    浏览
+                    <text class="number">{{ article.stats.visit }}</text>
+                    次
+                </view>
+            </view>
+        </view>
+    </view>
 </template>
 
 <script>
-	export default {
-		name: 'article-min-card',
-		props: {
-			article: {
-				type: Object,
-				default: () => {}
-			}
-		},
-		methods: {
-			fnClickEvent() {
-				this.$emit('on-click', this.article);
-			}
-		}
-	};
+export default {
+    name: 'article-min-card',
+    props: {
+        article: {
+            type: Object,
+            default: () => {
+            }
+        }
+    },
+    methods: {
+        fnClickEvent() {
+            this.$emit('on-click', this.article);
+        }
+    }
+};
 </script>
 
 <style scoped lang="scss">
-	.article-min-card {
-		display: flex;
-		box-sizing: border-box;
-		border-radius: 12rpx;
-		background-color: #ffff;
-		overflow: hidden;
-		margin: 12rpx 24rpx;
-		margin-bottom: 24rpx;
-		padding: 16rpx;
-		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+.article-min-card {
+    display: flex;
+    box-sizing: border-box;
+    border-radius: 12rpx;
+    background-color: #ffff;
+    overflow: hidden;
+    margin: 12rpx 24rpx;
+    margin-bottom: 24rpx;
+    padding: 16rpx;
+    box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
 
-		&.lr_image_text {}
+    &.lr_image_text {
+    }
 
-		&.lr_text_image {
-			.left {
-				order: 2;
-				padding-left: 30rpx;
-			}
+    &.lr_text_image {
+        .left {
+            order: 2;
+            padding-left: 30rpx;
+        }
 
-			.right {
-				order: 1;
-				padding-left: 0;
-			}
-		}
+        .right {
+            order: 1;
+            padding-left: 0;
+        }
+    }
 
-		&.tb_image_text {
-			flex-direction: column;
+    &.tb_image_text {
+        flex-direction: column;
 
-			.left {
-				width: 100%;
-				height: 220rpx;
-			}
+        .left {
+            width: 100%;
+            height: 220rpx;
+        }
 
-			.right {
-				padding-left: 0;
-				width: 100%;
+        .right {
+            padding-left: 0;
+            width: 100%;
 
-				.title {
-					margin-top: 24rpx;
-				}
+            .title {
+                margin-top: 24rpx;
+            }
 
-				.foot {
-					justify-content: flex-start;
+            .foot {
+                justify-content: flex-start;
 
-					.create-time {
-						.time-label {
-							display: inline-block;
-						}
-					}
+                .create-time {
+                    .time-label {
+                        display: inline-block;
+                    }
+                }
 
-					.visits {
-						margin-left: 24rpx;
-					}
-				}
-			}
-		}
+                .visits {
+                    margin-left: 24rpx;
+                }
+            }
+        }
+    }
 
-		&.tb_text_image {
-			flex-direction: column;
+    &.tb_text_image {
+        flex-direction: column;
 
-			.left {
-				width: 100%;
-				height: 220rpx;
-				order: 2;
-				margin-top: 20rpx;
-			}
+        .left {
+            width: 100%;
+            height: 220rpx;
+            order: 2;
+            margin-top: 20rpx;
+        }
 
-			.right {
-				padding-left: 0;
-				width: 100%;
-				order: 1;
+        .right {
+            padding-left: 0;
+            width: 100%;
+            order: 1;
 
-				.foot {
-					justify-content: flex-start;
+            .foot {
+                justify-content: flex-start;
 
-					.create-time {
-						.time-label {
-							display: inline-block;
-						}
-					}
+                .create-time {
+                    .time-label {
+                        display: inline-block;
+                    }
+                }
 
-					.visits {
-						margin-left: 24rpx;
-					}
-				}
-			}
-		}
+                .visits {
+                    margin-left: 24rpx;
+                }
+            }
+        }
+    }
 
-		&.only_text {
-			.left {
-				display: none;
-			}
+    &.only_text {
+        .left {
+            display: none;
+        }
 
-			.right {
-				padding-left: 0;
+        .right {
+            padding-left: 0;
 
-				.foot {
-					justify-content: flex-start;
+            .foot {
+                justify-content: flex-start;
 
-					.create-time {
-						.time-label {
-							display: inline-block;
-						}
-					}
+                .create-time {
+                    .time-label {
+                        display: inline-block;
+                    }
+                }
 
-					.visits {
-						margin-left: 24rpx;
-					}
-				}
-			}
-		}
+                .visits {
+                    margin-left: 24rpx;
+                }
+            }
+        }
+    }
 
-		.left {
-			width: 180rpx;
-			height: 130rpx;
+    .left {
+        width: 180rpx;
+        height: 130rpx;
 
-			.thumbnail {
-				width: 100%;
-				height: 100%;
-				border-radius: 12rpx;
-			}
-		}
+        .thumbnail {
+            width: 100%;
+            height: 100%;
+            border-radius: 12rpx;
+        }
+    }
 
-		.right {
-			width: 0;
-			flex-grow: 1;
-			display: flex;
-			flex-direction: column;
-			padding-left: 20rpx;
+    .right {
+        width: 0;
+        flex-grow: 1;
+        display: flex;
+        flex-direction: column;
+        padding-left: 20rpx;
 
-			.title {
-				font-size: 28rpx;
-				font-weight: 600;
-				color: var(--main-text-color);
-			}
+        .title {
+            font-size: 28rpx;
+            font-weight: 600;
+            color: var(--main-text-color);
+        }
 
-			.content {
-				font-size: 26rpx;
-				color: #909399;
-				margin-top: 14rpx;
-			}
+        .content {
+            font-size: 26rpx;
+            color: #909399;
+            margin-top: 14rpx;
+        }
 
-			.foot {
-				display: flex;
-				font-size: 24rpx;
-				justify-content: space-between;
-				align-items: center;
-				color: #909399;
-				margin-top: 14rpx;
+        .foot {
+            display: flex;
+            font-size: 24rpx;
+            justify-content: space-between;
+            align-items: center;
+            color: #909399;
+            margin-top: 14rpx;
 
-				.create-time {
-					font-size: 24rpx;
+            .create-time {
+                font-size: 24rpx;
 
-					.time-label {
-						display: none;
-					}
+                .time-label {
+                    display: none;
+                }
 
-					.icon {
-						font-size: 24rpx;
-						padding-right: 4rpx;
-					}
-				}
+                .icon {
+                    font-size: 24rpx;
+                    padding-right: 4rpx;
+                }
+            }
 
-				.visits {
-					.icon {
-						font-size: 28rpx;
-					}
+            .visits {
+                .icon {
+                    font-size: 28rpx;
+                }
 
-					.number {
-						padding: 0 6rpx;
-						font-size: 24rpx;
-					}
-				}
-			}
-		}
-	}
-</style>
+                .number {
+                    padding: 0 6rpx;
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+}
+
+</style>

components/article-vote/article-vote.vue

@@ -0,0 +1,569 @@
+<template>
+	<view class="vote-card" :class="[loading]">
+		<view v-if="loading !=='success'" class="vote-error" @click="fnGetData()">
+			{{loadingText}}
+		</view>
+		<template v-else>
+			<view class="vote-card-head flex flex-col">
+				<view class="flex justify-between">
+					<view class="flex">
+						<tm-tags color="orange" style="min-width:40rpx;" :shadow="0" rounded size="s"
+							model="fill">{{ index + 1 }}</tm-tags>
+						<tm-tags color="light-blue" :shadow="0" rounded size="s"
+							model="fill">{{ vote.spec._uh_type }}</tm-tags>
+						<tm-tags :color="vote.spec._uh_state.color" size="s" rounded :shadow="0"
+							model="fill">{{vote.spec._uh_state.state}}</tm-tags>
+					</view>
+					<view class="flex-shrink">
+						<tm-button theme="light-blue" :shadow="0" dense size="s"
+							@click="handleToVoteDetail(vote)">查看投票详情</tm-button>
+					</view>
+				</view>
+				<view class="title">
+					{{ vote.spec.title }}
+				</view>
+			</view>
+			<view class="vote-card-body">
+
+				<view v-if="vote.spec.remark" class="remark text-size-s">
+					{{vote.spec.remark}}
+				</view>
+
+				<template>
+					<!-- 单选 -->
+					<view v-if="vote.spec.type==='single'" class="single">
+						<view class="w-full flex flex-col uh-gap-8">
+							<template v-if="vote.spec.isVoted || vote.spec.hasEnded">
+								<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+									class="is-voted-item" :class="[option.checked?'selected':'']" :style="{
+										'--percent': option._uh_percent + '%'
+									}">
+									<view class="is-voted-item-content flex w-full flex-between uh-gap-4">
+										<view class="text-align-left flex-1 text-break">
+											{{option.title }}
+										</view>
+										<view class="flex-shrink ">
+											{{option._uh_percent }}%
+										</view>
+									</view>
+								</view>
+							</template>
+							<template v-else>
+								<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+									class="vote-select-option flex-1 w-full text-break"
+									:class="[option.checked?'light-blue':'grey-lighten-3']"
+									@click="handleSelectSingleOption(option)">
+									{{option.title }}
+								</view>
+							</template>
+						</view>
+					</view>
+
+					<!-- 多选 -->
+					<view v-else-if="vote.spec.type==='multiple'" class="multiple">
+						<view class="w-full flex flex-col uh-gap-8">
+							<template v-if="vote.spec.isVoted || vote.spec.hasEnded">
+								<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+									class="is-voted-item" :class="[option.checked?'selected':'']" :style="{
+										'--percent': option._uh_percent + '%'
+									}">
+									<view class="is-voted-item-content flex w-full flex-between uh-gap-4">
+										<view class="text-align-left flex-1 text-break">
+											{{option.title }}
+										</view>
+										<view class="flex-shrink ">
+											{{option._uh_percent }}%
+										</view>
+									</view>
+								</view>
+							</template>
+							<template v-else>
+								<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+									class="vote-select-option flex-1 w-full text-break"
+									:class="[option.checked?'light-blue':'grey-lighten-3']"
+									@click="handleSelectCheckboxOption(option)">
+									{{option.title }}
+								</view>
+							</template>
+						</view>
+					</view>
+
+					<!-- PK -->
+					<view v-else-if="vote.spec.type==='pk'" class="pk">
+						<view class="pk-container">
+							<view class="radio-item" v-for="(option,optionIndex) in vote.spec.options"
+								:key="optionIndex" :class="[optionIndex==0?'radio-left':'radio-right']"
+								:style="{width:option._uh_percent + '%'}">
+								<view class="option-item"
+									:class="[optionIndex==0?'option-item-left':'option-item-right']">
+									{{option._uh_percent }}%
+								</view>
+							</view>
+						</view>
+						<view class="option-foot w-full flex flex-between uh-mt-12">
+							<view class="w-full flex flex-col uh-gap-8">
+								<template v-if="vote.spec.isVoted || vote.spec.hasEnded">
+									<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+										class="is-voted-item" :class="[option.checked?'selected':'']" :style="{
+											'--percent': option._uh_percent + '%'
+										}">
+										<view class="is-voted-item-content flex w-full flex-between uh-gap-4">
+											<view class="text-align-left flex-1 text-break">
+												{{option.title }}
+											</view>
+											<view class="flex-shrink ">
+												{{option._uh_percent }}%
+											</view>
+										</view>
+									</view>
+								</template>
+								<template v-else>
+									<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+										class="vote-select-option flex-1 w-full text-break"
+										:class="[option.checked?'light-blue':'grey-lighten-3']"
+										@click="handleSelectSingleOption(option)">
+										选项{{ optionIndex+1}}：{{option.title }}
+									</view>
+								</template>
+							</view>
+						</view>
+					</view>
+				</template>
+			</view>
+			<view class="vote-card-foot flex flex-between">
+				<view class="left flex">
+					<tm-tags v-if="vote.spec.timeLimit==='permanent'" color="grey-darken-2" rounded size="s"
+						model="text">结束：永久有效 </tm-tags>
+					<tm-tags v-else color="grey-darken-2" rounded size="s" model="text">
+						<template
+							v-if="vote.spec._state=='未开始'">开始：{{ {d: vote.spec.startDate, f: 'yyyy-MM-dd HH:mm'} | formatTime }}
+						</template>
+						<template v-else>结束：{{ {d: vote.spec.endDate, f: 'yyyy-MM-dd HH:mm'} | formatTime }}
+						</template>
+					</tm-tags>
+				</view>
+
+				<view class="right flex flex-end">
+					<tm-tags color="grey-darken-2" rounded size="s" model="text">{{ vote.stats.voteCount }}
+						人已参与</tm-tags>
+					<tm-tags v-if="vote.spec.isVoted" color="blue" rounded size="s" model="text">已投票</tm-tags>
+				</view>
+			</view>
+
+			<view v-if="submitForm.voteData.length!==0" class="box-border uh-mt-12 w-full uh-px-2">
+				<tm-button v-if="fnCalcIsVoted()" theme="white" text :block="true" class="w-full">您已参与投票</tm-button>
+				<tm-button v-else-if="vote.spec._uh_state.state==='未开始'" theme="orange" text class="w-full" :height="72"
+					:block="true" @click="handleSubmitTip('投票未开始')">投票未开始</tm-button>
+				<tm-button v-else-if="vote.spec._uh_state.state==='已结束'" theme="red" text class="w-full" :height="72"
+					:block="true" @click="handleSubmitTip('投票已结束')">投票已结束</tm-button>
+				<tm-button v-else-if="!vote.spec.canAnonymously" theme="red" :shadow="0" class="w-full" :height="72"
+					text :block="true" @click="handleSubmit()">不支持匿名投票</tm-button>
+				<tm-button v-else-if="submitForm.voteData.length===0" theme="white" text class="w-full" :height="72"
+					:block="true" @click="handleSubmitTip('请选择选项')">提交投票（请选择选项）</tm-button>
+				<tm-button v-else theme="light-blue" class="w-full" :height="72" :block="true" :loading="submitLoading"
+					:disabled="submitLoading" @click="handleSubmit()">提交投票</tm-button>
+			</view>
+		</template>
+	</view>
+</template>
+
+<script>
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import {
+		VOTE_TYPES,
+		calcVoteState,
+		calcVotePercent,
+		voteCacheUtil
+	} from '@/utils/vote.js'
+
+	export default {
+		name: "ArticleVote",
+		components: {
+			tmButton,
+			tmTags
+		},
+		props: {
+			voteId: {
+				type: String,
+				default: ""
+			},
+			index: {
+				type: Number,
+				default: 0
+			},
+			article: {
+				type: Object,
+				default: () => ({})
+			}
+		},
+		data() {
+			return {
+				loading: "loading",
+				loadingText: "加载中，请稍等...",
+				detail: null,
+				vote: null,
+				submitForm: {
+					voteData: []
+				},
+				submitLoading: false
+			}
+		},
+		created() {
+			this.fnGetData();
+		},
+		methods: {
+			fnGetData() {
+				this.loadingText = "加载中，请稍等...";
+				this.loading = "loading";
+				this.$httpApi.v2
+					.getVoteDetail(this.voteId)
+					.then(res => {
+						this.pageTitle = "投票详情" + `（${VOTE_TYPES[res.vote.spec.type]}）`
+
+						const tempVoteRes = res;
+
+						tempVoteRes.vote.spec.isVoted = this.fnCalcIsVoted()
+						tempVoteRes.vote.spec.disabled = this.fnCalcIsVoted()
+						tempVoteRes.vote.spec._uh_state = calcVoteState(tempVoteRes.vote)
+						tempVoteRes.vote.spec._uh_type = VOTE_TYPES[tempVoteRes.vote.spec.type]
+
+						tempVoteRes.vote.spec.options.map((option, index) => {
+							option.value = option.id
+							option.label = option.title
+							option.isVoted = this.fnCalcIsVoted()
+							option.checked = this.fnCalcIsChecked(option)
+							option._uh_percent = calcVotePercent(tempVoteRes.vote, option);
+							option.dataStr = JSON.stringify(option)
+
+							return option
+						})
+
+						this.vote = tempVoteRes.vote
+						this.detail = tempVoteRes;
+
+						setTimeout(() => {
+							this.loading = 'success';
+						}, 200);
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadingText = "投票内容加载失败，点击重试"
+					})
+			},
+
+			fnCalcIsVoted() {
+				return voteCacheUtil.has(this.voteId)
+			},
+			fnCalcIsChecked(option) {
+				const data = voteCacheUtil.get(this.voteId)
+				if (!data) return false;
+				const checked = data.selected.includes(option.id)
+				return checked
+			},
+			formatJsonStr(jsonStr) {
+				return jsonStr ? JSON.parse(jsonStr) : {}
+			},
+			handleSubmitTip(text) {
+				uni.showToast({
+					icon: "none",
+					title: text
+				})
+			},
+			handleSubmit() {
+				if (!this.vote.spec.canAnonymously) {
+					uni.showModal({
+						icon: "none",
+						title: "提示",
+						content: "该投票不支持匿名，请到博主的 网站端 进行投票！",
+						cancelColor: "#666666",
+						cancelText: "关闭",
+						confirmText: "复制地址",
+						success: (res) => {
+							if (res.confirm) {
+								console.log("this.article", this.article)
+								const articleUrl = this.$baseApiUrl + (this.article?.status?.permalink ?? "")
+								this.$utils.copyText(articleUrl, "原文地址复制成功")
+							}
+						}
+					})
+					return
+				}
+
+				uni.showLoading({
+					title: "正在保存..."
+				})
+				this.submitLoading = true
+				this.$httpApi.v2
+					.submitVote(this.voteId, this.submitForm, this.vote.spec.canAnonymously)
+					.then(res => {
+						uni.showToast({
+							icon: "none",
+							title: "提交成功"
+						})
+
+						voteCacheUtil.set(this.voteId, {
+							selected: [...this.submitForm.voteData],
+							data: this.vote
+						})
+
+						this.fnGetData()
+					})
+					.catch(err => {
+						console.error(err);
+						uni.showToast({
+							icon: "none",
+							title: "提交失败，请重试"
+						})
+					}).finally(() => {
+						this.submitLoading = false
+					})
+			},
+
+			handleSelectSingleOption(option) {
+				if (this.vote.spec._uh_state.state == '未开始') {
+					this.showToast(`投票未开始`)
+					return
+				}
+				if (this.vote.spec.hasEnded) return
+				if (this.vote.spec.disabled) return
+				this.vote.spec.options.map(item => {
+					if (option.id == item.id) {
+						item.checked = true
+					} else {
+						item.checked = false
+					}
+				})
+				this.submitForm.voteData = this.vote.spec.options.filter(x => x.checked).map(item => item.id)
+			},
+
+			handleSelectCheckboxOption(option) {
+				if (this.vote.spec._uh_state.state == '未开始') {
+					this.showToast(`投票未开始`)
+					return
+				}
+
+				if (this.vote.spec.hasEnded) return
+				if (this.vote.spec.disabled) return
+
+				const checkedList = this.vote.spec.options.filter(x => x.checked && x.id != option.id)
+
+				if (this.vote.spec.type === 'multiple' && checkedList.length >= this.vote.spec.maxVotes) {
+					this.showToast(`最多选择 ${this.vote.spec.maxVotes} 项`)
+					return
+				}
+
+				this.vote.spec.options.map(item => {
+					if (option.id == item.id) {
+						item.checked = !item.checked
+					}
+				})
+				this.submitForm.voteData = this.vote.spec.options.filter(x => x.checked).map(item => item.id)
+			},
+			handleToVoteDetail(vote) {
+				uni.navigateTo({
+					url: `/pagesA/vote-detail/vote-detail?name=${vote.metadata.name}`
+				});
+			},
+			showToast(content) {
+				uni.showToast({
+					icon: "none",
+					title: content,
+					mask: true
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.w-full {
+		width: 100%;
+	}
+
+	.wp-50 {
+		width: 50%;
+	}
+
+	.vote-card {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		padding: 24rpx;
+		border-radius: 12rpx;
+		background-color: #ffff;
+		overflow: hidden;
+		margin-bottom: 12rpx;
+		border: 1px solid #eee;
+
+		&.error {
+			padding: 0;
+			border-style: dashed;
+			border-color: #e88080;
+			color: #e88080;
+			background-color: rgba(232, 128, 128, 0.075);
+		}
+
+		&.loading {
+			padding: 0;
+			border-style: dashed;
+			border-color: rgba(3, 174, 252, 1);
+			color: rgba(3, 174, 252, 1);
+			background-color: rgba(3, 174, 252, 0.075);
+		}
+	}
+
+
+	.vote-error {
+		padding: 50rpx 24rpx;
+		font-size: 24rpx;
+		border-radius: 12rpx;
+		text-align: center;
+	}
+
+	.vote-card-head {
+		margin-bottom: 12rpx;
+
+		.title {
+			padding: 12rpx 0;
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+	}
+
+	.vote-card-body {
+
+		.remark {
+			box-sizing: border-box;
+			color: rgba(0, 0, 0, 0.75);
+			margin-bottom: 24rpx;
+		}
+	}
+
+	.vote-card-foot {
+		box-sizing: border-box;
+		padding-top: 6px;
+		margin-top: 12px;
+		border-top: 2rpx solid #eee;
+
+		.left {}
+	}
+
+	.is-voted-item {
+		min-height: 72rpx;
+		box-sizing: border-box;
+		position: relative;
+		border-radius: 12rpx;
+		background-color: rgba(229, 229, 229, 0.75);
+		font-size: 24rpx;
+		overflow: hidden;
+
+		&::before {
+			content: "";
+			width: var(--percent);
+			position: absolute;
+			left: 0;
+			top: 0;
+			bottom: 0;
+			background-color: rgba(208, 208, 208, 1);
+			z-index: 0;
+			border-radius: 6rpx;
+		}
+
+		&.selected {
+			background-color: rgba(3, 169, 244, 0.35);
+			color: #ffffff;
+
+			&::before {
+				background-color: rgba(3, 169, 244, 1);
+			}
+		}
+	}
+
+	.is-voted-item-content {
+		box-sizing: border-box;
+		min-height: 72rpx;
+		padding: 12rpx 24rpx;
+		position: relative;
+		z-index: 2;
+	}
+
+	.vote-select-option {
+		box-sizing: border-box;
+		padding: 20rpx 24rpx;
+		font-size: 24rpx;
+		border-radius: 12rpx;
+		transition: all 0.1s ease-in-out;
+	}
+
+	.single {
+		::v-deep {}
+	}
+
+	.multiple {
+		::v-deep {}
+	}
+
+	.pk {
+		box-sizing: border-box;
+		width: 100%;
+		padding: 0 12rpx;
+
+		::v-deep {
+
+			.pk-container {
+				box-sizing: border-box;
+				width: 100%;
+				display: flex;
+			}
+
+			.radio-item {
+				flex-grow: 1;
+				min-width: 30% !important;
+				max-width: 70% !important;
+			}
+
+			.radio-left {}
+
+			.radio-right {}
+
+			.option-item {
+				box-sizing: border-box;
+				width: 100%;
+				padding: 24rpx;
+				border-radius: 12rpx;
+			}
+
+			.option-item-left {
+				background: linear-gradient(90deg, #3B82F6, #60A5FA);
+				color: white;
+				clip-path: polygon(0 0, calc(100% - 40rpx) 0, 100% 100%, 0 100%);
+			}
+
+			.option-item-right {
+				background: linear-gradient(90deg, #F87171, #EF4444);
+				color: white;
+				clip-path: polygon(0 0, 100% 0, 100% 100%, 40rpx 100%);
+				text-align: right;
+			}
+
+			.option-foot {
+				width: 100%;
+				margin-top: 6rpx;
+				font-size: 24rpx;
+				color: #666;
+
+				.left {
+					box-sizing: border-box;
+					padding-right: 24rpx;
+				}
+
+				.right {
+					box-sizing: border-box;
+					padding-left: 24rpx;
+				}
+			}
+		}
+	}
+</style>

components/attachment-select/attachment-select.vue

@@ -1,207 +0,0 @@
-<template>
-	<tm-poup v-model="show" position="bottom" height="auto" @change="fnClose">
-		<view class="poup-head pa-24 text-align-center text-weight-b ">{{ title }}</view>
-		<view class="poup-body pa-24 pt-0 pb-0">
-			<view v-if="loading != 'success'" class="loading-wrap flex flex-center">
-				<view v-if="loading == 'loading'" class="loading">加载中...</view>
-				<view v-else class="error" @click="fnGetData()">加载失败，点击刷新！</view>
-			</view>
-			<block v-else>
-				<view v-if="total == 0" class="empty">无附件</view>
-				<scroll-view v-else class="poup-content" :enable-flex="true" :scroll-y="true" @touchmove.stop>
-					<view class="card-content">
-						<view class="card pa-12" v-for="(file, index) in dataList" :key="index" @click="fnOnSelect(file, index)">
-							<view class="card-inner round-3" :class="{ 'is-select': selectIndex == index }">
-								<cache-image v-if="file.isImage" class="cover" height="160rpx" :url="file.thumbPath" :fileMd5="file.thumbPath" mode="aspectFill"></cache-image>
-								<view v-else class="cover flex pl-46 pr-46 flex-center bg-gradient-blue-grey-accent text-align-center text-size-m">{{ file.mediaType }}</view>
-
-								<view class="name text-overflow text-size-m pa-12">{{ file.name }}</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</block>
-		</view>
-		<view class="poup-foot pa-30 pb-12 pt-0">
-			<!-- 分页 -->
-			<view v-if="total > queryParams.size" class="mt-36 pl-24 pr-24">
-				<tm-pagination color="bg-gradient-blue-accent" :page.sync="queryParams.page" :total="total" :totalVisible="5" @change="fnGetPagingData"></tm-pagination>
-			</view>
-			<view class=" flex flex-center mt-12">
-				<tm-button size="m" theme="bg-gradient-blue-accent" @click="fnSava()">确定选用</tm-button>
-				<tm-button size="m" theme="bg-gradient-orange-accent" @click="fnUpload()">上传</tm-button>
-				<tm-button size="m" theme="bg-gradient-blue-grey-accent" @click="fnClose(false)">关 闭</tm-button>
-			</view>
-		</view>
-	</tm-poup>
-</template>
-
-<script>
-import { getAdminAccessToken } from '@/utils/auth.js';
-
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-import tmPagination from '@/tm-vuetify/components/tm-pagination/tm-pagination.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-export default {
-	name: 'attachment-select',
-	components: { tmPoup, tmPagination, tmButton },
-	props: {
-		title: {
-			type: String,
-			default: '附件列表'
-		},
-		selectType: {
-			type: String,
-			default: ''
-		}
-	},
-	data() {
-		return {
-			show: true,
-			loading: 'loading',
-			total: 0,
-			queryParams: {
-				size: 6,
-				page: 1
-			},
-			dataList: [],
-			select: null,
-			selectIndex: -1
-		};
-	},
-	created() {
-		this.fnGetData();
-	},
-	methods: {
-		fnGetData() {
-			this.queryParams.page = 1;
-			this.fnGetPagingData(1);
-		},
-		fnGetPagingData(page) {
-			this.loading = 'loading';
-			const _params = {
-				...this.queryParams
-			};
-			_params.page = page - 1;
-			this.$httpApi.admin
-				.getAttachmentsByPage(_params)
-				.then(res => {
-					if (res.status == 200) {
-						this.total = res.data.total;
-						this.dataList = res.data.content.map(file => {
-							if (this.$utils.fnCheckIsFileType('image', file) && file.size / 1024 / 1024 > 2) {
-								file.isImage = false;
-								file.desc = '图片过大无法显示缩略图';
-							} else {
-								file.isImage = this.$utils.fnCheckIsFileType('image', file);
-							}
-							file.thumbPath = this.$utils.checkThumbnailUrl(file.thumbPath);
-							return file;
-						});
-						this.loading = 'success';
-					} else {
-						uni.$tm.toast('加载失败，请重试！');
-						this.loading = 'error';
-					}
-				})
-				.catch(err => {
-					console.error(err);
-					uni.$tm.toast('加载失败，请重试！');
-					this.loading = 'error';
-				});
-		},
-		fnOnSelect(file, index) {
-			this.select = file;
-			this.selectIndex = index;
-		},
-		fnSava() {
-			if (this.selectType) {
-				if (this.$utils.fnCheckIsFileType(this.selectType, this.select)) {
-					this.$emit('on-select', this.select);
-				} else {
-					uni.$tm.toast('该附件类型不符合！');
-				}
-			} else {
-				this.$emit('on-select', this.select);
-			}
-		},
-		fnClose(e) {
-			if (!e) {
-				this.$emit('on-close');
-			}
-		},
-		fnUpload() {
-			uni.chooseImage({
-				count: 1,
-				success: res => {
-					uni.uploadFile({
-						filePath: res.tempFilePaths[0],
-						header: {
-							'admin-authorization': getAdminAccessToken()
-						},
-						url: this.$baseApiUrl + '/api/admin/attachments/upload',
-						name: 'file',
-						success: upladRes => {
-							const _uploadRes = JSON.parse(upladRes.data);
-							if (_uploadRes.status == 200) {
-								uni.$tm.toast('上传成功！');
-								this.fnGetData(1);
-							} else {
-								uni.$tm.toast(_uploadRes.message);
-							}
-						},
-						fail: err => {
-							uni.$tm.toast(err.message);
-						}
-					});
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-.poup-head {
-}
-.poup-body {
-	height: 50vh;
-}
-.loading-wrap {
-	height: 50vh;
-	background-color: #fafafa;
-}
-.poup-content {
-	height: inherit;
-	box-sizing: border-box;
-	.card-content {
-		height: inherit;
-		display: flex;
-		flex-wrap: wrap;
-	}
-}
-.card {
-	width: 50%;
-	box-sizing: border-box;
-	&-inner {
-		box-sizing: border-box;
-		overflow: hidden;
-		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
-		border: 4rpx solid transparent;
-		&.is-select {
-			border-color: rgb(13, 141, 242);
-		}
-	}
-	.cover {
-		width: 100%;
-		height: 160rpx;
-		flex-wrap: wrap;
-		box-sizing: border-box;
-	}
-	.name {
-		color: #303133;
-		box-sizing: border-box;
-		text-align: center;
-	}
-}
-</style>

components/bottom-tool-bar/bottom-tool-bar.vue

@@ -1,194 +0,0 @@
-<template>
-	<view class="bottom-tool-bar">
-		<tm-translate :auto="true" animation-name="fadeUp">
-			<view class="content flex">
-				<view class="input" @click="fnToComment()">
-					<text class="icon iconfont icon-edit"></text>
-					<text class="text">(*^▽^*)说点啥吧~</text>
-				</view>
-				<view class="right flex">
-					<!-- 点赞 -->
-					<view class="item likes" @click="fnDoLikes()">
-						<view class="iconfont icon-like"></view>
-						<view class="text">{{ tempPost.likes }}</view>
-					</view>
-					<!-- 评论 -->
-					<view class="item comment">
-						<view class="iconfont icon-comment-dots"></view>
-						<view class="text">{{ tempPost.commentCount }}</view>
-					</view>
-					<!-- 分享 -->
-					<view class="item share" @click="fnOnShare()"><text class="iconfont icon-share1"></text></view>
-				</view>
-			</view>
-		</tm-translate>
-
-		<tm-shareSheet @change="fnOnShareChange" :actions="share.list" title="分享文章" v-model="share.show"></tm-shareSheet>
-	</view>
-</template>
-
-<script>
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmShareSheet from '@/tm-vuetify/components/tm-shareSheet/tm-shareSheet.vue';
-export default {
-	name: 'bottom-tool-bar',
-	components: {
-		tmTranslate,
-		tmShareSheet
-	},
-	props: {
-		// 文章数据
-		post: {
-			type: Object,
-			default: () => {}
-		},
-		// 其他参数
-		params: {
-			type: Object,
-			default: () => {}
-		}
-	},
-	data() {
-		return {
-			share: {
-				show: false,
-				list: [
-					[
-						{ name: '微信好友', bgcolor: '#07c160', icon: 'icon-weixin', color: 'white' },
-						{ name: '朋友圈', bgcolor: '#04c887', icon: 'icon-pengyouquan', color: 'white' },
-						{ name: '生成海报', bgcolor: '#1dc0fd', icon: 'icon-QQ', color: 'white' }
-					]
-				]
-			},
-			tempPost: {}
-		};
-	},
-	watch: {
-		post: {
-			deep: true,
-			handler(val) {
-				console.log('watch', val);
-				this.tempPost = this.$utils.deepClone(val);
-			}
-		}
-	},
-	created() {
-		console.log(this.post);
-		this.tempPost = this.$utils.deepClone(this.post);
-		console.log(this.tempPost);
-	},
-	methods: {
-		fnToComment() {
-			this.$Router.push({
-				path: '/pagesA/comment/comment',
-				query: {
-					postId: this.post.id,
-					parentId: 0,
-					title: this.post.title,
-					formPage: 'comment_list',
-					type: 'post'
-				}
-			});
-		},
-		fnDoLikes() {
-			this.$httpApi
-				.postLikePost(this.post.id)
-				.then(res => {
-					if (res.status == 200) {
-						uni.showToast({
-							icon: 'none',
-							title: '点赞成功'
-						});
-						this.tempPost.likes += 1;
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: res.message
-						});
-					}
-				})
-				.catch(err => {
-					console.log(err);
-					uni.showToast({
-						icon: 'none',
-						title: err.message
-					});
-				});
-		},
-		fnOnShare() {
-			// this.$emit('on-share');
-			this.share.show = true;
-		},
-		fnOnShareChange(e) {
-			console.log(e);
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-.bottom-tool-bar {
-	width: 100vw;
-	position: fixed;
-	left: 0;
-	bottom: 0;
-	z-index: 401;
-
-	::v-deep {
-		.tm-shareSheet-wk .uni-scroll-view-content {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-	.content {
-		width: 100%;
-		justify-content: space-between;
-		box-sizing: border-box;
-		padding: 24rpx;
-		background-color: #ffffff;
-		box-shadow: 0rpx -4rpx 24rpx rgba(0, 0, 0, 0.07);
-		border-radius: 24rpx 24rpx 0 0;
-		.input {
-			width: 280rpx;
-			padding: 12rpx 24rpx;
-			background-color: #f5f5f5;
-			border-radius: 60rpx;
-			font-size: 24rpx;
-			color: #666;
-			.icon {
-			}
-			.text {
-				padding-left: 8rpx;
-			}
-		}
-
-		.right {
-			width: 0;
-			flex-grow: 1;
-			align-items: center;
-			justify-content: space-between;
-			padding-left: 24rpx;
-			.item {
-				margin-left: 24rpx;
-				text-align: center;
-				display: flex;
-				align-items: center;
-				&.share {
-					.iconfont {
-						font-size: 36rpx;
-					}
-				}
-				.iconfont {
-					font-size: 36rpx;
-					color: #333;
-				}
-				.text {
-					padding-left: 6rpx;
-					font-size: 32rpx;
-				}
-			}
-		}
-	}
-}
-</style>

components/cache-image/cache-image.vue

@@ -1,197 +1,198 @@
 <template>
-	<view class="cache-image-wrap">
-		<view v-if="loadStatus == 'loading'" class="img-loading" :style="[imgStyle, loadStyle]">
-			<!-- <text class="img-load-icon iconfont icon-loading"></text>
-			<text class="img-load-text">{{ loadText }}</text> -->
-			<image :src="loadingImgSrc" :style="[loadingImgStyle]" mode="aspectFit"></image>
-		</view>
-		<view v-if="loadStatus == 'error'" class="img-error" :style="[imgStyle, loadErrStyle]">
-			<!-- <text class="img-err-icon iconfont icon-exclamation-circle"></text>
-			<text class="img-load-text">{{ loadErrText }}</text> -->
-			<image class="img-error-img" :src="loadingErrorImageSrc" mode="scaleToFill"></image>
-		</view>
-		<image v-show="loadStatus == 'success'" :src="src" @load="fnOnLoad" @error="fnOnError" :lazy-load="lazyLoad"
-			:style="[imgStyle]" :mode="mode" @click="$emit('on-click', url)"></image>
-	</view>
+    <view class="cache-image-wrap">
+        <view v-if="loadStatus == 'loading'" class="img-loading" :style="[imgStyle, loadStyle]">
+            <!-- <text class="img-load-icon iconfont icon-loading"></text>
+            <text class="img-load-text">{{ loadText }}</text> -->
+            <image :src="loadingImgSrc" :style="[loadingImgStyle]" mode="aspectFit"></image>
+        </view>
+        <view v-if="loadStatus == 'error'" class="img-error" :style="[imgStyle, loadErrStyle]">
+            <!-- <text class="img-err-icon iconfont icon-exclamation-circle"></text>
+            <text class="img-load-text">{{ loadErrText }}</text> -->
+            <image class="img-error-img" :src="loadingErrorImageSrc" mode="scaleToFill"></image>
+        </view>
+        <image v-show="loadStatus == 'success'" :src="src" @load="fnOnLoad" @error="fnOnError" :lazy-load="lazyLoad"
+               :style="[imgStyle]" :mode="mode" @click="$emit('on-click', url)"></image>
+    </view>
 </template>
 
 <script>
-	import imageCache from '@/utils/imageCache.js';
-	export default {
-		name: 'cache-image',
-		props: {
-			url: {
-				type: String,
-				default: ''
-			},
-			lazyLoad: {
-				type: Boolean,
-				default: true
-			},
-			loadStyle: {
-				type: Object,
-				default () {
-					return {
-						backgroundColor: '#ffffff',
-						color: '#333'
-					};
-				}
-			},
-			loadErrStyle: {
-				type: Object,
-				default () {
-					return {
-						color: 'rgba(244, 67, 54,1)'
-						// backgroundColor: 'rgba(244, 67, 54,0.2)'
-					};
-				}
-			},
-			mode: {
-				type: String,
-				default: 'aspectFill'
-			},
-			loadText: {
-				type: String,
-				default: '加载中...'
-			},
-			loadErrText: {
-				type: String,
-				default: '加载失败'
-			},
-			fileMd5: {
-				type: String,
-				default: ''
-			},
-			styles: {
-				type: Object,
-				default () {
-					return {};
-				}
-			},
-			width: {
-				type: String,
-				default: '100%'
-			},
-			height: {
-				type: String,
-				default: '100%'
-			},
-			radius: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				imgStyle: {},
-				loadingImgStyle: {
-					width: '120rpx',
-				},
-				src: '', // 图片地址
-				loadStatus: 'loading'
-			};
-		},
-		computed: {
-			imagesConfig() {
-				return this.$tm.vx.getters().getConfigs.imagesConfig
-			},
-			loadingImgSrc() {
-				return this.imagesConfig.loadingGifUrl;
-			},
-			loadingErrorImageSrc() {
-				return this.imagesConfig.loadingErrUrl
-			}
-		},
-		watch: {
-			// 监听图片md5值的变化
-			fileMd5(val) {
-				// 查找获取图片缓存
-				this.fnGetImageCache();
-			}
-		},
-		created() {
-			this.imgStyle = {
-				width: this.width,
-				height: this.height,
-				borderRadius: this.radius,
-				...this.styles
-			};
+import imageCache from '@/utils/imageCache.js';
 
-			// 查找获取图片缓存
-			this.fnGetImageCache();
-		},
-		methods: {
-			// 查找获取图片缓存
-			async fnGetImageCache() {
-				// #ifdef APP-PLUS
-				var result = await imageCache.getImageCache(this.url, this.fileMd5);
-				if (result) {
-					this.src = result;
-				} else {
-					this.src = this.url;
-				}
-				// #endif
-				// #ifndef APP-PLUS
-				this.src = this.url;
-				// #endif
-			},
-			fnOnLoad() {
-				this.loadStatus = 'success';
-			},
-			fnOnError(e) {
-				this.loadStatus = 'error';
-			}
-		}
-	};
+export default {
+    name: 'cache-image',
+    props: {
+        url: {
+            type: String,
+            default: ''
+        },
+        lazyLoad: {
+            type: Boolean,
+            default: true
+        },
+        loadStyle: {
+            type: Object,
+            default() {
+                return {
+                    backgroundColor: '#ffffff',
+                    color: '#333'
+                };
+            }
+        },
+        loadErrStyle: {
+            type: Object,
+            default() {
+                return {
+                    color: 'rgba(244, 67, 54,1)'
+                    // backgroundColor: 'rgba(244, 67, 54,0.2)'
+                };
+            }
+        },
+        mode: {
+            type: String,
+            default: 'aspectFill'
+        },
+        loadText: {
+            type: String,
+            default: '加载中...'
+        },
+        loadErrText: {
+            type: String,
+            default: '加载失败'
+        },
+        fileMd5: {
+            type: String,
+            default: ''
+        },
+        styles: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        width: {
+            type: String,
+            default: '100%'
+        },
+        height: {
+            type: String,
+            default: '100%'
+        },
+        radius: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            imgStyle: {},
+            loadingImgStyle: {
+                width: '120rpx',
+            },
+            src: '', // 图片地址
+            loadStatus: 'loading'
+        };
+    },
+    computed: {
+        imagesConfig() {
+            return this.$tm.vx.getters().getConfigs.imagesConfig
+        },
+        loadingImgSrc() {
+            return this.$utils.checkImageUrl(this.imagesConfig.loadingGifUrl);
+        },
+        loadingErrorImageSrc() {
+            return this.$utils.checkImageUrl(this.imagesConfig.loadingErrUrl)
+        }
+    },
+    watch: {
+        // 监听图片md5值的变化
+        fileMd5(val) {
+            // 查找获取图片缓存
+            this.fnGetImageCache();
+        }
+    },
+    created() {
+        this.imgStyle = {
+            width: this.width,
+            height: this.height,
+            borderRadius: this.radius,
+            ...this.styles
+        };
+
+        // 查找获取图片缓存
+        this.fnGetImageCache();
+    },
+    methods: {
+        // 查找获取图片缓存
+        async fnGetImageCache() {
+            // #ifdef APP-PLUS
+            var result = await imageCache.getImageCache(this.url, this.fileMd5);
+            if (result) {
+                this.src = result;
+            } else {
+                this.src = this.url;
+            }
+            // #endif
+            // #ifndef APP-PLUS
+            this.src = this.url;
+            // #endif
+        },
+        fnOnLoad() {
+            this.loadStatus = 'success';
+        },
+        fnOnError(e) {
+            this.loadStatus = 'error';
+        }
+    }
+};
 </script>
 
 <style scoped lang="scss">
-	.cache-image-wrap {
-		width: 100%;
-		height: 100%;
-	}
+.cache-image-wrap {
+    width: 100%;
+    height: 100%;
+}
 
-	.img-loading,
-	.img-error {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		box-sizing: border-box;
-		background-color: #f2f2f2;
-	}
+.img-loading,
+.img-error {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    background-color: #f2f2f2;
+}
 
-	.img-load-icon {
-		font-size: 36rpx;
-		animation: xhRote 0.8s infinite linear;
-	}
+.img-load-icon {
+    font-size: 36rpx;
+    animation: xhRote 0.8s infinite linear;
+}
 
-	.img-load-text {
-		font-size: 28rpx;
-		margin-top: 8rpx;
-		color: inherit;
-	}
+.img-load-text {
+    font-size: 28rpx;
+    margin-top: 8rpx;
+    color: inherit;
+}
 
-	.img-error {
-		font-size: 28rpx;
+.img-error {
+    font-size: 28rpx;
 
-		&-img {
-			width: 100%;
-			border-radius: 12rpx;
-		}
-	}
+    &-img {
+        width: 100%;
+        border-radius: 12rpx;
+    }
+}
 
-	.img-err-icon {
-		font-size: 36rpx;
-	}
+.img-err-icon {
+    font-size: 36rpx;
+}
 
-	@keyframes xhRote {
-		0% {
-			transform: rotate(0deg);
-		}
+@keyframes xhRote {
+    0% {
+        transform: rotate(0deg);
+    }
 
-		100% {
-			transform: rotate(360deg);
-		}
-	}
-</style>
+    100% {
+        transform: rotate(360deg);
+    }
+}
+</style>

components/category-mini-card/category-mini-card.vue

@@ -43,7 +43,7 @@
 			top: 0;
 			width: 100%;
 			height: 100%;
-			background-color: rgba(0, 0, 0, 0.5);
+			background-color: rgba(0, 0, 0, 0.25);
 			backdrop-filter: blur(3rpx);
 		}
 

components/comment-list/comment-list.vue

@@ -6,6 +6,10 @@
                 <text>评论列表</text>
                 <text class="count">（{{ (result && result.total) || 0 }}条）</text>
             </view>
+			<view class="refresh">
+				<text class="icon iconfont icon-sync-alt text-weight-s text-grey-darken-1"></text>
+				<text class="text-weight-s text-grey-darken-1 ml-6" style="font-size: 26rpx;" @click="fnGetData">刷新</text>
+			</view>
         </view>
         <!-- 内容区域 -->
         <view class="comment-list_content">
@@ -30,8 +34,7 @@
                         <text class="text-red text-size-s">- 文章已开启禁止评论 -</text>
                     </tm-empty>
                     <tm-empty v-else icon="icon-shiliangzhinengduixiang-" label="暂无评论">
-                        <tm-button theme="light-blue" :dense="true" :shadow="0" size="m"
-                                   @click="fnToComment(null)">抢沙发
+                        <tm-button theme="light-blue" :dense="true" :shadow="0" size="m" @click="fnToComment(null)">抢沙发
                         </tm-button>
                     </tm-empty>
                 </view>
@@ -146,11 +149,9 @@ export default {
                 return uni.$tm.toast('文章已禁止评论！');
             }
             let _comment = {};
+            console.log('data', data)
             if (data) {
-                let {
-                    type,
-                    comment
-                } = data;
+                let {type, comment} = data;
                 // 来自用户
                 _comment = {
                     isComment: false,
@@ -165,16 +166,14 @@ export default {
                 _comment = {
                     isComment: true,
                     postName: this.post.metadata.name,
-                    title: '评论文章：' + this.post.spec.title,
+                    title: '新增评论',
                     formPage: 'comment_list',
                     from: 'posts',
                     type: 'post'
                 };
             }
 
-            this.$emit("on-comment", {
-                _comment
-            })
+            this.$emit("on-comment", _comment)
         },
         fnCopyContent(content) {
             uni.$tm.u.setClipboardData(content);

components/comment-modal/comment-modal.vue

@@ -2,7 +2,7 @@
     <tm-poup v-model="isShow" position="bottom" height="71vh" @change="handleOnChange">
         <view class="title text-align-center">{{ calcTitle }}</view>
         <tm-form @submit="fnOnSubmit">
-            <tm-input :auto-focus="true" name="content" :vertical="true" required :height="220" input-type="textarea"
+            <tm-input name="content" :vertical="true" required :height="220" input-type="textarea"
                       bg-color="grey-lighten-5" :maxlength="200" :borderBottom="false" placeholder="请输入内容,不超过200字符..."
                       v-model="form.content"></tm-input>
             <tm-input name="author" align="right" required title="我的昵称" placeholder="请输入您的昵称..."
@@ -169,7 +169,7 @@ export default {
                 }
                 this.$httpApi.v2.addPostComment(commentForm)
                     .then(res => {
-                        uni.$tm.toast('评论成功！');
+                        uni.$tm.toast('评论成功，可能需要审核！');
                         // 更新评论者信息
                         this.handleSetVisitor();
                         this.handleClose(true)
@@ -196,7 +196,7 @@ export default {
             }
             this.$httpApi.v2.addPostCommentReply(this.form.postName, replyForm)
                 .then(res => {
-                    uni.$tm.toast('回复成功！');
+                    uni.$tm.toast('回复成功，可能需要审核！');
                     // 更新评论者信息
                     this.handleSetVisitor();
                     this.handleClose(true)
@@ -208,15 +208,17 @@ export default {
         },
         handleOnChange(isOpen) {
             this.isShow = isOpen;
-            if (!isOpen) {
-                this.$emit("on-close", {
-                    refresh: false
-                })
-            }
+			if(!isOpen){
+				this.$emit("on-close", {
+					isSubmit:false,
+					refresh: false
+				})
+			}
         },
         handleClose(refresh = false) {
             this.isShow = false;
             this.$emit("on-close", {
+				isSubmit:true,
                 refresh: refresh
             })
         }

components/e-swiper/e-swiper.scss

@@ -102,6 +102,8 @@
 			width: 100%;
 			box-sizing: border-box;
 			padding: 20rpx 24rpx;
+			background-color: rgba(0, 0, 0, 0.085);
+			backdrop-filter: blur(3rpx);
 			&.no-dot {
 				bottom: 0;
 			}

components/e-swiper/e-swiper.vue

@@ -43,7 +43,7 @@
 						</view>
 					</view>
 					<view class="right-hot-ttf">
-						<text class="text hot-text">{{ title }}</text>
+						<text class="text hot-text text-overflow-2">{{ title }}</text>
 					</view>
 				</view>
 			</view>
@@ -63,10 +63,10 @@
 						</view>
 						<!-- 标题 -->
 						<view class="Top-Title">
-							<text class="text title-text">{{ item.title }}</text>
+							<text class="text title-text text-overflow-2">{{ item.title }}</text>
 						</view>
 						<!-- 用户信息 -->
-						<view class="Bottom-UserInfo">
+						<view v-if="false" class="Bottom-UserInfo">
 							<!-- 头像 -->
 							<view class="UserImage-box">
 								<image :src="item.avatar" class="Image" mode="aspectFill"></image>
@@ -217,4 +217,4 @@
 
 <style lang="scss" scoped>
 	@import './e-swiper.scss';
-</style>
+</style>

components/journal-card/journal-card.vue

@@ -1,159 +0,0 @@
-<template>
-	<view class="journal-card mb-24  round-3 bg-white ">
-		<view class="head pa-24 pb-0 flex flex-between">
-			<view class="left flex">
-				<cache-image class="avatar rounded" radius="50%" width="70rpx" height="70rpx" :url="bloggerInfo.avatar"
-					:fileMd5="bloggerInfo.avatar" mode="scaleToFill"></cache-image>
-				<view class="info pl-16 flex flex-col">
-					<view class="nickname text-weight-b text-grey-darken-4">{{ bloggerInfo.nickname }}</view>
-					<view class="mt-3 time text-size-m ">
-						{{ $tm.dayjs(journal.createTime).format('YYYY-MM-DD HH:mm:ss') }}</view>
-				</view>
-			</view>
-			<view class="right">
-				<tm-button v-if="useLike" :shadow="0" theme="light-blue" size="s"
-					@click="fnLike(journal)">点赞({{ journal.likes }})</tm-button>
-				<tm-button v-if="useEdit" :shadow="0" theme="light-blue" size="s"
-					@click="$emit('on-edit', journal)">编辑</tm-button>
-				<tm-button v-if="useDel" :shadow="0" theme="red" size="s" @click="fnDel(journal)">删除</tm-button>
-			</view>
-		</view>
-		<tm-more v-if="journal.content.length > 50" :maxHeight="100" label="查看全部内容" open-label="隐藏部分内容">
-			<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
-				:loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
-				:tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
-				:content="journal.content" :markdown="true" :showLineNumber="true" :showLanguageName="true"
-				:copyByLongPress="true" />
-		</tm-more>
-		<mp-html v-else class="evan-markdown" lazy-load :domain="markdownConfig.domain"
-			:loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
-			:tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
-			:content="journal.content" :markdown="true" :showLineNumber="true" :showLanguageName="true"
-			:copyByLongPress="true" />
-	</view>
-</template>
-
-<script>
-	import MarkdownConfig from '@/common/markdown/markdown.config.js';
-	import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
-	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-	import tmMore from '@/tm-vuetify/components/tm-more/tm-more.vue';
-	export default {
-		name: 'journal-card',
-		components: {
-			mpHtml,
-			tmButton,
-			tmMore
-		},
-		props: {
-			isAdmin: {
-				type: Boolean,
-				default: false
-			},
-			journal: {
-				type: Object,
-				default: () => {}
-			},
-			useLike: {
-				type: Boolean,
-				default: false
-			},
-			useEdit: {
-				type: Boolean,
-				default: false
-			},
-			useDel: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				markdownConfig: MarkdownConfig
-			};
-		},
-		computed: {
-			bloggerInfo() {
-				let blogger = this.$tm.vx.getters().getConfigs.authorConfig.blogger;
-				blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
-				return blogger;
-			},
-		},
-		methods: {
-			fnLike(journal) {
-				uni.showLoading({
-					mask: true,
-					title: '正在点赞中...'
-				});
-				this.$httpApi
-					.postJournalLikes(journal.id)
-					.then(res => {
-						if (res.status == 200) {
-							journal.likes += 1;
-							uni.$tm.toast('o(￣▽￣)ｄ点赞成功！');
-						} else {
-							uni.$tm.toast('Ծ‸Ծ点赞失败了~');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast('Ծ‸Ծ点赞失败了~');
-					});
-			},
-
-			fnDel(journal) {
-				uni.$eShowModal({
-						title: '提示',
-						content: '您确定要删除该日记吗？',
-						showCancel: true,
-						cancelText: '否',
-						cancelColor: '#999999',
-						confirmText: '是',
-						confirmColor: '#03a9f4'
-					})
-					.then(res => {
-						this.$httpApi.admin
-							.deleteJournalsById(journal.id)
-							.then(res => {
-								if (res.status == 200) {
-									this.$emit('on-del', journal);
-									uni.$tm.toast('删除成功！');
-								} else {
-									uni.$tm.toast('Ծ‸Ծ删除失败~');
-								}
-							})
-							.catch(err => {
-								uni.$tm.toast('Ծ‸Ծ删除失败~');
-							});
-					})
-					.catch(() => {});
-			}
-		}
-	};
-</script>
-
-<style scoped lang="scss">
-	.journal-card {
-		box-sizing: border-box;
-		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
-		overflow: hidden;
-
-		.avatar {
-			width: 70rpx;
-			height: 70rpx;
-			border: 6rpx solid #fff;
-			box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
-		}
-
-		.info {
-			justify-content: center;
-
-			.nickname {
-				font-size: 30rpx;
-			}
-
-			.time {
-				font-size: 26rpx;
-			}
-		}
-	}
-</style>

components/notify-dialog/notify-dialog.vue

@@ -0,0 +1,93 @@
+<template>
+    <tm-poup v-model="isShow" width="80vw" height="800rpx" position="center" :round="6" @change="fnOnChange">
+        <view class="fulled pa-4">
+            <view class="mt-24 fulled text-weight-b text-size-sm text-align-center text-overflow-2 pb-24">{{ title }}</view>
+            <view class="fulled mt-2">
+                <scroll-view class="fulled" scroll-y :style="{
+                    height: url? '600rpx': '680rpx'
+                }">
+                    <mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
+                             :loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
+                             :tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
+                             :content="content" :markdown="true" :showLineNumber="true" :showLanguageName="true"
+                             :copyByLongPress="true"/>
+                </scroll-view>
+            </view>
+            <view v-if="url" class="fulled mt-12 flex flex-center">
+                <tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnToWebview()">
+                    点击跳转内容链接
+                </tm-button>
+            </view>
+        </view>
+    </tm-poup>
+</template>
+
+
+<script>
+import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
+
+import MarkdownConfig from '@/common/markdown/markdown.config.js';
+
+export default {
+    name: 'notify-dialog',
+    components: {
+        tmPoup,
+        tmButton,
+        mpHtml
+    },
+    props: {
+        show: {
+            type: Boolean,
+            default: false
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        content: {
+            type: String,
+            default: ''
+        },
+        url: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            isShow: false,
+            markdownConfig: MarkdownConfig,
+        };
+    },
+    created() {
+        this.isShow = this.show;
+    },
+    methods: {
+        fnToWebview() {
+            if (this.$utils.checkIsUrl(this.url)) {
+                uni.navigateTo({
+                    url: '/pagesC/website/website?data=' +
+                        JSON.stringify({
+                            title: this.title,
+                            url: encodeURIComponent(this.url)
+                        }),
+                    success: () => {
+                        this.fnOnChange(false)
+                    }
+                });
+            }
+        },
+        fnOnChange(e) {
+            this.isShow = false;
+            this.$emit('on-change', e);
+        }
+    }
+}
+</script>
+
+
+<style scoped lang="scss">
+
+</style>

components/plugin-unavailable/plugin-unavailable.vue

@@ -0,0 +1,200 @@
+<template>
+	<view v-if="pluginInfo" class="plugin-unavailable flex flex-col flex-center"
+		:class="{border:useBorder,'decoration':useDecoration}" :style="[calcCustomStyle]">
+		<!-- 图标 -->
+		<image class="plugin-logo" :src="pluginInfo.logo" mode="scaleToFill"></image>
+		<!-- 名称 -->
+		<view class="plugin-name">
+			{{ pluginInfo.name }}
+		</view>
+		<view class="plugin-error">
+			未安装/启用插件
+		</view>
+		<!-- 描述 -->
+		<view class="plugin-desc">
+			{{ pluginInfo.desc }}
+		</view>
+		<view v-if="errorText" class="plugin-tip">
+			{{errorText}}
+		</view>
+		<!-- 插件地址 -->
+		<view class="plugin-url">
+			插件地址：{{ pluginInfo.url }}
+		</view>
+		<!-- 反馈按钮/复制地址 -->
+		<view class="plugin-btns w-full flex-center">
+			<!-- #ifndef MP-WEIXIN -->
+			<tm-button theme="light-blue" :block="true" class="w-full" :height="70" @click="copy">复制地址</tm-button>
+			<!-- #endif -->
+			<!-- #ifdef MP-WEIXIN -->
+			<tm-button theme="light-blue" plan text :height="70" @click="copy">复制地址</tm-button>
+			<tm-button theme="light-blue" open-type="contact" :height="70">提交反馈</tm-button>
+			<!-- #endif -->
+		</view>
+
+		<view class="plugin-copyright">
+			提示：请确保 Halo 博客已安装相关插件
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		NeedPluginIds,
+		NeedPlugins,
+		CheckNeedPluginAvailable
+	} from "@/utils/plugin.js"
+	import utils from '@/utils/index.js'
+
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+
+	export default {
+		name: "plugin-unavailable",
+		components: {
+			tmButton
+		},
+		props: {
+			pluginId: {
+				type: String,
+				default: ""
+			},
+			errorText: {
+				type: String,
+				default: ""
+			},
+			useDecoration: {
+				type: Boolean,
+				default: true
+			},
+			useBorder: {
+				type: Boolean,
+				default: true
+			},
+			customStyle: {
+				type: Object,
+				default: () => ({})
+			}
+		},
+		data() {
+			return {
+				NeedPluginIds,
+				NeedPlugins,
+				pluginInfo: null,
+				defaultStyle: {
+					width: "80vw",
+					borderRadius: "24rpx"
+				}
+			};
+		},
+		computed: {
+			calcCustomStyle() {
+				const style = this.customStyle ?? {}
+				return {
+					...this.defaultStyle,
+					...style
+				}
+			}
+		},
+		watch: {
+			pluginId: {
+				deep: true,
+				immediate: true,
+				handler(newVal, oldVal) {
+					this.pluginInfo = NeedPlugins.get(newVal)
+				}
+			}
+		},
+		methods: {
+			copy() {
+				utils.copyText(this.pluginInfo.url, "插件地址已复制")
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.plugin-unavailable {
+		box-sizing: border-box;
+		margin: auto;
+		padding: 100rpx 36rpx;
+		gap: 24rpx;
+		font-size: 28rpx;
+
+		&.border {
+			// border: 2rpx solid #E2E8F0;
+			border: 2rpx solid #eee;
+		}
+
+		&.decoration {
+			background-color: rgba(255, 255, 255, 0.95);
+			box-shadow: 0 0 12rpx rgba(226, 232, 240, 0.35);
+			backdrop-filter: blur(6rpx);
+			border-top: 12rpx solid rgba(3, 169, 244, 1);
+		}
+
+	}
+
+	.plugin-logo {
+		box-sizing: border-box;
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 24rpx;
+	}
+
+	.plugin-name {
+		box-sizing: border-box;
+		font-weight: bold;
+		color: #333;
+		font-size: 32rpx;
+	}
+
+	.plugin-error {
+		box-sizing: border-box;
+		padding: 6rpx 16rpx;
+		border-radius: 36rpx;
+		background-color: rgba(255, 61, 49, 0.075);
+		color: rgba(255, 61, 49, 1);
+		font-size: 24rpx;
+		font-weight: bold;
+	}
+
+	.plugin-tip {
+		box-sizing: border-box;
+		padding: 10rpx 20rpx;
+		border-radius: 12rpx;
+		border: 2rpx dashed #f2c97d;
+		color: #f0a020;
+		font-size: 24rpx;
+	}
+
+	.plugin-desc {
+		box-sizing: border-box;
+		width: 60vw;
+		font-size: 24rpx;
+		text-align: center;
+		color: #64748b;
+	}
+
+	.plugin-url {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 16rpx 24rpx;
+		border-radius: 12rpx;
+		background-color: #F1F5F9;
+		color: #666;
+		font-size: 24rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.plugin-btns {
+		box-sizing: border-box;
+	}
+
+	.plugin-copyright {
+		font-size: 20rpx;
+		color: #999;
+		transform: scale(0.9) translateY(20px);
+	}
+</style>

components/restrict-read-skeleton/restrict-read-skeleton.vue

@@ -0,0 +1,243 @@
+<script>
+export default {
+  name: 'restrict-read-skeleton',
+  props: {
+    loading: {
+      type: Boolean,
+      default: true
+    },
+    hover: {
+      type: Boolean,
+      default: false
+    },
+    buttonText: {
+      type: String,
+      default: '刷新'
+    },
+    buttonColor: {
+      type: String,
+      default: '#07c160'
+    },
+    buttonSize: {
+      type: String,
+      default: 'normal', // 'small', 'normal', 'large'
+      validator: value => ['small', 'normal', 'large'].includes(value)
+    },
+    lines: {
+      type: Number,
+      default: 4,
+      validator: value => value >= 1 && value <= 6
+    },
+    skeletonColor: {
+      type: String,
+      default: '#f5f5f5'
+    },
+    skeletonHighlight: {
+      type: String,
+      default: '#e8e8e8'
+    },
+    animationDuration: {
+      type: Number,
+      default: 1.5
+    },
+    showButton: {
+      type: Boolean,
+      default: true
+    },
+    tipText: {
+      type: String,
+      default: '' // 默认不显示提示文字
+    },
+    tipColor: {
+      type: String,
+      default: '#666666' // 提示文字颜色
+    },
+    tipSize: {
+      type: Number,
+      default: 24 // 提示文字大小，单位rpx
+    }
+  },
+  methods: {
+    handleRefresh() {
+      this.$emit('refresh');
+    },
+    onTouchStart() {
+      this.$emit('touchstart');
+    },
+    onTouchEnd() {
+      this.$emit('touchend');
+    }
+  }
+};
+</script>
+
+<template>
+  <!-- 骨架屏容器 -->
+  <view class="container">
+    <!-- 骨架屏内容 -->
+    <view class="skeleton" v-if="loading">
+      <!-- 内容区域 -->
+      <view class="skeleton-body">
+        <view
+            v-for="(item, index) in Array(lines).fill(0)"
+            :key="index"
+            class="skeleton-line"
+            :class="{
+            'short': index === lines - 2,
+            'shorter': index === lines - 1
+          }"
+          :style="{
+            background: `linear-gradient(90deg, ${skeletonColor} 25%, ${skeletonHighlight} 50%, ${skeletonColor} 75%)`,
+            animationDuration: `${animationDuration}s`
+          }">
+        </view>
+      </view>
+    </view>
+
+    <!-- 实际内容 -->
+    <view v-else>
+      <slot></slot>
+    </view>
+
+    <!-- 提示文字和按钮容器 -->
+    <view v-if="showButton" class="button-container">
+      <!-- 提示文字 -->
+      <text 
+        v-if="tipText" 
+        class="tip-text"
+        :style="{
+          color: tipColor,
+          fontSize: tipSize + 'rpx'
+        }"
+      >{{ tipText }}</text>
+      
+      <!-- 按钮 -->
+      <button
+        class="overlay-button"
+        :class="[buttonSize, { 'button-hover': hover }]"
+        hover-class="none"
+        @touchstart="onTouchStart"
+        @touchend="onTouchEnd"
+        @click="handleRefresh"
+        :style="{ backgroundColor: buttonColor }"
+      >
+        {{ buttonText }}
+      </button>
+    </view>
+  </view>
+</template>
+
+<style scoped lang="scss">
+/* 容器样式 */
+.container {
+  position: relative;
+  width: 100%;
+  min-height: 200rpx;
+  background-color: #ffffff;
+  border-radius: 16rpx;
+  overflow: hidden;
+  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
+  transition: all 0.3s ease;
+
+  &:hover {
+    box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.08);
+  }
+}
+
+/* 骨架屏样式 */
+.skeleton {
+  width: 100%;
+  height: 100%;
+  padding: 30rpx;
+
+  &-body {
+    margin: 20rpx 0;
+  }
+
+  &-line {
+    height: 32rpx;
+    background-size: 400% 100%;
+    border-radius: 8rpx;
+    margin-bottom: 20rpx;
+    animation: skeleton-loading 1.5s ease infinite;
+
+    &.short {
+      width: 70%;
+    }
+
+    &.shorter {
+      width: 50%;
+    }
+  }
+}
+
+/* 按钮容器样式 */
+.button-container {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  z-index: 2;
+}
+
+/* 提示文字样式 */
+.tip-text {
+  margin-bottom: 20rpx;
+  text-align: center;
+  line-height: 1.4;
+}
+
+/* 按钮样式 */
+.overlay-button {
+  position: relative; // 改为相对定位
+  transform: none; // 移除transform
+  color: white;
+  border-radius: 50rpx;
+  padding: 0 40rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 28rpx;
+  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
+  transition: all 0.3s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+
+  &:active {
+    transform: scale(0.95); // 简化active状态的transform
+  }
+
+  &.small {
+    height: 60rpx;
+    line-height: 60rpx;
+    font-size: 24rpx;
+    padding: 0 30rpx;
+  }
+
+  &.large {
+    height: 100rpx;
+    line-height: 100rpx;
+    font-size: 32rpx;
+    padding: 0 50rpx;
+  }
+}
+
+.button-hover {
+  transform: translateY(-4rpx); // 简化hover状态的transform
+  box-shadow: 0 8rpx 16rpx rgba(0, 0, 0, 0.15);
+}
+
+/* 骨架屏动画 */
+@keyframes skeleton-loading {
+  0% {
+    background-position: 100% 50%;
+  }
+  100% {
+    background-position: 0 50%;
+  }
+}
+</style>

components/vote-card/vote-card.vue

@@ -0,0 +1,252 @@
+<template>
+	<view class="vote-card" @click="$emit('on-click',vote)">
+		<view class="vote-card-head flex">
+			<view class="left flex flex-center w-full">
+				<view class="flex-shrink">
+					<tm-tags color="light-blue" :shadow="0" rounded size="s" model="fill">{{ vote.spec._uh_type}}</tm-tags>
+				</view>
+				<view class="title text-overflow">
+					{{ vote.spec.title }}
+				</view>
+			</view>
+		</view>
+		<view class="vote-card-body w-full">
+			<view v-if="vote.spec.remark" class="remark text-overflow-2 text-size-s">
+				{{vote.spec.remark}}
+			</view>
+		</view>
+		<view class="vote-card-foot flex flex-between">
+			<view class="left flex">
+				<tm-tags :color="vote.spec._uh_state.color" size="s" rounded :shadow="0"
+					model="text">{{vote.spec._uh_state.state}}</tm-tags>
+
+				<tm-tags v-if="vote.spec.isVoted" color="blue" rounded size="s" model="text">已投票</tm-tags>
+
+				<tm-tags v-if="vote.spec.timeLimit==='permanent'" color="grey-darken-2" rounded size="s"
+					model="text">结束时间：永久有效 </tm-tags>
+				<tm-tags v-else color="grey-darken-2" rounded size="s" model="text">
+					<template
+						v-if="vote.spec._uh_state.state=='未开始'">开始时间：{{ {d: vote.spec.startDate, f: 'yyyy-MM-dd HH:mm'} | formatTime }}
+					</template>
+					<template v-else>结束时间：{{ {d: vote.spec.endDate, f: 'yyyy-MM-dd HH:mm'} | formatTime }}
+					</template>
+				</tm-tags>
+			</view>
+
+			<view v-if="false" class="right flex flex-end">
+				<tm-tags v-if="false" color="grey-darken-2" rounded size="s" model="text">{{ vote.stats.voteCount }}
+					人已参与</tm-tags>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import tmGroupradio from '@/tm-vuetify/components/tm-groupradio/tm-groupradio.vue';
+	import tmRadio from '@/tm-vuetify/components/tm-radio/tm-radio.vue';
+	import tmGroupcheckbox from '@/tm-vuetify/components/tm-groupcheckbox/tm-groupcheckbox.vue';
+	import tmCheckbox from '@/tm-vuetify/components/tm-checkbox/tm-checkbox.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+
+	export default {
+		name: "VoteCard",
+		options: {
+			virtualHost: true,
+			styleIsolation: 'shared'
+		},
+		components: {
+			tmGroupradio,
+			tmRadio,
+			tmGroupcheckbox,
+			tmCheckbox,
+			tmButton,
+			tmTags
+		},
+		props: {
+			vote: {
+				type: Object,
+				default: () => ({})
+			},
+			index: {
+				type: Number,
+				default: 0
+			},
+			showOptions: {
+				type: Boolean,
+				default: false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.w-full {
+		width: 100%;
+	}
+
+	.wp-50 {
+		width: 50%;
+	}
+
+	.vote-card {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		margin: 0 24rpx;
+		padding: 24rpx;
+		border-radius: 12rpx;
+		background-color: #ffff;
+		box-shadow: 0rpx 2rpx 12rpx rgba(0, 0, 0, 0.035);
+		overflow: hidden;
+		margin-bottom: 24rpx;
+		// border: 1px solid #eee;
+	}
+
+	.vote-card-head {
+		margin-bottom: 12rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.left {
+			.title {
+				font-size: 28rpx;
+				font-weight: bold;
+			}
+		}
+	}
+
+	.vote-card-body {
+
+		.remark {
+			box-sizing: border-box;
+			padding-top: 0;
+			color: rgba(0, 0, 0, 0.75);
+			margin-bottom: 12rpx;
+		}
+	}
+
+	.vote-card-foot {
+		box-sizing: border-box;
+		padding-top: 6px;
+		margin-top: 6px;
+		border-top: 2rpx solid #F7F7F7;
+
+		.left {}
+	}
+
+
+	.single {
+		::v-deep {
+			.tm-groupradio {
+				width: 100%;
+				box-sizing: border-box;
+				display: flex;
+				flex-wrap: wrap;
+				gap: 12rpx 0;
+			}
+
+			.tm-checkbox {
+				box-sizing: border-box;
+				display: block;
+				padding: 0 12rpx;
+				width: 50%;
+			}
+
+			.tm-button-label {
+				width: 100%;
+			}
+		}
+	}
+
+	.multiple {
+		::v-deep {
+			.tm-groupcheckbox {
+				width: 100%;
+				box-sizing: border-box;
+				display: flex;
+				flex-wrap: wrap;
+				gap: 12rpx 0;
+			}
+
+			.tm-checkbox {
+				box-sizing: border-box;
+				display: block;
+				padding: 0 12rpx;
+				width: 50%;
+			}
+
+			.tm-button-label {
+				width: 100%;
+			}
+		}
+	}
+
+	.pk {
+		box-sizing: border-box;
+		width: 100%;
+		padding: 0 12rpx;
+
+		::v-deep {
+			.tm-groupradio {
+				display: flex;
+				width: 100%;
+			}
+
+			.tm-checkbox {
+				flex-grow: 1;
+				min-width: 30% !important;
+				max-width: 70% !important;
+			}
+
+			.radio-item {
+				position: relative;
+
+				.selected {
+					z-index: 10;
+				}
+			}
+
+			.radio-left {}
+
+			.radio-right {}
+
+			.option-item {
+				width: 100%;
+				padding: 12rpx 24rpx;
+				border-radius: 12rpx;
+			}
+
+			.option-item-left {
+				background: linear-gradient(90deg, #3B82F6, #60A5FA);
+				color: white;
+				clip-path: polygon(0 0, calc(100% - 40rpx) 0, 100% 100%, 0 100%);
+			}
+
+			.option-item-right {
+				background: linear-gradient(90deg, #F87171, #EF4444);
+				color: white;
+				clip-path: polygon(0 0, 100% 0, 100% 100%, 40rpx 100%);
+				text-align: right;
+			}
+
+			.option-foot {
+				width: 100%;
+				margin-top: 6rpx;
+				font-size: 24rpx;
+				color: #666;
+
+				.left {
+					box-sizing: border-box;
+					padding-right: 24rpx;
+				}
+
+				.right {
+					box-sizing: border-box;
+					padding-left: 24rpx;
+				}
+			}
+		}
+	}
+</style>

config/index.js

@@ -1,30 +1,85 @@
 // 应用设置存储key值
 export const _AppConfigKey = 'APP_GLOBAL_CONFIGS';
+export const _AppMockJsonKey = 'APP_GLOBAL_MOCK_JSON';
 
 // 默认的应用设置
 export const DefaultAppConfigs = {
-	loveConfig: {},
-	imagesConfig: {},
-	authorConfig: {},
-	appConfig: {},
-	pluginConfig: {},
-	adConfig: {},
+    basicConfig: {
+        tokenConfig: {
+            personalToken: "",
+        }
+    },
+    loveConfig: {},
+    imagesConfig: {},
+    authorConfig: {},
+    appConfig: {},
+    pluginConfig: {
+        toolsPlugin: {},
+        linksSubmitPlugin: {},
+    },
+    pageConfig: {
+        homeConfig: {
+            pageTitle: "首页",
+            useCategory: true,
+            bannerConfig: {
+                enabled: true,
+                showTitle: true,
+                showIndicator: true,
+                height: "400rpx",
+                dotPosition: "right",
+                type: "post",
+                list: []
+            }
+        },
+        categoryConfig: {
+            type: "list"
+        },
+        momentConfig: {
+            useTagRandomColor: true
+        }
+    },
+    auditConfig: {
+        auditModeEnabled: false,
+        auditModeData: {
+            jsonUrl: "",
+            jsonData: ""
+        }
+    }
 }
 
 /**
  * 获取应用设置
  */
 export const getAppConfigs = () => {
-	let configs = uni.getStorageSync(_AppConfigKey)
-	if (configs) return JSON.parse(configs)
+    let configs = uni.getStorageSync(_AppConfigKey)
+    if (configs) return JSON.parse(configs)
 
-	uni.setStorageSync(_AppConfigKey, JSON.stringify(DefaultAppConfigs))
-	return configs;
+    uni.setStorageSync(_AppConfigKey, JSON.stringify(DefaultAppConfigs))
+    return DefaultAppConfigs;
 }
 
 /**
  * 保存应用设置
  */
 export const setAppConfigs = (configs) => {
-	uni.setStorageSync(_AppConfigKey, JSON.stringify(configs))
+    uni.setStorageSync(_AppConfigKey, JSON.stringify(configs))
+}
+
+
+/**
+ * 获取应用模拟数据
+ */
+export const getAppMockJson = () => {
+    let json = uni.getStorageSync(_AppMockJsonKey)
+    if (json) return JSON.parse(json)
+
+    uni.setStorageSync(_AppMockJsonKey, JSON.stringify({}))
+    return {};
+}
+
+/**
+ * 保存应用模拟数据
+ */
+export const setAppMockJson = (json) => {
+    uni.setStorageSync(_AppMockJsonKey, JSON.stringify(json))
 }

config/token.config.template.js

@@ -1,16 +0,0 @@
-/** 配置后台管理员token */
-const HaloTokenConfig = Object.freeze({
-	
-	/** 基础请求域名：你的Halo博客基础域名 */
-	BASE_API: "https://demo.halo.run",
-	// BASE_API: "https://blog.925i.cn",
-
-
-	/** 管理员token */
-	systemToken: ``,
-	/** 匿名用户token */
-	anonymousToken: ``
-})
-
-
-export default HaloTokenConfig;

config/uhalo.config.js

@@ -0,0 +1,12 @@
+/** 应用基础配置 */
+const UHaloBaseConfig = Object.freeze({
+
+    /** 基础请求域名：你的Halo博客基础域名 */
+    BASE_API: "",
+    // 示例：
+    // BASE_API: "https://blog.xiaoxiaomo.cn",
+
+    // todo：可能有其他配置
+})
+
+export default UHaloBaseConfig;

config/unihalo.mock.json

@@ -0,0 +1,177 @@
+{
+  "home": {
+    "bannerList": [
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      }
+    ],
+    "categoryList": [
+      {
+        "title": "uni-halo",
+        "desc": "",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": ""
+      },
+      {
+        "title": "uni-halo",
+        "desc": "",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": ""
+      },
+      {
+        "title": "uni-halo",
+        "desc": "",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": ""
+      },
+      {
+        "title": "uni-halo",
+        "desc": "",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": ""
+      }
+    ],
+    "postList": [
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      }
+    ]
+  },
+  "category": {
+    "list": [
+      {
+        "title": "uni-halo",
+        "desc": "",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": ""
+      },
+      {
+        "title": "uni-halo",
+        "desc": "",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": ""
+      },
+      {
+        "title": "uni-halo",
+        "desc": "",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": ""
+      },
+      {
+        "title": "uni-halo",
+        "desc": "",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": ""
+      }
+    ]
+  },
+  "moments": {
+    "list": [
+      {
+        "content": "你好啊，这是我的一条生活记录",
+        "time": "2024-05-25 08:59:00",
+        "images": [
+          "/upload/uni_halo_ad_cover.png",
+          "/upload/uni_halo_ad_cover.png",
+          "/upload/uni_halo_ad_cover.png"
+        ]
+      }
+    ]
+  },
+  "gallery": {
+    "list": [
+      "/upload/uni_halo_ad_cover.png",
+      "/upload/uni_halo_ad_cover.png",
+      "/upload/uni_halo_ad_cover.png",
+      "/upload/uni_halo_ad_cover.png"
+    ]
+  },
+  "archives": {
+    "list": [
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      },
+      {
+        "title": "uni-halo（2.0）开源啦！！！",
+        "desc": "uni-halo 2.0 已独立兼容 Halo2.x 应用，欢迎小伙伴们体验。",
+        "cover": "/upload/uni_halo_ad_cover.png",
+        "time": "2024-05-25 08:59:00"
+      }
+    ]
+  }
+}

main.js

@@ -1,14 +1,10 @@
 import App from "./App";
 import Vue from "vue";
-import {
-	router,
-	RouterMount
-} from './router/router.js'
-Vue.use(router)
 
 // 挂载全局工具类
 import utils from "./utils/index.js";
 Vue.prototype.$utils = utils;
+uni.$utils = utils;
 
 // 全局统一样式的对话框
 import Fy from '@/js_sdk/fy-showModal/index.js'
@@ -62,7 +58,7 @@ Vue.prototype.$http = http;
 import ApiManager from '@/api/index.js'
 Vue.use(ApiManager);
 
-import HaloTokenConfig from '@/config/token.config.js'
+import HaloTokenConfig from '@/config/uhalo.config.js'
 Vue.prototype.$baseApiUrl = HaloTokenConfig.BASE_API
 
 // 由于微信小程序的运行机制问题，需声明如下一行，H5和APP非必填
@@ -75,10 +71,4 @@ const app = new Vue({
 	...App,
 });
 
-// #ifdef H5
-RouterMount(app, router, '#app')
-// #endif
-
-// #ifndef H5
-app.$mount(); //为了兼容小程序及app端必须这样写才有效果
-// #endif
+app.$mount();

manifest.json

@@ -2,8 +2,8 @@
     "name" : "uni-halo",
     "appid" : "__UNI__5748B6E",
     "description" : "uni-halo博客：基于halo开源博客系统API开发的多端博客。",
-    "versionName" : "1.0.0",
-    "versionCode" : 100,
+    "versionName" : "2.0.8",
+    "versionCode" : 208,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -112,43 +112,43 @@
             }
         },
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     /* 快应用特有相关 */
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx1bb161867082c72f",
+        "appid" : "",
         "setting" : {
             "urlCheck" : false,
             "minified" : true
         },
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "mp-alipay" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "mp-baidu" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "mp-toutiao" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "uniStatistics" : {
-        "enable" : true,
+        "enable" : false,
         "version" : "2"
     },
     "vueVersion" : "2",
@@ -158,7 +158,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/apis" : {
-                    "target" : "https://demo.halo.run",
+                    "target" : "https://blog.xiaoxiaomo.cn",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {
@@ -174,7 +174,11 @@
             }
         },
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
+        },
+        "router" : {
+            "base" : "/uni-halo/",
+            "mode" : "history"
         }
     },
     "_spaceID" : "699a26a5-a6cd-4b54-b603-5155b312a5f5",
@@ -186,32 +190,47 @@
             "es6" : true
         },
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "mp-jd" : {
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "mp-kuaishou" : {
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "mp-lark" : {
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "quickapp-webview-huawei" : {
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "quickapp-webview-union" : {
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
+        }
+    },
+    "app-harmony" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "mp-harmony" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "mp-xhs" : {
+        "uniStatistics" : {
+            "enable" : false
         }
     }
 }

package.json

@@ -1,28 +1,26 @@
 {
-	"name": "uni-halo",
-	"version": "1.0.0",
-	"description": "<p align=\"center\">\r     <img alt=\"logo\" src=\"https://b.925i.cn/uni_halo/uni_halo_logo.png\" width=\"120\" height=\"120\" style=\"margin-bottom: 10px;\">\r </p>\r <h3 align=\"center\" style=\"margin: 30px 0 30px;font-weight: bold;font-size:40px;\">uni-halo</h3>\r <h3 align=\"center\">uni-halo 基于Halo一款现代化的开源博客/CMS系统API开发的可多端编译应用</h3>",
-	"repository": {
-		"type": "git",
-		"url": "git+https://gitee.com/ialley-workshop-open/uni-halo.git"
-	},
-	"keywords": [
-		"uni-halo",
-		"小莫唐尼",
-		"巷子工坊"
-	],
-	"author": "巷子工坊丨小莫唐尼",
-	"license": "AGPL-3.0",
-	"bugs": {
-		"url": "https://gitee.com/ialley-workshop-open/uni-halo/issues"
-	},
-	"homepage": "https://uni-halo.925i.cn",
-	"devDependencies": {
-		"vue-i18n": "^9.1.10"
-	},
-	"dependencies": {
-		"qs": "^6.12.1",
-		"uni-read-pages": "^1.0.5",
-		"uni-simple-router": "^2.0.8-beta.4"
-	}
+  "name": "uni-halo",
+  "version": "2.0.8",
+  "description": "<p align=\"center\">\r     <img alt=\"logo\" src=\"https://b.925i.cn/uni_halo/uni_halo_logo.png\" width=\"120\" height=\"120\" style=\"margin-bottom: 10px;\">\r </p>\r <h3 align=\"center\" style=\"margin: 30px 0 30px;font-weight: bold;font-size:40px;\">uni-halo</h3>\r <h3 align=\"center\">uni-halo 基于Halo一款现代化的开源博客/CMS系统API开发的可多端编译应用</h3>",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/ialley-workshop-open/uni-halo.git"
+  },
+  "keywords": [
+    "uni-halo",
+    "小莫唐尼",
+    "巷子工坊"
+  ],
+  "author": "巷子工坊丨小莫唐尼",
+  "license": "AGPL-3.0",
+  "bugs": {
+    "url": "https://gitee.com/ialley-workshop-open/uni-halo/issues"
+  },
+  "homepage": "https://uni-halo.925i.cn",
+  "devDependencies": {
+    "vue-i18n": "^9.1.10"
+  },
+  "dependencies": {
+    "qs": "^6.12.1"
+  }
 }

pages.json

@@ -107,7 +107,7 @@
         {
           "path": "article-detail/article-detail",
           "style": {
-            "navigationBarTitleText": "文章详情",
+            "navigationBarTitleText": "内容详情",
             "enablePullDownRefresh": true,
             "app-plus": {
               "pullToRefresh": {
@@ -163,7 +163,7 @@
         {
           "path": "archives/archives",
           "style": {
-            "navigationBarTitleText": "文章归档",
+            "navigationBarTitleText": "归档",
             "enablePullDownRefresh": true,
             "app-plus": {
               "pullToRefresh": {
@@ -185,24 +185,11 @@
               }
             }
           }
-        },
-        {
-          "path": "journal/journal",
-          "style": {
-            "navigationBarTitleText": "个人日记",
-            "enablePullDownRefresh": true,
-            "app-plus": {
-              "pullToRefresh": {
-                "color": "#03a9f4",
-                "style": "circle"
-              }
-            }
-          }
-        },
+        }, 
         {
           "path": "articles/articles",
           "style": {
-            "navigationBarTitleText": "文章列表",
+            "navigationBarTitleText": "内容搜索",
             "enablePullDownRefresh": true,
             "app-plus": {
               "pullToRefresh": {
@@ -273,26 +260,52 @@
             }
           }
         },
-        {
-          "path": "test-page/test-page",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "advertise/advertise",
-          "style": {
-            "navigationBarTitleText": "广告页面",
-            "enablePullDownRefresh": false
-          }
-        },
         {
           "path": "submit-link/submit-link",
           "style": {
             "navigationBarTitleText": "友链提交",
             "enablePullDownRefresh": false
           }
-        }
+        },
+		{
+		  "path": "moment-detail/moment-detail",
+		  "style": {
+		    "navigationBarTitleText": "瞬间详情",
+		    "enablePullDownRefresh": true,
+		    "app-plus": {
+		      "pullToRefresh": {
+		        "color": "#03a9f4",
+		        "style": "circle"
+		      }
+		    }
+		  }
+		},
+		{
+			"path": "votes/votes",
+			"style": {
+			  "navigationBarTitleText": "投票列表",
+			  "enablePullDownRefresh": true,
+			  "app-plus": {
+			    "pullToRefresh": {
+			      "color": "#03a9f4",
+			      "style": "circle"
+			    }
+			  }
+			}
+		},
+		{
+			"path": "vote-detail/vote-detail",
+			"style": {
+			  "navigationBarTitleText": "投票详情",
+			  "enablePullDownRefresh": true,
+			  "app-plus": {
+			    "pullToRefresh": {
+			      "color": "#03a9f4",
+			      "style": "circle"
+			    }
+			  }
+			}
+		}
       ]
     },
     {

pages/index/index.vue

@@ -1,57 +1,136 @@
 <template>
-    <view class="app-page"></view>
+	<view class="app-page flex flex-center">
+		<PluginUnavailable v-if="!uniHaloPluginAvailable" :pluginId="uniHaloPluginId"
+			:error-text="uniHaloPluginAvailableError" :use-border="false" :use-decoration="false" />
+	</view>
 </template>
 
 <script>
-const homePagePath = '/pages/tabbar/home/home'
-const startPagePath = '/pagesA/start/start'
-export default {
-    computed: {
-        configs() {
-            return this.$tm.vx.getters().getConfigs;
-        }
-    },
-    onLoad() {
-        uni.$tm.vx.actions('config/fetchConfigs').then((res) => {
-            // #ifdef MP-WEIXIN
-            uni.$tm.vx.commit('setWxShare', res.shareConfig);
-            // #endif
-            this.fnCheckShowStarted();
-        }).catch((err) => {
-            uni.switchTab({
-                url: homePagePath
-            });
-        })
-    },
-    methods: {
-        fnCheckShowStarted() {
-            if (!this.configs.appConfig.startConfig.enabled) {
-                uni.switchTab({
-                    url: homePagePath
-                });
-                return;
-            }
+	import pluginAvailableMixin from "@/common/mixins/pluginAvailable.js"
+	import PluginUnavailable from '@/components/plugin-unavailable/plugin-unavailable.vue'
 
-            // 是否每次都显示启动页
-            if (this.configs.appConfig.startConfig.alwaysShow) {
-                uni.removeStorageSync('APP_HAS_STARTED')
-                uni.redirectTo({
-                    url: startPagePath
-                });
-                return;
-            }
+	const homePagePath = '/pages/tabbar/home/home'
+	const startPagePath = '/pagesA/start/start'
+	const articleDetailPath = '/pagesA/article-detail/article-detail';
 
-            // 只显示一次启动页
-            if (uni.getStorageSync('APP_HAS_STARTED')) {
-                uni.switchTab({
-                    url: homePagePath
-                });
-            } else {
-                uni.redirectTo({
-                    url: startPagePath
-                });
-            }
-        }
-    }
-};
+	const _DEV_ = false
+	const _DEV_TO_TYPE_ = "page"
+	const _DEV_TO_PATH_ = "/pagesA/article-detail/article-detail?name=077efb85-3544-4307-b24c-537a9e53f116"
+
+	export default {
+		mixins: [pluginAvailableMixin],
+		components: {
+			PluginUnavailable
+		},
+		computed: {
+			configs() {
+				return this.$tm.vx.getters().getConfigs;
+			}
+		},
+		async onLoad(options) {
+			// 检查插件
+			this.setPluginId(this.NeedPluginIds.PluginUniHalo)
+			this.setPluginError("阿偶，检测到当前插件没有安装或者启用，无法启动 uni-halo 哦，请联系管理员")
+			if (!await this.checkPluginAvailable()) return
+
+			// 获取配置
+			uni.$tm.vx.actions('config/fetchConfigs').then(async (res) => {
+				if (options.scene) {
+					if ('' !== options.scene) {
+						const postId = await this.getPostIdByQRCode(options.scene);
+						if (postId) {
+							uni.redirectTo({
+								url: articleDetailPath + `?name=${postId}`,
+								animationType: 'slide-in-right'
+							});
+						}
+					}
+				}
+
+				// #ifdef MP-WEIXIN
+				// uni.$tm.vx.commit('setWxShare', res.shareConfig);
+				// #endif
+
+				// 获取mockjson
+				if (res.auditConfig.auditModeEnabled) {
+					if (res.auditConfig.auditModeData.jsonUrl) {
+						await uni.$tm.vx.actions('config/fetchMockJson')
+					} else {
+						const mockJson = uni.$utils.checkJsonAndParse(res.auditConfig.auditModeData
+							.jsonData)
+						if (mockJson.ok) {
+							uni.$tm.vx.commit('config/setMockJson', mockJson.jsonData)
+						}
+					}
+				}
+
+				// 进入检查
+				this.fnCheckShowStarted();
+			}).catch((err) => {
+				uni.switchTab({
+					url: homePagePath
+				});
+			})
+		},
+		methods: {
+			fnCheckShowStarted() {
+				// 本地开发，快速跳转页面，发布请设置 _DEV_ = false
+				if (_DEV_ && _DEV_TO_PATH_) {
+					if (_DEV_TO_TYPE_ == 'tabbar') {
+						uni.switchTab({
+							url: _DEV_TO_PATH_
+						});
+					} else if (_DEV_TO_TYPE_ == 'page') {
+						uni.navigateTo({
+							url: _DEV_TO_PATH_
+						});
+					}
+					return
+				}
+
+				if (!this.configs.appConfig.startConfig.enabled) {
+					uni.switchTab({
+						url: homePagePath
+					});
+					return;
+				}
+
+				// 是否每次都显示启动页
+				if (this.configs.appConfig.startConfig.alwaysShow) {
+					uni.removeStorageSync('APP_HAS_STARTED')
+					uni.redirectTo({
+						url: startPagePath
+					});
+					return;
+				}
+
+				// 只显示一次启动页
+				if (uni.getStorageSync('APP_HAS_STARTED')) {
+					uni.switchTab({
+						url: homePagePath
+					});
+				} else {
+					uni.redirectTo({
+						url: startPagePath
+					});
+				}
+			},
+			async getPostIdByQRCode(key) {
+				const response = await this.$httpApi.v2.getQRCodeInfo(key);
+				if (response) {
+					if (response && response.postId) {
+						return response.postId;
+					}
+				}
+				return null;
+			}
+		}
+	};
 </script>
+
+<style lang="scss" scoped>
+	.app-page {
+		width: 100vw;
+		height: 100vh;
+	}
+</style>

pages/tabbar/category/category.vue

@@ -1,207 +1,472 @@
 <template>
-	<view class="app-page">
-		<view v-if="loading != 'success'" class="loading-wrap">
-			<tm-skeleton model="listAvatr"></tm-skeleton>
-			<tm-skeleton model="listAvatr"></tm-skeleton>
-			<tm-skeleton model="listAvatr"></tm-skeleton>
-		</view>
-		<!-- 内容区域 -->
-		<view v-else class="app-page-content">
-			<view v-if="dataList.length == 0" class="content-empty flex flex-center" style="height: 70vh;">
-				<!-- 空布局 -->
-				<tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无数据"></tm-empty>
-			</view>
-			<block v-else>
-				<tm-translate v-for="(item, index) in dataList" :key="index"
-					style="box-sizing: border-box;width: 50%;padding: 0 8rpx;" animation-name="fadeUp"
-					:wait="calcAniWait(index)">
-					<view class="catgory-card" :style="{backgroundImage:`url(${item.spec.cover})`}">
-						<view class="content" @click="handleToCategory(item)">
-							<view style="font-size: 32rpx;color: #ffffff;">{{ item.spec.displayName }}</view>
-							<view style="font-size: 24rpx;color: #ffffff;margin-top: 6rpx;">共
-								{{ item.postCount }} 篇文章
-							</view>
-						</view>
-					</view>
-				</tm-translate>
-				<tm-flotbutton @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
-				<view class="load-text">{{ loadMoreText }}</view>
-			</block>
-		</view>
-	</view>
+    <view class="app-page" :style="{
+		padding:calcShowType==='list-post'? 0 : '24rpx 0'
+	}">
+        <view v-if="loading !== 'success'" class="loading-wrap">
+            <tm-skeleton model="listAvatr"></tm-skeleton>
+            <tm-skeleton model="listAvatr"></tm-skeleton>
+            <tm-skeleton model="listAvatr"></tm-skeleton>
+        </view>
+        <!-- 内容区域 -->
+        <view v-else class="app-page-content" :class="[calcShowType==='list-post'?'list-post':'']">
+            <view v-if="dataList.length === 0" class="content-empty flex flex-center" style="height: 70vh;">
+                <!-- 空布局 -->
+                <tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无数据"></tm-empty>
+            </view>
+            <block v-else>
+                <block v-if="calcAuditModeEnabled || calcShowType==='list'">
+                    <tm-translate v-for="(item, index) in dataList" :key="index"
+                                  style="box-sizing: border-box;width: 50%;padding: 0 8rpx;" animation-name="fadeUp"
+                                  :wait="calcAniWait(index)">
+                        <view class="catgory-card" :style="{backgroundImage:`url(${item.spec.cover})`}">
+                            <view class="content" @click="handleToCategory(item)">
+                                <view style="font-size: 32rpx;color: #ffffff;">{{ item.spec.displayName }}</view>
+                                <view v-if="!calcAuditModeEnabled"
+                                      style="font-size: 24rpx;color: #ffffff;margin-top: 6rpx;">
+                                    共 {{ item.postCount }} 篇文章
+                                </view>
+                            </view>
+                        </view>
+                    </tm-translate>
+                    <view class="load-text">{{ loadMoreText }}</view>
+                </block>
+                <view v-else-if="calcShowType==='list-post'" class="fulled flex" style="min-height:100vh">
+                    <view class="bg-white" :style="{height: '100%'}">
+                        <tm-sliderNav :list="categoryList" bg-color="white" color="light-blue" rang-key="displayName"
+                                      @change="fnOnCategoryChange"></tm-sliderNav>
+                    </view>
+                    <scroll-view class="right-content pt-12 pb-12" :scroll-y="true" :scroll-top="scrollTop"
+                                 :scroll-with-animation="true" :refresher-enabled="true" :refresher-triggered="triggered"
+                                 :refresher-threshold="60" refresher-background="#fafafa"
+                                 @refresherrefresh="fnGetPostByCategory(true)" @scrolltolower="fnGetPostByCategory(false)"
+                                 @scroll="fnOnScroll" @touchmove.stop @touchstart="fnOnTouchStart" @touchend="fnOnTouchEnd"
+                                 @touchcancel="fnOnTouchEnd">
+                        <view v-if="postList.length === 0" class="article-empty flex flex-center">
+                            <tm-empty :size="120" icon="icon-shiliangzhinengduixiang-" label="该分类下暂无文章~"></tm-empty>
+                        </view>
+                        <block v-else>
+                            <block v-for="(post, index) in postList" :key="post.spec.publishTime">
+                                <tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
+                                    <article-min-card :article="post" @on-click="fnToArticleDetail"></article-min-card>
+                                </tm-translate>
+                            </block>
+                            <view class="load-text">{{ loadMoreText }}</view>
+                        </block>
+                    </scroll-view>
+                </view>
+
+                <view class="flot-buttons">
+                    <tm-button @click="fnScrollTop" size="m" :fab="true" theme="light-blue"
+                               icon="icon-angle-up"></tm-button>
+                    <tm-button v-if="!calcAuditModeEnabled" @click="fnChangeShowType" size="m" :fab="true" theme="light-blue"
+                               :icon="calcShowType==='list'?'icon-align-left':'icon-all'"></tm-button>
+                </view>
+            </block>
+        </view>
+
+    </view>
 </template>
 
 <script>
-	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
 
-	import MarkdownConfig from '@/common/markdown/markdown.config.js';
-	import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
+import MarkdownConfig from '@/common/markdown/markdown.config.js';
+import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
+import tmFlowLayout from '@/tm-vuetify/components/tm-flowLayout/tm-flowLayout.vue';
+import tmSliderNav from '@/tm-vuetify/components/tm-sliderNav/tm-sliderNav.vue';
+import ArticleMinCard from '@/components/article-min-card/article-min-card.vue';
 
-	export default {
-		components: {
-			tmSkeleton,
-			tmFlotbutton,
-			tmTranslate,
-			tmEmpty,
-			mpHtml
-		},
-		data() {
-			return {
-				markdownConfig: MarkdownConfig,
-				loading: 'loading',
-				queryParams: {
-					size: 20,
-					page: 1
-				},
-				hasNext: false,
-				dataList: [],
-				isLoadMore: false,
-				loadMoreText: '加载中...'
-			};
-		},
 
-		onLoad() {
-			this.fnGetData();
-		},
-		onPullDownRefresh() {
-			this.isLoadMore = false;
-			this.queryParams.page = 0;
-			this.fnGetData();
-		},
+export default {
+    components: {
+        tmSkeleton,
+        tmButton,
+        tmTranslate,
+        tmEmpty,
+        mpHtml,
+        tmFlowLayout,
+        tmSliderNav,
+        ArticleMinCard
+    },
+    data() {
+        return {
+            markdownConfig: MarkdownConfig,
+            loading: 'loading',
+            queryParams: {
+                size: 20,
+                page: 1,
+                fieldSelector: ['spec.hideFromList=false']
+            },
+            hasNext: false,
+            dataList: [],
+            categoryList: [],
+            isLoadMore: false,
+            loadMoreText: '加载中...',
+            currentCategoryConfig: {
+                type: "list"
+            },
+            currentCategoryName: "",
+            postQueryParams: {
+                size: 10,
+                page: 0,
+            },
+            postList: [],
+            triggered: false,
+            scrollTop: 0,
+            tempScrollTop: 0,
+            scrollTimeout: null,
+        };
+    },
+    computed: {
+        haloConfigs() {
+            return this.$tm.vx.getters().getConfigs;
+        },
+        calcAuditModeEnabled() {
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
+        mockJson() {
+            return this.$tm.vx.getters().getMockJson;
+        },
+        categoryConfig() {
+            return this.haloConfigs.pageConfig.categoryConfig
+        },
+        calcShowType() {
+            return this.currentCategoryConfig.type
+        }
+    },
+    watch: {
+        categoryConfig: {
+            deep: true,
+            immediate: true,
+            handler(newVal) {
+                console.log("执行了", newVal)
+                if (!newVal) return;
+                this.currentCategoryConfig = newVal
+                this.handleInitPage()
+            },
+        }
+    },
+    onPullDownRefresh() {
+        this.isLoadMore = false;
+        this.queryParams.page = 0;
+        this.fnGetData();
+    },
+    onReachBottom(e) {
+        if (this.calcAuditModeEnabled) {
+            uni.showToast({
+                icon: 'none',
+                title: '没有更多数据了'
+            });
+            return
+        }
+        if (this.hasNext) {
+            if (this.calcShowType === 'list') {
 
-		onReachBottom(e) {
-			if (this.hasNext) {
-				this.queryParams.page += 1;
-				this.isLoadMore = true;
-				this.fnGetData();
-			} else {
-				uni.showToast({
-					icon: 'none',
-					title: '没有更多数据了'
-				});
-			}
-		},
-		methods: {
-			fnGetData() {
-				uni.showLoading({
-					mask: true,
-					title: '加载中...'
-				});
-				// 设置状态为加载中
-				if (!this.isLoadMore) {
-					this.loading = 'loading';
-				}
-				this.loadMoreText = '加载中...';
-				this.$httpApi.v2
-					.getCategoryList(this.queryParams)
-					.then(res => {
-						console.log('请求结果：');
-						console.log(res);
+                this.queryParams.page += 1;
+            } else {
+                this.postQueryParams.page += 1;
+            }
+            this.isLoadMore = true;
+            this.fnGetData();
+        } else {
+            uni.showToast({
+                icon: 'none',
+                title: '没有更多数据了'
+            });
+        }
+    },
+    methods: {
+        fnChangeShowType() {
+            if (this.calcShowType === 'list-post') {
+                this.currentCategoryConfig.type = 'list'
+            } else {
+                this.currentCategoryConfig.type = 'list-post'
+            }
+            this.handleInitPage();
+        },
+        handleResetInit() {
+            this.postList = []
+            this.dataList = []
+            this.categoryList = []
+            this.queryParams.page = 0;
+            this.postQueryParams.page = 0;
+            this.hasNext = false
+            this.isLoadMore = false
+            this.loadMoreText = '加载中...'
+            this.currentCategoryName = ""
+            this.triggered = false
+            this.fnResetSetAniWaitIndex()
+        },
+        handleInitPage() {
+            this.handleResetInit()
+            if (this.calcShowType === 'list-post') {
+                this.queryParams.size = 99999
+            }
+            this.fnGetData();
+        },
+        fnGetData() {
+            if (this.calcAuditModeEnabled) {
+                this.categoryConfig.type = "list"
+                this.dataList = this.mockJson.category.list.map((item) => {
+                    return {
+                        metadata: {
+                            name: Date.now() * Math.random(),
+                        },
+                        spec: {
+                            displayName: item.title,
+                            cover: this.$utils.checkImageUrl(item.cover)
+                        },
+                        postCount: 0
+                    }
+                });
+                this.loading = 'success';
+                this.loadMoreText = '呜呜，没有更多数据啦~';
+                uni.hideLoading();
+                uni.stopPullDownRefresh();
+                return;
+            }
+            uni.showLoading({
+                mask: true,
+                title: '加载中...'
+            });
+            // 设置状态为加载中
+            if (!this.isLoadMore) {
+                this.loading = 'loading';
+            }
+            this.loadMoreText = '加载中...';
+            this.$httpApi.v2
+                .getCategoryList(this.queryParams)
+                .then(res => {
+                    console.log('请求结果：');
+                    console.log(res);
+                    if (this.calcShowType === 'list') {
+                        this.loading = 'success';
+                        this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+                        // 处理数据
+                        this.hasNext = res.hasNext;
 
-						this.loading = 'success';
-						this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-						// 处理数据
-						this.hasNext = res.hasNext;
+                        const tempItems = res.items.map(item => {
+                            item.spec.cover = this.$utils.checkThumbnailUrl(item.spec.cover, true)
+                            return item;
+                        })
 
-						const tempItems = res.items.map(item => {
-							item.spec.cover = this.$utils.checkThumbnailUrl(item.spec.cover, true)
-							return item;
-						})
+                        if (this.isLoadMore) {
+                            this.dataList = this.dataList.concat(tempItems);
+                        } else {
+                            this.dataList = tempItems;
+                        }
+                    } else {
+                        this.dataList = res.items
+                        this.categoryList = res.items.map(item => {
+                            return {
+                                displayName: item.spec.displayName,
+                                name: item.metadata.name,
+                                ...item,
+                            }
+                        })
+                        this.triggered = false;
+                        this.loading = 'success';
+                        if (this.dataList.length !== 0) {
+                            this.currentCategoryName = this.dataList[0].metadata.name;
+                            this.fnGetPostByCategory()
+                        }
+                    }
+                })
+                .catch(err => {
+                    console.error(err);
+                    this.loading = 'error';
+                    this.loadMoreText = '加载失败，请下拉刷新！';
+                })
+                .finally(() => {
+                    setTimeout(() => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                    }, 500);
+                });
+        },
+        handlePreview(index, list) {
+            uni.previewImage({
+                current: index,
+                urls: list.map(item => item.url)
+            })
+        },
+        handleToCategory(data) {
+            if (this.calcAuditModeEnabled) {
+                return;
+            }
+            uni.navigateTo({
+                url: `/pagesA/category-detail/category-detail?name=${data.metadata.name}&title=${data.spec.displayName}`
+            })
+        },
+        fnGetPostByCategory(isPulldownRefresh = true, triggered = true) {
+            if (!isPulldownRefresh) {
+                if (this.hasNext) {
+                    this.postQueryParams.page += 1;
+                } else {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '没有更多数据了'
+                    });
+                }
+            } else {
+                this.postQueryParams.page = 0;
+                if (triggered) {
+                    this.triggered = true;
+                }
+            }
 
-						if (this.isLoadMore) {
-							this.dataList = this.dataList.concat(tempItems);
-						} else {
-							this.dataList = tempItems;
-						}
-					})
-					.catch(err => {
-						console.error(err);
-						this.loading = 'error';
-						this.loadMoreText = '加载失败，请下拉刷新！';
-					})
-					.finally(() => {
-						setTimeout(() => {
-							uni.hideLoading();
-							uni.stopPullDownRefresh();
-						}, 500);
-					});
-			},
-			handlePreview(index, list) {
-				uni.previewImage({
-					current: index,
-					urls: list.map(item => item.url)
-				})
-			},
-			handleToCategory(data) {
-				uni.navigateTo({
-					url: `/pagesA/category-detail/category-detail?name=${data.metadata.name}&title=${data.spec.displayName}`
-				})
-			}
-		}
-	};
+            this.$httpApi.v2
+                .getCategoryPostList(this.currentCategoryName, this.postQueryParams)
+                .then(res => {
+                    this.hasNext = res.hasNext;
+
+                    if (!isPulldownRefresh) {
+                        this.postList = this.postList.concat(res.items);
+                    } else {
+                        this.postList = res.items;
+                    }
+                    this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+                })
+                .catch(err => {
+                    this.loadMoreText = '加载失败！';
+                })
+                .finally(() => {
+                    this.triggered = false;
+                });
+        },
+
+        fnOnCategoryChange(e) {
+            this.fnResetSetAniWaitIndex();
+            this.currentCategoryName = this.dataList[e].metadata.name;
+            this.fnToTopScroll();
+            this.postList = [];
+            this.fnGetPostByCategory();
+        },
+
+        fnOnScroll(e) {
+            this.tempScrollTop = e.detail.scrollTop;
+        },
+        fnToTopScroll() {
+            uni.pageScrollTo({
+                scrollTop: 0,
+                duration: 500
+            });
+            this.scrollTop = 0;
+            this.tempScrollTop = 0;
+        },
+        fnOnTouchStart() {
+            clearTimeout(this.scrollTimeout);
+        },
+        fnOnTouchEnd() {
+            this.scrollTimeout = setTimeout(() => {
+                this.scrollTop = this.tempScrollTop;
+            }, 500);
+        },
+        //跳转文章详情
+        fnToArticleDetail(post) {
+            uni.navigateTo({
+                url: '/pagesA/article-detail/article-detail?name=' + post.metadata.name,
+                animationType: 'slide-in-right'
+            });
+        },
+        fnScrollTop() {
+            if (this.calcShowType === 'list') {
+                this.fnToTopPage()
+            } else {
+                this.fnToTopScroll()
+            }
+        }
+    }
+};
 </script>
 
 <style lang="scss" scoped>
-	.app-page {
-		width: 100vw;
-		display: flex;
-		flex-direction: column;
-		padding: 24rpx 0;
-	}
+.app-page {
+    width: 100vw;
+    display: flex;
+    flex-direction: column;
+    padding: 24rpx 0;
+}
 
-	.loading-wrap {
-		padding: 24rpx;
-	}
+.auditModeEnabled {
+    width: 100%;
+    height: 80vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
 
-	.app-page-content {
-		display: flex;
-		flex-wrap: wrap;
-		padding: 0 12rpx;
-		gap: 20rpx 0;
-	}
+.loading-wrap {
+    padding: 24rpx;
+}
 
-	.catgory-card {
-		width: 100%;
-		height: 200rpx;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		box-sizing: border-box;
-		border-radius: 12rpx;
-		background-color: #ffff;
-		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
-		overflow: hidden;
-		background-repeat: no-repeat;
-		background-size: cover;
+.app-page-content {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0 12rpx;
+    gap: 20rpx 0;
 
-		&:before {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 0;
-			right: 0;
-			bottom: 0;
-			background-color: rgba(0, 0, 0, 0.15);
-			z-index: 1;
-		}
-	}
+    &.list-post {
+        padding: 0;
+        gap: 0;
+    }
+}
 
-	.content {
-		width: 100%;
-		height: 100%;
-		position: relative;
-		z-index: 2;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
 
-	.load-text {
-		width: 100%;
-		text-align: center;
-	}
-</style>
+.catgory-card {
+    width: 100%;
+    height: 200rpx;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    border-radius: 12rpx;
+    background-color: #ffff;
+    box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+    overflow: hidden;
+    background-repeat: no-repeat;
+    background-size: cover;
+
+    &:before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(0, 0, 0, 0.15);
+		backdrop-filter: blur(3rpx);
+        z-index: 1;
+    }
+}
+
+.content {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    z-index: 2;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+
+.load-text {
+    width: 100%;
+    text-align: center;
+}
+
+.flot-buttons {
+    position: fixed;
+    bottom: 100rpx;
+    right: 32rpx;
+    flex-direction: column;
+    display: flex;
+    gap: 6rpx;
+    z-index: 999;
+}
+</style>

pages/tabbar/gallery/gallery.vue

@@ -1,253 +1,393 @@
 <template>
-    <view class="app-page">
-        <!-- 顶部切换 -->
-        <view class="e-fixed" v-if="category.list.length > 0">
-            <tm-tabs color="light-blue" v-model="category.activeIndex" range-key="displayName" :list="category.list"
-                     align="left" @change="fnOnCategoryChange"></tm-tabs>
-        </view>
-        <!-- 占位区域 -->
-        <view v-if="category.list.length > 0" style="width: 100vw;height: 90rpx;"></view>
-        <!-- 加载区域 -->
-        <view v-if="loading != 'success'" class="loading-wrap">
-            <tm-skeleton model="card"></tm-skeleton>
-            <tm-skeleton model="card"></tm-skeleton>
-            <tm-skeleton model="card"></tm-skeleton>
-            <tm-skeleton model="card"></tm-skeleton>
-        </view>
-        <!-- 内容区域 -->
-        <view class="content" v-else>
-            <view v-if="dataList.length == 0" class="content-empty">
-                <!-- 空布局 -->
-                <tm-empty icon="icon-shiliangzhinengduixiang-" label="博主还没有分享图片~"></tm-empty>
-            </view>
-            <block v-else>
-                <block v-for="(item, index) in dataList" :key="index">
-                    <tm-translate style="box-sizing: border-box;padding: 6rpx;width: 50%;height: 250rpx;"
-                                  animation-name="fadeUp" :wait="calcAniWait(index)">
-                        <view style="border-radius: 12rpx;overflow: hidden;width: 100%;height: 250rpx;">
-                            <image style="width: 100%;height: 100%;" mode="aspectFill" :src="item.spec.cover"
-                                   @click="fnPreview(index)"/>
-                        </view>
-                    </tm-translate>
-                </block>
+	<view class="app-page" :class="[uniHaloPluginPageClass]">
+		<PluginUnavailable v-if="!uniHaloPluginAvailable" :pluginId="uniHaloPluginId"
+			:error-text="uniHaloPluginAvailableError" />
+		<template v-else>
+			<!-- 顶部切换 -->
+			<view class="e-fixed" v-if="category.list.length > 0">
+				<tm-tabs color="light-blue" :shadow="0" v-model="category.activeIndex" range-key="displayName"
+					:list="category.list" align="left" @change="fnOnCategoryChange($event, false)"></tm-tabs>
+			</view>
+			<!-- 占位区域 -->
+			<view v-if="category.list.length > 0" style="width: 100vw;height: 90rpx;"></view>
+			<!-- 加载区域 -->
+			<view v-if="loading == 'loading'" class="loading-wrap">
+				<tm-skeleton model="card"></tm-skeleton>
+				<tm-skeleton model="card"></tm-skeleton>
+				<tm-skeleton model="card"></tm-skeleton>
+				<tm-skeleton model="card"></tm-skeleton>
+			</view>
+			<view v-else-if="loading == 'error'" class="flex flex-col flex-center" style="width:100%;height:60vh;">
+				<tm-empty icon="icon-wind-cry" label="阿偶，似乎获取数据失败了~">
+					<tm-button theme="light-blue" size="m" :shadow="0" @click="fnGetData(true)">刷新试试</tm-button>
+				</tm-empty>
+			</view>
+			<!-- 内容区域 -->
+			<view v-else class="content">
+				<k-touch-listen class="touch-listen-content" @touchLeft="touchLeft" @touchRight="touchRight">
+					<view v-if="dataList.length === 0" class="content-empty">
+						<!-- 空布局 -->
+						<tm-empty icon="icon-shiliangzhinengduixiang-" label="博主还没有分享图片~"></tm-empty>
+					</view>
+					<block v-else>
+						<block v-if="galleryConfig.useWaterfall">
+							<!--瀑布流-->
+							<tm-flowLayout-custom ref="wafll" style="width: 100%;"
+								@click="fnOnFlowClick"></tm-flowLayout-custom>
+						</block>
+						<!--   列表   -->
+						<block v-else>
+							<tm-translate v-for="(item, index) in dataList" :key="index"
+								style="box-sizing: border-box;padding: 6rpx;width: 50%;height: 250rpx;"
+								animation-name="fadeUp" :wait="calcAniWait(index)">
+								<view style="border-radius: 12rpx;overflow: hidden;width: 100%;height: 250rpx;">
+									<image style="width: 100%;height: 100%;" mode="aspectFill" :src="item.spec.url"
+										@click="fnPreview(item)" />
+								</view>
+							</tm-translate>
+						</block>
 
-                <tm-flotbutton @click="fnToTopPage" color="light-blue" size="m" icon="icon-angle-up"></tm-flotbutton>
-                <view class="load-text">{{ loadMoreText }}</view>
-            </block>
-        </view>
-    </view>
+						<view class="load-text">{{ loadMoreText }}</view>
+					</block>
+				</k-touch-listen>
+			</view>
+
+			<view v-if="!calcAuditModeEnabled" class="flot-buttons">
+				<tm-button v-if="loading == 'error'" @click="fnGetCategory" size="m" :fab="true" theme="light-blue"
+					icon="icon-sync-alt"></tm-button>
+				<tm-button @click="fnToTopPage" size="m" :fab="true" theme="light-blue"
+					icon="icon-angle-up"></tm-button>
+			</view>
+		</template>
+	</view>
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue';
-import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
-import tmFlowLayout from '@/tm-vuetify/components/tm-flowLayout/tm-flowLayout.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue';
+	import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
+	import tmFlowLayoutCustom from '@/tm-vuetify/components/tm-flowLayout-custom/tm-flowLayout-custom.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
 
-export default {
-    components: {
-        tmSkeleton,
-        tmTranslate,
-        tmFlotbutton,
-        tmTags,
-        tmEmpty,
-        tmIcons,
-        tmImages,
-        tmFlowLayout,
-        tmTabs
-    },
-    data() {
-        return {
-            isBlackTheme: false,
-            loading: 'loading',
-            category: {
-                activeIndex: 0,
-                activeValue: '',
-                list: []
-            },
-            queryParams: {
-                size: 10,
-                page: 1,
-                group: ""
-            },
-            cache: {
-                dataList: [],
-                total: 0
-            },
-            isLoadMore: false,
-            loadMoreText: '',
-            hasNext: false,
-            dataList: []
-        };
-    },
-    filters: {
-        filterTakeTime(val) {
-            return uni.$tm.dayjs(val).format('DD/MM/YYYY');
-        }
-    },
-    onLoad() {
-        this.fnSetPageTitle('个人图库');
-        this.fnGetCategory();
-    },
-    onPullDownRefresh() {
-        this.dataList = []
-        this.isLoadMore = false;
-        this.queryParams.page = 1;
-        this.fnGetData();
-    },
-    onReachBottom(e) {
-        if (this.hasNext) {
-            this.queryParams.page += 1;
-            this.isLoadMore = true;
-            this.fnGetData();
-        } else {
-            uni.showToast({
-                icon: 'none',
-                title: '没有更多数据了'
-            });
-        }
-    },
-    methods: {
-        fnOnCategoryChange(index) {
-            this.fnResetSetAniWaitIndex();
-            this.cache.dataList = []
-            this.dataList = [];
-            this.queryParams.group = this.category.list[index].name;
-            this.queryParams.page = 1;
-            this.fnToTopPage();
-            this.fnGetData();
-        },
-        fnGetCategory() {
-            this.$httpApi.v2.getPhotoGroupList({
-                page: 1,
-                size: 9999
-            }).then(res => {
-                this.category.list = res.items.map(item => {
-                    return {
-                        name: item.metadata.name,
-                        displayName: item.spec.displayName
-                    }
-                });
-                if (this.category.list.length !== 0) {
-                    this.queryParams.group = this.category.list[0].name;
-                    this.fnGetData();
-                }
+	import pluginAvailable from "@/common/mixins/pluginAvailable.js"
+	import PluginUnavailable from '@/components/plugin-unavailable/plugin-unavailable.vue'
+	export default {
+		options: {
+			multipleSlots: true
+		},
+		mixins: [pluginAvailable],
+		components: {
+			tmSkeleton,
+			tmTranslate,
+			tmFlotbutton,
+			tmTags,
+			tmEmpty,
+			tmIcons,
+			tmImages,
+			tmFlowLayoutCustom,
+			tmTabs,
+			tmButton,
+			PluginUnavailable
+		},
+		data() {
+			return {
+				isBlackTheme: false,
+				loading: 'loading',
+				category: {
+					activeIndex: 0,
+					activeValue: '',
+					list: []
+				},
+				queryParams: {
+					size: 10,
+					page: 1,
+					group: ""
+				},
+				isLoadMore: false,
+				loadMoreText: '',
+				hasNext: false,
+				dataList: [],
+				lock: false
+			};
+		},
+		computed: {
+			galleryConfig() {
+				return this.$tm.vx.getters().getConfigs.pageConfig.galleryConfig;
+			},
+			haloConfigs() {
+				return this.$tm.vx.getters().getConfigs;
+			},
+			mockJson() {
+				return this.$tm.vx.getters().getMockJson;
+			},
+			calcAuditModeEnabled() {
+				return this.haloConfigs.auditConfig.auditModeEnabled
+			},
+		},
+		watch: {
+			galleryConfig: {
+				async handler(newValue, oldValue) {
+					if (!newValue) return;
+					this.fnSetPageTitle(newValue.pageTitle);
+					this.fnGetCategory();
+				},
+				deep: true,
+				immediate: true
+			}
+		},
+		async onLoad() {
+			// 检查插件
+			this.setPluginId(this.NeedPluginIds.PluginPhotos)
+			this.setPluginError("阿偶，检测到当前插件没有安装或者启用，无法使用图库功能哦，请联系管理员")
+			await this.checkPluginAvailable()
+		},
+		onPullDownRefresh() {
+			if (!this.uniHaloPluginAvailable) {
+				uni.hideLoading();
+				uni.stopPullDownRefresh();
+				return
+			}
+			this.dataList = []
+			this.isLoadMore = false;
+			this.queryParams.page = 1;
+			this.fnGetData(true);
+		},
+		onReachBottom(e) {
+			if (!this.uniHaloPluginAvailable) return;
+			if (this.calcAuditModeEnabled) {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+				return;
+			}
 
-            });
-        },
-        fnGetData() {
-            // 设置状态为加载中
-            if (!this.isLoadMore) {
-                this.loading = 'loading';
-            }
-            this.loadMoreText = '';
-            this.$httpApi.v2
-                .getPhotoListByGroupName(this.queryParams)
-                .then(res => {
-                    console.log("相册 res", res)
-                    this.hasNext = res.hasNext;
-                    this.loading = 'success';
-                    if (res.items.length != 0) {
-                        const _list = res.items.map((item, index) => {
-                            item.spec.cover = this.$utils.checkImageUrl(item.spec.cover);
-                            return item;
-                        });
-                        this.fnCacheDataList(_list);
-                        if (this.isLoadMore) {
-                            this.dataList = this.dataList.concat(_list);
-                        } else {
-                            this.dataList = _list;
-                        }
-                    }
-                    this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+			if (this.hasNext) {
+				this.queryParams.page += 1;
+				this.isLoadMore = true;
+				this.fnGetData(false);
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+			}
+		},
+		methods: {
+			fnGetDataByCategory(index) {
+				this.fnResetSetAniWaitIndex();
+				this.queryParams.group = this.category.list[index].name;
+				this.queryParams.page = 1;
+				this.fnToTopPage();
+				this.dataList = [];
+				this.fnGetData(true);
+			},
+			fnOnCategoryChange(index) {
+				if (this.lock) {
+					// uni.showToast({
+					// 	title: "上一个请求进行中...",
+					// 	icon: "none"
+					// })
+					return;
+				}
+				this.fnGetDataByCategory(index)
+			},
+			fnGetCategory() {
+				if (this.calcAuditModeEnabled) {
+					this.fnGetData(true);
+					return
+				}
+				this.$httpApi.v2.getPhotoGroupList({
+					page: 1,
+					size: 0
+				}).then(res => {
+					this.category.list = res.items.map(item => {
+						return {
+							name: item.metadata.name,
+							displayName: item.spec.displayName,
+							priority: item.spec.priority
+						}
+					}).sort((a, b) => a.priority - b.priority);
 
-                })
-                .catch(err => {
-                    console.error(err);
-                    this.loading = 'error';
-                    this.waterfall.loading = 'finish';
-                    this.loadMoreText = '加载失败，请下拉刷新！';
-                })
-                .finally(() => {
-                    setTimeout(() => {
-                        uni.hideLoading();
-                        uni.stopPullDownRefresh();
-                    }, 500);
-                });
-        },
-        // 缓存数据
-        fnCacheDataList(dataList) {
-            if (this.queryParams.page == 1) {
-                this.cache.dataList = dataList;
-            } else {
-                this.cache.dataList = [...this.cache.dataList, ...dataList];
-            }
-        },
+					if (this.category.list.length !== 0) {
+						this.queryParams.group = this.category.list[0].name;
+						this.fnGetData(true);
+					}
+				}).catch(e => {
+					this.loading = 'error'
+					this.category.list = []
+					this.category.activeIndex = 0
+					this.category.activeValue = ""
+				});
+			},
+			fnGetData(isClearWaterfall = false) {
+				if (this.calcAuditModeEnabled) {
+					this.dataList = this.mockJson.gallery.list.map(item => {
+						return {
+							metadata: {
+								name: Date.now() * Math.random(),
+							},
+							spec: {
+								url: this.$utils.checkImageUrl(item)
+							}
+						}
+					})
 
-        // 瀑布流组件点击事件
-        fnOnClick(data) {
-            console.log('点击数据', data);
-        },
-        // 预览
-        fnPreview(index) {
-            uni.previewImage({
-                current: index,
-                urls: this.dataList.map(x => x.spec.cover),
-                indicator: 'number',
-                loop: true
-            });
-        }
-    }
-};
+					this.loading = 'success';
+
+					if (this.galleryConfig.useWaterfall) {
+						this.$nextTick(() => {
+							if (isClearWaterfall) {
+								this.$refs.wafll.clear()
+							}
+							setTimeout(() => {
+								this.$refs.wafll.pushData(this.dataList)
+							}, 50)
+						})
+					}
+					this.loadMoreText = '呜呜，没有更多数据啦~';
+					uni.hideLoading();
+					uni.stopPullDownRefresh();
+					this.lock = false;
+					return;
+				}
+
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '';
+				this.$httpApi.v2
+					.getPhotoListByGroupName(this.queryParams)
+					.then(res => {
+						this.hasNext = res.hasNext;
+						this.loading = 'success';
+						if (res.items.length !== 0) {
+							const _list = res.items.map((item, index) => {
+								item.spec.url = this.$utils.checkImageUrl(item.spec.url || item.spec.cover);
+								return item;
+							});
+							if (this.isLoadMore) {
+								this.dataList = this.dataList.concat(_list);
+							} else {
+								this.dataList = _list;
+							}
+							if (this.galleryConfig.useWaterfall) {
+								this.$nextTick(() => {
+									if (isClearWaterfall) {
+										this.$refs.wafll.clear()
+									}
+									this.$refs.wafll.pushData(_list)
+								})
+							}
+						}
+						this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+							this.lock = false;
+						}, 500);
+					});
+			},
+			fnOnFlowClick({
+				item
+			}) {
+				this.fnPreview(item)
+			},
+			// 预览
+			fnPreview(data) {
+				uni.previewImage({
+					current: this.dataList.findIndex(x => x.metadata.name === data.metadata.name),
+					urls: this.dataList.map(x => x.spec.url),
+					indicator: 'number',
+					loop: true
+				});
+			},
+			touchLeft() {
+				if (this.loading != "success") return;
+				this.category.activeIndex += 1
+				if (this.category.activeIndex >= this.category.list.length) {
+					this.category.activeIndex = 0
+				}
+				this.lock = true
+				this.fnGetDataByCategory(this.category.activeIndex)
+			},
+			touchRight() {
+				if (this.loading != "success") return;
+				this.category.activeIndex -= 1
+				if (this.category.activeIndex < 0) {
+					this.category.activeIndex = 0
+				}
+				this.lock = true
+				this.fnGetDataByCategory(this.category.activeIndex)
+			}
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
-    width: 100vw;
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-    padding-bottom: 24rpx;
-    background-color: #fafafa;
+	.app-page {
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		padding-bottom: 24rpx;
+		background-color: #fafafa;
+	}
 
-    &.is-balck {
-        background-color: #212121;
-    }
-}
+	.content {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		box-sizing: border-box;
 
-.content {
-    display: flex;
-    flex-wrap: wrap;
-    box-sizing: border-box;
-    padding: 0 24rpx;
-    padding-top: 24rpx;
-    gap: 12rpx 0;
+		.content-empty {
+			width: 100%;
+			height: 70vh;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
 
-    .content-empty {
-        width: 100%;
-        height: 70vh;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-}
+	.touch-listen-content {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		box-sizing: border-box;
+		padding: 24rpx 24rpx 0;
+		gap: 12rpx 0;
+	}
 
-.loading-wrap {
-    box-sizing: border-box;
-    padding: 24rpx;
-}
+	.loading-wrap {
+		box-sizing: border-box;
+		padding: 24rpx;
+	}
 
-.card {
-    box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
-}
+	.load-text {
+		width: 100%;
+		text-align: center;
+	}
 
-.load-text {
-    width: 100%;
-    text-align: center;
-}
-</style>
+	.flot-buttons {
+		position: fixed;
+		bottom: 100rpx;
+		right: 32rpx;
+		flex-direction: column;
+		display: flex;
+		gap: 6rpx;
+		z-index: 999;
+	}
+</style>

pages/tabbar/moments/moments.vue

@@ -1,240 +1,410 @@
 <template>
-    <view class="app-page">
-        <view v-if="loading != 'success'" class="loading-wrap">
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-        </view>
-        <!-- 内容区域 -->
-        <view v-else class="app-page-content">
-            <view v-if="dataList.length == 0" class="content-empty flex flex-center" style="min-height: 70vh;">
-                <!-- 空布局 -->
-                <tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无数据"></tm-empty>
-            </view>
-            <block v-else>
-                <block v-for="(moment, index) in dataList" :key="index">
-                    <!--  卡片 -->
-                    <tm-translate animation-name="fadeUp" :wait="calcAniWait()">
-                        <view class="moment-card">
-                            <view class="head" style="display: flex;align-items: center;">
-                                <view class="avatar" style="flex-shrink: 0;">
-                                    <image style="width: 66rpx;height: 66rpx;border-radius: 50%;"
-                                           :src="moment.spec.user.avatar"/>
-                                </view>
-                                <view class="nickname" style="margin-left: 12rpx;">
-                                    <view style="font-size: 30rpx;font-weight: bold;color: #333333;">
-                                        {{ moment.spec.user.displayName }}
-                                    </view>
-                                    <view style="margin-top: 6rpx;font-size: 24rpx;color: #666;">
-                                        {{ {d: moment.spec.releaseTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
-                                    </view>
-                                </view>
-                            </view>
-                            <view class="content">
-                                <mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
-                                         :loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
-                                         :tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
-                                         :content="moment.spec.content.html" :markdown="true" :showLineNumber="true"
-                                         :showLanguageName="true" :copyByLongPress="true"/>
-                            </view>
-                            <view v-if="moment.spec.content.medium.length!==0" class="images"
-                                  :class="['images-'+moment.spec.content.medium.length]">
-                                <view class="image-item" v-for="(image,mediumIndex) in moment.spec.content.medium"
-                                      :key="mediumIndex">
-                                    <image mode="aspectFill" style="width: 100%;height: 100%;border-radius: 6rpx;"
-                                           :src="image.url"
-                                           @click="handlePreview(mediumIndex,moment.spec.content.medium)"/>
-                                </view>
-                            </view>
-                        </view>
-                    </tm-translate>
-                </block>
-                <tm-flotbutton @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
-                <view class="load-text">{{ loadMoreText }}</view>
-            </block>
-        </view>
-    </view>
+	<view class="app-page" :class="[uniHaloPluginPageClass]">
+		<PluginUnavailable v-if="!uniHaloPluginAvailable" :pluginId="uniHaloPluginId"
+			:error-text="uniHaloPluginAvailableError" />
+		<template v-else>
+			<view v-if="loading !== 'success'" class="loading-wrap">
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+			</view>
+			<!-- 内容区域 -->
+			<view v-else class="app-page-content">
+				<view v-if="dataList.length === 0" class="content-empty flex flex-center" style="min-height: 70vh;">
+					<!-- 空布局 -->
+					<tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无数据"></tm-empty>
+				</view>
+				<block v-else>
+					<!-- 卡片 -->
+					<tm-translate v-for="(moment, index) in dataList" :key="moment.metadata.name"
+						animation-name="fadeUp" :wait="calcAniWait(index)">
+						<view class="moment-card">
+							<view class="head" style="display: flex;align-items: center;">
+								<view class="avatar" style="flex-shrink: 0;">
+									<image style="width: 66rpx;height: 66rpx;border-radius: 50%;"
+										:src="moment.spec.user.avatar" />
+								</view>
+								<view class="nickname" style="margin-left: 12rpx;">
+									<view style="font-size: 30rpx;font-weight: bold;color: #333333;">
+										{{ moment.spec.user.displayName }}
+									</view>
+									<view style="margin-top: 6rpx;font-size: 24rpx;color: #666;">
+										{{ {d: moment.spec.releaseTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
+									</view>
+								</view>
+							</view>
+							<view class="content" @click.stop="handleToMomentDetail(moment)">
+								<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
+									:loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
+									:tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
+									:content="moment.spec.newHtml" :markdown="true" :showLineNumber="true"
+									:showLanguageName="true" :copyByLongPress="true" />
+							</view>
+							<view v-if="moment.images && moment.images.length!==0" class="images"
+								:class="['images-'+moment.images.length]">
+								<view class="image-item" v-for="(image,mediumIndex) in moment.images"
+									:key="mediumIndex">
+									<image mode="aspectFill" style="width: 100%;height: 100%;border-radius: 6rpx;"
+										:src="image.url" @click="handlePreview(mediumIndex,moment.images)" />
+								</view>
+							</view>
+							<view v-if="moment.audios && moment.audios.length!==0" class="mb-12"
+								style="display: flex; flex-direction: column; gap: 12rpx 0;padding: 0 24rpx;padding-right:28rpx;">
+								<audio v-for="(audio,index) in moment.audios" :controls="true" :key="index"
+									:id="audio.url" :poster="bloggerInfo.avatar"
+									:name="'来自' + (startConfig.title||bloggerInfo.nickname) + '的声音'"
+									:author="bloggerInfo.nickname" :src="audio.url"></audio>
+							</view>
+							<view v-if="moment.videos && moment.videos.length!==0" class="mb-12"
+								style="display: flex; flex-direction: column; gap: 12rpx 0;padding: 0 24rpx; ">
+								<video style="width:100%;height: 400rpx;border-radius: 12rpx;"
+									v-for="(video,index) in moment.videos" :key="index" :src="video.url"
+									:id="'video_' + video.id" :show-mute-btn="true" :controls="true"
+									:show-center-play-btn="true" :enable-progress-gesture="true"
+									@play="onVideoPlay(video.id)" @pause="onVideoPause(video.id)"
+									@ended="onVideoEnded(video.id)"></video>
+							</view>
+							<view v-if="moment.spec.tags && moment.spec.tags.length!==0"
+								class="mt-12 px-16 pb-24 flex flex-wrap">
+								<tm-tags v-for="(tag,tagIndex) in moment.spec.tags" :key="tagIndex"
+									:color="randomTagColor()" size="m" model="text">
+									{{ tag }}
+								</tm-tags>
+							</view>
+						</view>
+					</tm-translate>
+					<tm-flotbutton @click="fnToTopPage" :width="90" size="xs" color="light-blue" :icon-size="24"
+						icon="icon-angle-up"></tm-flotbutton>
+					<view class="load-text">{{ loadMoreText }}</view>
+				</block>
+			</view>
+		</template>
+	</view>
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
 
-import MarkdownConfig from '@/common/markdown/markdown.config.js';
-import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
+	import MarkdownConfig from '@/common/markdown/markdown.config.js';
+	import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
+	import {
+		getRandomNumberByRange
+	} from "@/utils/random.js";
+	import {
+		generateUUID
+	} from '@/utils/uuid.js';
 
-export default {
-    components: {
-        tmSkeleton,
-        tmFlotbutton,
-        tmTranslate,
-        tmEmpty,
-        mpHtml
-    },
-    data() {
-        return {
-            markdownConfig: MarkdownConfig,
-            loading: 'loading',
-            queryParams: {
-                size: 10,
-                page: 1
-            },
-            hasNext: false,
-            dataList: [],
-            isLoadMore: false,
-            loadMoreText: '加载中...'
-        };
-    },
+	import pluginAvailableMixin from "@/common/mixins/pluginAvailable.js"
+	import PluginUnavailable from '@/components/plugin-unavailable/plugin-unavailable.vue'
+	
+	export default {
+		mixins: [pluginAvailableMixin],
+		components: {
+			tmSkeleton,
+			tmFlotbutton,
+			tmTranslate,
+			tmEmpty,
+			tmTags,
+			mpHtml,
+			PluginUnavailable
+		},
+		data() {
+			return {
+				markdownConfig: MarkdownConfig,
+				loading: 'loading',
+				queryParams: {
+					size: 10,
+					page: 1
+				},
+				hasNext: false,
+				dataList: [],
+				isLoadMore: false,
+				loadMoreText: '加载中...',
+				tagColors: ['orange', 'green', 'red', 'blue'],
+				videoContexts: {},
+				currentVideoId: null
+			};
+		},
 
-    computed: {
-        bloggerInfo() {
-            let blogger = this.$tm.vx.getters().getConfigs.authorConfig.blogger;
-            blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
-            return blogger;
-        }
-    },
+		computed: {
+			bloggerInfo() {
+				let blogger = this.$tm.vx.getters().getConfigs.authorConfig.blogger;
+				blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
+				return blogger;
+			},
+			haloConfigs() {
+				return this.$tm.vx.getters().getConfigs;
+			},
+			mockJson() {
+				return this.$tm.vx.getters().getMockJson;
+			},
+			calcAuditModeEnabled() {
+				return this.haloConfigs.auditConfig.auditModeEnabled
+			},
+			calcUseTagRandomColor() {
+				return this.haloConfigs.pageConfig.momentConfig.useTagRandomColor
+			},
+			startConfig() {
+				return this.haloConfigs.appConfig.startConfig;
+			}
+		},
+		async onLoad() { 
+			// 检查插件
+			this.setPluginId(this.NeedPluginIds.PluginMoments)
+			this.setPluginError("阿偶，检测到当前插件没有安装或者启用，无法使用瞬间功能哦，请联系管理员")
+			if (!await this.checkPluginAvailable()) return
+			
+			this.fnGetData();
+		},
+		onPullDownRefresh() {
+			if (!this.uniHaloPluginAvailable) {
+				uni.hideLoading();
+				uni.stopPullDownRefresh();
+				return
+			}
+			this.isLoadMore = false;
+			this.queryParams.page = 0;
+			this.videoContexts = {};
+			this.currentVideoId = null;
+			this.fnGetData();
+		},
+		onReachBottom(e) {
+			if (!this.uniHaloPluginAvailable) return;
+			if (this.calcAuditModeEnabled) {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+				return
+			}
+			if (this.hasNext) {
+				this.queryParams.page += 1;
+				this.isLoadMore = true;
+				this.fnGetData();
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+			}
+		},
+		methods: {
+			fnGetData() {
+				if (this.calcAuditModeEnabled) {
+					this.dataList = this.mockJson.moments.list.map((item) => {
+						return {
+							metadata: {
+								name: Date.now() * Math.random(),
+							},
+							spec: {
+								user: {
+									displayName: this.bloggerInfo.nickname,
+									avatar: this.$utils.checkAvatarUrl(this.bloggerInfo.avatar),
+								},
+								content: {
+									html: item.content
+								},
+								releaseTime: item.time,
+								visible: "PUBLIC"
+							},
+							images: item.images.map((img) => {
+								return {
+									type: "PHOTO",
+									url: this.$utils.checkThumbnailUrl(img),
+								}
+							}),
+							videos: []
+						}
+					});
+					this.loading = 'success';
+					this.loadMoreText = '呜呜，没有更多数据啦~';
+					uni.hideLoading();
+					uni.stopPullDownRefresh();
+					return;
+				}
+				uni.showLoading({
+					mask: true,
+					title: '加载中...'
+				});
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi.v2
+					.getMomentList(this.queryParams)
+					.then(res => {
+						this.loading = 'success';
+						this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						this.hasNext = res.hasNext;
 
-    onLoad() {
-        this.fnGetData();
-    },
-    onPullDownRefresh() {
-        this.isLoadMore = false;
-        this.queryParams.page = 0;
-        this.fnGetData();
-    },
+						const tempItems = res.items.filter(x => x.spec.visible === 'PUBLIC').map(item => {
+							item.spec.user = {
+								displayName: this.bloggerInfo.nickname,
+								avatar: this.$utils.checkAvatarUrl(this.bloggerInfo.avatar)
+							}
+							item.spec.content.medium.map(medium => {
+								medium.url = this.$utils.checkThumbnailUrl(medium.url, true)
+							})
 
-    onReachBottom(e) {
-        if (this.hasNext) {
-            this.queryParams.page += 1;
-            this.isLoadMore = true;
-            this.fnGetData();
-        } else {
-            uni.showToast({
-                icon: 'none',
-                title: '没有更多数据了'
-            });
-        }
-    },
-    methods: {
-        fnGetData() {
-            uni.showLoading({
-                mask: true,
-                title: '加载中...'
-            });
-            // 设置状态为加载中
-            if (!this.isLoadMore) {
-                this.loading = 'loading';
-            }
-            this.loadMoreText = '加载中...';
-            this.$httpApi.v2
-                .getMomentList(this.queryParams)
-                .then(res => {
-                    console.log('请求结果：');
-                    console.log(res);
+							item.spec.newHtml = this.removeTagLinksCompletely(item.spec.content.html, '')
+							item['images'] = item.spec.content.medium
+								.filter(x => x.type === 'PHOTO')
 
-                    this.loading = 'success';
-                    this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-                    this.hasNext = res.hasNext;
+							item['videos'] = item.spec.content.medium
+								.filter(x => x.type === 'VIDEO').map(item => {
+									item.id = generateUUID()
+									return item;
+								})
 
-                    const tempItems = res.items.map(item => {
-                        item.spec.user = {
-                            displayName: this.bloggerInfo.nickname,
-                            avatar: this.$utils.checkAvatarUrl(this.bloggerInfo.avatar)
-                        }
-                        item.spec.content.medium
-                            .filter(x => x.type === 'PHOTO')
-                            .map(medium => {
-                                medium.url = this.$utils.checkThumbnailUrl(medium.url, true)
-                            })
-                        return item;
-                    })
+							item['audios'] = item.spec.content.medium
+								.filter(x => x.type === 'AUDIO')
+							return item;
+						})
 
-                    if (this.isLoadMore) {
-                        this.dataList = this.dataList.concat(tempItems);
-                    } else {
-                        this.dataList = tempItems;
-                    }
-                })
-                .catch(err => {
-                    console.error(err);
-                    this.loading = 'error';
-                    this.loadMoreText = '加载失败，请下拉刷新！';
-                })
-                .finally(() => {
-                    setTimeout(() => {
-                        uni.hideLoading();
-                        uni.stopPullDownRefresh();
-                    }, 500);
-                });
-        },
-        handlePreview(index, list) {
-            uni.previewImage({
-                current: index,
-                urls: list.map(item => item.url)
-            })
-        }
-    }
-};
+						if (this.isLoadMore) {
+							this.dataList = this.dataList.concat(tempItems);
+						} else {
+							this.dataList = tempItems;
+						}
+
+						this.$nextTick(() => {
+							this.createVideoContexts(tempItems);
+						})
+
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
+					});
+			},
+			handlePreview(index, list) {
+				uni.previewImage({
+					current: index,
+					urls: list.map(item => item.url)
+				})
+			},
+			removeTagLinksCompletely(htmlString) {
+				const regex = /<a\s+(?:[^>]*?\s+)?class=(['"])[^'"]*?\btag\b[^'"]*?\1[^>]*?>.*?<\/a>/gi;
+				const newHtml = htmlString.replace(regex, '');
+				return newHtml
+			},
+			randomTagColor() {
+				if (!this.calcUseTagRandomColor) return "blue";
+				const randomIndex = getRandomNumberByRange(0, this.tagColors.length);
+				return this.tagColors[randomIndex];
+			},
+			createVideoContexts(list) {
+				this.stopAllVideos()
+				list.map(item => item.videos).flat().forEach(item => {
+					this.videoContexts[item.id] = uni.createVideoContext(`video_${item.id}`, this);
+				})
+			},
+			onVideoPlay(videoId) {
+				this.currentVideoId = videoId;
+				this.stopAllVideos(videoId)
+			},
+			onVideoPause(videoId) {
+				if (this.currentVideoId == videoId) {
+					this.currentVideoId = null;
+				}
+			},
+			onVideoEnded(videoId) {
+				this.currentVideoId = null;
+			},
+			stopAllVideos(excludesVideoId = null) {
+				Object.keys(this.videoContexts).forEach(videoId => {
+					if (!excludesVideoId || excludesVideoId != videoId) {
+						const videoContext = this.videoContexts[videoId]
+						videoContext?.pause();
+					}
+				});
+			},
+			handleToMomentDetail(moment) {
+				if (this.calcAuditModeEnabled) return;
+				uni.navigateTo({
+					url: '/pagesA/moment-detail/moment-detail?name=' + moment.metadata.name,
+					animationType: 'slide-in-right'
+				});
+			}
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
-    width: 100vw;
-    display: flex;
-    flex-direction: column;
-    padding: 24rpx 0;
-}
+	.app-page {
+		box-sizing: border-box;
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		padding: 24rpx 0;
+	}
 
-.loading-wrap {
-    padding: 24rpx;
-}
+	.loading-wrap {
+		padding: 24rpx;
+	}
 
-.moment-card {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    margin: 0 24rpx;
-    border-radius: 12rpx;
-    background-color: #ffff;
-    box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
-    overflow: hidden;
-    margin-bottom: 24rpx;
-}
+	.moment-card {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		margin: 0 24rpx;
+		border-radius: 12rpx;
+		background-color: #ffff;
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+		overflow: hidden;
+		margin-bottom: 24rpx;
+	}
 
-.head {
-    padding: 24rpx;
-    padding-bottom: 0;
-}
+	.head {
+		padding: 24rpx;
+		padding-bottom: 0;
+	}
 
-.images {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: flex-start;
-    padding: 24rpx;
-    padding-top: 0;
+	.images {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: flex-start;
+		padding: 24rpx;
+		padding-top: 0;
 
-    .image-item {
-        box-sizing: border-box;
-        border-radius: 24rpx;
-        padding: 6rpx;
-        width: 33%;
-        height: 200rpx
-    }
+		.image-item {
+			box-sizing: border-box;
+			border-radius: 24rpx;
+			padding: 6rpx;
+			width: 33%;
+			height: 200rpx
+		}
 
-    &-1 {
-        > .image-item {
-            width: 100%;
-            height: 350rpx
-        }
-    }
+		&-1 {
+			>.image-item {
+				width: 100%;
+				height: 350rpx
+			}
+		}
 
-    &-2 {
-        > .image-item {
-            width: 50%;
-            height: 250rpx
-        }
-    }
-}
-</style>
+		&-2 {
+			>.image-item {
+				width: 50%;
+				height: 250rpx
+			}
+		}
+	}
+
+	::v-deep .uni-audio-default {
+		width: 100%;
+		border-radius: 12rpx;
+	}
+</style>

pages/template.vue

@@ -1,135 +0,0 @@
-<template>
-	<view class="app-page">
-		<view v-if="loading != 'success'" class="loading-wrap">
-			<tm-skeleton model="listAvatr"></tm-skeleton>
-			<tm-skeleton model="listAvatr"></tm-skeleton>
-			<tm-skeleton model="listAvatr"></tm-skeleton>
-		</view>
-		<!-- 内容区域 -->
-		<view v-else class="app-page-content">
-			<view v-if="dataList.length == 0" class="content-empty flex flex-center">
-				<!-- 空布局 -->
-				<tm-empty icon="icon-shiliangzhinengduixiang-" label="该分类下暂无数据"></tm-empty>
-			</view>
-			<block v-else>
-				<block v-for="(item, index) in dataList" :key="index">
-					<!--  卡片 -->
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
-						<!-- 列表项 -->
-						{{ item }}
-					</tm-translate>
-				</block>
-				<tm-flotbutton @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
-				<view class="load-text">{{ loadMoreText }}</view>
-			</block>
-		</view>
-	</view>
-</template>
-
-<script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-export default {
-	components: {
-		tmSkeleton,
-		tmFlotbutton,
-		tmTranslate,
-		tmEmpty
-	},
-	data() {
-		return {
-			loading: 'loading',
-			queryParams: {
-				size: 10,
-				page: 0
-			},
-			result: null,
-			dataList: [],
-			hasNext:false,
-			isLoadMore: false,
-			loadMoreText: '加载中...'
-		};
-	},
-
-	onLoad() {
-		this.fnSetPageTitle();
-	},
-	created() {
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnGetData();
-	},
-
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
-			this.fnGetData();
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		fnGetData() {
-			return;
-			uni.showLoading({
-				mask: true,
-				title: '加载中...'
-			});
-			// 设置状态为加载中
-			if (!this.isLoadMore) {
-				this.loading = 'loading';
-			}
-			this.loadMoreText = '加载中...';
-			this.$httpApi
-				.getXXX(this.queryParams)
-				.then(res => {
-					console.log('请求结果：');
-					console.log(res);
-
-					this.loading = 'success';
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-					// 处理数据
-					this.result = res.data;
-					if (this.isLoadMore) {
-						this.dataList = this.dataList.concat(res.data.content);
-					} else {
-						this.dataList = res.data.content;
-					}
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 500);
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.app-page {
-	width: 100vw;
-	display: flex;
-	flex-direction: column;
-	padding: 24rpx 0;
-	padding-bottom: 144rpx;
-}
-.loading-wrap {
-	padding: 24rpx;
-}
-</style>

pagesA/about/about.vue

@@ -10,11 +10,11 @@
                 <tm-listitem title="开源组织" :font-size="28" @click="$utils.copyText('https://www.ialley.cn', '巷子工坊官网已复制成功！')">
                     <text class="text-size-s" slot="rightValue">巷子工坊</text>
                 </tm-listitem>
-                <tm-listitem title="开源作者" :font-size="28" @click="$utils.copyText('https://b.925i.cn', '作者博客地址已复制')">
+                <tm-listitem title="开源作者" :font-size="28" @click="$utils.copyText('https://www.xiaoxiaomo.cn', '作者主页地址已复制')">
                     <text class="text-size-s" slot="rightValue">小莫唐尼</text>
                 </tm-listitem>
-                <tm-listitem title="作者博客" :font-size="28" @click="$utils.copyText('https://b.925i.cn', '作者博客地址已复制')">
-                    <text class="text-size-s text-overflow" slot="rightValue">https://b.925i.cn</text>
+                <tm-listitem title="作者博客" :font-size="28" @click="$utils.copyText('https://blog.xiaoxiaomo.cn', '作者博客地址已复制')">
+                    <text class="text-size-s text-overflow" slot="rightValue">https://blog.xiaoxiaomo.cn</text>
                 </tm-listitem>
                 <tm-listitem title="文档地址" :font-size="28" @click="$utils.copyText('https://uni-halo.925i.cn', '项目码云仓库已复制')">
                     <text class="text-size-s text-overflow" slot="rightValue">https://uni-halo.925i.cn</text>

pagesA/advertise/advertise.vue

@@ -1,145 +0,0 @@
-<template>
-    <tm-fullView>
-        <tm-sheet :shadow="24">
-            <tm-alerts label="观看视频即可获取注册码" close></tm-alerts>
-            <tm-divider color="red" model="dashed" :text="codeDataShow?'请复制下方注册码':'请点击“获取注册码”'"></tm-divider>
-            <view class="ma-20" v-show="!codeDataShow">
-                <tm-button theme="bg-gradient-orange-accent" :round="24" block @click="openVideoAd">获取注册码</tm-button>
-            </view>
-            <view class="ma-20" v-show="codeDataShow">
-                <tm-coupon :hdata="codeData" color="orange" @click="fnCopyCode"></tm-coupon>
-            </view>
-        </tm-sheet>
-        <!-- 		<tm-sheet :shadow="24">
-            <tm-images @load="loadimg" src="https://picsum.photos/300?id=7"></tm-images>
-        </tm-sheet> -->
-    </tm-fullView>
-
-</template>
-
-<script>
-let videoAd = null;
-import tmFullView from "@/tm-vuetify/components/tm-fullView/tm-fullView.vue"
-import tmMenubars from "@/tm-vuetify/components/tm-menubars/tm-menubars.vue"
-import tmSheet from "@/tm-vuetify/components/tm-sheet/tm-sheet.vue"
-import tmAlerts from "@/tm-vuetify/components/tm-alerts/tm-alerts.vue"
-import tmDivider from "@/tm-vuetify/components/tm-divider/tm-divider.vue"
-import tmCoupon from '@/tm-vuetify/components/tm-coupon/tm-coupon.vue'
-import tmButton from "@/tm-vuetify/components/tm-button/tm-button.vue"
-import tmImages from "@/tm-vuetify/components/tm-images/tm-images.vue"
-
-export default {
-    components: {
-        tmFullView,
-        tmMenubars,
-        tmSheet,
-        tmAlerts,
-        tmDivider,
-        tmCoupon,
-        tmButton,
-        tmImages
-    },
-    data() {
-        return {
-            adUnitId: '',
-            codeDataShow: false,
-            codeData: {
-                // img: 'https://lywq.muyin.site/logo.png',
-                title: "请获取",
-                btnText: '复制',
-                time: '有效期5分钟',
-                sale: '',
-                saleLable: '注册码',
-                saleSplit: ''
-            }
-        }
-    },
-    computed: {
-        adConfigs() {
-            return this.$tm.vx.getters().getConfigs.adConfig;
-        }
-    },
-    onLoad(options) {
-        // #ifdef MP-WEIXIN
-        wx.hideShareMenu();
-        this.adLoad();
-        // #endif
-        uni.onCopyUrl((result) => {
-            setTimeout(() => {
-                uni.setClipboardData({
-                    data: "禁止复制哦",
-                })
-            }, 1000);
-        })
-    },
-    methods: {
-        adLoad() {
-            if (wx.createRewardedVideoAd) {
-                videoAd = wx.createRewardedVideoAd({
-                    adUnitId: this.adConfigs.rewardedVideoAdId //你的广告key
-                })
-                videoAd.onError(err => {
-                })
-                videoAd.onClose((status) => {
-                    if (status && status.isEnded || status === undefined) {
-                        //这里写广告播放完成后的事件
-                        this.getRegistrationCode();
-                    } else {
-                        // 广告播放未完成
-                    }
-                })
-            }
-        },
-        openVideoAd: function () {
-            if (videoAd && this.adConfigs.rewardedVideoAdId != '') {
-                videoAd.show().catch(err => {
-                    // 失败重试
-                    console.log("广告拉取失败")
-                    videoAd.load().then(() => videoAd.show())
-                })
-            } else {
-                this.getRegistrationCode();
-            }
-        },
-        getRegistrationCode() {
-            uni.showLoading({
-                title: '正在获取...'
-            });
-            this.$httpApi.v2.getPostVerifyCode()
-                .then(res => {
-                    if (res.code === 200) {
-                        uni.$tm.toast('获取成功！');
-                        this.codeData.title = res.data;
-                        this.codeDataShow = true;
-                    } else {
-                        uni.$tm.toast('操作失败，请重试！');
-                    }
-                })
-                .catch(err => {
-                    uni.$tm.toast(err.message);
-                });
-        },
-        fnCopyCode() {
-            uni.setClipboardData({
-                data: this.codeData.title,
-                showToast: false,
-                success: () => {
-                    uni.showToast({
-                        icon: 'none',
-                        title: '复制成功！'
-                    });
-                    setTimeout(() => {
-                        uni.navigateBack()
-                    }, 500);
-                },
-                fail: () => {
-                    uni.showToast({
-                        icon: 'none',
-                        title: '复制失败！'
-                    });
-                }
-            });
-        }
-    }
-}
-</script>

pagesA/archives/archives.vue

@@ -1,13 +1,15 @@
 <template>
     <view class="app-page">
+
         <view class="e-fixed">
-            <tm-tabs color="light-blue" v-model="tab.activeIndex" :list="tab.list" align="center" @change="fnOnTabChange"></tm-tabs>
+            <tm-tabs color="light-blue" v-model="tab.activeIndex" :list="tab.list" align="center"
+                     @change="fnOnTabChange"></tm-tabs>
         </view>
         <!-- 占位区域 -->
         <view style="width: 100vw;height: 90rpx;"></view>
 
         <!-- 骨架屏：加载区域 -->
-        <view v-if="loading != 'success'" class="loading-wrap">
+        <view v-if="loading !== 'success'" class="loading-wrap">
             <tm-skeleton model="listAvatr"></tm-skeleton>
             <tm-skeleton model="listAvatr"></tm-skeleton>
             <tm-skeleton model="listAvatr"></tm-skeleton>
@@ -15,46 +17,55 @@
 
         <!-- 加载完成区域 -->
         <block v-else>
-            <view v-if="dataList.length == 0" class="list-empty flex flex-center">
-                <tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无归档的文章"></tm-empty>
+            <view v-if="dataList.length === 0" class="list-empty flex flex-center">
+                <tm-empty v-if="calcAuditModeEnabled" icon="icon-shiliangzhinengduixiang-" label="暂无归档的内容"></tm-empty>
+                <tm-empty v-else icon="icon-shiliangzhinengduixiang-" label="暂无归档的文章"></tm-empty>
             </view>
             <view v-else class="e-timeline tm-timeline mt-24">
                 <block v-for="(item, index) in dataList" :key="index">
                     <view class="tm-timeline-item tm-timeline-item--leftDir">
                         <view style="width: 160rpx;">
                             <view :style="{ width: '24rpx', height: '24rpx' }" :class="[black_tmeme ? 'bk' : '']"
-                                  class="flex-center rounded tm-timeline-jidian border-white-a-2 grey-lighten-2 light-blue shadow-primary-4"></view>
+                                  class="flex-center rounded tm-timeline-jidian border-white-a-2 grey-lighten-2 light-blue shadow-primary-4">
+                            </view>
                             <view :style="{ marginTop: '-24rpx' }"
                                   :class="[index !== dataList.length - 1 ? 'tm-timeline-item-boder' : '', black_tmeme ? 'bk' : '']"
                                   class="grey-lighten-2"></view>
                         </view>
                         <view class="tm-timeline-item-content relative">
                             <view class="tm-timeline-item-left">
-                                <view class="time text-weight-b mb-24">
-                                    {{ item.year }}年
-                                    <block v-if="tab.activeIndex == 0">{{ item.month }}月</block>
-                                    <text class="text-size-s text-grey-darken-1 ml-24">（共发布 {{ item.posts.length }} 篇文章）</text>
+                                <view class="flex time text-weight-b mb-24">
+                                    <text>{{ item.year }}年</text>
+                                    <text v-if="tab.activeIndex === 0">{{ item.month }}月</text>
+                                    <view v-if="calcAuditModeEnabled" class="text-size-s text-grey-darken-1 ml-12">
+                                        （共 {{ item.posts.length }} 篇内容）
+                                    </view>
+                                    <view v-else class="text-size-s text-grey-darken-1 ml-12">
+                                        （共 {{ item.posts.length }} 篇文章）
+                                    </view>
                                 </view>
-                                <block v-if="item.posts.length != 0">
-                                    <block v-for="(post, postIndex) in item.posts" :key="post.id">
-                                        <tm-translate animation-name="fadeUp" :wait="calcAniWait(postIndex)">
-                                            <view class="flex post shadow-3 pa-24 mb-24" :class="[globalAppSettings.layout.cardType]"
-                                                  @click="fnToArticleDetail(post)">
-                                                <image class="post-thumbnail" :src="$utils.checkThumbnailUrl(post.thumbnail)"
-                                                       mode="aspectFill"></image>
-                                                <view class="post-info pl-20">
-                                                    <view class="post-info_title text-overflow">{{ post.title }}</view>
-                                                    <view class="post-info_summary text-overflow-2 mt-12 text-size-s text-grey-darken-1">
-                                                        {{ post.summary }}
-                                                    </view>
-                                                    <view class="post-info_time mt-12  text-size-s text-grey-darken-1">
-                                                        <text class="iconfont icon-clock text-size-s mr-6"></text>
-                                                        <text class="time-label">发布时间：</text>
-                                                        {{ {d: post.createTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
-                                                    </view>
+                                <block v-if="item.posts.length !== 0">
+                                    <block v-for="(post, postIndex) in item.posts" :key="post.metadata.name">
+                                        <view class="flex post shadow-3 pa-24 mb-24"
+                                              :class="[globalAppSettings.layout.cardType]"
+                                              @click="fnToArticleDetail(post)">
+                                            <image class="post-thumbnail"
+                                                   :src="$utils.checkThumbnailUrl(post.spec.cover)" mode="aspectFill">
+                                            </image>
+                                            <view class="post-info pl-20">
+                                                <view class="post-info_title text-overflow">{{ post.spec.title }}
+                                                </view>
+                                                <view
+                                                    class="post-info_summary text-overflow-2 mt-12 text-size-s text-grey-darken-1">
+                                                    {{ post.status.excerpt }}
+                                                </view>
+                                                <view class="post-info_time mt-12  text-size-s text-grey-darken-1">
+                                                    <text class="iconfont icon-clock text-size-s mr-6"></text>
+                                                    <text class="time-label">发布时间：</text>
+                                                    {{ {d: post.spec.publishTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
                                                 </view>
                                             </view>
-                                        </tm-translate>
+                                        </view>
                                     </block>
                                 </block>
                                 <view v-else class="post-empty text-size-m text-grey-darken-1">该日期下暂无归档文章！</view>
@@ -63,8 +74,10 @@
                     </view>
                 </block>
             </view>
+            <view class="load-text mt-12">{{ loadMoreText }}</view>
             <!-- 返回顶部 -->
-            <tm-flotbutton @click="fnToTopPage" size="m" color="bg-gradient-light-blue-accent" icon="icon-angle-up"></tm-flotbutton>
+            <tm-flotbutton @click="fnToTopPage" size="m" color="bg-gradient-light-blue-accent"
+                           icon="icon-angle-up"></tm-flotbutton>
         </block>
     </view>
 </template>
@@ -75,6 +88,7 @@ import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
 import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
 import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
 import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+import qs from 'qs'
 
 export default {
     components: {
@@ -93,11 +107,13 @@ export default {
             },
             queryParams: {
                 size: 10,
-                page: 0
+                page: 1
             },
-            result: null,
-            dataList: [],
-            api: 'getMonthArchives'
+            result: {},
+            cacheDataList: [], // 所有请求的缓存数据
+            dataList: [], // 显示的数据
+            isLoadMore: false,
+            loadMoreText: "加载中..."
         };
     },
     computed: {
@@ -106,53 +122,245 @@ export default {
         },
         color_tmeme: function () {
             return this.$tm.vx.state().tmVuetify.color;
-        }
+        },
+        haloConfigs() {
+            return this.$tm.vx.getters().getConfigs;
+        },
+        mockJson() {
+            return this.$tm.vx.getters().getMockJson;
+        },
+        calcAuditModeEnabled() {
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
     },
     created() {
         this.fnGetData();
     },
     onPullDownRefresh() {
+        this.isLoadMore = false;
+        this.queryParams.page = 1;
         this.fnGetData();
-        this.queryParams.page = 0;
     },
-
+    onReachBottom(e) {
+        if (this.calcAuditModeEnabled) {
+            uni.showToast({
+                icon: 'none',
+                title: '没有更多数据了'
+            });
+            return
+        }
+        if (this.result.hasNext) {
+            this.queryParams.page += 1;
+            this.isLoadMore = true;
+            this.fnGetData();
+        } else {
+            uni.showToast({
+                icon: 'none',
+                title: '没有更多数据了'
+            });
+        }
+    },
     methods: {
         fnOnTabChange(index) {
             this.fnResetSetAniWaitIndex();
-            const _api = ['getMonthArchives', 'getYearArchives'];
-            this.api = _api[index];
             this.queryParams.page = 0;
-            this.fnGetData();
+            this.dataList = this.handleGetShowDataList(this.handleGetPosts(this.cacheDataList))
+            this.fnToTopPage();
         },
         fnGetData() {
-            this.loading = 'loading';
-            // uni.showLoading({
-            // 	mask: true,
-            // 	title: '加载中...'
-            // });
-            this.$httpApi[this.api](this.queryParams)
-                .then(res => {
-                    this.result = res.data;
-                    this.dataList = res.data;
-                    setTimeout(() => {
-                        this.loading = 'success';
-                    }, 500);
-                })
-                .catch(err => {
-                    console.error(err);
-                    this.loading = 'error';
-                })
-                .finally(() => {
-                    setTimeout(() => {
-                        uni.hideLoading();
-                        uni.stopPullDownRefresh();
-                    }, 500);
+            if (this.calcAuditModeEnabled) {
+                const dataList = this.mockJson.archives.list.map(item => {
+                    const date = new Date(item.time)
+                    const year = date.getFullYear()
+                    const month = date.getMonth() + 1
+                    return {
+                        metadata: {
+                            name: Date.now() * Math.random(),
+                            labels: {
+                                "content.halo.run/archive-year": year,
+                                "content.halo.run/archive-month": month
+                            }
+                        },
+                        spec: {
+                            pinned: false,
+                            cover: item.cover,
+                            title: item.title,
+                            publishTime: item.time
+                        },
+                        status: {
+                            excerpt: item.desc
+                        },
+                        stats: {
+                            visit: 0
+                        }
+                    }
                 });
+                const posts = this.handleGetPosts(dataList)
+                this.dataList = []
+                this.cacheDataList = dataList;
+                this.dataList = this.handleGetShowDataList(posts)
+                this.loading = 'success';
+                this.loadMoreText = '呜呜，没有更多数据啦~';
+                uni.hideLoading();
+                uni.stopPullDownRefresh();
+                return;
+            }
+            if (this.isLoadMore) {
+                uni.showLoading({
+                    title: "加载中..."
+                })
+            } else {
+                this.loading = 'loading';
+            }
+            this.loadMoreText = "加载中...";
+            const paramsStr = qs.stringify(this.queryParams, {
+                allowDots: true,
+                encodeValuesOnly: true,
+                skipNulls: true,
+                encode: true,
+                arrayFormat: 'repeat'
+            })
+            uni.request({
+                url: this.$baseApiUrl + '/apis/api.content.halo.run/v1alpha1/posts?' + paramsStr,
+                method: 'GET',
+                success: (res) => {
+                    const data = res.data;
+                    this.result = data;
+                    const posts = this.handleGetPosts(data.items)
+                    const showDataList = this.handleGetShowDataList(posts)
+                    if (this.isLoadMore) {
+                        this.cacheDataList = this.handleUniqueCacheDatalist([
+                            ...this.cacheDataList, ...data.items
+                        ]);
+                        this.handleMergeDataList2(showDataList)
+                    } else {
+                        this.dataList = []
+                        this.cacheDataList = data.items;
+                        this.dataList = showDataList
+                    }
+
+                    this.loading = 'success';
+                    this.loadMoreText = data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+                    uni.hideLoading();
+                    uni.stopPullDownRefresh();
+
+                },
+                fail: (err) => {
+                    this.loading = 'error';
+                    this.loadMoreText = '加载失败，请下拉刷新！';
+                    uni.$tm.toast(err.message || '数据加载失败！');
+                    uni.hideLoading();
+                    uni.stopPullDownRefresh();
+                }
+            })
+        },
+        // 处理数据分类
+        handleGetPosts(dataList) {
+            const posts = {}
+            const postLabelYearKey = "content.halo.run/archive-year"
+            const postLabelMonthKey = "content.halo.run/archive-month"
+            dataList.forEach(item => {
+                let postItemKey = ""
+                if (this.tab.activeIndex === 0) {
+                    postItemKey =
+                        `${item.metadata.labels[postLabelYearKey]}-${item.metadata.labels[postLabelMonthKey]}`
+                } else {
+                    postItemKey = `${item.metadata.labels[postLabelYearKey]}`
+                }
+                if (posts[postItemKey]) {
+                    posts[postItemKey].push(item)
+                } else {
+                    posts[postItemKey] = [item]
+                }
+            })
+            return posts;
+        },
+        // 根据分类的数据，处理成显示的数据
+        handleGetShowDataList(posts) {
+            const dataListResult = []
+            Object.keys(posts).forEach((key) => {
+                const postData = {
+                    sort: 0,
+                    key: key,
+                    year: key,
+                    month: "",
+                    posts: posts[key]
+                }
+                if (this.tab.activeIndex == 0) {
+                    const splitDate = key.split("-")
+                    postData.year = splitDate[0]
+                    postData.month = splitDate[1]
+                    postData.sort = Number(key.replace("-", ""))
+                } else {
+                    postData.sort = Number(key)
+                }
+                dataListResult.push(postData)
+            })
+
+            dataListResult.sort((a, b) => {
+                return Number(b.sort) - Number(a.sort)
+            })
+
+            return dataListResult;
+        },
+        handleMergeDataList(list1, list2) {
+            // 将list1转换为以key为键的对象
+            let merged = list1.reduce((acc, item) => {
+                acc[item.key] = {
+                    ...item
+                };
+                return acc;
+            }, {});
+
+            // 遍历list2，合并posts数组或添加新对象
+            list2.forEach(item => {
+                if (merged[item.key]) {
+                    // 如果key已存在，合并posts数组
+                    merged[item.key].posts = [...merged[item.key].posts, ...item.posts];
+                } else {
+                    // 如果key不存在，添加新对象
+                    merged[item.key] = {
+                        ...item
+                    };
+                }
+            });
+
+            // 将对象转换回数组
+            return Object.values(merged);
+        },
+        handleMergeDataList2(list) {
+            list.forEach((item, index) => {
+                const find = this.dataList.find(x => x.key == item.key)
+                if (find) {
+                    item.posts.forEach(post => {
+                        if (!find.posts.find(x => x.metadata.name == post.metadata.name)) {
+                            find.posts.push(post)
+                        }
+                    })
+                }
+            })
+            list.forEach(post => {
+                if (!this.dataList.find(x => x.key === post.key)) {
+                    this.dataList.push(post)
+                }
+            })
+
+            this.dataList.sort((a, b) => {
+                return Number(b.sort) - Number(a.sort)
+            })
+        },
+        handleUniqueCacheDatalist(dataList) {
+            const seen = new Set();
+            return dataList.filter(item => {
+                return seen.has(item.metadata.name) ? false : seen.add(item.metadata.name);
+            });
         },
-        //跳转文章详情
         fnToArticleDetail(article) {
+            if (this.calcAuditModeEnabled) {
+                return;
+            }
             uni.navigateTo({
-                url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+                url: '/pagesA/article-detail/article-detail?name=' + article.metadata.name,
                 animationType: 'slide-in-right'
             });
         }
@@ -169,6 +377,15 @@ export default {
     background-color: #fafafd;
 }
 
+.auditModeEnabled {
+    width: 100%;
+    height: 80vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+
 .loading-wrap {
     padding: 24rpx;
 }
@@ -376,4 +593,8 @@ export default {
         }
     }
 }
+
+.time {
+    align-items: center;
+}
 </style>

pagesA/articles/articles.vue

@@ -1,214 +1,245 @@
 <template>
-    <view class="app-page" :class="{ 'is-balck grey-darken-6': isBlackTheme }">
-        <!-- 顶部切换 -->
-        <view class="e-fixed shadow-2">
-            <tm-search v-model="queryParams.keyword" :round="24" :shadow="0" color="light-blue"
-                       insert-color="light-blue" :clear="true" @input="fnOnSearch" @confirm="fnOnSearch"></tm-search>
-            <tm-tabs v-if="false" color="light-blue" :shadow="0" v-model="tab.activeIndex" :list="tab.list"
-                     align="center" @change="fnOnTabChange"></tm-tabs>
-        </view>
-        <!-- 占位区域 -->
-        <view style="width: 100vw;height: 100rpx;"></view>
-        <!-- 加载区域 -->
-        <view v-if="loading != 'success'" class="loading-wrap pa-24">
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-        </view>
-        <!-- 内容区域 -->
-        <view v-else class="content">
-            <view v-if="dataList.length == 0" class="content-empty flex flex-center">
-                <!-- 空布局 -->
-                <tm-empty v-if="!queryParams.keyword" icon="icon-shiliangzhinengduixiang-" label="请输入关键词搜索"></tm-empty>
-                <tm-empty v-else icon="icon-shiliangzhinengduixiang-"
-                          :label="`未搜到 ${queryParams.keyword} 相关文章`"></tm-empty>
-            </view>
-            <block v-else>
-                <!-- 文章卡片 -->
-                <tm-translate v-for="(article, index) in dataList" :key="article.name" animation-name="fadeUp"
-                              :wait="calcAniWait(index)">
-                    <view class="article-card" @click="fnToArticleDetail(article)">
-                        <rich-text style="font-size: 32rpx;font-weight: bold;color: #333;"
-                                   :nodes="article.title"></rich-text>
-                        <rich-text style="font-size: 28rpx;margin-top: 16rpx;color: #555;"
-                                   :nodes="article.content"></rich-text>
-                        <text style="font-size: 24rpx;margin-top: 24rpx;color:#888">
-                            发布日期：{{ {d: article.publishTimestamp, f: 'yyyy年MM月dd日'} | formatTime }}
-                        </text>
-                    </view>
-                </tm-translate>
+	<view class="app-page" :class="[uniHaloPluginPageClass]">
+		<PluginUnavailable v-if="!uniHaloPluginAvailable" :pluginId="uniHaloPluginId"
+			:error-text="uniHaloPluginAvailableError" />
+		<template v-else>
 
-                <tm-flotbutton @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
-                <view class="load-text">{{ loadMoreText }}</view>
-            </block>
-        </view>
-    </view>
+			<!-- 顶部切换 -->
+			<view class="e-fixed shadow-1">
+				<tm-search v-model="queryParams.keyword" :round="24" :shadow="0" color="light-blue"
+					insert-color="light-blue" :clear="true" @input="fnOnSearch" @confirm="fnOnSearch"></tm-search>
+				<tm-tabs v-if="false" color="light-blue" :shadow="0" v-model="tab.activeIndex" :list="tab.list"
+					align="center" @change="fnOnTabChange"></tm-tabs>
+			</view>
+			<!-- 占位区域 -->
+			<view style="width: 100vw;height: 100rpx;"></view>
+			<!-- 加载区域 -->
+			<view v-if="loading == 'loading'" class="loading-wrap pa-24">
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+			</view>
+			<view v-else-if="loading == 'error'" class="content-empty flex flex-center">
+				<tm-empty icon="icon-wind-cry" label="搜索异常"></tm-empty>
+			</view>
+			<!-- 内容区域 -->
+			<view v-else class="content">
+				<view v-if="dataList.length == 0" class="content-empty flex flex-center">
+					<!-- 空布局 -->
+					<tm-empty v-if="!queryParams.keyword" icon="icon-shiliangzhinengduixiang-"
+						label="请输入关键词搜索"></tm-empty>
+					<tm-empty v-else icon="icon-shiliangzhinengduixiang-"
+						:label="`未搜到 ${queryParams.keyword} 相关内容`"></tm-empty>
+				</view>
+				<block v-else>
+					<tm-translate v-for="(item, index) in dataList" :key="item.metadataName" animation-name="fadeUp"
+						:wait="calcAniWait(index)">
+						<view class="article-card" @click="fnToDetail(item)">
+							<view class="mb-12 flex flex-start">
+								<view class="flex-shrink ml--12">
+									<tm-tags v-if="isArticle(item)" color="blue" size="n" model="text">文章</tm-tags>
+									<tm-tags v-else color="green" size="n" model="text">瞬间</tm-tags>
+								</view>
+								<text class="ml-2 text-overflow text-size-n text-weight-b"
+									style="color: #333;">{{ item.title }}</text>
+							</view>
+							<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
+								:loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
+								:tag-style="markdownConfig.tagStyle" :content="item.description || item.content"
+								:markdown="true" :showLineNumber="true" :showLanguageName="true"
+								:copyByLongPress="true" />
+							<view class="mt-12 flex flex-center flex-between">
+								<text style="font-size: 24rpx;color:#888">
+									最近更新时间：{{ {d: item.updateTimestamp, f: 'yyyy年MM月dd日 HH点mm分ss秒'} | formatTime }}
+								</text>
+								<!-- <tm-tags v-if="isArticle(item)" color="blue" size="n" model="text">文章</tm-tags>
+							<tm-tags v-else color="green" size="n" model="text">瞬间</tm-tags> -->
+							</view>
+						</view>
+					</tm-translate>
+
+					<tm-flotbutton @click="fnToTopPage" size="m" color="light-blue"
+						icon="icon-angle-up"></tm-flotbutton>
+
+				</block>
+			</view>
+		</template>
+	</view>
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
 
-export default {
-    components: {
-        tmSkeleton,
-        tmSearch,
-        tmTranslate,
-        tmTabs,
-        tmFlotbutton,
-        tmEmpty
-    },
-    data() {
-        return {
-            isBlackTheme: false,
-            loading: 'loading',
-            tab: {
-                activeIndex: 0,
-                list: ['全部', '最新文章', '热门文章', '最近更新', '最多点赞']
-            },
-            queryParams: {
-                keyword: "",
-                limit: 5,
-                highlightPreTag: "<text>",
-                highlightPostTag: "</text>"
-            },
-            cache: {
-                dataList: [],
-                total: 0
-            },
-            hasNext: false,
-            isLoadMore: false,
-            loadMoreText: '加载中...',
-            dataList: []
-        };
-    },
-    onLoad() {
-        this.fnSetPageTitle('文章列表');
-    },
-    created() {
-        if (!this.queryParams.keyword) {
-            this.loading = 'success'
-        } else {
-            this.fnGetData();
-        }
-    },
-    onPullDownRefresh() {
-        this.fnResetSetAniWaitIndex();
-        this.isLoadMore = false;
-        this.fnGetData();
-    },
+	import MarkdownConfig from '@/common/markdown/markdown.config.js';
+	import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
 
-    methods: {
-        fnOnTabChange(index) {
-            this.fnResetSetAniWaitIndex();
-            this.dataList = [];
-            const _sorts = {
-                0: '',
-                1: 'topPriority,createTime,desc',
-                2: 'topPriority,visits,desc',
-                3: 'topPriority,updateTime,desc',
-                4: 'topPriority,likes,desc'
-            };
-            this.queryParams.sort = _sorts[index];
-            this.dataList = [];
-            this.fnToTopPage();
-            this.fnGetData();
-        },
-        fnOnSearch() {
-            this.fnResetSetAniWaitIndex();
-            this.isLoadMore = false;
-            if (!this.queryParams.keyword) {
-                this.dataList = []
-            } else {
-                this.fnGetData();
-            }
-        },
-        fnGetData() {
-            // uni.showLoading({
-            // 	mask: true,
-            // 	title: '加载中...'
-            // });
-            // 设置状态为加载中
-            if (!this.isLoadMore) {
-                this.loading = 'loading';
-            }
-            this.loadMoreText = '加载中...';
-            this.$httpApi.v2
-                .getPostListByKeyword(this.queryParams)
-                .then(res => {
-                    console.log('请求结果：');
-                    console.log(res);
+	import pluginAvailableMixin from "@/common/mixins/pluginAvailable.js"
+	import PluginUnavailable from '@/components/plugin-unavailable/plugin-unavailable.vue'
 
-                    this.loading = 'success';
-                    this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-                    this.hasNext = res.hasNext;
-                    if (this.isLoadMore) {
-                        this.dataList = this.dataList.concat(res.hits);
-                    } else {
-                        this.dataList = res.hits;
-                    }
-                })
-                .catch(err => {
-                    console.error(err);
-                    this.loading = 'error';
-                    this.loadMoreText = '加载失败，请下拉刷新！';
-                })
-                .finally(() => {
-                    setTimeout(() => {
-                        uni.hideLoading();
-                        uni.stopPullDownRefresh();
-                    }, 800);
-                });
-        },
+	export default {
+		mixins: [pluginAvailableMixin],
+		components: {
+			tmSkeleton,
+			tmSearch,
+			tmTranslate,
+			tmTabs,
+			tmFlotbutton,
+			tmEmpty,
+			tmTags,
+			mpHtml,
+			PluginUnavailable
+		},
+		data() {
+			return {
+				markdownConfig: MarkdownConfig,
+				loading: 'loading',
+				tab: {
+					activeIndex: 0,
+					list: ['全部', '最新文章', '热门文章', '最近更新', '最多点赞']
+				},
+				queryParams: {
+					keyword: "",
+					limit: 50,
+					highlightPreTag: "",
+					highlightPostTag: ""
+				},
+				cache: {
+					dataList: [],
+					total: 0
+				},
+				dataList: []
+			};
+		},
+		computed: {
+			haloConfigs() {
+				return this.$tm.vx.getters().getConfigs;
+			},
+			calcAuditModeEnabled() {
+				return this.haloConfigs.auditConfig.auditModeEnabled
+			},
+		},
+		async onLoad() {
+			this.fnSetPageTitle('内容搜索');
+			// 检查插件
+			this.setPluginId(this.NeedPluginIds.PluginSearchWidget)
+			this.setPluginError("阿偶，检测到当前插件没有安装或者启用，无法使用搜索功能哦，请联系管理员")
+			if (!await this.checkPluginAvailable()) return
+			if (!this.queryParams.keyword) {
+				this.loading = 'success'
+			} else {
+				this.fnGetData();
+			}
+		},
 
-        //跳转文章详情
-        fnToArticleDetail(article) {
-            uni.navigateTo({
-                url: '/pagesA/article-detail/article-detail?name=' + article.name,
-                animationType: 'slide-in-right'
-            });
-        }
-    }
-};
+		onPullDownRefresh() {
+			if (!this.uniHaloPluginAvailable) {
+				uni.hideLoading();
+				uni.stopPullDownRefresh();
+				return
+			}
+			this.fnOnSearch()
+		},
+
+		methods: {
+			fnOnTabChange(index) {
+				this.fnResetSetAniWaitIndex();
+				this.dataList = [];
+				this.fnToTopPage();
+				this.fnGetData();
+			},
+			fnOnSearch() {
+				this.fnResetSetAniWaitIndex();
+				if (!this.queryParams.keyword) {
+					this.dataList = []
+				} else {
+					this.fnGetData();
+				}
+			},
+			fnGetData() {
+				if (this.calcAuditModeEnabled) {
+					return;
+				}
+				// 设置状态为加载中
+				this.loading = 'loading';
+				this.$httpApi.v2
+					.getPostListByKeyword(this.queryParams)
+					.then(res => {
+						this.loading = 'success';
+						this.dataList = res.hits;
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 800);
+					});
+			},
+			isArticle(item) {
+				return item.type == 'post.content.halo.run'
+			},
+			//跳转详情
+			fnToDetail(item) {
+				if (this.calcAuditModeEnabled) return;
+				if (this.isArticle(item)) {
+					uni.navigateTo({
+						url: '/pagesA/article-detail/article-detail?name=' + item.metadataName,
+						animationType: 'slide-in-right'
+					});
+				} else {
+					uni.navigateTo({
+						url: '/pagesA/moment-detail/moment-detail?name=' + item.metadataName,
+						animationType: 'slide-in-right'
+					});
+				}
+
+			}
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
-    width: 100vw;
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-    padding-bottom: 24rpx;
-    background-color: #fafafd;
+	.app-page {
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		padding-bottom: 24rpx;
+		background-color: #fafafd;
 
-    &.is-balck {
-        background-color: #212121;
-    }
-}
+		&.is-balck {
+			background-color: #212121;
+		}
+	}
 
-.content {
-    padding-top: 24rpx;
+	.content {
+		padding-top: 24rpx;
+	}
 
-    .content-empty {
-        height: 60vh;
-    }
-}
+	.content-empty {
+		height: 60vh;
+	}
 
-.article-card {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    margin: 0 24rpx;
-    padding: 24rpx;
-    border-radius: 12rpx;
-    background-color: #ffff;
-    box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
-    overflow: hidden;
-    margin-bottom: 24rpx;
-}
-</style>
+	.article-card {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		margin: 0 24rpx;
+		padding: 24rpx;
+		border-radius: 12rpx;
+		background-color: #ffff;
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+		overflow: hidden;
+		margin-bottom: 24rpx;
+	}
+</style>

pagesA/category-detail/category-detail.vue

@@ -68,6 +68,18 @@ export default {
         this.queryParams.page = 0;
         this.fnGetData();
     },
+    onShareAppMessage() {
+        return {
+            title: this.pageTitle,
+            path: `/pagesA/category-detail/category-detail?name=${this.name}&title=${this.pageTitle}`
+        }
+    },
+    onShareTimeline() {
+        return {
+            title: this.pageTitle,
+            path: `/pagesA/category-detail/category-detail?name=${this.name}&title=${this.pageTitle}`
+        }
+    },
     onReachBottom(e) {
         if (this.hasNext) {
             this.queryParams.page += 1;

pagesA/contact/contact.vue

@@ -26,7 +26,6 @@
         <!-- 社交联系方式列表 -->
         <view class="contact ma-50 mt-0 pt-12">
             <block v-if="calcIsNotEmpty">
-
                 <block v-for="(item, index) in result" :key="index">
                     <view v-if="item.value" class="item mt-24 flex" @click="fnOnClick(item)">
                         <view class="left">
@@ -37,9 +36,9 @@
                     </view>
                 </block>
             </block>
-           <view  v-else class="mt-12 pt-12">
-               <tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无联系方式"/>
-           </view>
+            <view v-else class="mt-12 pt-12">
+                <tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无联系方式"/>
+            </view>
         </view>
     </view>
 </template>
@@ -137,36 +136,47 @@ export default {
             return blogger;
         },
         socialConfig() {
-            return this.authorConfig.social
+            return this.authorConfig.social;
         },
         calcIsNotEmpty() {
             return this.result.some((item) => item.value !== "");
         }
     },
+    watch: {
+        socialConfig: {
+            handler(newVal) {
+                if (!newVal) return;
+                this.fnGetData();
+            },
+            deep: true,
+            immediate: true
+        }
+    },
     onLoad() {
         this.fnSetPageTitle('联系博主');
     },
-    created() {
-        this.fnGetData();
-    },
     methods: {
         fnGetData() {
             for (let key in this.socialConfig) {
+                if (key === 'enabled') {
+                    continue;
+                }
                 this.result.find(x => x.key === key).value = this.socialConfig[key];
             }
         },
         fnOnClick(item) {
-            if (this.globalAppSettings.contact.isLinkCopy && this.$utils.checkIsUrl(item.value)) {
-                uni.navigateTo({
-                    url: '/pagesC/website/website?data=' +
-                        JSON.stringify({
-                            title: item.name,
-                            url: item.value
-                        })
-                });
-            } else {
-                this.$utils.copyText(item.value, item.name + ' 已复制！');
-            }
+            this.$utils.copyText(item.value, item.name + ' 已复制！');
+            // if (this.globalAppSettings.contact.isLinkCopy && this.$utils.checkIsUrl(item.value)) {
+            //     uni.navigateTo({
+            //         url: '/pagesC/website/website?data=' +
+            //             JSON.stringify({
+            //                 title: item.name,
+            //                 url: item.value
+            //             })
+            //     });
+            // } else {
+            //     this.$utils.copyText(item.value, item.name + ' 已复制！');
+            // }
         }
     }
 };

pagesA/disclaimers/disclaimers.vue

@@ -7,12 +7,12 @@
         <block v-else>
             <view class="text-weight-b text-size-lg text-align-center">《 本博客免责声明 》</view>
             <view v-if="false" class="text-size-s text-align-center mt-12 text-grey-darken-1">—— 博主：{{ bloggerInfo.nickname }} ——</view>
-            <view class="mt-32">1、本博客属于个人非赢利性质的网站，所有转载的文章都以遵循原作者的版权声明注明了文章来源。</view>
+            <view class="mt-32">1、本博客属于个人非盈利性质的网站，所有转载的文章都以遵循原作者的版权声明注明了文章来源。</view>
             <view class="mt-24">2、如果原文没有版权声明，按照目前互联网开放的原则，本博客将在不通知作者的情况下转载文章。</view>
             <view class="mt-24">3、如果原文明确注明“禁止转载”，本博客将不会转载。</view>
             <view class="mt-24">
                 4、如果本博客转载的文章不符合作者的版权声明或者作者不想让本博客转载您的文章，请邮件告知
-                <text class="text-bg-gradient-light-blue-accent ml-12 mr-12 ">
+                <text class="text-bg-gradient-light-blue-accent ml-12 mr-12 " @click="$utils.copyText(bloggerInfo.email, '电子邮箱已复制到剪贴板！')">
                     <text class="iconfont icon-mail-fill text-size-m mr-6"></text>
                     {{ bloggerInfo.email }}
                 </text>

pagesA/friend-links/friend-links.vue

@@ -1,422 +1,454 @@
 <template>
-    <view class="app-page card-shadow">
-        <view v-if="loading != 'success'" class="loading-wrap">
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-        </view>
-        <view v-else class="content" :class="{ 'bg-white': dataList.length !== 0 }">
-            <!-- 空数据 -->
-            <view v-if="dataList.length == 0" class="content-empty flex flex-center">
-                <tm-empty icon="icon-shiliangzhinengduixiang-" label="啊偶,博主还没有朋友呢~"></tm-empty>
-            </view>
+	<view class="app-page card-shadow" :class="[uniHaloPluginPageClass]">
+		<PluginUnavailable v-if="!uniHaloPluginAvailable" :pluginId="uniHaloPluginId"
+			:error-text="uniHaloPluginAvailableError" />
+		<template v-else>
+			<view v-if="loading != 'success'" class="loading-wrap">
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+			</view>
+			<view v-else class="content" :class="{ 'bg-white': dataList.length !== 0 }">
+				<!-- 空数据 -->
+				<view v-if="dataList.length == 0" class="content-empty flex flex-center">
+					<tm-empty icon="icon-shiliangzhinengduixiang-" label="啊偶,博主还没有朋友呢~"></tm-empty>
+				</view>
 
-            <!-- 如果只有一个分组：使用列表的形式 dataList.length == 1 -->
-            <view v-else class="flex flex-col pb-24">
-                <block v-for="(link, index) in dataList" :key="index">
-                    <tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
-                        <!-- 色彩版本 -->
-                        <view v-if="!globalAppSettings.links.useSimple" class="info flex pt-24 pb-24 pl-12 pr-12"
-                              :class="{ 'border-b-1': index !== dataList.length - 1 }" @click="fnOnLinkEvent(link)">
-                            <view class="link-logo">
-                                <cache-image class="link-logo_img" radius="12rpx" :url="link.spec.logo"
-                                             :fileMd5="link.spec.logo" mode="aspectFill"></cache-image>
-                            </view>
-                            <view class="flex flex-col pl-30 info-detail">
-                                <view class="link-card_name text-size-l text-weight-b text-red">
-                                    <tm-tags style="margin-right: 12rpx;margin-left: -2rpx;"
-                                             color="bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">
-                                        {{ link.spec.groupName || '暂未分组' }}
-                                    </tm-tags>
-                                    {{ link.spec.displayName }}
-                                </view>
-                                <view class="poup-tag mt-6" style="font-size: 28rpx;">
-                                    站点地址：{{ link.spec.url }}
-                                    <!-- <tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">
+				<!-- 如果只有一个分组：使用列表的形式 dataList.length == 1 -->
+				<view v-else class="flex flex-col pb-24">
+					<block v-for="(link, index) in dataList" :key="index">
+						<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
+							<!-- 色彩版本 -->
+							<view v-if="!globalAppSettings.links.useSimple" class="info flex pt-24 pb-24 pl-12 pr-12"
+								:class="{ 'border-b-1': index !== dataList.length - 1 }" @click="fnOnLinkEvent(link)">
+								<view class="link-logo">
+									<cache-image class="link-logo_img" radius="12rpx" :url="link.spec.logo"
+										:fileMd5="link.spec.logo" mode="aspectFill"></cache-image>
+								</view>
+								<view class="flex flex-col pl-30 info-detail">
+									<view class="link-card_name text-size-l text-weight-b text-red">
+										<tm-tags style="margin-right: 12rpx;margin-left: -2rpx;"
+											color="bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">
+											{{ link.spec.groupName || '暂未分组' }}
+										</tm-tags>
+										{{ link.spec.displayName }}
+									</view>
+									<view class="poup-tag mt-6" style="font-size: 28rpx;">
+										站点地址：{{ link.spec.url }}
+										<!-- <tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">
                                         URL：{{ link.spec.url }}
                                     </tm-tags>
                                     <tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">
                                         {{ link.spec.groupName || '暂未分组' }}
                                     </tm-tags> -->
-                                </view>
-                                <view class="link-card_desc text-overflow mt-4" style="font-size: 28rpx;">
-                                    博客简介：{{ link.spec.description || '这个博主很懒，没写简介~' }}
-                                </view>
-                            </view>
-                        </view>
-                        <!-- 简洁版本 -->
-                        <view v-else class="link-card flex ml-24 mr-24 pt-24 pb-24" @click="fnOnLinkEvent(link)">
-                            <image class="logo shadow-6" :src="link.spec.logo" mode="aspectFill"></image>
-                            <view class="info pl-24">
-                                <view class="name text-size-g">{{ link.spec.displayName }}</view>
-                                <view class="desc mt-12 text-size-s text-grey-darken-1">{{ link.spec.description }}
-                                </view>
-                                <view v-if="false" class="link mt-12 text-size-m text-grey-darken-1">
-                                    <text class="iconfont icon-link mr-6 text-size-s"></text>
-                                    {{ link.spec.url }}
-                                </view>
-                            </view>
-                        </view>
-                    </tm-translate>
-                </block>
-            </view>
+									</view>
+									<view class="link-card_desc text-overflow mt-4" style="font-size: 28rpx;">
+										博客简介：{{ link.spec.description || '这个博主很懒，没写简介~' }}
+									</view>
+								</view>
+							</view>
+							<!-- 简洁版本 -->
+							<view v-else class="link-card flex ml-24 mr-24 pt-24 pb-24" @click="fnOnLinkEvent(link)">
+								<image class="logo shadow-6" :src="link.spec.logo" mode="aspectFill"></image>
+								<view class="info pl-24">
+									<view class="name text-size-g">{{ link.spec.displayName }}</view>
+									<view class="desc mt-12 text-size-s text-grey-darken-1">{{ link.spec.description }}
+									</view>
+									<view v-if="false" class="link mt-12 text-size-m text-grey-darken-1">
+										<text class="iconfont icon-link mr-6 text-size-s"></text>
+										{{ link.spec.url }}
+									</view>
+								</view>
+							</view>
+						</tm-translate>
+					</block>
+				</view>
 
-            <!-- 返回顶部 -->
-            <tm-flotbutton color="light-blue" @click="fnToTopPage" size="m" icon="icon-angle-up"></tm-flotbutton>
-            <tm-flotbutton v-if="haloPluginConfigs.submitLink.enabled" :offset="[16,80]" label="申请"
-                           actions-pos="left" :show-text="true" color="bg-gradient-orange-accent"
-                           @click="toSubmitLinkPage"></tm-flotbutton>
-            <!-- 详情弹窗 -->
-            <tm-poup v-model="detail.show" :width="640" height="auto" position="center" :round="6">
-                <view class="poup pa-36" v-if="detail.data">
-                    <view class="info flex">
-                        <view class="poup-logo bg-gradient-amber-accent pa-4 shadow-24">
-                            <image class="poup-logo_img" :src="$utils.checkImageUrl(detail.data.spec.logo)" mode="aspectFill"></image>
-                        </view>
-                        <view class="pl-24 info-detail">
-                            <view class="poup-name text-size-lg text-weight-b">{{ detail.data.spec.displayName }}</view>
-                            <view class="poup-tag ml--10">
-                                <tm-tags color="bg-gradient-light-blue-lighten" size="n" model="fill">
-                                    {{ detail.data.spec.groupName }}
-                                </tm-tags>
-                            </view>
-                            <view class="poup-link text-size-m" @click="fnCopyLink(detail.data)">
-                                <text class="text-orange">{{ detail.data.spec.url }}</text>
-                                <text class="iconfont icon-copy text-size-s ml-6 text-grey"></text>
-                            </view>
-                        </view>
-                    </view>
+				<!-- 返回顶部 -->
+				<tm-flotbutton color="light-blue" @click="fnToTopPage" size="m" icon="icon-angle-up"></tm-flotbutton>
+				<tm-flotbutton v-if="haloPluginConfigs.linksSubmitPlugin.enabled" :offset="[16,80]" label="申请"
+					actions-pos="left" :show-text="true" color="bg-gradient-orange-accent"
+					@click="toSubmitLinkPage"></tm-flotbutton>
+				<!-- 详情弹窗 -->
+				<tm-poup v-model="detail.show" :width="640" height="auto" position="center" :round="6">
+					<view class="poup pa-36" v-if="detail.data">
+						<view class="info flex">
+							<view class="poup-logo bg-gradient-amber-accent pa-4 shadow-24">
+								<image class="poup-logo_img" :src="$utils.checkImageUrl(detail.data.spec.logo)"
+									mode="aspectFill"></image>
+							</view>
+							<view class="pl-24 info-detail">
+								<view class="poup-name text-size-lg text-weight-b">{{ detail.data.spec.displayName }}
+								</view>
+								<view class="poup-tag ml--10">
+									<tm-tags color="bg-gradient-light-blue-lighten" size="n" model="fill">
+										{{ detail.data.spec.groupName }}
+									</tm-tags>
+								</view>
+								<view class="poup-link text-size-m" @click="fnCopyLink(detail.data)">
+									<text class="text-orange">{{ detail.data.spec.url }}</text>
+									<text class="iconfont icon-copy text-size-s ml-6 text-grey"></text>
+								</view>
+							</view>
+						</view>
 
-                    <view class="poup-desc mt-20">
-                        博客简介：{{ detail.data.spec.description || '这个博主很懒，没写简介~' }}
-                    </view>
+						<view class="poup-desc mt-20">
+							博客简介：{{ detail.data.spec.description || '这个博主很懒，没写简介~' }}
+						</view>
 
-                    <!-- 博客预览图 -->
-                    <view class="mt-24">
-                        <tm-images :width="568" :round="2" :src="calcSiteThumbnail(detail.data.spec.url)"
-                                   mode="aspectFill"></tm-images>
-                    </view>
-                </view>
-            </tm-poup>
+						<!-- 博客预览图 -->
+						<view class="mt-24">
+							<tm-images :width="568" :round="2" :src="calcSiteThumbnail(detail.data.spec.url)"
+								mode="aspectFill"></tm-images>
+						</view>
+					</view>
+				</tm-poup>
 
-            <view class="load-text">{{ loadMoreText }}</view>
-        </view>
-    </view>
+				<view class="load-text">{{ loadMoreText }}</view>
+			</view>
+		</template>
+	</view>
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
 
-export default {
-    components: {
-        tmSkeleton,
-        tmTranslate,
-        tmFlotbutton,
-        tmTags,
-        tmEmpty,
-        tmImages,
-        tmPoup
-    },
-    data() {
-        return {
-            loading: 'loading',
-            queryParams: {
-                size: 10,
-                page: 1
-            },
-            detail: {
-                show: false,
-                data: null
-            },
-            hasNext: false,
-            isLoadMore: false,
-            loadMoreText: '',
-            linkGroupList: [],
-            dataList: [],
-            colors: [
-                '#39B449',
-                '#E44C41',
-                '#8698A2',
-                '#0080FE',
-                '#1CBCB4',
-                '#6638B5'
-            ]
-        };
-    },
-    computed: {
-        haloPluginConfigs() {
-            return this.$tm.vx.getters().getConfigs.pluginConfig;
-        },
-        calcSiteThumbnail(val) {
-            return val => {
-                if (!val) return '';
-                if (val.charAt(val.length - 1) !== '/') {
-                    val = val + '/';
-                }
-                return 'https://image.thum.io/get/width/1000/crop/800/' + val;
-            };
-        }
-    },
-    onLoad() {
-        this.fnSetPageTitle('友情链接');
-        this.fnGetLinkGroupData();
-    },
-    onPullDownRefresh() {
-        this.isLoadMore = false;
-        this.queryParams.page = 1;
-        this.dataList = []
-        this.fnGetData();
-    },
-    onReachBottom(e) {
-        if (this.hasNext) {
-            this.queryParams.page += 1;
-            this.isLoadMore = true;
-            this.fnGetData();
-        } else {
-            uni.showToast({
-                icon: 'none',
-                title: '没有更多数据了'
-            });
-        }
-    },
-    methods: {
-        fnGetLinkGroupData() {
-            this.$httpApi.v2
-                .getFriendLinkGroupList({
-                    page: 1,
-                    size: 0
-                })
-                .then(res => {
-                    this.linkGroupList = res.items;
-                    this.fnGetData()
-                })
-                .catch(err => {
-                    console.error(err);
-                });
-        },
-        findLinkGroupDisplayNameByGroupMetadataName(groupName) {
-            if (this.linkGroupList.length === 0) return groupName || "未分组"
-            return this.linkGroupList.find(item => item.metadata.name === groupName)?.spec?.displayName || groupName || "未分组"
-        },
-        fnGetData() {
-            if (!this.isLoadMore) {
-                this.loading = 'loading';
-            }
-            this.loadMoreText = '';
-            this.$httpApi.v2
-                .getFriendLinkList(this.queryParams)
-                .then(res => {
-                    console.log('请求结果：');
-                    console.log(res);
-                    this.hasNext = res.hasNext;
-                    const list = res.items.map(item => {
-                        item.spec.logo = this.$utils.checkAvatarUrl(item.spec?.logo)
-                        item.spec.groupName = this.findLinkGroupDisplayNameByGroupMetadataName(item.spec?.groupName)
-                        return item;
-                    })
-                    this.dataList = this.dataList.concat(list);
-                    setTimeout(() => {
-                        this.loading = 'success';
-                        this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-                    }, 500);
+	import pluginAvailableMixin from "@/common/mixins/pluginAvailable.js"
+	import PluginUnavailable from '@/components/plugin-unavailable/plugin-unavailable.vue'
 
-                })
-                .catch(err => {
-                    console.error(err);
-                    this.loading = 'error';
-                    this.loadMoreText = '加载失败，请下拉刷新！';
-                })
-                .finally(() => {
-                    setTimeout(() => {
-                        uni.hideLoading();
-                        uni.stopPullDownRefresh();
-                    }, 500);
-                });
-        },
+	export default {
+		mixins: [pluginAvailableMixin],
+		components: {
+			tmSkeleton,
+			tmTranslate,
+			tmFlotbutton,
+			tmTags,
+			tmEmpty,
+			tmImages,
+			tmPoup,
+			PluginUnavailable
+		},
+		data() {
+			return {
+				loading: 'loading',
+				queryParams: {
+					size: 10,
+					page: 1
+				},
+				detail: {
+					show: false,
+					data: null
+				},
+				hasNext: false,
+				isLoadMore: false,
+				loadMoreText: '',
+				linkGroupList: [],
+				dataList: [],
+				colors: [
+					'#39B449',
+					'#E44C41',
+					'#8698A2',
+					'#0080FE',
+					'#1CBCB4',
+					'#6638B5'
+				]
+			};
+		},
+		computed: {
+			haloConfigs() {
+				return this.$tm.vx.getters().getConfigs;
+			},
+			haloPluginConfigs() {
+				return this.$tm.vx.getters().getConfigs.pluginConfig;
+			},
+			calcSiteThumbnail(val) {
+				return val => {
+					if (!val) return '';
+					if (val.charAt(val.length - 1) !== '/') {
+						val = val + '/';
+					}
+					return 'https://image.thum.io/get/width/1000/crop/800/' + val;
+				};
+			},
+			calcAuditModeEnabled() {
+				return this.haloConfigs.auditConfig.auditModeEnabled
+			},
+		},
+		async onLoad() {
+			this.fnSetPageTitle('友情链接');
+			// 检查插件
+			this.setPluginId(this.NeedPluginIds.PluginLinks)
+			this.setPluginError("阿偶，检测到当前插件没有安装或者启用，无法使用友情链接功能哦，请联系管理员")
+			if (!await this.checkPluginAvailable()) return
+			this.fnGetLinkGroupData();
+		},
+		onPullDownRefresh() {
+			if (!this.uniHaloPluginAvailable) {
+				uni.hideLoading();
+				uni.stopPullDownRefresh();
+				return
+			}
+			this.isLoadMore = false;
+			this.queryParams.page = 1;
+			this.dataList = []
+			this.fnGetData();
+		},
+		onReachBottom(e) {
+			if (!this.uniHaloPluginAvailable) return;
+			if (this.hasNext) {
+				this.queryParams.page += 1;
+				this.isLoadMore = true;
+				this.fnGetData();
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+			}
+		},
+		methods: {
+			fnGetLinkGroupData() {
+				this.$httpApi.v2
+					.getFriendLinkGroupList({
+						page: 1,
+						size: 0
+					})
+					.then(res => {
+						this.linkGroupList = res.items;
+						this.fnGetData()
+					})
+					.catch(err => {
+						console.error(err);
+					});
+			},
+			findLinkGroupDisplayNameByGroupMetadataName(groupName) {
+				if (this.linkGroupList.length === 0) return groupName || "未分组"
+				return this.linkGroupList.find(item => item.metadata.name === groupName)?.spec?.displayName || groupName ||
+					"未分组"
+			},
+			fnGetData() {
+				if (this.calcAuditModeEnabled) {
+					return;
+				}
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '';
+				this.$httpApi.v2
+					.getFriendLinkList(this.queryParams)
+					.then(res => {
+						console.log('请求结果：');
+						console.log(res);
+						this.hasNext = res.hasNext;
+						const list = res.items.map(item => {
+							item.spec.logo = this.$utils.checkAvatarUrl(item.spec?.logo)
+							item.spec.groupName = this.findLinkGroupDisplayNameByGroupMetadataName(item.spec
+								?.groupName)
+							return item;
+						})
+						this.dataList = this.dataList.concat(list);
+						setTimeout(() => {
+							this.loading = 'success';
+							this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						}, 500);
 
-        handleGroup(list) {
-            const group = {}
-            list.forEach(item => {
-                if (group[item.spec.groupName]) {
-                    group[item.spec.groupName].children.push(item)
-                } else {
-                    group[item.spec.groupName] = {
-                        title: item.spec.groupName,
-                        children: [item]
-                    }
-                }
-            })
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
+					});
+			},
 
-            return Object.keys(group).map(key => {
-                const {
-                    title,
-                    children = []
-                } = group[key]
-                return {
-                    title,
-                    children
-                }
-            })
-        },
-        fnOnLinkEvent(link) {
-            this.detail.data = link;
-            this.detail.show = true;
-        },
+			handleGroup(list) {
+				const group = {}
+				list.forEach(item => {
+					if (group[item.spec.groupName]) {
+						group[item.spec.groupName].children.push(item)
+					} else {
+						group[item.spec.groupName] = {
+							title: item.spec.groupName,
+							children: [item]
+						}
+					}
+				})
 
-        fnCopyLink(link) {
-            uni.setClipboardData({
-                data: `${link.spec.displayName}:${link.spec.url}`,
-                showToast: false,
-                success: () => {
-                    uni.showToast({
-                        icon: 'none',
-                        title: '链接复制成功！'
-                    });
-                },
-                fail: () => {
-                    uni.showToast({
-                        icon: 'none',
-                        title: '复制失败！'
-                    });
-                }
-            });
-        },
-        toSubmitLinkPage() {
-            this.$Router.push({
-                path: '/pagesA/submit-link/submit-link'
-            });
-        }
-    }
-};
+				return Object.keys(group).map(key => {
+					const {
+						title,
+						children = []
+					} = group[key]
+					return {
+						title,
+						children
+					}
+				})
+			},
+			fnOnLinkEvent(link) {
+				this.detail.data = link;
+				this.detail.show = true;
+			},
+
+			fnCopyLink(link) {
+				uni.setClipboardData({
+					data: `${link.spec.displayName}:${link.spec.url}`,
+					showToast: false,
+					success: () => {
+						uni.showToast({
+							icon: 'none',
+							title: '链接复制成功！'
+						});
+					},
+					fail: () => {
+						uni.showToast({
+							icon: 'none',
+							title: '复制失败！'
+						});
+					}
+				});
+			},
+			toSubmitLinkPage() {
+				uni.navigateTo({
+					url: '/pagesA/submit-link/submit-link'
+				})
+			}
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
-    width: 100vw;
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-    background-color: #fafafd;
-}
+	.app-page {
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background-color: #fafafd;
+	}
 
-.loading-wrap {
-    padding: 24rpx;
-    min-height: 100vh;
-}
+	.loading-wrap {
+		padding: 24rpx;
+		min-height: 100vh;
+	}
 
-.content {
-    padding: 0 24rpx;
-    padding-top: 24rpx;
+	.content {
+		padding: 0 24rpx;
+		padding-top: 24rpx;
 
-    .content-empty {
-        height: 60vh;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-}
+		.content-empty {
+			height: 60vh;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
 
-.link-card {
-    border-bottom: 2rpx solid #f5f5f5;
-    background-color: #ffffff;
+	.link-card {
+		border-bottom: 2rpx solid #f5f5f5;
+		background-color: #ffffff;
 
-    &.one {
-        border: 0;
-        box-shadow: 0rpx 2rpx 24rpx 0rpx rgba(0, 0, 0, 0.03);
+		&.one {
+			border: 0;
+			box-shadow: 0rpx 2rpx 24rpx 0rpx rgba(0, 0, 0, 0.03);
 
-        .logo {
-            box-shadow: 0rpx 2rpx 12rpx rgba(0, 0, 0, 0.1);
-        }
-    }
+			.logo {
+				box-shadow: 0rpx 2rpx 12rpx rgba(0, 0, 0, 0.1);
+			}
+		}
 
-    .logo {
-        // width: 126rpx;
-        // height: 126rpx;
-        width: 80rpx;
-        height: 80rpx;
-        border-radius: 12rpx;
-        border: 6rpx solid #ffffff;
-        box-shadow: none;
-    }
+		.logo {
+			// width: 126rpx;
+			// height: 126rpx;
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 12rpx;
+			border: 6rpx solid #ffffff;
+			box-shadow: none;
+		}
 
-    .info {
-        width: 0;
-        flex-grow: 1;
+		.info {
+			width: 0;
+			flex-grow: 1;
 
-        .name {
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            color: #303133;
-            font-size: 30rpx;
-            font-weight: bold;
-        }
+			.name {
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				color: #303133;
+				font-size: 30rpx;
+				font-weight: bold;
+			}
 
-        .desc {
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            color: #303133;
-            font-size: 28rpx;
-        }
-    }
-}
+			.desc {
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				color: #303133;
+				font-size: 28rpx;
+			}
+		}
+	}
 
-.link-card_name {
-    // color: #303133;
-    // color: #0080fe;
-}
+	.link-card_name {
+		// color: #303133;
+		// color: #0080fe;
+	}
 
-.link-card_desc {
-    font-size: 24rpx;
-    line-height: 1.6;
-    color: #303133;
-}
+	.link-card_desc {
+		font-size: 24rpx;
+		line-height: 1.6;
+		color: #303133;
+	}
 
-.link-logo {
-    width: 140rpx;
-    height: 140rpx;
+	.link-logo {
+		width: 140rpx;
+		height: 140rpx;
 
-    &_img {
-        width: 100%;
-        height: 100%;
-    }
-}
+		&_img {
+			width: 100%;
+			height: 100%;
+		}
+	}
 
-.poup-logo {
-    width: 140rpx;
-    height: 140rpx;
-    border-radius: 50%;
+	.poup-logo {
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: 50%;
 
-    &_img {
-        width: 100%;
-        height: 100%;
-        border-radius: 50%;
-    }
-}
+		&_img {
+			width: 100%;
+			height: 100%;
+			border-radius: 50%;
+		}
+	}
 
-.info-detail {
-    width: 0;
-    flex-grow: 1;
-    justify-content: center;
-}
+	.info-detail {
+		width: 0;
+		flex-grow: 1;
+		justify-content: center;
+	}
 
-.poup-desc {
-    font-size: 28rpx;
-    line-height: 1.6;
-    color: #555 !important;
-}
+	.poup-desc {
+		font-size: 28rpx;
+		line-height: 1.6;
+		color: #555 !important;
+	}
 
-.preview-site {
-    width: 100%;
-    height: 300rpx;
-}
-</style>
+	.preview-site {
+		width: 100%;
+		height: 300rpx;
+	}
+</style>

pagesA/journal/journal.vue

@@ -1,137 +0,0 @@
-<template>
-    <view class="app-page">
-        <view v-if="loading != 'success'" class="loading-wrap pa-24">
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-            <tm-skeleton model="listAvatr"></tm-skeleton>
-        </view>
-        <!-- 内容区域 -->
-        <view v-else class="app-page-content pa-24">
-            <view v-if="dataList.length == 0" class="content-empty flex flex-center">
-                <!-- 空布局 -->
-                <tm-empty icon="icon-shiliangzhinengduixiang-" label="博主还没有写任何日记"></tm-empty>
-            </view>
-            <block v-else>
-                <block v-for="(journal, index) in dataList" :key="index">
-                    <tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
-                        <!-- 日记卡片 -->
-                        <journal-card :journal="journal" :useLike="true"></journal-card>
-                    </tm-translate>
-                </block>
-
-                <tm-flotbutton @click="fnToTopPage" color="light-blue" size="m" icon="icon-angle-up"></tm-flotbutton>
-                <view class="load-text">{{ loadMoreText }}</view>
-            </block>
-        </view>
-    </view>
-</template>
-
-<script>
-import MarkdownConfig from '@/common/markdown/markdown.config.js';
-import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
-import journalCard from '@/components/journal-card/journal-card.vue';
-
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-
-export default {
-    components: {mpHtml, tmSkeleton, tmEmpty, tmTranslate, tmFlotbutton, journalCard},
-    data() {
-        return {
-            loading: 'loading',
-            markdownConfig: MarkdownConfig,
-            queryParams: {
-                size: 10,
-                page: 0
-            },
-
-            dataList: [],
-            hasNext: false,
-            isLoadMore: false,
-            loadMoreText: '加载中...'
-        };
-    },
-
-    onLoad() {
-        this.fnSetPageTitle('个人日记');
-    },
-    created() {
-        this.fnGetData();
-    },
-    onPullDownRefresh() {
-        this.isLoadMore = false;
-        this.queryParams.page = 0;
-        this.fnGetData();
-    },
-    onReachBottom(e) {
-        if (this.hasNext) {
-            this.queryParams.page += 1;
-            this.isLoadMore = true;
-            this.fnGetData();
-        } else {
-            uni.showToast({
-                icon: 'none',
-                title: '没有更多数据了'
-            });
-        }
-    },
-    methods: {
-        fnGetData() {
-            // uni.showLoading({
-            // 	mask: true,
-            // 	title: '加载中...'
-            // });
-            // 设置状态为加载中
-            if (!this.isLoadMore) {
-                this.loading = 'loading';
-            }
-            this.loadMoreText = '加载中...';
-            this.$httpApi
-                .getJournals(this.queryParams)
-                .then(res => {
-                    this.loading = 'success';
-                    this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-                    // 处理数据
-                    this.result = res.data;
-                    if (this.isLoadMore) {
-                        this.dataList = this.dataList.concat(res.data.content);
-                    } else {
-                        this.dataList = res.data.content;
-                    }
-                    this.loading = 'success';
-                })
-                .catch(err => {
-                    console.error(err);
-                    this.loading = 'error';
-                    this.loadMoreText = '加载失败，请下拉刷新！';
-                })
-                .finally(() => {
-                    setTimeout(() => {
-                        uni.hideLoading();
-                        uni.stopPullDownRefresh();
-                    }, 500);
-                });
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-.app-page {
-    width: 100vw;
-    display: flex;
-    flex-direction: column;
-}
-
-.loading-wrap {
-}
-
-.app-page-content {
-}
-
-.content-empty {
-    height: 60vh;
-}
-</style>

pagesA/love/album.vue

@@ -123,14 +123,13 @@ export default {
         fnGetData() {
             this.loading = 'loading';
             this.queryParams.group = this.loveConfig.lovePhoto.groupName
-            console.log('this.loveConfig------------',this.loveConfig)
             this.$httpApi.v2
                 .getPhotoListByGroupName(this.queryParams)
                 .then(res => {
                     console.log("相册 res", res)
                     this.loading = 'success';
                     this.dataList = res.items.map((item, index) => {
-                        item['image'] = this.$utils.checkImageUrl(item.spec.cover);
+                        item['image'] = this.$utils.checkImageUrl(item.spec.cover || item.spec.url);
                         item['takeTime'] = this.$tm.dayjs(item.metadata.creationTimestamp).format(
                             'DD/MM/YYYY');
                         return item;
@@ -161,13 +160,13 @@ export default {
         fnChange(isNext) {
             throttle(() => {
                 if (isNext) {
-                    if (this.swiperIndex == this.dataList.length - 1) {
+                    if (this.swiperIndex === this.dataList.length - 1) {
                         this.swiperIndex = 0;
                     } else {
                         this.swiperIndex += 1;
                     }
                 } else {
-                    if (this.swiperIndex == 0) {
+                    if (this.swiperIndex === 0) {
                         this.swiperIndex = this.dataList.length - 1;
                     } else {
                         this.swiperIndex -= 1;

pagesA/love/love.vue

@@ -7,7 +7,7 @@
                     <image class="avatar" :src="$utils.checkAvatarUrl(loveConfig.loveInfo.boyAvatar)" mode="aspectFit"></image>
                     <view class="name">{{ loveConfig.loveInfo.boyNickname }}</view>
                 </view>
-                <image class="like" :src="$utils.checkImageUrl(loveConfig.loveImageUrl)" mode="scaleToFill"></image>
+                <image class="like" :src="$utils.checkImageUrl(loveConfig.pageImages.heartImageUrl)" mode="scaleToFill"></image>
                 <view class="girl">
                     <image class="avatar" :src="$utils.checkAvatarUrl(loveConfig.loveInfo.girlAvatar)" mode="aspectFit"></image>
                     <view class="name">{{ loveConfig.loveInfo.girlNickname }}</view>
@@ -43,7 +43,7 @@
             <block v-for="(nav, index) in navList" :key="index">
                 <view v-if="nav.use" class="list-item" @click="fnToPage(nav.key)">
                     <view class="left">
-                        <image class="icon" :src="nav.iconImageUrl" mode="aspectFit"></image>
+                        <image class="icon" :src="$utils.checkImageUrl(nav.iconImageUrl)" mode="aspectFit"></image>
                     </view>
                     <view class="right">
                         <view class="name">{{ nav.title }}</view>
@@ -100,21 +100,21 @@ export default {
                 {
                     key: 'journey',
                     use: configs.ourStory.enabled,
-                    iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
+                    iconImageUrl: configs.ourStory.iconUrl,
                     title: '关于我们',
                     desc: '我们一起度过的那些经历'
                 },
                 {
                     key: 'album',
                     use: configs.lovePhoto.enabled,
-                    iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
+                    iconImageUrl: configs.lovePhoto.iconUrl,
                     title: '恋爱相册',
                     desc: '定格了我们的那些小美好'
                 },
                 {
                     key: 'list',
                     use: configs.loveDaily.enabled,
-                    iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
+                    iconImageUrl: configs.loveDaily.iconUrl,
                     title: '恋爱清单',
                     desc: '你我之间的约定我们都在努力实现'
                 },

pagesA/moment-detail/moment-detail.vue

@@ -0,0 +1,357 @@
+<template>
+	<view class="app-page">
+		<view v-if="loading !== 'success'" class="loading-wrap">
+			<tm-skeleton model="card"></tm-skeleton>
+			<tm-skeleton model="card"></tm-skeleton>
+			<tm-skeleton model="card"></tm-skeleton>
+		</view>
+		<block v-else>
+			<view class="moment-card">
+				<view class="card flex flex-start">
+					<view class="avatar" style="flex-shrink: 0;">
+						<image style="width: 80rpx;height: 80rpx;border-radius: 50%;" :src="moment.spec.user.avatar" />
+					</view>
+					<view class="nickname" style="margin-left: 12rpx;">
+						<view style="font-size: 30rpx;font-weight: bold;color: #333333;">
+							{{ moment.spec.user.displayName }}
+						</view>
+						<view style="margin-top: 6rpx;font-size: 24rpx;color: #666;">
+							{{ {d: moment.spec.releaseTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
+						</view>
+					</view>
+				</view>
+
+				<view v-if="moment.spec.tags && moment.spec.tags.length!==0" class="card flex flex-wrap flex-start"
+					style="padding-top:12rpx;padding-bottom:12rpx;">
+					<text class="text-size-m">标签列表：</text>
+					<tm-tags v-for="(tag,tagIndex) in moment.spec.tags" :key="tagIndex" :color="randomTagColor()"
+						size="m" model="text">
+						{{ tag }}
+					</tm-tags>
+				</view>
+
+				<view class="card" style="padding:0">
+					<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
+						:loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
+						:tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
+						:content="moment.spec.newHtml" :markdown="true" :showLineNumber="true" :showLanguageName="true"
+						:copyByLongPress="true" />
+				</view>
+				<view v-if="moment.images && moment.images.length!==0" class="card">
+					<view class="card-head text-size-m">
+						图片附件：
+					</view>
+					<view class="images" :class="['images-'+moment.images.length]">
+						<view class="image-item" v-for="(image,mediumIndex) in moment.images" :key="mediumIndex">
+							<image mode="aspectFill" style="width: 100%;height: 100%;border-radius: 6rpx;"
+								:src="image.url" @click="handlePreview(mediumIndex,moment.images)" />
+						</view>
+					</view>
+				</view>
+
+				<view v-if="moment.audios && moment.audios.length!==0" class="card">
+					<view class="card-head text-size-m">
+						音频附件：
+					</view>
+					<view
+						style="display: flex; flex-direction: column; gap: 12rpx 0;padding: 0 24rpx;padding-right:28rpx;">
+						<audio v-for="(audio,index) in moment.audios" :controls="true" :key="index" :id="audio.url"
+							:poster="bloggerInfo.avatar"
+							:name="'来自' + (startConfig.title||bloggerInfo.nickname) + '的声音'"
+							:author="bloggerInfo.nickname" :src="audio.url"></audio>
+					</view>
+				</view>
+				<view v-if="moment.videos && moment.videos.length!==0" class="card">
+					<view class="card-head text-size-m">
+						视频附件：
+					</view>
+					<view style="margin-top:24rpx;width:100%;display: flex; flex-direction: column; gap: 12rpx 0;">
+						<video style="width:100%;height: 400rpx;border-radius: 12rpx;"
+							v-for="(video,index) in moment.videos" :key="index" :src="video.url"
+							:id="'video_' + video.id" :show-mute-btn="true" :controls="true"
+							:show-center-play-btn="true" :enable-progress-gesture="true" @play="onVideoPlay(video.id)"
+							@pause="onVideoPause(video.id)" @ended="onVideoEnded(video.id)"></video>
+					</view>
+				</view>
+
+			</view>
+
+			<!-- 返回顶部 -->
+			<tm-flotbutton :width="90" :offset="[16, 80]" icon="icon-angle-up" color="bg-gradient-light-blue-accent"
+				@click="fnToTopPage()"></tm-flotbutton>
+		</block>
+	</view>
+</template>
+
+<script>
+	import MarkdownConfig from '@/common/markdown/markdown.config.js';
+
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+
+	import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
+	import {
+		getAppConfigs
+	} from '@/config/index.js'
+	import HaloTokenConfig from "@/config/uhalo.config";
+	import {
+		getRandomNumberByRange
+	} from "@/utils/random.js";
+	import {
+		generateUUID
+	} from '@/utils/uuid.js';
+
+	export default {
+		components: {
+			tmSkeleton,
+			tmFlotbutton,
+			tmButton,
+			tmEmpty,
+			mpHtml,
+			tmTags
+		},
+		data() {
+			return {
+				loading: 'loading',
+				markdownConfig: MarkdownConfig,
+				queryParams: {
+					name: null
+				},
+				moment: null,
+				tagColors: ['orange', 'green', 'red', 'blue'],
+				videoContexts: {},
+				currentVideoId: null
+			};
+		},
+		computed: {
+			haloConfigs() {
+				return this.$tm.vx.getters().getConfigs;
+			},
+			calcUrl() {
+				return url => {
+					if (this.$utils.checkIsUrl(url)) {
+						return url;
+					}
+					return getApp().globalData.baseApiUrl + url;
+				};
+			},
+			// 获取博主信息
+			bloggerInfo() {
+				const blogger = this.haloConfigs.authorConfig.blogger;
+				blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
+				return blogger;
+			},
+			calcUseTagRandomColor() {
+				return this.haloConfigs.pageConfig.momentConfig.useTagRandomColor;
+			},
+		},
+		onLoad(e) {
+			this.fnSetPageTitle('瞬间加载中...');
+			this.queryParams.name = e.name;
+			this.fnGetData();
+		},
+		onPullDownRefresh() {
+			this.videoContexts = {};
+			this.currentVideoId = null;
+			this.fnGetData();
+		},
+		onShareAppMessage() {
+			return {
+				path: '/pagesA/moment-detail/moment-detail?name=' + this.moment.metadata.name,
+				title: this.moment.spec.title,
+			}
+		},
+		onShareTimeline() {
+			return {
+				title: this.moment.spec.title,
+				query: {
+					name: this.moment.metadata.name
+				}
+			}
+		},
+		methods: {
+			fnGetData() {
+				this.loading = 'loading';
+				this.$httpApi.v2
+					.getMomentByName(this.queryParams.name)
+					.then(res => {
+						console.log('获取详情', res);
+						let _tempResult = res;
+						this.fnSetPageTitle('瞬间详情');
+
+						_tempResult.spec.user = {
+							displayName: this.bloggerInfo.nickname,
+							avatar: this.$utils.checkAvatarUrl(this.bloggerInfo.avatar)
+						}
+						_tempResult.spec.content.medium.map(medium => {
+							medium.url = this.$utils.checkThumbnailUrl(medium.url, true)
+						})
+
+						_tempResult.spec.newHtml = this.removeTagLinksCompletely(_tempResult.spec.content.html, '')
+						_tempResult['images'] = _tempResult.spec.content.medium
+							.filter(x => x.type === 'PHOTO')
+
+						_tempResult['videos'] = _tempResult.spec.content.medium
+							.filter(x => x.type === 'VIDEO').map(_tempResult => {
+								_tempResult.id = generateUUID()
+								return _tempResult;
+							})
+
+						_tempResult['audios'] = _tempResult.spec.content.medium
+							.filter(x => x.type === 'AUDIO')
+
+						this.moment = _tempResult;
+						this.loading = 'success';
+
+						this.$nextTick(() => {
+							this.createVideoContexts(_tempResult.videos);
+						})
+					})
+					.catch(err => {
+						console.log("错误", err)
+						this.loading = 'error';
+					})
+					.finally(() => {
+						uni.hideLoading();
+						uni.stopPullDownRefresh();
+					});
+			},
+			handlePreview(index, list) {
+				uni.previewImage({
+					current: index,
+					urls: list.map(item => item.url)
+				})
+			},
+			removeTagLinksCompletely(htmlString) {
+				const regex = /<a\s+(?:[^>]*?\s+)?class=(['"])[^'"]*?\btag\b[^'"]*?\1[^>]*?>.*?<\/a>/gi;
+				const newHtml = htmlString.replace(regex, '');
+				return newHtml
+			},
+			randomTagColor() {
+				if (!this.calcUseTagRandomColor) return "blue";
+				const randomIndex = getRandomNumberByRange(0, this.tagColors.length);
+				return this.tagColors[randomIndex];
+			},
+			createVideoContexts(videos) {
+				this.stopAllVideos()
+				videos.forEach(item => {
+					this.videoContexts[item.id] = uni.createVideoContext(`video_${item.id}`, this);
+				})
+			},
+			onVideoPlay(videoId) {
+				this.currentVideoId = videoId;
+				this.stopAllVideos(videoId)
+			},
+			onVideoPause(videoId) {
+				if (this.currentVideoId == videoId) {
+					this.currentVideoId = null;
+				}
+			},
+			onVideoEnded(videoId) {
+				this.currentVideoId = null;
+			},
+			stopAllVideos(excludesVideoId = null) {
+				Object.keys(this.videoContexts).forEach(videoId => {
+					if (!excludesVideoId || excludesVideoId != videoId) {
+						const videoContext = this.videoContexts[videoId]
+						videoContext?.pause();
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.app-page {
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		background-color: #fafafd;
+		padding-bottom: 24rpx;
+	}
+
+	.loading-wrap {
+		padding: 0 24rpx;
+		height: inherit;
+		background-color: #fff;
+	}
+
+	.moment-card {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		gap: 24rpx;
+		padding: 24rpx;
+	}
+
+	.card {
+		width: 100%;
+		box-sizing: border-box;
+		border-radius: 12rpx;
+		background-color: #ffff;
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+		overflow: hidden;
+		padding: 24rpx;
+
+		&-head {
+			position: relative;
+			// padding-left: 24rpx;
+			margin-bottom: 6rpx;
+
+			&:before {
+				display: none;
+				box-sizing: border-box;
+				content: "";
+				width: 6rpx;
+				height: 24rpx;
+				border-radius: 24rpx;
+				background: #2196F3;
+				position: absolute;
+				left: 0;
+				top: 6rpx;
+				overflow: hidden;
+			}
+		}
+	}
+
+
+	.images {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: flex-start;
+		padding: 24rpx;
+
+		.image-item {
+			box-sizing: border-box;
+			border-radius: 24rpx;
+			padding: 6rpx;
+			width: 33%;
+			height: 200rpx
+		}
+
+		&-1 {
+			>.image-item {
+				width: 100%;
+				height: 350rpx
+			}
+		}
+
+		&-2 {
+			>.image-item {
+				width: 50%;
+				height: 250rpx
+			}
+		}
+	}
+
+	::v-deep .uni-audio-default {
+		width: 100%;
+		border-radius: 12rpx;
+	}
+</style>

pagesA/start/start.vue

@@ -1,443 +1,531 @@
 <template>
-    <view class="app-page bg-gradient-blue-lighten-b" :style="pageStyle">
-        <view class="tn-satr">
-            <view class="sky"></view>
-            <view class="stars">
-                <view class="falling-stars">
-                    <view class="star-fall"></view>
-                    <view class="star-fall"></view>
-                    <view class="star-fall"></view>
-                    <view class="star-fall"></view>
-                </view>
-                <view class="small-stars">
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                </view>
-                <view class="medium-stars">
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                    <view class="star"></view>
-                </view>
-            </view>
-        </view>
+	<view class="app-page bg-gradient-blue-lighten-b" :class="calcPageClass" :style="[calcPageStyle]">
+		<view v-if="calcBackgroundType!=='video'" class="tn-satr">
+			<view class="sky"></view>
+			<view class="stars">
+				<view class="falling-stars">
+					<view class="star-fall"></view>
+					<view class="star-fall"></view>
+					<view class="star-fall"></view>
+					<view class="star-fall"></view>
+				</view>
+				<view class="small-stars">
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+				</view>
+				<view class="medium-stars">
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+					<view class="star"></view>
+				</view>
+			</view>
+		</view>
 
-        <view class="user-info__container flex flex-col flex-center">
-            <image class="user-info__avatar" :src="$utils.checkImageUrl(startConfig.logo)" mode="aspectFill"></image>
-            <view class="user-info__nick-name">「 {{ startConfig.title }} 」</view>
-        </view>
+		<video v-else class="video-bg" :object-fit="startConfig.bgVideoFit" :src="$utils.checkUrl(startConfig.bgVideo)" :loop="true"
+			:autoplay="true" :muted="true" :controls="false" :show-fullscreen-btn="false" :show-play-btn="false"
+			:show-center-play-btn="false" :show-loading="false" :enable-progress-gesture="false"
+			:show-progress="false"></video>
 
-        <view class="text-align-center text-white" style="padding: 60vh 0 0 0;">
-            <view class="" style="font-size: 44rpx;" v-if="startConfig.desc1">{{ startConfig.desc1 }}</view>
-            <view class="mt-30 text-size-m" v-if="startConfig.desc2">{{ startConfig.desc2 }}</view>
-        </view>
+		<cover-view v-if="startConfig.title || startConfig.logo" class="title-container">
 
-        <view class="" style="padding: 120rpx 200rpx;z-index: 999;position: relative;">
-            <view class="start-btn" @click="fnStart()">{{ startConfig.btnText || '开始体验' }}</view>
-        </view>
+			<cover-view v-if="startConfig.logo" class="app-logo">
+				<cover-view class="app-logo-border">
+					<cover-image class="app-logo-image" :src="$utils.checkImageUrl(startConfig.logo)"
+						mode="aspectFill"></cover-image>
+				</cover-view>
+			</cover-view>
 
-        <!-- 波浪效果 -->
-        <wave></wave>
-    </view>
+			<cover-view v-if="startConfig.title" class="app-title" :style="startConfig.titleStyle">
+				「 {{ startConfig.title }} 」
+			</cover-view>
+		</cover-view>
+
+		<cover-view class="bottom-container">
+			<cover-view class="text-align-center" :style="startConfig.descStyle"
+				style="color:white;padding: 60vh 0 0 0;">
+				<cover-view style="font-size: 44rpx;" v-show="startConfig.desc1">
+					{{ startConfig.desc1 }}
+				</cover-view>
+				<cover-view class="mt-30 text-size-m" v-show="startConfig.desc2">
+					{{ startConfig.desc2 }}
+				</cover-view>
+			</cover-view>
+			<!-- #ifdef APP-PLUS -->
+			<cover-view class="start-btn-app" :style="[startConfig.btnStyle]" @click="fnStart()">
+				{{ startConfig.btnText || '开始体验' }}
+			</cover-view>
+			<!-- #endif -->
+			<!-- #ifndef APP-PLUS -->
+			<cover-view class="start-btn" :class="[startConfig.btnClass]" @click="fnStart()"
+				:style="[startConfig.btnStyle]">{{ startConfig.btnText || '开始体验' }}
+			</cover-view>
+			<!-- #endif -->
+		</cover-view>
+		<!-- 波浪效果 -->
+		<wave v-if="startConfig.useWave"></wave>
+	</view>
 </template>
 
 <script>
-import wave from '@/components/wave/wave.vue';
+	import wave from '@/components/wave/wave.vue';
 
-export default {
-    components: {
-        wave
-    },
-    computed: {
-        startConfig() {
-            return this.$tm.vx.getters().getConfigs.appConfig.startConfig;
-        },
-        pageStyle() {
-            if (this.startConfig.bg) {
-                const _bg = this.$utils.checkIsUrl(this.startConfig.bg) ? `url(${this.$utils.checkImageUrl(this.startConfig.bg)})` : this
-                    .startConfig.bg;
-                return {
-                    background: _bg + '!important'
-                };
-            }
-            return {};
-        }
-    },
-    methods: {
-        fnStart() {
-            uni.switchTab({
-                url: '/pages/tabbar/home/home',
-                success: () => {
-                    uni.setStorageSync('APP_HAS_STARTED', true);
-                }
-            });
-        }
-    }
-};
+	export default {
+		components: {
+			wave
+		},
+		computed: {
+			startConfig() {
+				return this.$tm.vx.getters().getConfigs.appConfig.startConfig;
+			},
+			calcBackgroundType() {
+				return this.startConfig.backgroundType;
+			},
+			calcPageClass() {
+				if (this.calcBackgroundType === 'color') {
+					return [this.startConfig.bg]
+				}
+				return []
+			},
+			calcPageStyle() {
+				if (this.calcBackgroundType === 'color') {
+					return {}
+				}
+				if (this.calcBackgroundType === 'image') {
+					return {
+						backgroundImage: `url(${this.$utils.checkImageUrl(this.startConfig.bgImage)})!important`,
+						backgroundSize: this.startConfig.bgImageFit
+					}
+				}
+				if (this.calcBackgroundType === 'video') {
+					return {
+						background: '#ffffff'
+					}
+				}
+				return {};
+			}
+		},
+		methods: {
+			fnStart() {
+				uni.switchTab({
+					url: '/pages/tabbar/home/home',
+					success: () => {
+						uni.setStorageSync('APP_HAS_STARTED', true);
+					}
+				});
+			}
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
-    width: 100vw;
-    height: 100vh;
-}
+	.app-page {
+		position: relative;
+		width: 100vw;
+		height: 100vh;
+		background-size: cover;
+		background-repeat: no-repeat;
+	}
 
-.start-btn {
-    box-sizing: border-box;
-    background-color: transparent;
-    padding: 16rpx 50rpx;
-    border-radius: 50rpx;
-    border: 2rpx solid #ffffff;
-    color: #ffffff;
-    text-align: center;
-    font-size: 28rpx;
-}
+	.start-btn {
+		box-sizing: border-box;
+		background-color: transparent;
+		padding: 16rpx 50rpx;
+		border-radius: 50rpx;
+		border: 2rpx solid #ffffff;
+		color: #ffffff;
+		text-align: center;
+		font-size: 28rpx;
+		margin-top: 60rpx;
+		margin-bottom: 120rpx;
+	}
 
-/* 用户信息 start */
-.user-info {
-    &__container {
-        position: absolute;
-        top: 25vh;
-        left: 50%;
-        -webkit-transform: translate(-50%, -50%);
-        transform: translate(-50%, -50%);
-    }
+	.start-btn-app {
+		border-radius: 50rpx;
+		color: #ffffff;
+		text-align: center;
+		font-size: 28rpx;
+		margin: 60rpx auto 120rpx auto;
+		width: 40vw;
+		height: 60rpx;
+		line-height: 60rpx;
+		border: 2rpx solid #ffffff;
+	}
 
-    &__avatar {
-        width: 200rpx;
-        height: 200rpx;
-        border: 8rpx solid rgba(255, 255, 255, 0.05);
-        border-radius: 50%;
-        overflow: hidden;
-        box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.15);
-    }
+	.bottom-container {
+		display: flex;
+		flex-direction: column;
+		position: absolute;
+		bottom: 50rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 999;
+	}
 
-    &__nick-name {
-        color: #ffffff;
-        margin-top: 26rpx;
-        font-size: 36rpx;
-        font-weight: 600;
-        text-align: center;
-    }
-}
+	.video-bg {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 0;
+	}
 
-/* 用户信息 end */
+	.title-container {
+		width: 100vw;
+		position: absolute;
+		top: 20vh;
+		left: 0;
+		z-index: 999;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
 
-/* 流星*/
-.tn-satr {
-    position: fixed;
-    width: 100%;
-    height: 600px;
-    overflow: hidden;
-    flex-shrink: 0;
-    z-index: 998;
-}
+	.app-logo {
+		width: 200rpx;
+		height: 200rpx;
 
-.stars {
-    position: absolute;
-    z-index: 1;
-    width: 100%;
-    height: 400px;
-}
+		&-border {
+			width: 100%;
+			height: 100%;
+			box-sizing: border-box;
+			border: 8rpx solid rgba(255, 255, 255, 0.35);
+			border-radius: 50%;
+			overflow: hidden;
+		}
 
-.star {
-    border-radius: 50%;
-    background: #ffffff;
-    box-shadow: 0px 0px 6px 0px rgba(255, 255, 255, 0.8);
-}
+		&-image {
+			width: 100%;
+			height: 100%;
+			border-radius: 50%;
+		}
+	}
 
-.small-stars .star {
-    position: absolute;
-    width: 3px;
-    height: 3px;
-}
+	.app-title {
+		color: #ffffff;
+		margin-top: 26rpx;
+		font-size: 36rpx;
+		font-weight: 600;
+		text-align: center;
+	}
 
-.small-stars .star:nth-child(2n) {
-    opacity: 0;
-    -webkit-animation: star-blink 1.2s linear infinite alternate;
-    animation: star-blink 1.2s linear infinite alternate;
-}
 
-.small-stars .star:nth-child(1) {
-    left: 40px;
-    bottom: 50px;
-}
+	.tn-satr {
+		position: fixed;
+		width: 100%;
+		height: 600px;
+		overflow: hidden;
+		flex-shrink: 0;
+		z-index: 998;
+	}
 
-.small-stars .star:nth-child(2) {
-    left: 200px;
-    bottom: 40px;
-}
+	.stars {
+		position: absolute;
+		z-index: 1;
+		width: 100%;
+		height: 400px;
+	}
 
-.small-stars .star:nth-child(3) {
-    left: 60px;
-    bottom: 120px;
-}
+	.star {
+		border-radius: 50%;
+		background: #ffffff;
+		box-shadow: 0 0 6px 0 rgba(255, 255, 255, 0.8);
+	}
 
-.small-stars .star:nth-child(4) {
-    left: 140px;
-    bottom: 250px;
-}
+	.small-stars .star {
+		position: absolute;
+		width: 3px;
+		height: 3px;
+	}
 
-.small-stars .star:nth-child(5) {
-    left: 400px;
-    bottom: 300px;
-}
+	.small-stars .star:nth-child(2n) {
+		opacity: 0;
+		-webkit-animation: star-blink 1.2s linear infinite alternate;
+		animation: star-blink 1.2s linear infinite alternate;
+	}
 
-.small-stars .star:nth-child(6) {
-    left: 170px;
-    bottom: 80px;
-}
+	.small-stars .star:nth-child(1) {
+		left: 40px;
+		bottom: 50px;
+	}
 
-.small-stars .star:nth-child(7) {
-    left: 200px;
-    bottom: 360px;
-    -webkit-animation-delay: 0.2s;
-    animation-delay: 0.2s;
-}
+	.small-stars .star:nth-child(2) {
+		left: 200px;
+		bottom: 40px;
+	}
 
-.small-stars .star:nth-child(8) {
-    left: 250px;
-    bottom: 320px;
-}
+	.small-stars .star:nth-child(3) {
+		left: 60px;
+		bottom: 120px;
+	}
 
-.small-stars .star:nth-child(9) {
-    left: 300px;
-    bottom: 340px;
-}
+	.small-stars .star:nth-child(4) {
+		left: 140px;
+		bottom: 250px;
+	}
 
-.small-stars .star:nth-child(10) {
-    left: 130px;
-    bottom: 320px;
-    -webkit-animation-delay: 0.5s;
-    animation-delay: 0.5s;
-}
+	.small-stars .star:nth-child(5) {
+		left: 400px;
+		bottom: 300px;
+	}
 
-.small-stars .star:nth-child(11) {
-    left: 230px;
-    bottom: 330px;
-    -webkit-animation-delay: 7s;
-    animation-delay: 7s;
-}
+	.small-stars .star:nth-child(6) {
+		left: 170px;
+		bottom: 80px;
+	}
 
-.small-stars .star:nth-child(12) {
-    left: 300px;
-    bottom: 360px;
-    -webkit-animation-delay: 0.3s;
-    animation-delay: 0.3s;
-}
+	.small-stars .star:nth-child(7) {
+		left: 200px;
+		bottom: 360px;
+		-webkit-animation-delay: 0.2s;
+		animation-delay: 0.2s;
+	}
 
-@-webkit-keyframes star-blink {
-    50% {
-        width: 3px;
-        height: 3px;
-        opacity: 1;
-    }
-}
+	.small-stars .star:nth-child(8) {
+		left: 250px;
+		bottom: 320px;
+	}
 
-@keyframes star-blink {
-    50% {
-        width: 3px;
-        height: 3px;
-        opacity: 1;
-    }
-}
+	.small-stars .star:nth-child(9) {
+		left: 300px;
+		bottom: 340px;
+	}
 
-.medium-stars .star {
-    position: absolute;
-    width: 3px;
-    height: 3px;
-    opacity: 0;
-    -webkit-animation: star-blink 1.2s ease-in infinite alternate;
-    animation: star-blink 1.2s ease-in infinite alternate;
-}
+	.small-stars .star:nth-child(10) {
+		left: 130px;
+		bottom: 320px;
+		-webkit-animation-delay: 0.5s;
+		animation-delay: 0.5s;
+	}
 
-.medium-stars .star:nth-child(1) {
-    left: 300px;
-    bottom: 50px;
-}
+	.small-stars .star:nth-child(11) {
+		left: 230px;
+		bottom: 330px;
+		-webkit-animation-delay: 7s;
+		animation-delay: 7s;
+	}
 
-.medium-stars .star:nth-child(2) {
-    left: 400px;
-    bottom: 40px;
-    -webkit-animation-delay: 0.4s;
-    animation-delay: 0.4s;
-}
+	.small-stars .star:nth-child(12) {
+		left: 300px;
+		bottom: 360px;
+		-webkit-animation-delay: 0.3s;
+		animation-delay: 0.3s;
+	}
 
-.medium-stars .star:nth-child(3) {
-    left: 330px;
-    bottom: 300px;
-    -webkit-animation-delay: 0.2s;
-    animation-delay: 0.2s;
-}
+	@-webkit-keyframes star-blink {
+		50% {
+			width: 3px;
+			height: 3px;
+			opacity: 1;
+		}
+	}
 
-.medium-stars .star:nth-child(4) {
-    left: 460px;
-    bottom: 300px;
-    -webkit-animation-delay: 0.9s;
-    animation-delay: 0.9s;
-}
+	@keyframes star-blink {
+		50% {
+			width: 3px;
+			height: 3px;
+			opacity: 1;
+		}
+	}
 
-.medium-stars .star:nth-child(5) {
-    left: 300px;
-    bottom: 150px;
-    -webkit-animation-delay: 1.2s;
-    animation-delay: 1.2s;
-}
+	.medium-stars .star {
+		position: absolute;
+		width: 3px;
+		height: 3px;
+		opacity: 0;
+		-webkit-animation: star-blink 1.2s ease-in infinite alternate;
+		animation: star-blink 1.2s ease-in infinite alternate;
+	}
 
-.medium-stars .star:nth-child(6) {
-    left: 440px;
-    bottom: 120px;
-    -webkit-animation-delay: 1s;
-    animation-delay: 1s;
-}
+	.medium-stars .star:nth-child(1) {
+		left: 300px;
+		bottom: 50px;
+	}
 
-.medium-stars .star:nth-child(7) {
-    left: 200px;
-    bottom: 140px;
-    -webkit-animation-delay: 0.8s;
-    animation-delay: 0.8s;
-}
+	.medium-stars .star:nth-child(2) {
+		left: 400px;
+		bottom: 40px;
+		-webkit-animation-delay: 0.4s;
+		animation-delay: 0.4s;
+	}
 
-.medium-stars .star:nth-child(8) {
-    left: 30px;
-    bottom: 480px;
-    -webkit-animation-delay: 0.3s;
-    animation-delay: 0.3s;
-}
+	.medium-stars .star:nth-child(3) {
+		left: 330px;
+		bottom: 300px;
+		-webkit-animation-delay: 0.2s;
+		animation-delay: 0.2s;
+	}
 
-.medium-stars .star:nth-child(9) {
-    left: 460px;
-    bottom: 400px;
-    -webkit-animation-delay: 1.2s;
-    animation-delay: 1.2s;
-}
+	.medium-stars .star:nth-child(4) {
+		left: 460px;
+		bottom: 300px;
+		-webkit-animation-delay: 0.9s;
+		animation-delay: 0.9s;
+	}
 
-.medium-stars .star:nth-child(10) {
-    left: 150px;
-    bottom: 10px;
-    -webkit-animation-delay: 1s;
-    animation-delay: 1s;
-}
+	.medium-stars .star:nth-child(5) {
+		left: 300px;
+		bottom: 150px;
+		-webkit-animation-delay: 1.2s;
+		animation-delay: 1.2s;
+	}
 
-.medium-stars .star:nth-child(11) {
-    left: 420px;
-    bottom: 450px;
-    -webkit-animation-delay: 1.2s;
-    animation-delay: 1.2s;
-}
+	.medium-stars .star:nth-child(6) {
+		left: 440px;
+		bottom: 120px;
+		-webkit-animation-delay: 1s;
+		animation-delay: 1s;
+	}
 
-.medium-stars .star:nth-child(12) {
-    left: 340px;
-    bottom: 180px;
-    -webkit-animation-delay: 1.1s;
-    animation-delay: 1.1s;
-}
+	.medium-stars .star:nth-child(7) {
+		left: 200px;
+		bottom: 140px;
+		-webkit-animation-delay: 0.8s;
+		animation-delay: 0.8s;
+	}
 
-@keyframes star-blink {
-    50% {
-        width: 4px;
-        height: 4px;
-        opacity: 1;
-    }
-}
+	.medium-stars .star:nth-child(8) {
+		left: 30px;
+		bottom: 480px;
+		-webkit-animation-delay: 0.3s;
+		animation-delay: 0.3s;
+	}
 
-.star-fall {
-    position: relative;
-    border-radius: 2px;
-    width: 80px;
-    height: 2px;
-    overflow: hidden;
-    -webkit-transform: rotate(-20deg);
-    transform: rotate(-20deg);
-}
+	.medium-stars .star:nth-child(9) {
+		left: 460px;
+		bottom: 400px;
+		-webkit-animation-delay: 1.2s;
+		animation-delay: 1.2s;
+	}
 
-.star-fall:after {
-    content: '';
-    position: absolute;
-    width: 50px;
-    height: 2px;
-    background: -webkit-gradient(linear, right top, left top, from(rgba(0, 0, 0, 0)), to(rgba(255, 255, 255, 0.4)));
-    background: linear-gradient(to left, rgba(0, 0, 0, 0) 0%, rgba(255, 255, 255, 0.4) 100%);
-    left: 100%;
-    -webkit-animation: star-fall 3.6s linear infinite;
-    animation: star-fall 3.6s linear infinite;
-}
+	.medium-stars .star:nth-child(10) {
+		left: 150px;
+		bottom: 10px;
+		-webkit-animation-delay: 1s;
+		animation-delay: 1s;
+	}
 
-.star-fall:nth-child(1) {
-    left: 80px;
-    bottom: -100px;
-}
+	.medium-stars .star:nth-child(11) {
+		left: 420px;
+		bottom: 450px;
+		-webkit-animation-delay: 1.2s;
+		animation-delay: 1.2s;
+	}
 
-.star-fall:nth-child(1):after {
-    -webkit-animation-delay: 2.4s;
-    animation-delay: 2.4s;
-}
+	.medium-stars .star:nth-child(12) {
+		left: 340px;
+		bottom: 180px;
+		-webkit-animation-delay: 1.1s;
+		animation-delay: 1.1s;
+	}
 
-.star-fall:nth-child(2) {
-    left: 200px;
-    bottom: -200px;
-}
+	@keyframes star-blink {
+		50% {
+			width: 4px;
+			height: 4px;
+			opacity: 1;
+		}
+	}
 
-.star-fall:nth-child(2):after {
-    -webkit-animation-delay: 2s;
-    animation-delay: 2s;
-}
+	.star-fall {
+		position: relative;
+		border-radius: 2px;
+		width: 80px;
+		height: 2px;
+		overflow: hidden;
+		-webkit-transform: rotate(-20deg);
+		transform: rotate(-20deg);
+	}
 
-.star-fall:nth-child(3) {
-    left: 430px;
-    bottom: -50px;
-}
+	.star-fall:after {
+		content: '';
+		position: absolute;
+		width: 50px;
+		height: 2px;
+		background: -webkit-gradient(linear, right top, left top, from(rgba(0, 0, 0, 0)), to(rgba(255, 255, 255, 0.4)));
+		background: linear-gradient(to left, rgba(0, 0, 0, 0) 0%, rgba(255, 255, 255, 0.4) 100%);
+		left: 100%;
+		-webkit-animation: star-fall 3.6s linear infinite;
+		animation: star-fall 3.6s linear infinite;
+	}
 
-.star-fall:nth-child(3):after {
-    -webkit-animation-delay: 3.6s;
-    animation-delay: 3.6s;
-}
+	.star-fall:nth-child(1) {
+		left: 80px;
+		bottom: -100px;
+	}
 
-.star-fall:nth-child(4) {
-    left: 400px;
-    bottom: 100px;
-}
+	.star-fall:nth-child(1):after {
+		-webkit-animation-delay: 2.4s;
+		animation-delay: 2.4s;
+	}
 
-.star-fall:nth-child(4):after {
-    -webkit-animation-delay: 0.2s;
-    animation-delay: 0.2s;
-}
+	.star-fall:nth-child(2) {
+		left: 200px;
+		bottom: -200px;
+	}
 
-@-webkit-keyframes star-fall {
-    20% {
-        left: -100%;
-    }
+	.star-fall:nth-child(2):after {
+		-webkit-animation-delay: 2s;
+		animation-delay: 2s;
+	}
 
-    100% {
-        left: -100%;
-    }
-}
+	.star-fall:nth-child(3) {
+		left: 430px;
+		bottom: -50px;
+	}
 
-@keyframes star-fall {
-    20% {
-        left: -100%;
-    }
+	.star-fall:nth-child(3):after {
+		-webkit-animation-delay: 3.6s;
+		animation-delay: 3.6s;
+	}
 
-    100% {
-        left: -100%;
-    }
-}
-</style>
+	.star-fall:nth-child(4) {
+		left: 400px;
+		bottom: 100px;
+	}
+
+	.star-fall:nth-child(4):after {
+		-webkit-animation-delay: 0.2s;
+		animation-delay: 0.2s;
+	}
+
+	@-webkit-keyframes star-fall {
+		20% {
+			left: -100%;
+		}
+
+		100% {
+			left: -100%;
+		}
+	}
+
+	@keyframes star-fall {
+		20% {
+			left: -100%;
+		}
+
+		100% {
+			left: -100%;
+		}
+	}
+</style>

pagesA/submit-link/submit-link.vue

@@ -53,7 +53,7 @@
                 <view class="poup pa-36" scroll-y="auto">
                     <view class="info flex">
                         <view class="poup-logo pa-4 shadow-24">
-                            <image :src="blogDetail.blogLogo" class="poup-logo_img" mode="aspectFill"></image>
+                            <image :src="$utils.checkAvatarUrl(blogDetail.blogLogo)" class="poup-logo_img" mode="aspectFill"></image>
                         </view>
                         <view class="pl-24 info-detail">
                             <view class="poup-name text-size-lg text-weight-b">{{ blogDetail.blogName }}</view>
@@ -97,6 +97,7 @@ import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue'
 import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue'
 import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue'
 import tmCoupon from '@/tm-vuetify/components/tm-coupon/tm-coupon.vue'
+import $utils from "@/utils";
 
 export default {
     components: {
@@ -128,11 +129,14 @@ export default {
         };
     },
     computed: {
+      $utils() {
+        return $utils
+      },
         haloPluginConfigs(){
             return this.$tm.vx.getters().getConfigs.pluginConfig;
         },
         blogDetail() {
-            return this.haloPluginConfigs.submitLink;
+            return this.haloPluginConfigs.linksSubmitPlugin;
         },
         calcSiteThumbnail(val) {
             return val => {
@@ -147,13 +151,13 @@ export default {
             return `
 				   博客名称：${this.blogDetail.blogName}
 				   博客地址：${this.blogDetail.blogUrl}
-				   博客logo：${this.blogDetail.blogLogo}
+				   博客logo：${$utils.checkAvatarUrl(this.blogDetail.blogLogo)}
 				   博客简介：${this.blogDetail.blogDesc}
 				`
         },
         calcBlogCoupon() {
             return {
-                img: this.blogDetail.blogLogo,
+                img: $utils.checkAvatarUrl(this.blogDetail.blogLogo),
                 title: this.blogDetail.blogName,
                 time: this.blogDetail.blogDesc,
                 btnText: '友链详情'
@@ -192,7 +196,7 @@ export default {
             this.$httpApi.v2.submitLink(this.form)
                 .then(res => {
                     if (res.code === 200) {
-                        uni.$tm.toast('友链提交成功！');
+                        uni.$tm.toast(res.msg);
                         setTimeout(() => {
                             uni.navigateTo({
                                 url: '/pagesA/friend-links/friend-links',
@@ -204,7 +208,7 @@ export default {
                             });
                         }, 1000);
                     } else {
-                        uni.$tm.toast('操作失败，请重试！');
+                        uni.$tm.toast(res.msg);
                     }
                 })
                 .catch(err => {

pagesA/test-page/test-page.vue

@@ -1,289 +0,0 @@
-<template>
-	<view class="app-page">
-
-		<view v-if="loading != 'success' && articleList.length===0" class="loading-wrap">
-			加载中
-		</view>
-		<block v-else>
-
-			<view v-if="articleList.length == 0" class="article-empty"><tm-empty icon="icon-shiliangzhinengduixiang-"
-					label="博主还没有发表任何文章~"></tm-empty></view>
-			<block v-else>
-
-				<view style="width: 100%;text-align: center;display: flex;flex-direction: column;align-items: center;"
-					v-for="(article, index) in articleList" :key="index">
-					<image style="width: 100%;height: 250rpx;" :src="article.cover"></image>
-					<view style="margin-top: 12rpx;">{{article.title}}</view>
-				</view>
-				<view class="load-text mt-12">{{ loadMoreText }}</view>
-			</block>
-		</block>
-	</view>
-</template>
-
-<script>
-	export default {
-		components: {
-
-		},
-		data() {
-			return {
-				loading: 'loading',
-				queryParams: {
-					size: 30,
-					page: 1
-				},
-				result: {},
-				isLoadMore: false,
-				loadMoreText: '加载中...',
-				bannerCurrent: 0,
-				bannerList: [],
-				noticeList: [],
-				articleList: [],
-				categoryList: [],
-			};
-		},
-		onLoad() {
-			this.fnQuery();
-		},
-
-		onPullDownRefresh() {
-			this.isLoadMore = false;
-			this.queryParams.page = 1;
-			this.fnQuery();
-		},
-
-		onReachBottom(e) {
-			if (this.result.hasNext) {
-				this.queryParams.page += 1;
-				this.isLoadMore = true;
-				this.fnGetArticleList();
-			} else {
-				uni.showToast({
-					icon: 'none',
-					title: '没有更多数据了'
-				});
-			}
-		},
-		methods: {
-			fnQuery() {
-				this.fnGetArticleList();
-			},
-			fnOnBannerChange(e) {
-				this.bannerCurrent = e.current;
-			},
-			fnOnBannerClick(item) {
-				if (item.id == '') return;
-				this.fnToArticleDetail({
-					metadata: {
-						name: item.id
-					}
-				});
-			},
-			fnGetArticleList() {
-
-				// 设置状态为加载中
-				if (!this.isLoadMore) {
-					this.loading = 'loading';
-				}
-				this.loadMoreText = '加载中...';
-				const list = new Array(30).fill(10).map(item => {
-					return {
-						title: '红红火火恍恍惚惚哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈发放',
-						cover: 'https://blog.925i.cn/upload/房间%20少女%20蓝色眼睛%20夏天的裙子%20室内绿色植物%20动漫壁纸_彼岸壁纸.webp'
-					}
-				})
-
-				setTimeout(() => {
-					setTimeout(() => {
-						this.result = {
-							hasNext: true
-						};
-
-						if (this.isLoadMore) {
-							this.articleList = this.articleList.concat(list);
-						} else {
-							this.articleList = list;
-						}
-					}, 200)
-					this.loading = 'success';
-					this.loadMoreText = this.result ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-					uni.hideLoading();
-					uni.stopPullDownRefresh();
-				}, 300)
-
-
-			},
-
-			//跳转文章详情
-			fnToArticleDetail(article) {
-				uni.navigateTo({
-					url: '/pagesA/article-detail/article-detail?name=' + article.metadata.name,
-					animationType: 'slide-in-right'
-				});
-			},
-			// 快捷导航页面跳转
-			fnToNavPage(item) {
-				switch (item.type) {
-					case 'tabbar':
-						uni.switchTab({
-							url: item.path
-						});
-						break;
-					case 'page':
-						uni.navigateTo({
-							url: item.path
-						});
-						break;
-				}
-			},
-			// 分类页面
-			fnToCategoryPage() {
-				uni.switchTab({
-					url: '/pages/tabbar/category/category'
-				});
-			},
-			// 所有的文章列表页面
-			fnToArticlesPage() {
-				uni.navigateTo({
-					url: '/pagesA/articles/articles'
-				});
-			},
-
-			// 根据slug查询分类下的文章
-			fnToCategoryBy(category) {
-				uni.navigateTo({
-					url: `/pagesA/category-detail/category-detail?name=${category.metadata.name}&title=${category.spec.displayName}`
-				});
-			},
-
-			fnChangeMode() {
-				const isBlackTheme = this.$tm.vx.state().tmVuetify.black;
-				this.$tm.theme.setBlack(!isBlackTheme);
-				uni.setNavigationBarColor({
-					backgroundColor: !isBlackTheme ? '#0a0a0a' : '#ffffff',
-					frontColor: !isBlackTheme ? '#ffffff' : '#0a0a0a'
-				});
-			},
-
-			fnToSearch() {
-				uni.navigateTo({
-					url: '/pagesA/articles/articles'
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	.app-page {
-		width: 100vw;
-		min-height: 100vh;
-		display: flex;
-		flex-direction: column;
-		// background-color: #ffffff;
-
-		.logo {
-			width: 60rpx;
-			height: 60rpx;
-			box-sizing: border-box;
-		}
-
-		::v-deep {
-			.tm-menubars .body .body_wk .left {
-				min-width: initial;
-			}
-		}
-	}
-
-	.loading-wrap {
-		padding: 24rpx;
-	}
-
-	.search-input {
-		background-color: #f5f5f5;
-		align-items: center;
-		/* #ifdef MP-WEIXIN */
-		margin-right: 24rpx;
-
-		/* #endif */
-		&_icon {}
-
-		&_text {}
-	}
-
-	.show-more {
-		width: 42rpx;
-		height: 42rpx;
-		box-sizing: border-box;
-		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
-	}
-
-	.banner {
-		overflow: hidden;
-	}
-
-	.quick-nav {
-		background-color: #fff;
-		box-sizing: border-box;
-
-		// box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
-		.name {
-			color: var(--main-text-color);
-		}
-	}
-
-	.category {
-		width: 94vw;
-		display: flex;
-		height: 200rpx;
-		white-space: nowrap;
-		margin: 0 24rpx;
-
-		.content {
-			display: inline-block;
-			padding-left: 24rpx;
-
-			&:first-child {
-				padding-left: 0;
-			}
-		}
-
-		.cate-empty {
-			height: inherit;
-		}
-	}
-
-	.page-item {
-		&_title {
-			position: relative;
-			padding-left: 24rpx;
-			font-size: 32rpx;
-			z-index: 1;
-			color: var(--main-text-color);
-
-			&:before {
-				content: '';
-				position: absolute;
-				left: 0rpx;
-				top: 8rpx;
-				width: 8rpx;
-				height: 30rpx;
-				background-color: rgba(33, 150, 243, 1);
-				border-radius: 6rpx;
-				z-index: 0;
-			}
-		}
-	}
-
-	.h_row_col2 {
-		display: flex;
-		flex-wrap: wrap;
-		box-sizing: border-box;
-		padding: 0 12rpx;
-
-		.ani-item {
-			width: 50%;
-		}
-	}
-</style>

pagesA/vote-detail/vote-detail.vue

@@ -0,0 +1,729 @@
+<template>
+	<view class="app-page">
+		<view v-if="loading != 'success'" class="loading-wrap">
+			<tm-skeleton model="listAvatr"></tm-skeleton>
+			<tm-skeleton model="listAvatr"></tm-skeleton>
+			<tm-skeleton model="listAvatr"></tm-skeleton>
+			<tm-skeleton model="listAvatr"></tm-skeleton>
+		</view>
+		<block v-else>
+			<view v-if="!detail" class="empty">
+				<tm-empty icon="icon-shiliangzhinengduixiang-" label="未查询到数据"></tm-empty>
+			</view>
+			<block v-else>
+				<view class="vote-card vote-info-card">
+					<view class="sub-title"> 投票信息 </view>
+					<view class="vote-card-body flex flex-col uh-mt-8">
+						<view class="">
+							投票类型：<tm-tags color="light-blue" :shadow="0" size="xs" model="fill">
+								{{ vote.spec._uh_type }} </tm-tags>
+						</view>
+						<view class="">
+							投票状态：<tm-tags :color="vote.spec._uh_state.color" size="xs" :shadow="0"
+								model="fill">{{vote.spec._uh_state.state}}</tm-tags>
+						</view>
+						<view class="">
+							投票方式：<tm-tags v-if="vote.spec.canAnonymously" color="light-blue" size="xs" :shadow="0"
+								model="fill">匿名</tm-tags>
+							<tm-tags v-else color="red" size="xs" :shadow="0" model="fill">不匿名</tm-tags>
+						</view>
+						<view class="">
+							开始时间：{{ {d: vote.spec.startDate, f: 'yyyy-MM-dd HH:mm'} | formatTime }}
+						</view>
+						<view class="">
+							<text v-if="vote.spec.timeLimit==='permanent'">
+								结束时间：永久有效
+							</text>
+							<text v-else>
+								结束时间：{{ {d: vote.spec.endDate, f: 'yyyy-MM-dd HH:mm'} | formatTime }}
+							</text>
+						</view>
+					</view>
+				</view>
+
+				<view class="vote-card">
+					<view class="vote-card-head flex flex-col items-start mb-12">
+						<view class="sub-title"> 投票内容 </view>
+						<view class="sub-content">
+							{{ vote.spec.title }}
+						</view>
+						<view v-if="vote.spec.remark" class="sub-remark">
+							{{ vote.spec.remark  }}
+						</view>
+					</view>
+					<view class="vote-card-body uh-mt-8">
+						<view class="sub-title"> 投票选项 <text v-if="vote.spec.type==='multiple'"
+								class="sub-title-count">（最多选择 {{ vote.spec.maxVotes }} 项）</text> </view>
+						<view v-if="vote.spec.type==='single'" class="single">
+							<view class="w-full flex flex-col uh-gap-8">
+								<template v-if="vote.spec.isVoted || vote.spec.hasEnded">
+									<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+										class="is-voted-item" :class="[option.checked?'selected':'']" :style="{
+											'--percent':option._uh_percent + '%'
+										}">
+										<view class="is-voted-item-content flex w-full flex-between uh-gap-8">
+											<view class="flex-1 text-align-left text-break">
+												{{option.title }}
+											</view>
+											<view class="flex-shrink">
+												{{option._uh_percent }}%
+											</view>
+										</view>
+									</view>
+								</template>
+								<template v-else>
+									<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+										class="vote-select-option flex-1 w-full text-break"
+										:class="[option.checked?'light-blue':'grey-lighten-3']"
+										@click="handleSelectSingleOption(option)">
+										{{option.title }}
+									</view>
+								</template>
+							</view>
+						</view>
+
+						<view v-else-if="vote.spec.type==='multiple'" class="multiple">
+							<view class="w-full flex flex-col uh-gap-8">
+								<template v-if="vote.spec.isVoted || vote.spec.hasEnded">
+									<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+										class="is-voted-item" :class="[option.checked?'selected':'']" :style="{
+											'--percent':option._uh_percent + '%'
+										}">
+										<view class="is-voted-item-content flex w-full flex-between uh-gap-8">
+											<view class="flex-1 text-align-left text-break">
+												{{option.title }}
+											</view>
+											<view class="flex-shrink">
+												{{option._uh_percent }}%
+											</view>
+										</view>
+									</view>
+								</template>
+								<template v-else>
+									<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+										class="vote-select-option flex-1 w-full text-break"
+										:class="[option.checked?'light-blue':'grey-lighten-3']"
+										@click="handleSelectCheckboxOption(option)">
+										{{option.title }}
+									</view>
+								</template>
+							</view>
+						</view>
+
+						<view v-else-if="vote.spec.type==='pk'" class="pk">
+							<view class="pk-container">
+								<view class="radio-item" v-for="(option,optionIndex) in vote.spec.options"
+									:key="optionIndex" :class="[optionIndex==0?'radio-left':'radio-right']"
+									:style="{width: option._uh_percent + '%'}">
+									<view class="option-item"
+										:class="[optionIndex==0?'option-item-left':'option-item-right']">
+										{{option._uh_percent }}%
+									</view>
+								</view>
+							</view>
+							<view class="option-foot w-full flex flex-col uh-gap-8">
+								<template v-if="vote.spec.isVoted || vote.spec.hasEnded">
+									<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+										class="is-voted-item" :class="[option.checked?'selected':'']" :style="{
+											'--percent': option._uh_percent + '%'
+										}">
+										<view class="is-voted-item-content flex w-full flex-between uh-gap-8">
+											<view class="flex-1 text-align-left text-break">
+												选项{{ optionIndex+1}}：{{option.title }}
+											</view>
+											<view class="flex-shrink">
+												{{option._uh_percent }}%
+											</view>
+										</view>
+									</view>
+								</template>
+								<template v-else>
+									<view v-for="(option,optionIndex) in vote.spec.options" :key="optionIndex"
+										class="vote-select-option flex-1 w-full text-break"
+										:class="[option.checked?'light-blue':'grey-lighten-3']"
+										@click="handleSelectSingleOption(option)">
+										选项{{ optionIndex+1}}：{{option.title }}
+									</view>
+								</template>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="vote-card">
+					<view class="vote-card-body">
+						<view class="sub-title"> 投票统计 </view>
+						<view class="">
+							<tm-tags color="grey-darken-4" size="s" model="text">{{ vote.stats.voteCount }}
+								人已参与</tm-tags>
+							<!-- <tm-tags v-if="vote.spec.isVoted" color="blue" rounded size="s" model="text">已投票</tm-tags> -->
+						</view>
+					</view>
+				</view>
+
+				<!-- 暂时不做,目前没有意义 -->
+				<!-- <view v-if="vote.spec.canSeeVoters" class="vote-card">
+					<view class="vote-card-body">
+						<view class="sub-title"> 投票用户 </view>
+						<view class="">
+							
+						</view>
+					</view>
+				</view> -->
+
+				<view class="vote-submit flex w-full flex-center" :style="{
+					paddingBottom:safeAreaBottom + 'rpx'
+				}">
+					<tm-button v-if="fnCalcIsVoted()" theme="white" text :block="true" class="w-full">您已参与投票</tm-button>
+					<tm-button v-else-if="vote.spec._uh_state.state==='未开始'" theme="orange" text class="w-full"
+						:block="true" @click="handleSubmitTip('投票未开始')">投票未开始</tm-button>
+					<tm-button v-else-if="vote.spec._uh_state.state==='已结束'" theme="red" text class="w-full"
+						:block="true" @click="handleSubmitTip('投票已结束')">投票已结束</tm-button>
+					<tm-button v-else-if="!vote.spec.canAnonymously" theme="red" :shadow="0" class="w-full" text
+						:block="true" @click="handleSubmit()">不支持匿名投票</tm-button>
+					<tm-button v-else-if="submitForm.voteData.length===0" theme="white" text class="w-full"
+						:block="true" @click="handleSubmitTip('请选择选项')">提交投票（请选择选项）</tm-button>
+					<tm-button v-else theme="light-blue" class="w-full" :block="true" :loading="submitLoading"
+						:disabled="submitLoading" @click="handleSubmit()">提交投票</tm-button>
+				</view>
+			</block>
+		</block>
+	</view>
+</template>
+
+<script>
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+
+	import {
+		VOTE_TYPES,
+		calcVoteState,
+		calcVotePercent,
+		voteCacheUtil
+	} from '@/utils/vote.js'
+
+	export default {
+		components: {
+			tmSkeleton,
+			tmEmpty,
+			tmButton,
+			tmTags,
+		},
+		data() {
+			return {
+				safeAreaBottom: 24,
+				loading: 'loading',
+				submitLoading: false,
+				pageTitle: '加载中...',
+
+				name: '',
+				detail: null,
+				vote: null,
+				submitForm: {
+					voteData: []
+				}
+			};
+		},
+
+		onLoad(e) {
+			this.name = e.name;
+			this.fnGetData();
+			// this.fnGetVoteUserList();
+			// #ifndef H5
+			const systemInfo = uni.getSystemInfoSync();
+			this.safeAreaBottom = systemInfo.safeAreaInsets.bottom + 12;
+			// #endif
+		},
+		onPullDownRefresh() {
+			this.fnGetData();
+			// this.fnGetVoteUserList();
+		},
+		onShareAppMessage() {
+			return {
+				path: '/pagesA/vote-detail/vote-detail?name=' + this.name,
+				title: this.vote?.spec?.title ?? "来投个票吧",
+				imageUrl: ""
+			}
+		},
+		onShareTimeline() {
+			return {
+				title: this.vote?.spec?.title ?? "来投个票吧",
+				query: {
+					name: this.name
+				},
+				imageUrl: ""
+			}
+		},
+		methods: {
+			fnGetData() {
+				// 设置状态为加载中 
+				this.loading = 'loading';
+				this.pageTitle = "加载中..."
+				this.$httpApi.v2
+					.getVoteDetail(this.name)
+					.then(res => {
+						this.pageTitle = "投票详情" + `（${VOTE_TYPES[res.vote.spec.type]}）`
+
+						const tempVoteRes = res;
+
+						tempVoteRes.vote.spec.isVoted = this.fnCalcIsVoted()
+						tempVoteRes.vote.spec.disabled = this.fnCalcIsVoted()
+						tempVoteRes.vote.spec._uh_state = calcVoteState(tempVoteRes.vote)
+						tempVoteRes.vote.spec._uh_type = VOTE_TYPES[tempVoteRes.vote.spec.type]
+
+						tempVoteRes.vote.spec.options.map((option, index) => {
+							option.value = option.id
+							option.label = option.title
+							option.isVoted = this.fnCalcIsVoted()
+							option.checked = this.fnCalcIsChecked(option)
+							option._uh_percent = calcVotePercent(tempVoteRes.vote, option);
+
+							option.dataStr = JSON.stringify(option)
+
+							return option
+						})
+
+						this.vote = tempVoteRes.vote
+						this.detail = tempVoteRes;
+
+						setTimeout(() => {
+							this.loading = 'success';
+						}, 200);
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.pageTitle = "加载失败，请重试..."
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+							this.fnSetPageTitle(this.pageTitle);
+						}, 200);
+					});
+			},
+			fnGetVoteUserList() {
+				this.$httpApi.v2
+					.getVoteUserList(this.name)
+					.then(res => {
+						console.log("查询投票用户列表")
+					})
+					.catch(err => {
+						console.log("err")
+					})
+			},
+			fnCalcIsVoted() {
+				return voteCacheUtil.has(this.name)
+			},
+
+			fnCalcIsChecked(option) {
+				const data = voteCacheUtil.get(this.name)
+				if (!data) return false;
+				const checked = data.selected.includes(option.id)
+				return checked
+			},
+			onOptionRadioChange(e) {
+				this.submitForm.voteData = e.map(item => this.vote.spec.options[item.index]?.id);
+			},
+			onOptionCheckboxChange(e) {
+				this.submitForm.voteData = e.map(item => this.vote.spec.options[item.index]?.id);
+			},
+			onOptionPkChange(e) {
+				this.submitForm.voteData = e.map(item => this.vote.spec.options[item.index]?.id);
+			},
+			formatJsonStr(jsonStr) {
+				return jsonStr ? JSON.parse(jsonStr) : {}
+			},
+			handleSubmitTip(text) {
+				this.showToast(text)
+			},
+			handleSubmit() {
+				if (!this.vote.spec.canAnonymously) {
+					uni.showModal({
+						icon: "none",
+						title: "提示",
+						content: "该投票不支持匿名，请到博主的 网站端 进行投票！",
+						cancelColor: "#666666",
+						cancelText: "关闭",
+						confirmText: "复制地址",
+						success: (res) => {
+							if (res.confirm) {
+								this.$utils.copyText(this.$baseApiUrl, "复制成功")
+							}
+						}
+					})
+					return
+				}
+
+				this.submitLoading = true
+				uni.showLoading({
+					title: "正在保存..."
+				})
+
+				this.$httpApi.v2
+					.submitVote(this.name, this.submitForm, this.vote.spec.canAnonymously)
+					.then(res => {
+
+						this.showToast("提交成功")
+						voteCacheUtil.set(this.name, {
+							selected: [...this.submitForm.voteData],
+							data: this.vote
+						})
+
+						setTimeout(() => {
+							uni.startPullDownRefresh()
+							this.submitLoading = false
+						}, 1500);
+					})
+					.catch(err => {
+						console.error(err);
+						this.showToast("提交失败，请重试")
+						this.submitLoading = false
+					})
+			},
+
+			handleSelectSingleOption(option) {
+				if (this.vote.spec._uh_state.state == '未开始') {
+					this.showToast(`投票未开始`)
+					return
+				}
+				if (this.vote.spec.hasEnded) return
+				if (this.vote.spec.disabled) return
+				this.vote.spec.options.map(item => {
+					if (option.id == item.id) {
+						item.checked = true
+					} else {
+						item.checked = false
+					}
+				})
+
+				this.submitForm.voteData = this.vote.spec.options.filter(x => x.checked).map(item => item.id)
+			},
+
+			handleSelectCheckboxOption(option) {
+				if (this.vote.spec._uh_state.state == '未开始') {
+					this.showToast(`投票未开始`)
+					return
+				}
+				if (this.vote.spec.hasEnded) return
+				if (this.vote.spec.disabled) return
+
+				const checkedList = this.vote.spec.options.filter(x => x.checked && x.id != option.id)
+
+				if (this.vote.spec.type === 'multiple' && checkedList.length >= this.vote.spec.maxVotes) {
+					this.showToast(`最多选择 ${this.vote.spec.maxVotes} 项`)
+					return
+				}
+
+				this.vote.spec.options.map(item => {
+					if (option.id == item.id) {
+						item.checked = !item.checked
+					}
+				})
+
+				this.submitForm.voteData = this.vote.spec.options.filter(x => x.checked).map(item => item.id)
+			},
+			showToast(content) {
+				uni.showToast({
+					icon: "none",
+					title: content,
+					mask: true
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.app-page {
+		box-sizing: border-box;
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		padding: 24rpx 0;
+		padding-bottom: 160rpx;
+		background-color: #fafafd;
+	}
+
+	.loading-wrap {
+		padding: 0 24rpx;
+		min-height: 100vh;
+	}
+
+	.empty {
+		height: 60vh;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.w-full {
+		width: 100%;
+	}
+
+	.wp-50 {
+		width: 50%;
+	}
+
+	.vote-card {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		margin: 0 24rpx;
+		padding: 24rpx;
+		border-radius: 12rpx;
+		background-color: #ffff;
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+		overflow: hidden;
+		margin-bottom: 24rpx;
+	}
+
+	.vote-info-card {
+		.vote-card-body {
+			font-size: 28rpx;
+			gap: 12rpx 0;
+			background: #F3F4F6;
+			color: #3F3F3F;
+			padding: 24rpx;
+			border-radius: 12rpx;
+		}
+	}
+
+	.vote-card-head {
+		margin-bottom: 12rpx;
+		display: flex;
+		align-items: flex-satrt;
+		justify-content: space-between;
+
+		.left {
+			.title {
+				font-size: 28rpx;
+				font-weight: bold;
+			}
+		}
+	}
+
+	.vote-card-body {
+
+		.remark {
+			box-sizing: border-box;
+			padding: 12rpx 6rpx;
+			padding-top: 0;
+			color: rgba(0, 0, 0, 0.75);
+		}
+	}
+
+	.vote-card-foot {
+		box-sizing: border-box;
+		margin-top: 12px;
+		padding-top: 6px;
+		border-top: 2rpx solid #eee;
+	}
+
+	.is-voted-item {
+		min-height: 72rpx;
+		box-sizing: border-box;
+		position: relative;
+		border-radius: 12rpx;
+		background-color: rgba(229, 229, 229, 0.75);
+		font-size: 24rpx;
+		overflow: hidden;
+
+		&::before {
+			content: "";
+			width: var(--percent);
+			position: absolute;
+			left: 0;
+			top: 0;
+			bottom: 0;
+			background-color: rgba(208, 208, 208, 1);
+			z-index: 0;
+			border-radius: 6rpx;
+		}
+
+		&.selected {
+			background-color: rgba(3, 169, 244, 0.35);
+			color: #ffffff;
+
+			&::before {
+				background-color: rgba(3, 169, 244, 1);
+			}
+		}
+	}
+
+	.is-voted-item-content {
+		box-sizing: border-box;
+		min-height: 72rpx;
+		padding: 12rpx 24rpx;
+		position: relative;
+		z-index: 2;
+	}
+
+	.vote-select-option {
+		box-sizing: border-box;
+		padding: 20rpx 24rpx;
+		font-size: 24rpx;
+		border-radius: 12rpx;
+		transition: all 0.1s ease-in-out;
+	}
+
+
+	::v-deep {
+		.tm-button-label {
+			width: 100%;
+		}
+	}
+
+	.single {
+		::v-deep {}
+	}
+
+	.multiple {
+		::v-deep {}
+	}
+
+	.pk {
+		box-sizing: border-box;
+		width: 100%;
+
+		::v-deep {
+
+			.pk-container {
+				box-sizing: border-box;
+				width: 100%;
+				display: flex;
+			}
+
+			.radio-item {
+				flex-grow: 1;
+				min-width: 30% !important;
+				max-width: 70% !important;
+			}
+
+			.radio-left {}
+
+			.radio-right {}
+
+			.option-item {
+				box-sizing: border-box;
+				width: 100%;
+				padding: 24rpx;
+				border-radius: 12rpx;
+			}
+
+			.option-item-left {
+				background: linear-gradient(90deg, #3B82F6, #60A5FA);
+				color: white;
+				clip-path: polygon(0 0, calc(100% - 40rpx) 0, 100% 100%, 0 100%);
+			}
+
+			.option-item-right {
+				background: linear-gradient(90deg, #F87171, #EF4444);
+				color: white;
+				clip-path: polygon(0 0, 100% 0, 100% 100%, 40rpx 100%);
+				text-align: right;
+			}
+
+			.option-foot {
+				margin-top: 24rpx;
+				width: 100%;
+				font-size: 24rpx;
+				color: #666;
+
+				.tm-groupradio {
+					display: flex;
+					gap: 12rpx;
+				}
+
+				.tm-checkbox {
+					// width: 100%;
+					max-width: initial !important;
+				}
+
+				.tm-button {
+					width: 100%;
+				}
+
+				.left {
+					box-sizing: border-box;
+				}
+
+				.right {
+					box-sizing: border-box;
+
+					.flex-start.fulled {
+						justify-content: flex-end;
+					}
+				}
+			}
+		}
+	}
+
+	.sub-content {
+		margin-bottom: 12rpx;
+		padding: 12rpx 0;
+		font-weight: bold;
+		color: #2B2F33;
+		font-size: 30rpx;
+	}
+
+	.sub-remark {
+		margin-bottom: 36rpx;
+		padding-top: 12rpx;
+		color: #3F3F3F;
+		font-size: 28rpx;
+	}
+
+	.sub-title {
+		box-sizing: border-box;
+		position: relative;
+		margin-bottom: 12rpx;
+		padding-left: 24rpx;
+		// font-weight: bold;
+		font-size: 30rpx;
+
+		&:before {
+			content: "";
+			width: 8rpx;
+			height: 28rpx;
+			position: absolute;
+			left: 0;
+			top: 6rpx;
+			background: #03A9F4;
+			border-radius: 6rpx;
+		}
+
+		.sub-title-count {
+			font-size: 24rpx;
+			font-weight: normal;
+		}
+	}
+
+	.vote-submit {
+		box-sizing: border-box;
+		padding: 24rpx 36rpx;
+		position: fixed;
+		left: 0;
+		width: 100vw;
+		bottom: 0;
+		background-color: rgba(255, 255, 255, 0.98);
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+		border-top: 2rpx solid #eee;
+		z-index: 99;
+
+		::v-deep {
+			.tm-button {
+				text-align: center;
+			}
+
+			.tm-button-btn {
+				margin: 0;
+				width: 100%;
+			}
+		}
+	}
+</style>

pagesA/votes/votes.vue

@@ -0,0 +1,409 @@
+<template>
+	<view class="app-page" :class="[uniHaloPluginPageClass]">
+		<PluginUnavailable v-if="!uniHaloPluginAvailable" :pluginId="uniHaloPluginId"
+			:error-text="uniHaloPluginAvailableError" />
+		<template v-else>
+			<!-- 顶部切换 -->
+			<view class="e-fixed filter-box">
+				<tm-search v-model="queryParams.keyword" :round="24" :shadow="0" color="light-blue"
+					insert-color="light-blue" :clear="true" @input="fnOnSearch" @confirm="fnOnSearch"></tm-search>
+				<tm-dropDownMenu :shadow="0" color="light-blue" active-color="light-blue"
+					:default-selected="filterOption.selected" :list="filterOption.list"
+					@confirm="fnOnFilterConfirm"></tm-dropDownMenu>
+			</view>
+			<!-- 占位区域 -->
+			<view style="width: 100vw;height: 180rpx;"></view>
+			<!-- 加载区域 -->
+			<view v-if="loading == 'loading'" class="loading-wrap pa-24">
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+				<tm-skeleton model="listAvatr"></tm-skeleton>
+			</view>
+			<view v-else-if="loading == 'error'" class="content-empty flex flex-center">
+				<tm-empty icon="icon-wind-cry" label="加载异常"></tm-empty>
+			</view>
+			<!-- 内容区域 -->
+			<view v-else class="content">
+				<view v-if="dataList.length == 0" class="content-empty flex flex-center">
+					<tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无数据"></tm-empty>
+				</view>
+				<block v-else>
+					<tm-translate v-for="(item, index) in dataList" :key="item.metadata.name" animation-name="fadeUp"
+						:wait="calcAniWait(index)">
+						<VoteCard :vote="item" :index="index" @on-click="fnToDetail"></VoteCard>
+					</tm-translate>
+					<view class="load-text">{{ loadMoreText }}</view>
+					<tm-flotbutton @click="fnToTopPage" size="m" color="light-blue"
+						icon="icon-angle-up"></tm-flotbutton>
+
+				</block>
+			</view>
+		</template>
+	</view>
+</template>
+
+<script>
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmDropDownMenu from '@/tm-vuetify/components/tm-dropDownMenu/tm-dropDownMenu.vue';
+
+	import VoteCard from '@/components/vote-card/vote-card.vue'
+
+	import {
+		VOTE_TYPES,
+		calcVoteState,
+		voteCacheUtil
+	} from '@/utils/vote.js'
+	import pluginAvailableMixin from "@/common/mixins/pluginAvailable.js"
+	import PluginUnavailable from '@/components/plugin-unavailable/plugin-unavailable.vue'
+
+	export default {
+		options: {
+			styleIsolation: 'shared'
+		},
+		mixins: [pluginAvailableMixin],
+		components: {
+			tmSkeleton,
+			tmSearch,
+			tmTranslate,
+			tmTabs,
+			tmFlotbutton,
+			tmEmpty,
+			tmTags,
+			tmDropDownMenu,
+			VoteCard,
+			PluginUnavailable
+		},
+		data() {
+			return {
+				loading: 'loading',
+				hasNext: false,
+				isLoadMore: false,
+				loadMoreText: '加载中...',
+				filterOption: {
+					selected: [],
+					list: [{
+						title: '类型',
+						children: [{
+							title: "",
+							model: "list",
+							name: "type",
+							children: [{
+									title: "全部",
+									id: undefined
+								},
+								{
+									title: "单选",
+									id: 'single'
+								},
+								{
+									title: "多选",
+									id: 'multiple'
+								},
+								{
+									title: "双选PK",
+									id: 'pk'
+								}
+							]
+						}]
+					}, {
+						title: '状态',
+						children: [{
+							title: "",
+							model: "list",
+							name: "hasEnded",
+							children: [{
+									title: "全部",
+									id: undefined
+								},
+								{
+									title: "进行中",
+									id: false
+								},
+								{
+									title: "已结束",
+									id: true
+								}
+							]
+						}]
+					}, {
+						title: '排序',
+						children: [{
+							title: "",
+							model: "list",
+							name: "sort",
+							children: [{
+									title: "默认排序",
+									id: undefined
+								},
+								{
+									title: "较近创建",
+									id: 'metadata.creationTimestamp,desc'
+								},
+								{
+									title: "较早创建",
+									id: 'metadata.creationTimestamp,asc'
+								}
+							]
+						}]
+					}, {
+						title: '是否已投',
+						children: [{
+							title: "",
+							model: "list",
+							name: "isVoted",
+							children: [{
+									title: "全部",
+									id: undefined
+								},
+								{
+									title: "未投票",
+									id: false
+								},
+								{
+									title: "已投票",
+									id: true
+								}
+							]
+						}]
+					}]
+				},
+				filterIsVoted: undefined,
+				queryParams: {
+					keyword: "",
+					page: 1,
+					size: 10,
+					sort: undefined,
+					type: undefined,
+					hasEnded: undefined
+				},
+				dataList: []
+			};
+		},
+		computed: {
+			haloConfigs() {
+				return this.$tm.vx.getters().getConfigs;
+			},
+			calcAuditModeEnabled() {
+				return this.haloConfigs.auditConfig.auditModeEnabled
+			},
+		},
+		async onLoad() {
+			this.fnSetPageTitle('投票列表');
+			// 检查插件
+			this.setPluginId(this.NeedPluginIds.PluginVote)
+			this.setPluginError("阿偶，检测到当前插件没有安装或者启用，无法使用投票功能哦，请联系管理员")
+			if (!await this.checkPluginAvailable()) return
+			this.fnGetData();
+		},
+		onPullDownRefresh() {
+			if (!this.uniHaloPluginAvailable) {
+				uni.hideLoading();
+				uni.stopPullDownRefresh();
+				return
+			}
+			this.fnResetSetAniWaitIndex();
+			this.isLoadMore = false;
+			this.queryParams.page = 0;
+			this.fnGetData();
+		},
+		onReachBottom(e) {
+			if (!this.uniHaloPluginAvailable) return;
+			if (this.calcAuditModeEnabled) {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+				return
+			}
+			if (this.hasNext) {
+				this.queryParams.page += 1;
+				this.isLoadMore = true;
+				this.fnGetData();
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+			}
+		},
+		methods: {
+			fnOnSearch() {
+				this.fnResetSetAniWaitIndex();
+				this.fnToTopPage();
+				this.fnGetData();
+			},
+			fnGetData() {
+				if (this.calcAuditModeEnabled) {
+					return;
+				}
+				uni.showLoading({
+					mask: true,
+					title: '加载中...'
+				});
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi.v2
+					.getVoteList(this.queryParams)
+					.then(res => {
+						this.loading = 'success';
+						this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						this.hasNext = res.hasNext;
+
+						const tempItems = res.items.map(item => {
+							item.spec.disabled = true
+							item.spec.isVoted = this.fnCalcIsVoted(item.metadata.name)
+							item.spec._uh_state = calcVoteState(item)
+							item.spec._uh_type = VOTE_TYPES[item.spec.type]
+							item.spec.options.map((option, index) => {
+
+								option.checked = this.fnCalcIsChecked(item.metadata.name, option)
+								option.value = option.id
+								option.label = option.title
+
+								// 计算当前的选择占比
+								if (item.spec.type === 'single') {
+									option.percent = this.fnCalcPercent(option, item.stats);
+								} else if (item.spec.type === 'multiple') {
+									option.percent = this.fnCalcPercent(option, item.stats);
+								} else if (item.spec.type === 'pk') {
+									option.percent = this.fnCalcPercent(option, item.stats);
+								}
+
+								return option
+							})
+
+							return item;
+						})
+
+						if (this.isLoadMore) {
+							this.dataList = this.dataList.concat(tempItems);
+						} else {
+							this.dataList = tempItems;
+						}
+
+						this.dataList = this.dataList.sort((a, b) => {
+							return a.spec.isVoted - b.spec.isVoted
+						})
+
+						if (this.filterIsVoted != undefined) {
+							this.dataList = this.dataList.filter(x => x.spec.isVoted == this.filterIsVoted)
+						}
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 100);
+					});
+			},
+
+			fnCalcPercent(voteOption, stats) {
+				if (!stats?.voteDataList) return 0;
+				const option = stats.voteDataList.find(x => x.id == voteOption.id)
+				if (!option) return 0;
+				const percent = (option.voteCount / stats.voteCount) * 100
+				return Math.round(percent)
+			},
+
+			fnCalcIsVoted(name) {
+				return voteCacheUtil.has(name)
+			},
+			fnCalcIsChecked(name, option) {
+				const data = voteCacheUtil.get(name)
+				if (!data) return false;
+				const checked = data.selected.includes(option.id)
+				return checked
+			},
+		 
+			//跳转详情
+			fnToDetail(item) {
+				if (this.calcAuditModeEnabled) return;
+				uni.navigateTo({
+					url: '/pagesA/vote-detail/vote-detail?name=' + item.metadata.name,
+					animationType: 'slide-in-right'
+				});
+			},
+			fnOnFilterConfirm(e) {
+				// 类型
+				const type = e.find(x => x.name == 'type')
+				if (type.children.length == 0) {
+					this.queryParams.type = undefined
+				} else {
+					this.queryParams.type = type.children[0]?.id
+				}
+
+				// 状态
+				const hasEnded = e.find(x => x.name == 'hasEnded')
+				if (hasEnded.children.length == 0) {
+					this.queryParams.hasEnded = undefined
+				} else {
+					this.queryParams.hasEnded = hasEnded.children[0]?.id
+				}
+
+				// 排序
+				const sort = e.find(x => x.name == 'sort')
+				if (sort.children.length == 0) {
+					this.queryParams.sort = undefined
+				} else {
+					this.queryParams.sort = sort.children[0]?.id
+				}
+
+				// 是否已经投
+				const isVoted = e.find(x => x.name == 'isVoted')
+				if (isVoted.children.length == 0) {
+					this.filterIsVoted = undefined
+				} else {
+					this.filterIsVoted = isVoted.children[0]?.id
+				}
+
+				this.queryParams.page = 0;
+				this.isLoadMore = false;
+				this.fnResetSetAniWaitIndex();
+				this.fnToTopPage();
+				this.fnGetData();
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.app-page {
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		padding-bottom: 24rpx;
+		background-color: #fafafd;
+
+		&.is-balck {
+			background-color: #212121;
+		}
+	}
+
+	.filter-box {
+		box-shadow: 0rpx 0rpx 12rpx rgba(0, 0, 0, 0.035);
+	}
+
+	.content {
+		padding-top: 24rpx;
+	}
+
+	.content-empty {
+		height: 60vh;
+	}
+</style>

pagesC/website/website.vue

@@ -13,9 +13,12 @@ export default {
         };
     },
     onLoad(e) {
-        const {title, url} = JSON.parse(e.query.data);
-        this.webUrl = url;
-        this.fnSetPageTitle(title);
+        const {title, url} = JSON.parse(e.data);
+        this.webUrl = decodeURIComponent(url);
+		console.log("webUrl" + this.webUrl)
+        if (title) {
+            this.fnSetPageTitle(title);
+        }
     }
 };
 </script>

router/router.js

@@ -1,24 +0,0 @@
-// router.js
-import {
-	RouterMount,
-	createRouter
-} from 'uni-simple-router';
-
-const router = createRouter({
-	platform: process.env.VUE_APP_PLATFORM,
-	routes: [...ROUTES]
-});
-
-//全局路由前置守卫
-router.beforeEach((to, from, next) => {
-	next();
-});
-// 全局路由后置守卫
-router.afterEach((to, from) => {
-	console.log('跳转结束')
-})
-
-export {
-	router,
-	RouterMount
-}

store/config.js

@@ -5,33 +5,49 @@
  *  时间：2024年06月22日 12:00:44
  *  版本：v0.1.0
  */
-import {DefaultAppConfigs, getAppConfigs, setAppConfigs} from '@/config/index.js'
+import {DefaultAppConfigs, getAppConfigs, getAppMockJson, setAppConfigs, setAppMockJson} from '@/config/index.js'
 import v2Config from '@/api/v2/all.config.js'
+import utils from '@/utils/index.js'
+import {setTokens} from "@/utils/token";
 
 export default {
     namespaced: true,
     state: {
         configs: getAppConfigs(),
+        mockJson: getAppMockJson(),
     },
     getters: {
         getConfigs(state) {
             if (state.configs) return state.configs;
             return getAppConfigs()
         },
+        getMockJson(state) {
+            if (state.mockJson) return state.mockJson;
+            return getAppMockJson()
+        }
     },
     mutations: {
         setConfigs(state, data) {
             state.configs = data;
             setAppConfigs(data)
         },
+        setMockJson(state, data) {
+            setAppMockJson(data)
+            state.mockJson = data;
+        }
     },
     actions: {
-        fetchConfigs({commit, dispatch}) {
+        fetchConfigs({state, commit, dispatch}) {
             return new Promise(async (resolve, reject) => {
                 try {
                     const res = await v2Config.getAppConfigs()
                     if (res) {
-                        commit('setConfigs', res)
+                        commit('setConfigs', utils.deepMerge(DefaultAppConfigs, res))
+
+                        // 存储token
+                        if (res?.basicConfig?.tokenConfig) {
+                            setTokens(res.basicConfig.tokenConfig)
+                        }
                         resolve(res)
                     } else {
                         dispatch("setDefaultAppSettings");
@@ -47,5 +63,28 @@ export default {
         setDefaultAppSettings({commit}) {
             commit('setConfigs', JSON.parse(JSON.stringify(DefaultAppConfigs)))
         },
+        // 请求模拟数据
+        fetchMockJson({state, commit, dispatch}) {
+            return new Promise(async (resolve, reject) => {
+                const mockJsonUrl = utils.checkUrl(state.configs.basicConfig.auditModeMockUrl)
+                uni.request({
+                    url: mockJsonUrl,
+                    method: "GET",
+                    success: (res) => {
+                        commit('setMockJson', res.data)
+                        resolve({
+                            ok: true,
+                            data: res.data
+                        })
+                    },
+                    fail: (err) => {
+                        resolve({
+                            ok: false,
+                            data: err
+                        })
+                    }
+                })
+            })
+        },
     }
 };

tm-vuetify/components/tm-checkbox/tm-checkbox.vue

@@ -2,7 +2,7 @@
 	<view @click="onclick" class=" tm-checkbox " :class="[dense?'':'pa-20',inline?'d-inline-block':'']">
 		<view class=" flex-start">
 
-			<slot name="default" :checkData="{label:label,checked:changValue}" :on="onclick">
+			<slot name="default" :checkData="{label:label,checked:changValue,extendData}" :on="onclick">
 				<view :style="{width: sizes.wk,height: sizes.wk}" class="tm-checkbox-boey relative d-inline-block" 
 				:class="[black?'bk':'','flex-shrink mr-10',
 				changValue?'ani':'',
@@ -51,6 +51,10 @@
 	 */
 	import tmIcons from "@/tm-vuetify/components/tm-icons/tm-icons.vue"
 	export default {
+		options: {
+			virtualHost: true,
+			styleIsolation: 'shared'
+		},
 		components:{tmIcons},
 		name: 'tm-checkbox',
 		model: {
@@ -117,6 +121,10 @@
 			fllowTheme:{
 				type:Boolean|String,
 				default:true
+			},
+			extendData:{
+				type:Object,
+				default:()=>({})
 			}
 		},
 		data() {

tm-vuetify/components/tm-flowLayout-custom/tm-flowLayout-custom.vue

@@ -0,0 +1,215 @@
+<template>
+    <view class="tm-flowLayout relative">
+        <view class="tm-flowLayout-hidden absolute fulled">
+            <view v-for="(item, index) in list2" :key="index" style="width: 350rpx;" :class="'tm-flowLayout-hidden-'+index">
+                <tm-images @error="loadimg($event,false,index)" @load="loadimg($event,true,index)" :src="item.spec.url"></tm-images>
+            </view>
+        </view>
+        <view class="tm-flowLayout-cm flex-between">
+            <view class="tm-flowLayout-left" style="width: 48.6%;">
+                <block v-for="(item, index) in dataList[0]" :key="index">
+                    <view @click.stop="onclick(index,0)" class="tm-flowLayout-item mb-20 fulled" :class="['tm-flowLayout-item_'+index]">
+                        <tm-translate animation-name="fadeUp">
+                            <view class="card round-3 overflow white">
+                                <tm-images :previmage="false" :src="item.spec.url"></tm-images>
+                            </view>
+                        </tm-translate>
+                    </view>
+                </block>
+            </view>
+            <view class="tm-flowLayout-right" style="width: 48.6%;">
+                <block v-for="(item, index) in dataList[1]" :key="index">
+                    <view @click.stop="onclick(index,1)" class="tm-flowLayout-item mb-20 fulled" :class="['tm-flowLayout-item_'+index]">
+                        <tm-translate animation-name="fadeUp">
+                            <view class="card round-3 overflow white">
+                                <tm-images :previmage="false" :src="item.spec.url"></tm-images>
+                            </view>
+                        </tm-translate>
+                    </view>
+                </block>
+            </view>
+
+        </view>
+        <view v-if="isLoading" class="flex-shrink fulled">
+            <tm-loadding></tm-loadding>
+        </view>
+    </view>
+</template>
+
+<script>
+
+/**
+ * 瀑布流组件
+ * @property {Function} click 点击项目时触发
+ * @property {Function} load 当前列表加载完成发出的事件。
+ * @property {String} model = [rank|desc] desc下正时排序，所有加载完成再进行显示,rank随机，哪个先加载哪个先排前面。
+ */
+import tmImages from "@/tm-vuetify/components/tm-images/tm-images.vue"
+import tmLoadding from "@/tm-vuetify/components/tm-loadding/tm-loadding.vue"
+import tmIcons from "@/tm-vuetify/components/tm-icons/tm-icons.vue"
+import tmTranslate from "@/tm-vuetify/components/tm-translate/tm-translate.vue"
+
+export default {
+    components: {tmImages, tmLoadding, tmIcons, tmTranslate},
+    name: 'tm-flowLayout',
+    props: {
+        model: {
+            type: String,
+            default: 'rank' //desc下正时排序，所有加载完成再进行显示,rank随机，哪个先加载哪个先排前面。
+        }
+    },
+    data() {
+        return {
+            list2: [],
+            dataList: [
+                [], []
+            ],
+            colHeight: [0, 0],
+            minWidth: 0,
+            isLoading: true,
+        };
+    },
+    async mounted() {
+        let p = await this.$Querey('.tm-flowLayout-left').catch(e => {
+        });
+        this.minWidth = p[0].width;
+    },
+
+    methods: {
+        onclick(index, dirIndex) {
+            this.$emit('click',
+                {
+                    childrenIndex: index,
+                    dirIndex: dirIndex,
+                    item: this.dataList[dirIndex][index]
+                });
+        },
+        //修改或者替换列表数据
+        changeItemData(dirIndex, childrenIndex, item) {
+            this.dataList[dirIndex].splice(childrenIndex, 1, item);
+        },
+        //删除一项列表数据
+        delItemData(dirIndex, childrenIndex) {
+            this.colHeight.splice(dirIndex, 1, this.colHeight[dirIndex] - this.dataList[dirIndex][childrenIndex].height)
+            this.dataList[dirIndex].splice(childrenIndex, 1);
+            this.list2.splice(this.dataList[dirIndex][childrenIndex].index, 1);
+
+            this.$nextTick(function () {
+                this.sucessRank();
+            })
+        },
+        //向列表添加数据
+        pushData(list) {
+            let prIdx_i = this.list2.length;
+            if (!Array.isArray(list) || typeof list == 'undefined') {
+                return false;
+            }
+            for (let i = 0; i < list.length; i++) {
+                this.list2.push({
+                    index: i + prIdx_i,
+                    isLoad: false,
+                    image: "",
+                    width: 0,
+                    height: 0,
+                    ...list[i]
+                })
+            }
+        },
+        //获取内部列表数据
+        getDataList() {
+            return this.dataList;
+        },
+        async loadimg(event, isLoad, index) {
+            this.isLoading = true;
+            let ps = this.list2[index];
+            ps.isLoad = true;
+            if (isLoad == false) {
+                ps.width = this.minWidth;
+                ps.height = this.minWidth;
+
+            } else {
+                ps.width = this.minWidth;
+                ps.height = ps.height + event.height;
+            }
+            if (this.list2.length == 0 && this.dataList[0].length == 0 && this.dataList[1].length == 0) {
+                this.isLoading = false;
+                return;
+            }
+            this.list2.splice(index, 1, ps);
+            if (this.model == 'desc') {
+                this.sucessRank();
+            } else if (this.model == 'rank') {
+                let indexCol = this.colHeight[0] <= this.colHeight[1] ? 0 : 1;
+                this.dataList[indexCol].push(this.list2[index]);
+                this.colHeight.splice(indexCol, 1, this.colHeight[indexCol] + this.list2[index].height);
+                if (this.isAllLoading() === false) return;
+                this.isLoading = false;
+            }
+        },
+        isAllLoading() {
+            let isAllload = true;
+            for (let i = 0; i < this.list2.length; i++) {
+                if (this.list2[i].isLoad === false) {
+                    isAllload = false;
+                    break;
+                }
+            }
+            if (isAllload === true) {
+                // 当前列表加载完成发出的事件。
+                this.$emit('load', this.dataList)
+            }
+            return isAllload;
+        },
+        sucessRank() {
+            if (this.isAllLoading() === false) return;
+            this.isLoading = false;
+            for (let i = 0; i < this.list2.length; i++) {
+                // let p = await this.getLeftRightHeight();
+                let index = this.colHeight[0] <= this.colHeight[1] ? 0 : 1;
+                this.dataList[index].push(this.list2[i]);
+                this.colHeight.splice(index, 1, this.colHeight[index] + this.list2[i].height)
+            }
+
+        },
+        //清空瀑布流数据 。
+        clear() {
+            this.list2 = [];
+            this.dataList = [[], []];
+            this.isLoading = false;
+        },
+        getLeftRightHeight(index) {
+            let t = this;
+            return new Promise((resolve, rejecvt) => {
+                let q = uni.createSelectorQuery().in(t);
+                q.select(".tm-flowLayout-left").boundingClientRect();
+                q.select(".tm-flowLayout-right").boundingClientRect();
+                q.exec((res) => {
+                    resolve([res[0].height, res[1].height])
+                })
+            })
+        }
+
+    },
+};
+</script>
+
+<style lang="scss">
+.tm-flowLayout {
+    .tm-flowLayout-hidden {
+        width: 100%;
+        height: 100px;
+        overflow-y: auto;
+        left: -300%;
+        top: 0;
+    }
+
+    .tm-flowLayout-cm {
+        align-items: flex-start;
+    }
+
+    .card {
+        box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
+    }
+}
+
+</style>

tm-vuetify/components/tm-groupcheckbox/tm-groupcheckbox.vue

@@ -17,6 +17,10 @@
 	 * 
 	 */
 	export default {
+		options: {
+			virtualHost: true,
+			styleIsolation: 'shared'
+		},
 		name:'tm-groupcheckbox',
 		props:{
 			// 最大选择数量

tm-vuetify/components/tm-poup/tm-poup.vue

@@ -15,13 +15,13 @@
 				<!-- <view class="tm-poup-wk bottom">{{ show ? 'on' : 'off'}}</view> -->
 				<scroll-view :animation="aniData" @click.stop.prevent="" class="tm-poup-wk dhshiKa" scroll-y="true" :class="[
 							position_sv == 'top'?'round-b-' + round:'',
-							position_sv == 'bottom'?'round-t-' + round:'', 
-							position_sv, aniOn ? 'on ' : 'off', 
+							position_sv == 'bottom'?'round-t-' + round:'',
+							position_sv, aniOn ? 'on ' : 'off',
 							black_tmeme ? 'grey-darken-5 bk' : bgColor
 						]" :style="{
 							width: (position_sv == 'top' || position_sv == 'bottom') ? '100%' : width_w,
 							height: position_sv == 'right' || position_sv == 'left' ?'100%' : height_h,
-							
+
 						}">
 					<view :class="[clssStyle]" >
 						<slot></slot>
@@ -178,7 +178,7 @@
 				dhshiKa:true,//是否结束动画
 				aniData:null,
 				timdiiid:6369784254,
-				
+
 			};
 		},
 		deactivated() {
@@ -198,7 +198,7 @@
 				this.close();
 			},
 			close() {
-				let t = this;	
+				let t = this;
 				clearTimeout(this.timdiiid)
 				this.dhshiKa=false;
 				t.aniOn=false;
@@ -213,18 +213,18 @@
 			open() {
 				let t = this;
 				clearTimeout(this.timdiiid)
-				
-				
+
+
 				this.dhshiKa=false
 				this.aniOn=true;
-				
+
 				this.createBtT(this.position_sv,'on').then(()=>{
 					t.dhshiKa=true
-					
+
 					t.isclick=false
 					// console.log('on');
 				})
-				
+
 			},
 			//下至上。
 			createBtT(pos,type){
@@ -239,60 +239,60 @@
 					if(type=='on'){
 						aniData.translateY('0%').step();
 						this.aniData = aniData.export()
-						
+
 					}
 					if(type=='off'){
 						aniData.translateY('100%').step();
 						this.aniData = aniData.export()
-						
+
 					}
 				}else if(pos=='top'){
 					if(type=='on'){
 						aniData.translateY('0%').step();
 						this.aniData = aniData.export()
-						
+
 					}
 					if(type=='off'){
 						aniData.translateY('-100%').step();
 						this.aniData = aniData.export()
-						
+
 					}
 				}else if(pos=='left'){
 					if(type=='on'){
 						aniData.translateX('0%').step();
 						this.aniData = aniData.export()
-						
+
 					}
 					if(type=='off'){
 						aniData.translateX('-100%').step();
 						this.aniData = aniData.export()
-						
+
 					}
 				}else if(pos=='right'){
 					if(type=='on'){
 						aniData.translateX('0%').step();
 						this.aniData = aniData.export()
-						
+
 					}
 					if(type=='off'){
 						aniData.translateX('100%').step();
 						this.aniData = aniData.export()
-						
+
 					}
 				}else if(pos=='center'){
-					
+
 					if(type=='on'){
 						aniData.opacity(1).scale(1).step();
 						this.aniData = aniData.export()
-						
+
 					}
 					if(type=='off'){
 						aniData.opacity(0).scale(0.6).step();
 						this.aniData = aniData.export()
-						
+
 					}
 				}
-				
+
 				return new Promise(res=>{
 					t.timdiiid = setTimeout(()=>{
 						t.aniData = null;
@@ -319,7 +319,7 @@
 		overflow: hidden;
 		top: 0;
 		left: 0;
-		
+
 		&.isClickbled {
 			pointer-events: none;
 		}
@@ -346,7 +346,7 @@
 				transform: translateY(100%);
 				width: 100%;
 				bottom: 0;
-				
+
 			}
 
 			&.top {
@@ -382,7 +382,7 @@
 			justify-content: center;
 			align-items: center;
 			align-content: center;
-			
+
 
 			.tm-poup-wk {
 				position: static;

tm-vuetify/components/tm-radio/tm-radio.vue

@@ -2,7 +2,7 @@
 	<view @click="onclick" class=" tm-checkbox " :class="[dense?'':'pa-20',inline?'d-inline-block ':'fulled']">
 		<view class="flex-start fulled">
 			
-			<slot name="default" :checkData="{label:label,checked:changValue}" :on="onclick">
+			<slot name="default" :checkData="{label:label,checked:changValue,extendData}" :on="onclick">
 				<view :style="{width: sizes.wk,height: sizes.wk}" class="tm-checkbox-boey  relative d-inline-block"
 				:class="[black?'bk':'','flex-shrink mr-10 ',
 				changValue?'ani':'',
@@ -119,8 +119,11 @@
 			fllowTheme:{
 				type:Boolean|String,
 				default:true
-			}
-			
+			},
+			extendData:{
+				type:Object,
+				default:()=>({})
+			},
 		},
 		data() {
 			return {

tm-vuetify/tool/function/vuex.js

@@ -19,7 +19,6 @@ class vuex {
 		let t = this;
 		const g = this.store.getters
 		let keys = Object.keys(g);
-		console.log(keys)
 		let k = keys.map((el,index)=>{
 			let f = el.split('/');
 			let tst = {}

uni_modules/k-touch-listen/changelog.md

@@ -0,0 +1,18 @@
+## 1.0.2（2023-09-14）
+更新使用文档：
+引入本插件 然后使用，手动滑稽，教程简单吗？
+<k-touch-listen @touchUp="touchUp" @touchDown="touchDown" @touchLeft="touchLeft" @touchRight="touchRight">
+  <view>
+   //您需要监听的区域的代码
+  </view>
+</k-touch-listen>
+## 1.0.1（2023-09-14）
+更新使用文档：
+引入本插件 然后使用，手动滑稽，教程简单吗？
+<k-touch-listen @touchUp="touchUp" @touchDown="touchDown" @touchLeft="touchLeft" @touchRight="touchRight">
+  <view>
+   //您需要监听的区域的代码
+  </view>
+</k-touch-listen>
+## 1.0.0（2023-09-14）
+首次提交

uni_modules/k-touch-listen/components/k-touch-listen/k-touch-listen.vue

@@ -0,0 +1,113 @@
+<template>
+	<view class="touch-box" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'k-touch-listen',
+		data() {
+			return {
+				touchStartX: 0, // 触摸时的原点
+				touchStartY: 0, // 触摸时的原点
+				time: 0, // 时间记录，用于滑动时且时间小于1s则执行左右滑动
+				interval: '', // 记录/清理时间记录
+				touchMoveX: 0, // x轴方向移动的距离
+				touchMoveY: 0, // y轴方向移动的距离
+				touchMoveTag: false // 定义滑动状态
+			}
+		},
+		props: {
+			direction: {
+				type: String,
+				default: 'all'
+			},
+			distance: {
+				type: [String, Number],
+				default: 30
+			}
+		},
+		emits: ['touchUp', 'touchDown', 'touchLeft', 'touchRight'],
+		methods: {
+			// 触摸开始事件
+			touchStart(e) {
+				this.touchStartX = e.touches[0].pageX // 获取触摸时的原点
+				this.touchStartY = e.touches[0].pageY // 获取触摸时的原点
+				// 使用js计时器记录时间
+				this.interval = setInterval(() => {
+					this.time++
+				}, 100)
+			},
+			// 触摸移动事件
+			touchMove(e) {
+				this.touchMoveTag = true
+				this.touchMoveX = e.touches[0].pageX
+				this.touchMoveY = e.touches[0].pageY
+			},
+			ressetData() {
+				this.touchStartX = 0 // 触摸时的原点
+				this.touchStartY = 0 // 触摸时的原点
+				this.time = 0 // 时间记录，用于滑动时且时间小于1s则执行左右滑动
+				this.interval = '' // 记录/清理时间记录
+				this.touchMoveX = 0 // x轴方向移动的距离
+				this.touchMoveY = 0 // y轴方向移动的距离
+				this.touchMoveTag = false // 定义滑动状态
+			},
+			// 触摸结束事件
+			touchEnd(e) {
+				let moveX = this.touchMoveX - this.touchStartX
+				let moveY = this.touchMoveY - this.touchStartY
+				if (Math.sign(moveX) == -1) {
+					moveX *= -1
+				}
+				if (Math.sign(moveY) == -1) {
+					moveY *= -1
+				}
+				if (2 * moveX <= moveY && this.touchMoveTag) {
+					// 上下
+					if (this.direction != 'all' && this.direction != 'vertical') return
+					// 向上滑动
+					if (
+						this.touchMoveY - this.touchStartY <= -this.distance &&
+						this.time < 10
+					) {
+						this.$emit('touchUp')
+					}
+					// 向下滑动
+					if (
+						this.touchMoveY - this.touchStartY >= this.distance &&
+						this.time < 10
+					) {
+						this.$emit('touchDown')
+					}
+				} else if (moveX > 2 * moveY && this.touchMoveTag) {
+					// 左右
+					if (this.direction != 'all' && this.direction != 'horizontal') return
+					// 向左滑动
+					if (
+						this.touchMoveX - this.touchStartX <= -this.distance &&
+						this.time < 10
+					) {
+						this.$emit('touchLeft')
+					}
+					// 向右滑动
+					if (
+						this.touchMoveX - this.touchStartX >= this.distance &&
+						this.time < 10
+					) {
+						this.$emit('touchRight')
+					}
+				}
+				clearInterval(this.interval) // 清除setInterval
+				this.ressetData()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.touch-box {
+		width: 100%;
+		height: 100%;
+	}
+</style>

uni_modules/k-touch-listen/package.json

@@ -0,0 +1,85 @@
+{
+	"id": "k-touch-listen",
+	"displayName": "k-touch-listen 手势监听  全面兼容小程序、vue2、vue3等多端",
+	"version": "1.0.2",
+	"description": "用于监听用户滑动手势，左滑右滑，上滑下滑等一系列手势监听",
+	"keywords": [
+        "touch",
+        "手势",
+        "手势监听",
+        "手势监听",
+        "vue3"
+    ],
+	"repository": "",
+	"engines": {
+		"HBuilderX": "^3.7.6"
+	},
+	"dcloudext": {
+		"type": "component-vue",
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "插件不采集任何数据",
+			"permissions": "无"
+		},
+		"npmurl": ""
+	},
+	"uni_modules": {
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}

uni_modules/lime-painter/changelog.md

@@ -0,0 +1,225 @@
+## 1.9.6.6（2024-09-25）
+- fix: 修复background-position无效的问题
+## 1.9.6.5（2024-04-14）
+- fix: 修复`nvue`无法生图的问题
+## 1.9.6.4（2024-03-10）
+- fix: 修复代理ctx导致H5不能使用ctx.save
+## 1.9.6.3（2024-03-08）
+- fix: 修复支付宝真机无法使用的问题
+## 1.9.6.2（2024-02-22）
+- fix: 修复使用render函数报错的问题
+## 1.9.6.1（2023-12-22）
+- fix: 修复字节小程序非2d字体偏移
+- fix: 修复`canvasToTempFilePathSync`会触发两次的问题
+- fix: 修复`parser`图片没有宽度的问题
+## 1.9.6（2023-12-06）
+- fix: 修复背景图受padding影响
+- fix: 修复因字节报错改了代理实现导致微信报错
+- 1.9.5.8（2023-11-16）
+- fix: 修复margin问题
+- fix: 修复borderWidth问题
+- fix: 修复textBox问题
+- fix: 修复字节开发工具报`could not be cloned.`问题
+## 1.9.5.7（2023-07-27）
+- fix: 去掉多余的方法
+- chore: 更新文档，增加自定义字体说明
+## 1.9.5.6（2023-07-21）
+- feat: 有限的支持富文本
+- feat: H5和APP 增加 `hidpi` prop，主要用于大尺寸无法生成图片时用
+- fix: 修复 钉钉小程序 缺少 `measureText` 方法
+- chore: 由于微信小程序 pc 端的 canvas 2d 时不时抽风，故不使用canvas 2d
+## 1.9.5.5（2023-06-27）
+- fix: 修复把`emoji`表情字符拆分成多个字符的情况
+## 1.9.5.4（2023-06-05）
+- fix: 修复因`canvasToTempFilePathSync`监听导致重复调用
+## 1.9.5.3（2023-05-23）
+- fix: 因isPc错写成了isPC导致小程序PC不能生成图片
+## 1.9.5.2（2023-05-22）
+- feat: 删除多余文件
+## 1.9.5.1（2023-05-22）
+- fix: 修复 文字行数与`line-clamp`相同但不满一行时也加了省略号的问题
+## 1.9.5（2023-05-14）
+- feat: 增加 `text-indent` 和 `calc` 方法
+- feat: 优化 布局时间
+## 1.9.4.4（2023-04-15）
+- fix: 修复无法匹配负值
+- fix: 修复 Nvue IOS getImageInfo `useCORS` 为 undefined
+## 1.9.4.3（2023-04-01）
+- feat: 增加支持文字描边 `text-stroke: '5rpx #fff'`
+## 1.9.4.2（2023-03-30）
+- fix: 修复 支付宝小程序 isPC 在手机也为true的问题
+- feat: 由 微信开发工具 3060 版 无法获取图片尺寸，现 微信开发工具 3220 版 修复该问题，故还原上一版的获取图片方式。
+## 1.9.4.1（2023-03-28）
+- fix: 修复固定高度不正确问题
+## 1.9.4（2023-03-17）
+- fix: nvue ios getImageInfo缺少this报错
+- fix: pathType 非2d无效问题
+- fix: 修复 小米9se 可能会存在多次init 导致画面多次放大
+- fix: 修复 border 分开写 width style无效问题
+- fix: 修复 支付宝小程序IOS 再次进入不渲染的问题
+- fix: 修复 支付宝小程序安卓Zindex排序错乱问题
+- fix: 修复 微信开发工具 3060 版 无法获取图片的问题
+- feat: 把 for in 改为 forEach
+- feat: 增加 hidden
+- feat: 根节点 box-sizing 默认 `border-box`
+- feat: 增加支持 `vw` `wh`
+- chore: pathType 取消 默认值，因为字节开发工具不能显示
+- chore: 支付宝小程序开发工具不支持 生成图片 请以真机调试为准
+- bug: 企业微信 2.20.3无法使用
+## 1.9.3.5（2022-06-29）
+- feat: justifyContent 增加 `space-around`、`space-between`
+- feat: canvas 2d 也使用`getImageInfo`
+- fix: 修复 `text`的 `text-decoration`错位
+## 1.9.3.4（2022-06-20）
+- fix: 修复 因创建节点速度问题导致顺序出错。 
+- fix: 修复 微信小程序 PC 无法显示本地图片 
+- fix: 修复 flex-box 对齐问题 
+- feat: 增加 `text-shadow`
+- feat: 重写 `text` 对齐方式
+- chore: 更新文档
+## 1.9.3.3（2022-06-17）
+- fix: 修复 支付宝小程序 canvas 2d 存在ctx.draw问题导致报错
+- fix: 修复 支付宝小程序 toDataURL 存在权限问题改用 `toTempFilePath`
+- fix: 修复 支付宝小程序 image size 问题导致 `objectFit` 无效
+## 1.9.3.2（2022-06-14）
+- fix: 修复 image 设置背景色不生效问题
+- fix: 修复 nvue 环境判断缺少参数问题
+## 1.9.3.1（2022-06-14）
+- fix: 修复 bottom 定位不对问题
+- fix: 修复 因小数导致计算出错换行问题
+- feat: 增加 `useCORS` h5端图片跨域 在设置请求头无效果后试一下设置这个值
+- chore: 更新文档
+## 1.9.3（2022-06-13）
+- feat: 增加 `zIndex`
+- feat: 增加 `flex-box` 该功能处于原始阶段，非常简陋。
+- tips: QQ小程序 vue3 不支持, 为 uni 官方BUG
+## 1.9.2.9（2022-06-10）
+- fix: 修复`text-align`及`margin`居中问题
+## 1.9.2.8（2022-06-10）
+- fix: 修复 Nvue `canvasToTempFilePathSync` 不生效问题
+## 1.9.2.7（2022-06-10）
+- fix: 修复 margin及padding的bug
+- fix: 修复 Nvue `isCanvasToTempFilePath` 不生效问题
+## 1.9.2.6（2022-06-09）
+- fix: 修复 Nvue 不显示
+- feat: 增加支持字体渐变
+```html
+<l-painter-text 
+	text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+	css="background: linear-gradient(,#ff971b 0%, #1989fa 100%); background-clip: text" />
+```
+## 1.9.2.5（2022-06-09）
+- chore: 更变获取父级宽度的设定
+- chore: `pathType` 在canvas 2d 默认为 `url`
+## 1.9.2.4（2022-06-08）
+- fix: 修复 `pathType` 不生效问题
+## 1.9.2.3（2022-06-08）
+- fix: 修复 `canvasToTempFilePath` 漏写 `success` 参数
+## 1.9.2.2（2022-06-07）
+- chore: 更新文档
+## 1.9.2.1（2022-06-07）
+- fix: 修复 vue3 赋值给this再传入导致image无法绘制
+- fix: 修复 `canvasToTempFilePathSync` 时机问题
+- feat: canvas 2d 更改图片生成方式 `toDataURL` 
+## 1.9.2（2022-05-30）
+- fix: 修复 `canvasToTempFilePathSync` 在 vue3 下只生成一次
+## 1.9.1.7（2022-05-28）
+- fix: 修复 `qrcode`显示不全问题
+## 1.9.1.6（2022-05-28）
+- fix: 修复 `canvasToTempFilePathSync` 会重复多次问题
+- fix: 修复 `view` css `backgroundImage` 图片下载失败导致 子节点不渲染
+## 1.9.1.5（2022-05-27）
+- fix: 修正支付宝小程序 canvas 2d版本号 2.7.15
+## 1.9.1.4（2022-05-22）
+- fix: 修复字节小程序无法使用xml方式
+- fix: 修复字节小程序无法使用base64(非2D情况下工具上无法显示)
+- fix: 修复支付宝小程序 `canvasToTempFilePath` 报错
+## 1.9.1.3（2022-04-29）
+- fix: 修复vue3打包后uni对象为空后的报错
+## 1.9.1.2（2022-04-25）
+- fix: 删除多余文件
+## 1.9.1.1（2022-04-25）
+- fix: 修复图片不显示问题
+## 1.9.1（2022-04-12）
+- fix: 因四舍五入导致有些机型错位
+- fix: 修复无views报错 
+- chore: nvue下因ios无法读取插件内static文件，改由下载方式
+## 1.9.0（2022-03-20）
+- fix: 因无法固定尺寸导致生成图片不全
+- fix: 特定情况下text判断无效
+- chore: 本地化APP Nvue webview
+## 1.8.9（2022-02-20）
+- fix: 修复 小程序下载最多10次并发的问题
+- fix: 修复 APP端无法获取本地图片
+- fix: 修复 APP Nvue端不执行问题
+- chore: 增加图片缓存机制
+## 1.8.8.8（2022-01-27）
+- fix: 修复 主动调用尺寸问题
+## 1.8.8.6（2022-01-26）
+- fix: 修复 nvue 下无宽度时获取父级宽度 
+- fix: 修复 ios app 无法渲染问题
+## 1.8.8（2022-01-23）
+- fix: 修复 主动调用时无节点问题
+- fix: 修复 `box-shadow` 颜色问题
+- fix: 修复 `transform:rotate` 角度位置问题
+- feat: 增加 `overflow:hidden`
+## 1.8.7（2022-01-07）
+- fix: 修复 image 方向为 `right` 时原始宽高问题
+- feat: 支持 view 设置背景图 `background-image: url(xxx)`
+- chore: 去掉可选链
+## 1.8.6（2021-11-28）
+- feat: 支持`view`对`inline-block`的子集使用`text-align`
+## 1.8.5.5（2021-08-17）
+- chore: 更新文档，删除 replace
+- fix: 修复 text 值为 number时报错
+## 1.8.5.4（2021-08-16）
+- fix: 字节小程序兼容
+## 1.8.5.3（2021-08-15）
+- fix: 修复线性渐变与css现实效果不一致的问题
+- chore: 更新文档
+## 1.8.5.2（2021-08-13）
+- chore: 增加`background-image`、`background-repeat` 能力，主要用于背景纹理的绘制，并不是代替`image`。例如：大面积的重复平铺的水印
+- 注意：这个功能H5暂时无法使用，因为[官方的API有BUG](https://ask.dcloud.net.cn/question/128793)，待官方修复！！！
+## 1.8.5.1（2021-08-10）
+- fix: 修复因`margin`报错问题
+## 1.8.5（2021-08-09）
+- chore: 增加margin支持`auto`,以达到居中效果
+## 1.8.4（2021-08-06）
+- chore: 增加判断缓存文件条件
+- fix: 修复css 多余空格报错问题
+## 1.8.3（2021-08-04）
+- tips: 1.6.x 以下的版本升级到1.8.x后要为每个元素都加上定位：position: 'absolute'
+- fix: 修复只有一个view子元素时不计算高度的问题
+## 1.8.2（2021-08-03）
+- fix: 修复 path-type 为 `url` 无效问题
+- fix: 修复 qrcode `text` 为空时报错问题
+- fix: 修复 image `src` 动态设置时不生效问题
+- feat: 增加 css 属性 `min-width` `max-width`
+## 1.8.1（2021-08-02）
+- fix: 修复无法加载本地图片
+## 1.8.0（2021-08-02）
+- chore 文档更新
+- 使用旧版的同学不要升级！
+## 1.8.0-beta（2021-07-30）
+- ## 全新布局方式 不兼容旧版！
+- chore: 布局方式变更
+- tips: 微信canvas 2d 不支持真机调试
+## 1.6.6（2021-07-09）
+- chore: 统一命名规范，无须主动引入组件
+## 1.6.5（2021-06-08）
+- chore: 去掉console
+## 1.6.4（2021-06-07）
+- fix: 修复 数字 为纯字符串时不转换的BUG
+## 1.6.3（2021-06-06）
+- fix: 修复 PC 端放大的BUG
+## 1.6.2（2021-05-31）
+- fix: 修复 报`adaptor is not a function`错误
+- fix: 修复 text 多行高度
+- fix: 优化 默认文字的基准线
+- feat: `@progress`事件，监听绘制进度
+## 1.6.1（2021-02-28）
+- 删除多余节点
+## 1.6.0（2021-02-26）
+- 调整为uni_modules目录规范
+- 修复：transform的rotate不能为负数问题
+- 新增：`pathType` 指定生成图片返回的路径类型,可选值有 `base64`、`url`

uni_modules/lime-painter/components/common/relation.js

@@ -0,0 +1,150 @@
+const styles = (v ='') =>  v.split(';').filter(v => v && !/^[\n\s]+$/.test(v)).map(v => {
+						const key = v.slice(0, v.indexOf(':'))
+						const value = v.slice(v.indexOf(':')+1)
+						return {
+							[key
+								.replace(/-([a-z])/g, function() { return arguments[1].toUpperCase()})
+								.replace(/\s+/g, '')
+							]: value.replace(/^\s+/, '').replace(/\s+$/, '') || ''
+						}
+					})
+export function parent(parent) {
+	return {
+		provide() {
+			return {
+				[parent]: this
+			}
+		},
+		data() {
+			return {
+				el: {
+					id: null,
+					css: {},
+					views: []
+				},
+			}
+		},
+		watch: {
+			css: { 
+				handler(v) {
+					if(this.canvasId) {
+						this.el.css = (typeof v == 'object' ? v : v && Object.assign(...styles(v))) || {}
+						this.canvasWidth = this.el.css && this.el.css.width || this.canvasWidth
+						this.canvasHeight = this.el.css && this.el.css.height || this.canvasHeight
+					}
+				},
+				immediate: true
+			}
+		}
+	}
+}
+export function children(parent, options = {}) {
+	const indexKey = options.indexKey || 'index'
+	return {
+		inject: {
+			[parent]: {
+				default: null
+			}
+		},
+		watch: {
+			el: {
+				handler(v, o) {
+					if(JSON.stringify(v) != JSON.stringify(o))
+						this.bindRelation()
+				},
+				deep: true,
+				immediate: true
+			},
+			src: {
+				handler(v, o) {
+					if(v != o)
+						this.bindRelation()
+				},
+				immediate: true
+			},
+			text: {
+				handler(v, o) {
+					if(v != o) this.bindRelation()
+				},
+				immediate: true
+			},
+			css: {
+				handler(v, o) {
+					if(v != o)
+						this.el.css = (typeof v == 'object' ? v : v && Object.assign(...styles(v))) || {}
+				},
+				immediate: true
+			},
+			replace: {
+				handler(v, o) {
+					if(JSON.stringify(v) != JSON.stringify(o))
+						this.bindRelation()
+				},
+				deep: true,
+				immediate: true
+			}
+		},
+		created() {
+			if(!this._uid) {
+				this._uid = this._.uid
+			}
+			Object.defineProperty(this, 'parent', {
+				get: () => this[parent] || [],
+			})
+			Object.defineProperty(this, 'index', {
+				get: () =>  {
+					this.bindRelation();
+					const {parent: {el: {views=[]}={}}={}} = this
+					return views.indexOf(this.el)
+				},
+			});
+			this.el.type = this.type
+			if(this.uid) {
+				this.el.uid = this.uid
+			}
+			this.bindRelation()
+		},
+		// #ifdef VUE3
+		beforeUnmount() {
+			this.removeEl()
+		},
+		// #endif
+		// #ifdef VUE2
+		beforeDestroy() {
+			this.removeEl()
+		},
+		// #endif
+		methods: {
+			removeEl() {
+				if (this.parent) {
+					this.parent.el.views = this.parent.el.views.filter(
+						(item) => item._uid !== this._uid
+					);
+				}
+			},
+			bindRelation() {
+				if(!this.el._uid) {
+					this.el._uid = this._uid 
+				}
+				if(['text','qrcode'].includes(this.type)) {
+					this.el.text = this.$slots && this.$slots.default && this.$slots.default[0].text || `${this.text || ''}`.replace(/\\n/g, '\n')
+				}
+				if(this.type == 'image') {
+					this.el.src = this.src
+				}
+				if (!this.parent) {
+					return;
+				}
+				let views = this.parent.el.views || [];
+				if(views.indexOf(this.el) !== -1) {
+					this.parent.el.views = views.map(v => v._uid == this._uid ? this.el : v)
+				} else {
+					this.parent.el.views = [...views, this.el];
+				}
+			}
+		},
+		mounted() {
+			// this.bindRelation()
+		},
+	}
+}

uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue

@@ -0,0 +1,28 @@
+<template>
+	
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-image',
+		mixins:[children('painter')],
+		props: {
+			id: String,
+			css: [String, Object],
+			src: String
+		},
+		data() {
+			return {
+				type: 'image',
+				el: {
+					css: {},
+					src: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue

@@ -0,0 +1,27 @@
+<template>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-qrcode',
+		mixins:[children('painter')],
+		props: {
+			id: String,
+			css: [String, Object],
+			text: String
+		},
+		data() {
+			return {
+				type: 'qrcode',
+				el: {
+					css: {},
+					text: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue

@@ -0,0 +1,33 @@
+<template>
+	<text style="opacity: 0;height: 0;"><slot/></text>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-text',
+		mixins:[children('painter')],
+		props: {
+			type: {
+				type: String,
+				default: 'text'
+			},
+			uid: String,
+			css: [String, Object],
+			text: [String, Number],
+			replace: Object,
+		},
+		data() {
+			return {
+				// type: 'text',
+				el: {
+					css: {},
+					text: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue

@@ -0,0 +1,34 @@
+<template>
+	<view><slot/></view>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-view',
+		mixins:[children('painter'), parent('painter')],
+		props: {
+			id: String,
+			type: {
+				type: String,
+				default: 'view'
+			},
+			css: [String, Object],
+		},
+		data() {
+			return {
+				// type: 'view',
+				el: {
+					css: {},
+					views:[]
+				},
+			}
+		},
+		mounted() {
+			
+		}
+	}
+</script>
+
+<style>
+</style>

uni_modules/lime-painter/components/l-painter/l-painter.vue

@@ -0,0 +1,461 @@
+<template>
+	<view class="lime-painter" ref="limepainter">
+		<view v-if="canvasId && size" :style="styles">
+			<!-- #ifndef APP-NVUE -->
+			<canvas class="lime-painter__canvas" v-if="use2dCanvas" :id="canvasId" type="2d" :style="size"></canvas>
+			<canvas class="lime-painter__canvas" v-else :id="canvasId" :canvas-id="canvasId" :style="size"
+				:width="boardWidth * dpr" :height="boardHeight * dpr" :hidpi="hidpi"></canvas>
+
+			<!-- #endif -->
+			<!-- #ifdef APP-NVUE -->
+			<web-view :style="size" ref="webview"
+				src="/uni_modules/lime-painter/hybrid/html/index.html"
+				class="lime-painter__canvas" @pagefinish="onPageFinish" @error="onError" @onPostMessage="onMessage">
+			</web-view>
+			<!-- #endif -->
+		</view>
+		<slot />
+	</view>
+</template>
+
+<script>
+	import { parent } from '../common/relation'
+	import props from './props'
+	import {toPx, base64ToPath, pathToBase64, isBase64, sleep, getImageInfo }from './utils';
+	//  #ifndef APP-NVUE
+	import { canIUseCanvas2d, isPC} from './utils';
+	import Painter from './painter';
+	// import Painter from '@painter'
+	const nvue = {}
+	//  #endif
+	//  #ifdef APP-NVUE
+	import nvue from './nvue'
+	//  #endif
+	export default {
+		name: 'lime-painter',
+		mixins: [props, parent('painter'), nvue],
+		data() {
+			return {
+				use2dCanvas: false,
+				canvasHeight: 150,
+				canvasWidth: null,
+				parentWidth: 0,
+				inited: false,
+				progress: 0,
+				firstRender: 0,
+				done: false,
+				tasks: []
+			};
+		},
+		computed: {
+			styles() {
+				return `${this.size}${this.customStyle||''};` + (this.hidden && 'position: fixed; left: 1500rpx;')
+			},
+			canvasId() {
+				return `l-painter${this._ && this._.uid || this._uid}`
+			},
+			size() {
+				if (this.boardWidth && this.boardHeight) {
+					return `width:${this.boardWidth}px; height: ${this.boardHeight}px;`;
+				}
+			},
+			dpr() {
+				return this.pixelRatio || uni.getSystemInfoSync().pixelRatio;
+			},
+			boardWidth() {
+				const {width = 0} = (this.elements && this.elements.css) || this.elements || this
+				const w = toPx(width||this.width)
+				return w || Math.max(w, toPx(this.canvasWidth));
+			},
+			boardHeight() {
+				const {height = 0} = (this.elements && this.elements.css) || this.elements || this
+				const h = toPx(height||this.height)
+				return h || Math.max(h, toPx(this.canvasHeight));
+			},
+			hasBoard() {
+				return this.board && Object.keys(this.board).length
+			},
+			elements() {
+				return this.hasBoard ? this.board : JSON.parse(JSON.stringify(this.el))
+			}
+		},
+		created() {
+			this.use2dCanvas = this.type === '2d' && canIUseCanvas2d() && !isPC
+		},
+		async mounted() {
+			await sleep(30)
+			await this.getParentWeith()
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.$watch('elements', this.watchRender, {
+						deep: true,
+						immediate: true
+					});
+				}, 30)
+			})
+		},
+		// #ifdef VUE3
+		unmounted() {
+			this.done = false
+			this.inited = false
+			this.firstRender = 0
+			this.progress = 0
+			this.painter = null
+			clearTimeout(this.rendertimer)
+		},
+		// #endif
+		// #ifdef VUE2
+		destroyed() {
+			this.done = false
+			this.inited = false
+			this.firstRender = 0
+			this.progress = 0
+			this.painter = null
+			clearTimeout(this.rendertimer)
+		},
+		// #endif
+		methods: {
+			async watchRender(val, old) {
+				if (!val || !val.views || (!this.firstRender ? !val.views.length : !this.firstRender) || !Object.keys(val).length || JSON.stringify(val) == JSON.stringify(old)) return;
+				this.firstRender = 1
+				this.progress = 0
+				this.done = false
+				clearTimeout(this.rendertimer)
+				this.rendertimer = setTimeout(() => {
+					this.render(val);
+				}, this.beforeDelay)
+			},
+			async setFilePath(path, param) {
+				let filePath = path
+				const {pathType = this.pathType} =  param || this
+				if (pathType == 'base64' && !isBase64(path)) {
+					filePath = await pathToBase64(path)
+				} else if (pathType == 'url' && isBase64(path)) {
+					filePath = await base64ToPath(path)
+				}
+				if (param && param.isEmit) {
+					this.$emit('success', filePath);
+				}
+				return filePath
+			},
+			async getSize(args) {
+				const {width} = args.css || args
+				const {height} = args.css || args
+				if (!this.size) {
+					if (width || height) {
+						this.canvasWidth = width || this.canvasWidth
+						this.canvasHeight = height || this.canvasHeight
+						await sleep(30);
+					} else {
+						await this.getParentWeith()
+					}
+				}
+			},
+			canvasToTempFilePathSync(args) {
+				// this.stopWatch && this.stopWatch()
+				// this.stopWatch = this.$watch('done', (v) => {
+				// 	if (v) {
+				// 		this.canvasToTempFilePath(args)
+				// 		this.stopWatch && this.stopWatch()
+				// 	}
+				// }, {
+				// 	immediate: true
+				// })
+				this.tasks.push(args)
+				if(this.done){
+					this.runTask()
+				}
+			},
+			runTask(){
+				while(this.tasks.length){
+					const task = this.tasks.shift()	
+					 this.canvasToTempFilePath(task)
+				}
+			},
+			// #ifndef APP-NVUE
+			getParentWeith() {
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`.lime-painter`)
+						.boundingClientRect()
+						.exec(res => {
+							const {width, height} = res[0]||{}
+							this.parentWidth = Math.ceil(width||0)
+							this.canvasWidth = this.parentWidth || 300
+							this.canvasHeight = height || this.canvasHeight||150
+							resolve(res[0])
+						})
+				})
+			},
+			async render(args = {}) {
+				if(!Object.keys(args).length) {
+					return console.error('空对象')
+				}
+				this.progress = 0
+				this.done = false
+				// #ifdef APP-NVUE
+				this.tempFilePath.length = 0
+				// #endif
+				await this.getSize(args)
+				const ctx = await this.getContext();
+				
+				let {
+					use2dCanvas,
+					boardWidth,
+					boardHeight,
+					canvas,
+					afterDelay
+				} = this;
+				if (use2dCanvas && !canvas) {
+					return Promise.reject(new Error('canvas 没创建'));
+				}
+				this.boundary = {
+					top: 0,
+					left: 0,
+					width: boardWidth,
+					height: boardHeight
+				};
+				this.painter = null
+				if (!this.painter) {
+					const {width} = args.css || args
+					const {height} = args.css || args
+					if(!width && this.parentWidth) {
+						Object.assign(args, {width: this.parentWidth})
+					}
+					const param = {
+						context: ctx,
+						canvas,
+						width: boardWidth,
+						height: boardHeight,
+						pixelRatio: this.dpr,
+						useCORS: this.useCORS,
+						createImage: getImageInfo.bind(this),
+						performance: this.performance,
+						listen: {
+							onProgress: (v) => {
+								this.progress = v
+								this.$emit('progress', v)
+							},
+							onEffectFail: (err) => {
+								this.$emit('faill', err)
+							}
+						}
+					}
+					this.painter = new Painter(param)
+				} 
+				try{
+					// vue3 赋值给data会引起图片无法绘制
+					const { width, height } = await this.painter.source(JSON.parse(JSON.stringify(args)))
+					this.boundary.height = this.canvasHeight = height
+					this.boundary.width = this.canvasWidth = width
+					await sleep(this.sleep);
+					await this.painter.render()
+					await new Promise(resolve => this.$nextTick(resolve));
+					if (!use2dCanvas) {
+						await this.canvasDraw();
+					}
+					if (afterDelay && use2dCanvas) {
+						await sleep(afterDelay);
+					}
+					this.$emit('done');
+					this.done = true
+					if (this.isCanvasToTempFilePath) {
+						this.canvasToTempFilePath()
+							.then(res => {
+								this.$emit('success', res.tempFilePath)
+							})
+							.catch(err => {
+								this.$emit('fail', new Error(JSON.stringify(err)));
+							});
+					}
+					this.runTask()
+					return Promise.resolve({
+						ctx,
+						draw: this.painter,
+						node: this.node
+					});
+				}catch(e){
+					//TODO handle the exception
+				}
+				
+			},
+			canvasDraw(flag = false) {
+				return new Promise((resolve, reject) => this.ctx.draw(flag, () => setTimeout(() => resolve(), this
+					.afterDelay)));
+			},
+			async getContext() {
+				if (!this.canvasWidth) {
+					this.$emit('fail', 'painter no size')
+					console.error('[lime-painter]: 给画板或父级设置尺寸')
+					return Promise.reject();
+				}
+				if (this.ctx && this.inited) {
+					return Promise.resolve(this.ctx);
+				}
+				const { type, use2dCanvas, dpr, boardWidth, boardHeight } = this;
+				const _getContext = () => {
+					return new Promise(resolve => {
+						uni.createSelectorQuery()
+							.in(this)
+							.select(`#${this.canvasId}`)
+							.boundingClientRect()
+							.exec(res => {
+								if (res) {
+									const ctx = uni.createCanvasContext(this.canvasId, this);
+									if (!this.inited) {
+										this.inited = true;
+										this.use2dCanvas = false;
+										this.canvas = res;
+									}
+									
+									// 钉钉小程序框架不支持 measureText 方法，用此方法 mock
+									if (!ctx.measureText) {
+										function strLen(str) {
+											let len = 0;
+											for (let i = 0; i < str.length; i++) {
+												if (str.charCodeAt(i) > 0 && str.charCodeAt(i) < 128) {
+													len++;
+												} else {
+													len += 2;
+												}
+											}
+											return len;
+										}
+										ctx.measureText = text => {
+											let fontSize = ctx.state && ctx.state.fontSize || 12;
+											const font = ctx.__font
+											if (font && fontSize == 12) {
+												fontSize = parseInt(font.split(' ')[3], 10);
+											}
+											fontSize /= 2;
+											return {
+												width: strLen(text) * fontSize
+											};
+										}
+									}
+									
+									// #ifdef MP-ALIPAY
+									ctx.scale(dpr, dpr);
+									// #endif
+									this.ctx = ctx
+									resolve(this.ctx);
+								} else {
+									console.error('[lime-painter] no node')
+								}
+							});
+					});
+				};
+				if (!use2dCanvas) {
+					return _getContext();
+				}
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`#${this.canvasId}`)
+						.node()
+						.exec(res => {
+							let {node: canvas} = res && res[0]||{};
+							if(canvas) {
+								const ctx = canvas.getContext(type);
+								if (!this.inited) {
+									this.inited = true;
+									this.use2dCanvas = true;
+									this.canvas = canvas;
+								}
+								this.ctx = ctx
+								resolve(this.ctx);
+							} else {
+								console.error('[lime-painter]: no size')
+							}
+						});
+				});
+			},
+			canvasToTempFilePath(args = {}) {
+				return new Promise(async (resolve, reject) => {
+					const { use2dCanvas, canvasId, dpr, fileType, quality } = this;
+					const success = async (res) => {
+						try {
+							const tempFilePath = await this.setFilePath(res.tempFilePath || res, args)
+							const result = Object.assign(res, {tempFilePath})
+							args.success && args.success(result)
+							resolve(result)
+						} catch (e) {
+							this.$emit('fail', e)
+						}
+					}
+					
+					let { top: y = 0, left: x = 0, width, height } = this.boundary || this;
+					// let destWidth = width * dpr;
+					// let destHeight = height * dpr;
+					// #ifdef MP-ALIPAY
+					// width = destWidth;
+					// height = destHeight;
+					// #endif
+					
+					const copyArgs = Object.assign({
+						// x,
+						// y,
+						// width,
+						// height,
+						// destWidth,
+						// destHeight,
+						canvasId,
+						id: canvasId,
+						fileType,
+						quality,
+					}, args, {success});
+					// if(this.isPC || use2dCanvas) {
+					// 	copyArgs.canvas = this.canvas
+					// }
+					if (use2dCanvas) {
+						copyArgs.canvas = this.canvas
+						try{
+							// #ifndef MP-ALIPAY
+							const oFilePath = this.canvas.toDataURL(`image/${args.fileType||fileType}`.replace(/pg/, 'peg'), args.quality||quality)
+							if(/data:,/.test(oFilePath)) {
+								uni.canvasToTempFilePath(copyArgs, this);
+							} else {
+								const tempFilePath = await this.setFilePath(oFilePath, args)
+								args.success && args.success({tempFilePath})
+								resolve({tempFilePath})
+							}
+							// #endif
+							// #ifdef MP-ALIPAY
+							this.canvas.toTempFilePath(copyArgs)
+							// #endif
+						}catch(e){
+							args.fail && args.fail(e)
+							reject(e)
+						}
+					} else {
+						// #ifdef MP-ALIPAY
+						if(this.ctx.toTempFilePath) {
+							// 钉钉
+							const ctx = uni.createCanvasContext(canvasId);
+							ctx.toTempFilePath(copyArgs);
+						} else {
+							my.canvasToTempFilePath(copyArgs);
+						}
+						// #endif
+						// #ifndef MP-ALIPAY
+						uni.canvasToTempFilePath(copyArgs, this);
+						// #endif
+					}
+				})
+			}
+			// #endif
+		}
+	};
+</script>
+<style>
+	.lime-painter,
+	.lime-painter__canvas {
+		// #ifndef APP-NVUE
+		width: 100%;
+		// #endif
+		// #ifdef APP-NVUE
+		flex: 1;
+		// #endif
+	}
+</style>

uni_modules/lime-painter/components/l-painter/nvue.js

@@ -0,0 +1,214 @@
+// #ifdef APP-NVUE
+import {
+	sleep,
+	getImageInfo,
+	isBase64,
+	networkReg
+} from './utils';
+const dom = weex.requireModule('dom')
+import {
+	version
+} from '../../package.json'
+
+export default {
+	data() {
+		return {
+			tempFilePath: [],
+			isInitFile: false,
+			osName: uni.getSystemInfoSync().osName
+		}
+	},
+	methods: {
+		getParentWeith() {
+			return new Promise(resolve => {
+				dom.getComponentRect(this.$refs.limepainter, (res) => {
+					this.parentWidth = Math.ceil(res.size.width)
+					this.canvasWidth = this.canvasWidth || this.parentWidth || 300
+					this.canvasHeight = res.size.height || this.canvasHeight || 150
+					resolve(res.size)
+				})
+			})
+		},
+		onPageFinish() {
+			this.webview = this.$refs.webview
+			this.webview.evalJS(`init(${this.dpr})`)
+		},
+		onMessage(e) {
+			const res = e.detail.data[0] || null;
+			if (res.event) {
+				if (res.event == 'inited') {
+					this.inited = true
+				}
+				if (res.event == 'fail') {
+					this.$emit('fail', res)
+				}
+				if (res.event == 'layoutChange') {
+					const data = typeof res.data == 'string' ? JSON.parse(res.data) : res.data
+					this.canvasWidth = Math.ceil(data.width);
+					this.canvasHeight = Math.ceil(data.height);
+				}
+				if (res.event == 'progressChange') {
+					this.progress = res.data * 1
+				}
+				if (res.event == 'file') {
+					this.tempFilePath.push(res.data)
+					if (this.tempFilePath.length > 7) {
+						this.tempFilePath.shift()
+					}
+					return
+				}
+				if (res.event == 'success') {
+					if (res.data) {
+						this.tempFilePath.push(res.data)
+						if (this.tempFilePath.length > 8) {
+							this.tempFilePath.shift()
+						}
+						if (this.isCanvasToTempFilePath) {
+							this.setFilePath(this.tempFilePath.join(''), {
+								isEmit: true
+							})
+						}
+					} else {
+						this.$emit('fail', 'canvas no data')
+					}
+					return
+				}
+				this.$emit(res.event, JSON.parse(res.data));
+			} else if (res.file) {
+				this.file = res.data;
+			} else {
+				console.info(res[0])
+			}
+		},
+		getWebViewInited() {
+			if (this.inited) return Promise.resolve(this.inited);
+			return new Promise((resolve) => {
+				this.$watch(
+					'inited',
+					async val => {
+						if (val) {
+							resolve(val)
+						}
+					}, {
+						immediate: true
+					}
+				);
+			})
+		},
+		getTempFilePath() {
+			if (this.tempFilePath.length == 8) return Promise.resolve(this.tempFilePath)
+			return new Promise((resolve) => {
+				this.$watch(
+					'tempFilePath',
+					async val => {
+						if (val.length == 8) {
+							resolve(val.join(''))
+						}
+					}, {
+						deep: true
+					}
+				);
+			})
+		},
+		getWebViewDone() {
+			if (this.progress == 1) return Promise.resolve(this.progress);
+			return new Promise((resolve) => {
+				this.$watch(
+					'progress',
+					async val => {
+						if (val == 1) {
+							this.$emit('done')
+							this.done = true
+							this.runTask()
+							resolve(val)
+						}
+					}, {
+						immediate: true
+					}
+				);
+			})
+		},
+		async render(args) {
+			try {
+				await this.getSize(args)
+				const {
+					width
+				} = args.css || args
+				if (!width && this.parentWidth) {
+					Object.assign(args, {
+						width: this.parentWidth
+					})
+				}
+				const newNode = await this.calcImage(args);
+				await this.getWebViewInited()
+				this.webview.evalJS(`source(${JSON.stringify(newNode)})`)
+				await this.getWebViewDone()
+				await sleep(this.afterDelay)
+				if (this.isCanvasToTempFilePath) {
+					const params = {
+						fileType: this.fileType,
+						quality: this.quality
+					}
+					this.webview.evalJS(`save(${JSON.stringify(params)})`)
+				}
+				return Promise.resolve()
+			} catch (e) {
+				this.$emit('fail', e)
+			}
+		},
+		async calcImage(args) {
+			let node = JSON.parse(JSON.stringify(args))
+			const urlReg = /url\((.+)\)/
+			const {
+				backgroundImage
+			} = node.css || {}
+			const isBG = backgroundImage && urlReg.exec(backgroundImage)[1]
+			const url = node.url || node.src || isBG
+			if (['text', 'qrcode'].includes(node.type)) {
+				return node
+			}
+			if ((node.type === "image" || isBG) && url && !isBase64(url) && (this.osName == 'ios' || !networkReg
+					.test(url))) {
+				let {
+					path
+				} = await getImageInfo(url, true)
+				if (isBG) {
+					node.css.backgroundImage = `url(${path})`
+				} else {
+					node.src = path
+				}
+			} else if (node.views && node.views.length) {
+				for (let i = 0; i < node.views.length; i++) {
+					node.views[i] = await this.calcImage(node.views[i])
+				}
+			}
+			return node
+		},
+		async canvasToTempFilePath(args = {}) {
+			if (!this.inited) {
+				return this.$emit('fail', 'no init')
+			}
+			this.tempFilePath = []
+			if (args.fileType == 'jpg') {
+				args.fileType = 'jpeg'
+			}
+
+			this.webview.evalJS(`save(${JSON.stringify(args)})`)
+			try {
+				let tempFilePath = await this.getTempFilePath()
+
+				tempFilePath = await this.setFilePath(tempFilePath, args)
+				args.success({
+					errMsg: "canvasToTempFilePath:ok",
+					tempFilePath
+				})
+			} catch (e) {
+				console.log('e', e)
+				args.fail({
+					error: e
+				})
+			}
+		}
+	}
+}
+// #endif

uni_modules/lime-painter/components/l-painter/props.js

@@ -0,0 +1,56 @@
+export default {
+	props: {
+		board: Object,
+		pathType: String, // 'base64'、'url'
+		fileType: {
+			type: String,
+			default: 'png'
+		},
+		hidden: Boolean,
+		quality: {
+			type: Number,
+			default: 1
+		},
+		css: [String, Object],
+		// styles: [String, Object],
+		width: [Number, String],
+		height: [Number, String],
+		pixelRatio: Number,
+		customStyle: String,
+		isCanvasToTempFilePath: Boolean,
+		// useCanvasToTempFilePath: Boolean,
+		sleep: {
+			type: Number,
+			default: 1000 / 30
+		},
+		beforeDelay: {
+			type: Number,
+			default: 100
+		},
+		afterDelay: {
+			type: Number,
+			default: 100
+		},
+		performance: Boolean,
+		// #ifdef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY
+		type: {
+			type: String,
+			default: '2d'
+		},
+		// #endif
+		// #ifdef APP-NVUE
+		hybrid: Boolean,
+		timeout: {
+			type: Number,
+			default: 2000
+		},
+		// #endif
+		// #ifdef H5 || APP-PLUS
+		useCORS: Boolean,
+		hidpi: {
+			type: Boolean,
+			default: true
+		}
+		// #endif
+	}
+}

uni_modules/lime-painter/components/l-painter/utils.js

@@ -0,0 +1,368 @@
+export const networkReg = /^(http|\/\/)/;
+export const isBase64 = (path) => /^data:image\/(\w+);base64/.test(path);
+export function sleep(delay) {
+	return new Promise(resolve => setTimeout(resolve, delay))
+}
+let {platform, SDKVersion} = uni.getSystemInfoSync() 
+export const isPC = /windows|mac/.test(platform)
+// 缓存图片
+let cache = {}
+export function isNumber(value) {
+	return /^-?\d+(\.\d+)?$/.test(value);
+}
+export function toPx(value, baseSize, isDecimal = false) {
+	// 如果是数字
+	if (typeof value === 'number') {
+		return value
+	}
+	// 如果是字符串数字
+	if (isNumber(value)) {
+		return value * 1
+	}
+	// 如果有单位
+	if (typeof value === 'string') {
+		const reg = /^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g
+		const results = reg.exec(value);
+		if (!value || !results) {
+			return 0;
+		}
+		const unit = results[3];
+		value = parseFloat(value);
+		let res = 0;
+		if (unit === 'rpx') {
+			res = uni.upx2px(value);
+		} else if (unit === 'px') {
+			res = value * 1;
+		} else if (unit === '%') {
+			res = value * toPx(baseSize) / 100;
+		} else if (unit === 'em') {
+			res = value * toPx(baseSize || 14);
+		}
+		return isDecimal ? res.toFixed(2) * 1 : Math.round(res);
+	}
+	return 0
+}
+
+// 计算版本
+export function compareVersion(v1, v2) {
+	v1 = v1.split('.')
+	v2 = v2.split('.')
+	const len = Math.max(v1.length, v2.length)
+	while (v1.length < len) {
+		v1.push('0')
+	}
+	while (v2.length < len) {
+		v2.push('0')
+	}
+	for (let i = 0; i < len; i++) {
+		const num1 = parseInt(v1[i], 10)
+		const num2 = parseInt(v2[i], 10)
+
+		if (num1 > num2) {
+			return 1
+		} else if (num1 < num2) {
+			return -1
+		}
+	}
+	return 0
+}
+
+function gte(version) {
+  // #ifdef MP-ALIPAY
+  SDKVersion = my.SDKVersion
+  // #endif
+  return compareVersion(SDKVersion, version) >= 0;
+}
+export function canIUseCanvas2d() {
+	// #ifdef MP-WEIXIN
+	return gte('2.9.2');
+	// #endif
+	// #ifdef MP-ALIPAY
+	return gte('2.7.15');
+	// #endif
+	// #ifdef MP-TOUTIAO
+	return gte('1.78.0');
+	// #endif
+	return false
+}
+
+// #ifdef MP
+export const prefix = () => {
+	// #ifdef MP-TOUTIAO
+	return tt
+	// #endif
+	// #ifdef MP-WEIXIN
+	return wx
+	// #endif
+	// #ifdef MP-BAIDU
+	return swan
+	// #endif
+	// #ifdef MP-ALIPAY
+	return my
+	// #endif
+	// #ifdef MP-QQ
+	return qq
+	// #endif
+	// #ifdef MP-360
+	return qh
+	// #endif
+}
+// #endif
+
+
+
+/**
+ * base64转路径
+ * @param {Object} base64
+ */
+export function base64ToPath(base64) {
+	const [, format] = /^data:image\/(\w+);base64,/.exec(base64) || [];
+
+	return new Promise((resolve, reject) => {
+		// #ifdef MP
+		const fs = uni.getFileSystemManager()
+		//自定义文件名
+		if (!format) {
+			reject(new Error('ERROR_BASE64SRC_PARSE'))
+		}
+		const time = new Date().getTime();
+		let pre = prefix()
+		// #ifdef MP-TOUTIAO
+		const filePath = `${pre.getEnvInfoSync().common.USER_DATA_PATH}/${time}.${format}`
+		// #endif
+		// #ifndef MP-TOUTIAO
+		const filePath = `${pre.env.USER_DATA_PATH}/${time}.${format}`
+		// #endif
+		fs.writeFile({
+			filePath,
+			data: base64.split(',')[1],
+			encoding: 'base64',
+			success() {
+				resolve(filePath)
+			},
+			fail(err) {
+				console.error(err)
+				reject(err)
+			}
+		})
+		// #endif
+
+		// #ifdef H5
+		// mime类型
+		let mimeString = base64.split(',')[0].split(':')[1].split(';')[0];
+		//base64 解码
+		let byteString = atob(base64.split(',')[1]);
+		//创建缓冲数组
+		let arrayBuffer = new ArrayBuffer(byteString.length);
+		//创建视图
+		let intArray = new Uint8Array(arrayBuffer);
+		for (let i = 0; i < byteString.length; i++) {
+			intArray[i] = byteString.charCodeAt(i);
+		}
+		resolve(URL.createObjectURL(new Blob([intArray], {
+			type: mimeString
+		})))
+		// #endif
+
+		// #ifdef APP-PLUS
+		const bitmap = new plus.nativeObj.Bitmap('bitmap' + Date.now())
+		bitmap.loadBase64Data(base64, () => {
+			if (!format) {
+				reject(new Error('ERROR_BASE64SRC_PARSE'))
+			}
+			const time = new Date().getTime();
+			const filePath = `_doc/uniapp_temp/${time}.${format}`
+			bitmap.save(filePath, {},
+				() => {
+					bitmap.clear()
+					resolve(filePath)
+				},
+				(error) => {
+					bitmap.clear()
+					reject(error)
+				})
+		}, (error) => {
+			bitmap.clear()
+			reject(error)
+		})
+		// #endif
+	})
+}
+
+/**
+ * 路径转base64
+ * @param {Object} string
+ */
+export function pathToBase64(path) {
+	if (/^data:/.test(path)) return path
+	return new Promise((resolve, reject) => {
+		// #ifdef H5
+		let image = new Image();
+		image.setAttribute("crossOrigin", 'Anonymous');
+		image.onload = function() {
+			let canvas = document.createElement('canvas');
+			canvas.width = this.naturalWidth;
+			canvas.height = this.naturalHeight;
+			canvas.getContext('2d').drawImage(image, 0, 0);
+			let result = canvas.toDataURL('image/png')
+			resolve(result);
+			canvas.height = canvas.width = 0
+		}
+		image.src = path + '?v=' + Math.random()
+		image.onerror = (error) => {
+			reject(error);
+		};
+		// #endif
+
+		// #ifdef MP
+		if (uni.canIUse('getFileSystemManager')) {
+			uni.getFileSystemManager().readFile({
+				filePath: path,
+				encoding: 'base64',
+				success: (res) => {
+					resolve('data:image/png;base64,' + res.data)
+				},
+				fail: (error) => {
+					console.error({error, path})
+					reject(error)
+				}
+			})
+		}
+		// #endif
+
+		// #ifdef APP-PLUS
+		plus.io.resolveLocalFileSystemURL(getLocalFilePath(path), (entry) => {
+			entry.file((file) => {
+				const fileReader = new plus.io.FileReader()
+				fileReader.onload = (data) => {
+					resolve(data.target.result)
+				}
+				fileReader.onerror = (error) => {
+					reject(error)
+				}
+				fileReader.readAsDataURL(file)
+			}, reject)
+		}, reject)
+		// #endif
+	})
+}
+
+
+
+export function getImageInfo(path, useCORS) {
+	const isCanvas2D = this && this.canvas && this.canvas.createImage
+	return new Promise(async (resolve, reject) => {
+		// let time = +new Date()
+		let src = path.replace(/^@\//,'/')
+		if (cache[path] && cache[path].errMsg) {
+			resolve(cache[path])
+		} else {
+			try {
+				// #ifdef MP || APP-PLUS
+				if (isBase64(path) && (isCanvas2D ? isPC : true)) {
+					src = await base64ToPath(path)
+				}
+				// #endif
+				// #ifdef H5
+				if(useCORS) {
+					src = await pathToBase64(path)
+				}
+				// #endif
+			} catch (error) {
+				reject({
+					...error,
+					src
+				})
+			}
+			// #ifndef APP-NVUE
+			if(isCanvas2D && !isPC) {
+				const img = this.canvas.createImage()
+				img.onload = function() {
+					const image = {
+						path: img,
+						width:  img.width,
+						height:  img.height
+					}
+					cache[path] = image
+					resolve(cache[path])
+				}
+				img.onerror = function(err) {
+					reject({err,path})
+				}
+				img.src = src
+				return
+			}
+			// #endif
+			uni.getImageInfo({
+				src,
+				success: (image) => {
+					const localReg = /^\.|^\/(?=[^\/])/;
+					// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO
+					image.path = localReg.test(src) ?  `/${image.path}` : image.path;
+					// #endif
+					if(isCanvas2D) {
+						const img = this.canvas.createImage()
+						img.onload = function() {
+							image.path = img
+							cache[path] = image
+							resolve(cache[path])
+						}
+						img.onerror = function(err) {
+							reject({err,path})
+						}
+						img.src = src
+						return
+					}
+					// #ifdef APP-PLUS
+					// console.log('getImageInfo', +new Date() - time)
+					// ios 比较严格 可能需要设置跨域
+					if(uni.getSystemInfoSync().osName == 'ios' && useCORS) {
+						pathToBase64(image.path).then(base64 => {
+							image.path = base64
+							cache[path] = image
+							resolve(cache[path])
+						}).catch(err => {
+							console.error({err, path})
+							reject({err,path})
+						})
+						return
+					}
+					// #endif
+					cache[path] = image
+					resolve(cache[path])
+				},
+				fail(err) {
+					console.error({err, path})
+					reject({err,path})
+				}
+			})
+		}
+	})
+}
+
+
+// #ifdef APP-PLUS
+const getLocalFilePath = (path) => {
+	if (path.indexOf('_www') === 0 || path.indexOf('_doc') === 0 || path.indexOf('_documents') === 0 || path
+		.indexOf('_downloads') === 0) {
+		return path
+	}
+	if (path.indexOf('file://') === 0) {
+		return path
+	}
+	if (path.indexOf('/storage/emulated/0/') === 0) {
+		return path
+	}
+	if (path.indexOf('/') === 0) {
+		const localFilePath = plus.io.convertAbsoluteFileSystem(path)
+		if (localFilePath !== path) {
+			return localFilePath
+		} else {
+			path = path.substr(1)
+		}
+	}
+	return '_www/' + path
+}
+// #endif
+
+

uni_modules/lime-painter/hybrid/html/index.html

@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title></title>
+	<style type="text/css">
+		html,
+		body,
+		canvas {
+			padding: 0;
+			margin: 0;
+			width: 100%;
+			height: 100%;
+			overflow-y: hidden;
+			background-color: transparent;
+		}
+	</style>
+</head>
+
+<body>
+	<canvas id="lime-painter"></canvas>
+	<script type="text/javascript" src="./uni.webview.1.5.3.js"></script>
+	<script type="text/javascript" src="./painter.js"></script>
+	<script> 
+		var cache = [];
+		var painter = null;
+		var canvas = null;
+		var context = null;
+		var timer = null;
+		var pixelRatio = 1;
+		console.log = function (...args) {
+			postMessage(args);
+		};
+		// function stringify(key, value) {
+		// 	if (typeof value === 'object' && value !== null) {
+		// 		if (cache.indexOf(value) !== -1) {
+		// 			return;
+		// 		}
+		// 		cache.push(value);
+		// 	}
+		// 	return value;
+		// };
+
+		function emit(event, data) {
+			postMessage({
+				event,
+				data: (typeof data !== 'object' && data !== null ? data : JSON.stringify(data)) 
+			});
+			cache = [];
+		};
+		function postMessage(data) {
+			uni.postMessage({
+				data
+			});
+		};
+		
+		function init(dpr) {
+			canvas = document.querySelector('#lime-painter');
+			context = canvas.getContext('2d');
+			pixelRatio = dpr || window.devicePixelRatio;
+			painter = new Painter({
+				id: 'lime-painter',
+				context,
+				canvas,
+				pixelRatio,
+				width: canvas.offsetWidth,
+				height: canvas.offsetHeight,
+				listen: {
+					onProgress(v) {
+						emit('progressChange', v);
+					},
+					onEffectFail(err) {
+						//console.error(err)
+						emit('fail', err);
+					}
+				}
+			});
+			emit('inited', true);
+		};
+		function save(args) {
+			delete args.success;
+			delete args.fail;
+			clearTimeout(timer);
+			timer = setTimeout(() => {
+				const path = painter.save(args);
+				if (typeof path == 'string') {
+					const index = Math.ceil(path.length / 8);
+					for (var i = 0; i < 8; i++) {
+						if (i == 7) {
+							emit('success', path.substr(i * index, index));
+						} else {
+							emit('file', path.substr(i * index, index));
+						}
+					};
+				} else {
+					// console.log('canvas no data')
+					emit('fail', 'canvas no data');
+				};
+			}, 30);
+		};
+		async function source(args) {
+			let size = await painter.source(args);
+			emit('layoutChange', size);
+			if(!canvas.height) {
+				console.log('canvas no size')
+				emit('fail', 'canvas no size');
+			}
+			painter.render().catch(err => {
+				// console.error(err)
+				emit('fail', err);
+			});
+		};
+	</script>
+</body>
+
+</html>

uni_modules/lime-painter/package.json

@@ -0,0 +1,93 @@
+{
+  "id": "lime-painter",
+  "displayName": "海报画板",
+  "version": "1.9.6.6",
+  "description": "一款canvas海报组件，更优雅的海报生成方案，有限的支持富文本",
+  "keywords": [
+    "海报",
+    "富文本",
+    "生成海报",
+    "生成二维码",
+    "JSON"
+],
+  "repository": "https://gitee.com/liangei/lime-painter", 
+  "engines": {
+    "HBuilderX": "^3.4.14"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "305716444"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+        "QQ": "y",
+        "钉钉": "u",
+        "快手": "u",
+        "飞书": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  },
+  "name": "lime-painter",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

uni_modules/lime-painter/parser.js

@@ -0,0 +1,388 @@
+/*
+ * HTML5 Parser By Sam Blowes
+ *
+ * Designed for HTML5 documents
+ *
+ * Original code by John Resig (ejohn.org)
+ * http://ejohn.org/blog/pure-javascript-html-parser/
+ * Original code by Erik Arvidsson, Mozilla Public License
+ * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+ *
+ * ----------------------------------------------------------------------------
+ * License
+ * ----------------------------------------------------------------------------
+ *
+ * This code is triple licensed using Apache Software License 2.0,
+ * Mozilla Public License or GNU Public License
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Simple HTML Parser.
+ *
+ * The Initial Developer of the Original Code is Erik Arvidsson.
+ * Portions created by Erik Arvidssson are Copyright (C) 2004. All Rights
+ * Reserved.
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * ----------------------------------------------------------------------------
+ * Usage
+ * ----------------------------------------------------------------------------
+ *
+ * // Use like so:
+ * HTMLParser(htmlString, {
+ *     start: function(tag, attrs, unary) {},
+ *     end: function(tag) {},
+ *     chars: function(text) {},
+ *     comment: function(text) {}
+ * });
+ *
+ * // or to get an XML string:
+ * HTMLtoXML(htmlString);
+ *
+ * // or to get an XML DOM Document
+ * HTMLtoDOM(htmlString);
+ *
+ * // or to inject into an existing document/DOM node
+ * HTMLtoDOM(htmlString, document);
+ * HTMLtoDOM(htmlString, document.body);
+ *
+ */
+// Regular Expressions for parsing tags and attributes
+var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
+var endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/;
+var attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g; // Empty Elements - HTML 5
+
+var empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'); // Block Elements - HTML 5
+// fixed by xxx 将 ins 标签从块级名单中移除
+
+var block = makeMap('a,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video'); // Inline Elements - HTML 5
+
+var inline = makeMap('abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'); // Elements that you can, intentionally, leave open
+// (and which close themselves)
+
+var closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled"
+
+var fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); // Special Elements (can contain anything)
+
+var special = makeMap('script,style');
+function HTMLParser(html, handler) {
+  var index;
+  var chars;
+  var match;
+  var stack = [];
+  var last = html;
+
+  stack.last = function () {
+    return this[this.length - 1];
+  };
+
+  while (html) {
+    chars = true; // Make sure we're not in a script or style element
+
+    if (!stack.last() || !special[stack.last()]) {
+      // Comment
+      if (html.indexOf('<!--') == 0) {
+        index = html.indexOf('-->');
+
+        if (index >= 0) {
+          if (handler.comment) {
+            handler.comment(html.substring(4, index));
+          }
+
+          html = html.substring(index + 3);
+          chars = false;
+        } // end tag
+
+      } else if (html.indexOf('</') == 0) {
+        match = html.match(endTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(endTag, parseEndTag);
+          chars = false;
+        } // start tag
+
+      } else if (html.indexOf('<') == 0) {
+        match = html.match(startTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(startTag, parseStartTag);
+          chars = false;
+        }
+      }
+
+      if (chars) {
+        index = html.indexOf('<');
+        var text = index < 0 ? html : html.substring(0, index);
+        html = index < 0 ? '' : html.substring(index);
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+      }
+    } else {
+      html = html.replace(new RegExp('([\\s\\S]*?)<\/' + stack.last() + '[^>]*>'), function (all, text) {
+        text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, '$1$2');
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+
+        return '';
+      });
+      parseEndTag('', stack.last());
+    }
+
+    if (html == last) {
+      throw 'Parse Error: ' + html;
+    }
+
+    last = html;
+  } // Clean up any remaining tags
+
+
+  parseEndTag();
+
+  function parseStartTag(tag, tagName, rest, unary) {
+    tagName = tagName.toLowerCase();
+    if (block[tagName]) {
+      while (stack.last() && inline[stack.last()]) {
+        parseEndTag('', stack.last());
+      }
+    }
+
+    if (closeSelf[tagName] && stack.last() == tagName) {
+      parseEndTag('', tagName);
+    }
+
+    unary = empty[tagName] || !!unary;
+
+    if (!unary) {
+      stack.push(tagName);
+    }
+
+    if (handler.start) {
+      var attrs = [];
+      rest.replace(attr, function (match, name) {
+        var value = arguments[2] ? arguments[2] : arguments[3] ? arguments[3] : arguments[4] ? arguments[4] : fillAttrs[name] ? name : '';
+        attrs.push({
+          name: name,
+          value: value,
+          escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') // "
+
+        });
+      });
+
+      if (handler.start) {
+        handler.start(tagName, attrs, unary);
+      }
+    }
+  }
+
+  function parseEndTag(tag, tagName) {
+    // If no tag name is provided, clean shop
+    if (!tagName) {
+      var pos = 0;
+    } // Find the closest opened tag of the same type
+    else {
+        for (var pos = stack.length - 1; pos >= 0; pos--) {
+          if (stack[pos] == tagName) {
+            break;
+          }
+        }
+      }
+
+    if (pos >= 0) {
+      // Close all the open elements, up the stack
+      for (var i = stack.length - 1; i >= pos; i--) {
+        if (handler.end) {
+          handler.end(stack[i]);
+        }
+      } // Remove the open elements from the stack
+
+
+      stack.length = pos;
+    }
+  }
+}
+
+function makeMap(str) {
+  var obj = {};
+  var items = str.split(',');
+
+  for (var i = 0; i < items.length; i++) {
+    obj[items[i]] = true;
+  }
+
+  return obj;
+}
+
+function removeDOCTYPE(html) {
+  return html.replace(/<\?xml.*\?>\n/, '').replace(/<!doctype.*>\n/, '').replace(/<!DOCTYPE.*>\n/, '');
+}
+
+function parseAttrs(attrs) {
+  return attrs.reduce(function (pre, attr) {
+    var value = attr.value;
+    var name = attr.name;
+    if (pre[name]) {
+			pre[name] = pre[name] + " " + value;
+    } else {
+			pre[name] = value;
+    }
+
+    return pre;
+  }, {});
+}
+function convertStyleStringToJSON(styleString) {
+  var styles = styleString.split(";"); // 通过分号将样式字符串分割为多个样式声明
+  var result = {};
+
+  styles.forEach(function(style) {
+    var styleParts = style.split(":"); // 通过冒号将样式声明分割为属性和值
+    var property = styleParts[0].trim();
+    var value = styleParts[1] && styleParts[1].trim();
+
+    if (property && value) {
+      result[property] = value; // 将属性和值添加到结果对象中
+    }
+  });
+
+  return result;
+}
+function parseHtml(html) {
+  html = removeDOCTYPE(html);
+  var stacks = [];
+  var results = {
+    node: 'root',
+    children: []
+  };
+  HTMLParser(html, {
+    start: function start(tag, attrs, unary) {
+      var node = {
+        name: tag
+      };
+
+      if (attrs.length !== 0) {
+        node.attrs = parseAttrs(attrs);
+		node.styles = node.attrs.style ? convertStyleStringToJSON(node.attrs.style) : {}
+      }
+	
+	if(!node.type) {
+	  if(inline[node.name] && node.name !== 'img' ) {
+		node.type = 'text';
+		if(node.name == 'br') {
+			node.text = '\n'
+		} else if(node.name == 'strong'){
+			node.styles.fontWeight = 'bold'
+		}
+	  } else if(node.name == 'img'){
+		 node.type = 'image' 
+		 node.src =  node.attrs.src
+	  } else {
+		   node.type = 'view' 
+		   if(['h1','h2','h3','h4','h5','h6'].includes(node.name)) {
+			   node.styles.fontWeight = 'bold'
+		   }
+	  }
+	}		
+      if (unary) {
+        var parent = stacks[0] || results;
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      } else {
+        stacks.unshift(node);
+      }
+    },
+    end: function end(tag) {
+      var node = stacks.shift();
+      if (node.name !== tag) console.error('invalid state: mismatch end tag');
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+        parent.children.push(node);
+      }
+	  const isTextBox = node.children && node.children.length > 1 && node.children.every(child => {
+		  return ['text','image'].includes(child.type)
+	  })
+	  if(isTextBox) {
+		  node.type = 'textBox'
+	  }
+    },
+    chars: function chars(text) {
+      var node = {
+        type: 'text',
+        text: text
+      };
+
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      }
+    },
+    comment: function comment(text) {
+      var node = {
+        node: 'comment',
+        text: text
+      };
+      var parent = stacks[0];
+
+      if (!parent.children) {
+        parent.children = [];
+      }
+
+      parent.children.push(node);
+    }
+  });
+  return results.children;
+}
+
+export default parseHtml;

uni_modules/lime-painter/readme.md

@@ -0,0 +1,961 @@
+# Painter 画板 测试版
+
+> uniapp 海报画板，更优雅的海报生成方案  
+> [查看更多](https://limeui.qcoon.cn/#/painter)  
+
+## 平台兼容
+
+| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App |
+| --- | ---------- | ------------ | ---------- | ---------- | --------- | --- |
+| √   | √          | √            | 未测       | √          | √         | √   |
+
+## 安装
+在市场导入**[海报画板](https://ext.dcloud.net.cn/plugin?id=2389)uni_modules**版本的即可，无需`import`
+
+## 代码演示
+
+### 插件demo
+- lime-painter 为 demo
+- 位于 uni_modules/lime-painter/components/lime-painter
+- 导入插件后直接使用可查看demo
+```vue
+<lime-painter />
+```
+
+
+### 基本用法
+
+- 插件提供 JSON 及 Template 的方式绘制海报
+- 参考 css 块状流布局模拟 css schema。
+- 另外flex布局还不是成完善，请谨慎使用，普通的流布局我觉得已经够用了。
+
+#### 方式一 Template
+
+- 提供`l-painter-view`、`l-painter-text`、`l-painter-image`、`l-painter-qrcode`四种类型组件
+- 通过 `css` 属性绘制样式，与 style 使用方式保持一致。
+```html
+<l-painter>
+	//如果使用Template出现顺序错乱，可使用`template` 等所有变量完成再显示
+	<template v-if="show">
+		<l-painter-view
+			css="background: #07c160; height: 120rpx; width: 120rpx; display: inline-block"
+		></l-painter-view>
+		<l-painter-view
+			css="background: #1989fa; height: 120rpx; width: 120rpx; border-top-right-radius: 60rpx; border-bottom-left-radius: 60rpx; display: inline-block; margin: 0 30rpx;"
+		></l-painter-view>
+		<l-painter-view
+			css="background: #ff9d00; height: 120rpx; width: 120rpx; border-radius: 50%; display: inline-block"
+		></l-painter-view>
+	<template>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+- 在 json 里四种类型组件的`type`为`view`、`text`、`image`、`qrcode`
+- 通过 `board` 设置海报所需的 JSON 数据进行绘制或`ref`获取组件实例调用组件内的`render(json)`
+- 所有类型的 schema 都具有`css`字段，css 的 key 值使用**驼峰**如：`lineHeight`
+
+```html
+<l-painter :board="poster"/>
+```
+
+```js
+data() {
+	return {
+		poster: {
+			css: {
+				// 根节点若无尺寸，自动获取父级节点
+				width: '750rpx'
+			},
+			views: [
+				{
+					css: {
+						background: "#07c160",
+						height: "120rpx",
+						width: "120rpx",
+						display: "inline-block"
+					},
+					type: "view"
+				},
+				{
+					css: {
+						background: "#1989fa",
+						height: "120rpx",
+						width: "120rpx",
+						borderTopRightRadius: "60rpx",
+						borderBottomLeftRadius: "60rpx",
+						display: "inline-block",
+						margin: "0 30rpx"
+					},
+					views: [],
+					type: "view"
+				},
+				{
+					css: {
+						background: "#ff9d00",
+						height: "120rpx",
+						width: "120rpx",
+						borderRadius: "50%",
+						display: "inline-block"
+					},
+					views: [],
+					type: "view"
+				},
+			]
+		}
+	}
+}
+```
+
+### View 容器
+
+- 类似于 `div` 可以嵌套承载更多的 view、text、image，qrcode 共同构建一颗完整的节点树
+- 在 JSON 里具有 `views` 的数组字段，用于嵌套承载节点。
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <l-painter-view css="background: #f0f0f0; padding-top: 100rpx;">
+    <l-painter-view
+      css="background: #d9d9d9; width: 33.33%; height: 100rpx; display: inline-block"
+    ></l-painter-view>
+    <l-painter-view
+      css="background: #bfbfbf; width: 66.66%; height: 100rpx; display: inline-block"
+    ></l-painter-view>
+  </l-painter-view>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+{
+	css: {},
+	views: [
+		{
+			type: 'view',
+			css: {
+				background: '#f0f0f0',
+				paddingTop: '100rpx'
+			},
+			views: [
+				{
+					type: 'view',
+					css: {
+						background: '#d9d9d9',
+						width: '33.33%',
+						height: '100rpx',
+						display: 'inline-block'
+					}
+				},
+				{
+					type: 'view',
+					css: {
+						background: '#bfbfbf',
+						width: '66.66%',
+						height: '100rpx',
+						display: 'inline-block'
+					}
+				}
+			],
+
+		}
+	]
+}
+```
+
+### Text 文本
+
+- 通过 `text` 属性填写文本内容。
+- 支持`\n`换行符
+- 支持省略号，使用 css 的`line-clamp`设置行数，当文字内容超过会显示省略号。
+- 支持`text-decoration`
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <l-painter-view css="background: #e0e2db; padding: 30rpx; color: #222a29">
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+    />
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+      css="text-align:center; padding-top: 20rpx; text-decoration: line-through "
+    />
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+      css="text-align:right; padding-top: 20rpx"
+    />
+    <l-painter-text
+      text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+      css="line-clamp: 3; padding-top: 20rpx; background: linear-gradient(,#ff971b 0%, #ff5000 100%); background-clip: text"
+    />
+  </l-painter-view>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+// 基础用法
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置居中对齐
+		textAlign: 'center',
+		// 设置中划线
+		textDecoration: 'line-through'
+	}
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置右对齐
+		textAlign: 'right',
+	}
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置行数，超出显示省略号
+		lineClamp: 3,
+		// 渐变文字
+		background: 'linear-gradient(,#ff971b 0%, #1989fa 100%)',
+		backgroundClip: 'text'
+	}
+}
+```
+
+### Image 图片
+
+- 通过 `src` 属性填写图片路径。
+- 图片路径支持：网络图片，本地 static 里的图片路径，缓存路径，**字节的static目录是写相对路径**
+- 通过 `css` 的 `object-fit`属性可以设置图片的填充方式，可选值见下方 CSS 表格。
+- 通过 `css` 的 `object-position`配合 `object-fit` 可以设置图片的对齐方式，类似于`background-position`，详情见下方 CSS 表格。
+- 使用网络图片时：小程序需要去公众平台配置 [downloadFile](https://mp.weixin.qq.com/) 域名
+- 使用网络图片时：**H5 和 Nvue 需要决跨域问题**
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <!-- 基础用法 -->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx"
+  />
+  <!-- 填充方式 -->
+  <!-- css object-fit 设置 填充方式 见下方表格-->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx; object-fit: contain; background: #eee"
+  />
+  <!-- css object-position 设置 图片的对齐方式-->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx; object-fit: contain; object-position: 50% 50%; background: #eee"
+  />
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+// 基础用法
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx'
+	}
+},
+// 填充方式
+// css objectFit 设置 填充方式 见下方表格
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+		objectFit: 'contain'
+	}
+},
+// css objectPosition 设置 图片的对齐方式
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+		objectFit: 'contain',
+		objectPosition: '50% 50%'
+	}
+}
+```
+
+### Qrcode 二维码
+
+- 通过`text`属性填写需要生成二维码的文本。
+- 通过 `css` 里的 `color` 可设置生成码点的颜色。
+- 通过 `css` 里的 `background`可设置背景色。
+- 通过 `css `里的 `width`、`height`设置尺寸。
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <l-painter-qrcode
+    text="limeui.qcoon.cn"
+    css="width: 200rpx; height: 200rpx"
+  />
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+{
+	type: 'qrcode',
+	text: 'limeui.qcoon.cn',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+	}
+}
+```
+
+### 富文本
+- 这是一个有限支持的测试能力，只能通过JSON方式，不要抱太大希望!
+- 首先需要把富文本转成JSON,这需要引入`parser`这个包，如果你不使用是不会进入主包
+
+```html
+<l-painter ref="painter"/>
+```
+```js
+import parseHtml from '@/uni_modules/lime-painter/parser'
+const json = parseHtml(`<p><span>测试测试</span><img src="/static/logo.png"/></p>`)
+this.$refs.painter.render(json)
+```
+
+### 生成图片
+
+- 方式1、通过设置`isCanvasToTempFilePath`自动生成图片并在 `@success` 事件里接收海报临时路径
+- 方式2、通过调用内部方法生成图片：
+
+```html
+<l-painter ref="painter">...code</l-painter>
+```
+
+```js
+this.$refs.painter.canvasToTempFilePathSync({
+  fileType: "jpg",
+  // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
+  pathType: 'url',
+  quality: 1,
+  success: (res) => {
+    console.log(res.tempFilePath);
+	// 非H5 保存到相册
+	// H5 提示用户长按图另存
+	uni.saveImageToPhotosAlbum({
+		filePath: res.tempFilePath,
+		success: function () {
+			console.log('save success');
+		}
+	});
+  },
+});
+```
+
+### 主动调用方式
+
+- 通过获取组件实例内部的`render`函数 传递`JSON`即可
+
+```html
+<l-painter ref="painter" />
+```
+
+```js
+// 渲染
+this.$refs.painter.render(jsonSchema);
+// 生成图片
+this.$refs.painter.canvasToTempFilePathSync({
+  fileType: "jpg",
+  // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
+  pathType: 'url',
+  quality: 1,
+  success: (res) => {
+    console.log(res.tempFilePath);
+	// 非H5 保存到相册
+	uni.saveImageToPhotosAlbum({
+		filePath: res.tempFilePath,
+		success: function () {
+			console.log('save success');
+		}
+	});
+  },
+});
+```
+
+
+### H5跨域
+- 一般是需要后端或管理OSS资源的大佬处理
+- 一般OSS的处理方式:
+
+1、设置来源
+```cmd
+*
+```
+
+2、允许Methods
+```html
+GET
+```
+
+3、允许Headers
+```html
+access-control-allow-origin:*
+```
+
+4、最后如果还是不行,可试下给插件设置`useCORS`
+```html
+<l-painter useCORS>
+```
+
+
+
+### 海报示例
+
+- 提供一份示例，只把插件当成生成图片的工具，非必要不要在弹窗里使用。
+- 通过设置`isCanvasToTempFilePath`主动生成图片，再由 `@success` 事件接收海报临时路径
+- 设置`hidden`隐藏画板。
+请注意，示例用到了图片，海报的渲染是包括下载图片的时间，也许在某天图片会失效或访问超级慢，请更换为你的图片再查看，另外如果你是小程序请在使用示例时把**不校验合法域名**勾上！！！！！不然不显示还以为是插件的锅，求求了大佬们！
+#### 方式一 Template
+
+```html
+<image :src="path" mode="widthFix"></image>
+<l-painter
+  isCanvasToTempFilePath
+  @success="path = $event"
+  hidden
+  css="width: 750rpx; padding-bottom: 40rpx; background: linear-gradient(,#ff971b 0%, #ff5000 100%)"
+>
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="margin-left: 40rpx; margin-top: 40rpx; width: 84rpx;  height: 84rpx; border-radius: 50%;"
+  />
+  <l-painter-view
+    css="margin-top: 40rpx; padding-left: 20rpx; display: inline-block"
+  >
+    <l-painter-text
+      text="隔壁老王"
+      css="display: block; padding-bottom: 10rpx; color: #fff; font-size: 32rpx; fontWeight: bold"
+    />
+    <l-painter-text
+      text="为您挑选了一个好物"
+      css="color: rgba(255,255,255,.7); font-size: 24rpx"
+    />
+  </l-painter-view>
+  <l-painter-view
+    css="margin-left: 40rpx; margin-top: 30rpx; padding: 32rpx; box-sizing: border-box; background: #fff; border-radius: 16rpx; width: 670rpx; box-shadow: 0 20rpx 58rpx rgba(0,0,0,.15)"
+  >
+    <l-painter-image
+      src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+      css="object-fit: cover; object-position: 50% 50%; width: 606rpx; height: 606rpx; border-radius: 12rpx;"
+    />
+    <l-painter-view
+      css="margin-top: 32rpx; color: #FF0000; font-weight: bold; font-size: 28rpx; line-height: 1em;"
+    >
+      <l-painter-text text="￥" css="vertical-align: bottom" />
+      <l-painter-text
+        text="39"
+        css="vertical-align: bottom; font-size: 58rpx"
+      />
+      <l-painter-text text=".39" css="vertical-align: bottom" />
+      <l-painter-text
+        text="￥59.99"
+        css="vertical-align: bottom; padding-left: 10rpx; font-weight: normal; text-decoration: line-through; color: #999999"
+      />
+    </l-painter-view>
+    <l-painter-view css="margin-top: 32rpx; font-size: 26rpx; color: #8c5400">
+      <l-painter-text text="自营" css="color: #212121; background: #ffb400;" />
+      <l-painter-text
+        text="30天最低价"
+        css="margin-left: 16rpx; background: #fff4d9; text-decoration: line-through;"
+      />
+      <l-painter-text
+        text="满减优惠"
+        css="margin-left: 16rpx; background: #fff4d9"
+      />
+      <l-painter-text
+        text="超高好评"
+        css="margin-left: 16rpx; background: #fff4d9"
+      />
+    </l-painter-view>
+    <l-painter-view css="margin-top: 30rpx">
+      <l-painter-text
+        css="line-clamp: 2; color: #333333; line-height: 1.8em; font-size: 36rpx; width: 478rpx; padding-right:32rpx; box-sizing: border-box"
+        text="360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝"
+      ></l-painter-text>
+      <l-painter-qrcode
+        css="width: 128rpx; height: 128rpx;"
+        text="limeui.qcoon.cn"
+      ></l-painter-qrcode>
+    </l-painter-view>
+  </l-painter-view>
+</l-painter>
+```
+
+```js
+data() {
+	return {
+		path: ''
+	}
+}
+```
+
+#### 方式二 JSON
+
+```html
+<image :src="path" mode="widthFix"></image>
+<l-painter
+  :board="poster"
+  isCanvasToTempFilePath
+  @success="path = $event"
+  hidden
+/>
+```
+
+```js
+data() {
+	return {
+		path: '',
+		poster: {
+		    css: {
+		        width: "750rpx",
+		        paddingBottom: "40rpx",
+		        background: "linear-gradient(,#000 0%, #ff5000 100%)"
+		    },
+		    views: [
+		        {
+		            src: "https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg",
+		            type: "image",
+		            css: {
+		                background: "#fff",
+		                objectFit: "cover",
+		                marginLeft: "40rpx",
+		                marginTop: "40rpx",
+		                width: "84rpx",
+		                border: "2rpx solid #fff",
+		                boxSizing: "border-box",
+		                height: "84rpx",
+		                borderRadius: "50%"
+		            }
+		        },
+		        {
+		            type: "view",
+		            css: {
+		                marginTop: "40rpx",
+		                paddingLeft: "20rpx",
+		                display: "inline-block"
+		            },
+		            views: [
+		                {
+		                    text: "隔壁老王",
+		                    type: "text",
+		                    css: {
+		                        display: "block",
+		                        paddingBottom: "10rpx",
+		                        color: "#fff",
+		                        fontSize: "32rpx",
+		                        fontWeight: "bold"
+		                    }
+		                },
+		                {
+		                    text: "为您挑选了一个好物",
+		                    type: "text",
+		                    css: {
+		                        color: "rgba(255,255,255,.7)",
+		                        fontSize: "24rpx"
+		                    },
+		                }
+		            ],
+		        },
+		        {
+		            css: {
+		                marginLeft: "40rpx",
+		                marginTop: "30rpx",
+		                padding: "32rpx",
+		                boxSizing: "border-box",
+		                background: "#fff",
+		                borderRadius: "16rpx",
+		                width: "670rpx",
+		                boxShadow: "0 20rpx 58rpx rgba(0,0,0,.15)"
+		            },
+		            views: [
+		                {
+							src: "https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg",
+							type: "image",
+		                    css: {
+		                        objectFit: "cover",
+		                        objectPosition: "50% 50%",
+		                        width: "606rpx",
+		                        height: "606rpx"
+		                    },
+		                }, {
+		                    css: {
+		                        marginTop: "32rpx",
+		                        color: "#FF0000",
+		                        fontWeight: "bold",
+		                        fontSize: "28rpx",
+		                        lineHeight: "1em"
+		                    },
+		                    views: [{
+								text: "￥",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom"
+		                        },
+		                    }, {
+								text: "39",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom",
+		                            fontSize: "58rpx"
+		                        },
+		                    }, {
+								text: ".39",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom"
+		                        },
+		                    }, {
+								text: "￥59.99",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom",
+		                            paddingLeft: "10rpx",
+		                            fontWeight: "normal",
+		                            textDecoration: "line-through",
+		                            color: "#999999"
+		                        }
+		                    }],
+
+		                    type: "view"
+		                }, {
+		                    css: {
+		                        marginTop: "32rpx",
+		                        fontSize: "26rpx",
+		                        color: "#8c5400"
+		                    },
+		                    views: [{
+								text: "自营",
+								type: "text",
+		                        css: {
+		                            color: "#212121",
+		                            background: "#ffb400"
+		                        },
+		                    }, {
+								text: "30天最低价",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9",
+		                            textDecoration: "line-through"
+		                        },
+		                    }, {
+								text: "满减优惠",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9"
+		                        },
+		                    }, {
+								text: "超高好评",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9"
+		                        },
+
+		                    }],
+
+		                    type: "view"
+		                }, {
+		                    css: {
+		                        marginTop: "30rpx"
+		                    },
+		                    views: [
+								{
+									text: "360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝",
+									type: "text",
+									css: {
+										paddingRight: "32rpx",
+										boxSizing: "border-box",
+										lineClamp: 2,
+										color: "#333333",
+										lineHeight: "1.8em",
+										fontSize: "36rpx",
+										width: "478rpx"
+		                        },
+		                    }, {
+								text: "limeui.qcoon.cn",
+								type: "qrcode",
+		                        css: {
+		                            width: "128rpx",
+		                            height: "128rpx",
+		                        },
+
+		                    }],
+		                    type: "view"
+		                }],
+		            type: "view"
+		        }
+		    ]
+		}
+	}
+}
+```
+
+
+### 自定义字体
+- 需要平台的支持，已知微信小程序支持，其它的没试过，如果可行请告之
+
+```
+// 需要在app.vue中下载字体
+uni.loadFontFace({
+	global:true,
+	scopes: ['native'],
+	family: '自定义字体名称',
+	source: 'url("https://sungd.github.io/Pacifico.ttf")',
+  
+	success() {
+	  console.log('success')
+  }
+})
+
+
+// 然后就可以在插件的css中写font-family: '自定义字体名称'
+```
+
+
+### Nvue
+- 必须为HBX 3.4.11及以上
+
+
+### 原生小程序
+
+- 插件里的`painter.js`支持在原生小程序中使用
+- new Painter 之后在`source`里传入 JSON
+- 再调用`render`绘制海报
+- 如需生成图片，请查看微信小程序 cavnas 的[canvasToTempFilePath](https://developers.weixin.qq.com/miniprogram/dev/api/canvas/wx.canvasToTempFilePath.html)
+
+```html
+<canvas type="2d" id="painter" style="width: 100%"></canvas>
+```
+
+```js
+import { Painter } from "./painter";
+page({
+  data: {
+    poster: {
+      css: {
+        width: "750rpx",
+      },
+      views: [
+        {
+          type: "view",
+          css: {
+            background: "#d2d4c8",
+            paddingTop: "100rpx",
+          },
+          views: [
+            {
+              type: "view",
+              css: {
+                background: "#5f7470",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+            {
+              type: "view",
+              css: {
+                background: "#889696",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+            {
+              type: "view",
+              css: {
+                background: "#b8bdb5",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+  async onLoad() {
+    const res = await this.getCentext();
+    const painter = new Painter(res);
+    // 返回计算布局后的整个内容尺寸
+    const { width, height } = await painter.source(this.data.poster);
+    // 得到计算后的尺寸后 可给canvas尺寸赋值，达到动态响应效果
+    // 渲染
+    await painter.render();
+  },
+  // 获取canvas 2d
+  // 非2d 需要传一个 createImage 方法用于获取图片信息 即把 getImageInfo 的 success 通过 promise resolve 返回
+  getCentext() {
+    return new Promise((resolve) => {
+      wx.createSelectorQuery()
+        .select(`#painter`)
+        .node()
+        .exec((res) => {
+          let { node: canvas } = res[0];
+          resolve({
+            canvas,
+            context: canvas.getContext("2d"),
+            width: canvas.width,
+            height: canvas.height,
+			// createImage: getImageInfo()
+            pixelRatio: 2,
+          });
+        });
+    });
+  },
+});
+```
+
+### 旧版(1.6.x)更新
+
+- 由于 1.8.x 版放弃了以定位的方式，所以 1.6.x 版更新之后要每个样式都加上`position: absolute`
+- 旧版的 `image` mode 模式被放弃，使用`object-fit`
+- 旧版的 `isRenderImage` 改成 `is-canvas-to-temp-file-path`
+- 旧版的 `maxLines` 改成 `line-clamp`
+
+## API
+
+### Props
+
+| 参数                       | 说明                                                         | 类型             | 默认值       |
+| -------------------------- | ------------------------------------------------------------ | ---------------- | ------------ |
+| board                      | JSON 方式的海报元素对象集                                    | <em>object</em>  | -            |
+| css                        | 海报内容最外层的样式，可以理解为`body`                           | <em>object</em>  | 参数请向下看 |
+| custom-style               | canvas 元素的样式                                            | <em>string</em>  |              |
+| hidden               		 | 隐藏画板                                                    | <em>boolean</em>  |   `false`    |
+| is-canvas-to-temp-file-path | 是否生成图片，在`@success`事件接收图片地址                   | <em>boolean</em> | `false`      |
+| after-delay                | 生成图片错乱，可延时生成图片                                 | <em>number</em>  | `100`        |
+| type                       | canvas 类型，对微信头条支付宝小程序可有效,可选值：`2d`，`''` | <em>string</em>  | `2d`         |
+| file-type                  | 生成图片的后缀类型, 可选值：`png`、`jpg`                     | <em>string</em>  | `png`        |
+| path-type                  | 生成图片路径类型，可选值`url`、`base64`                      | <em>string</em>  | `-`          |
+| pixel-ratio                | 生成图片的像素密度，默认为对应手机的像素密度，`nvue`无效     | <em>number</em>  | `-`          |
+| hidpi                | H5和APP是否使用高清处理     | <em>boolean</em>  | `true`          |
+| width                      | **废弃** 画板的宽度，一般只用于通过内部方法时加上            | <em>number</em>  | ``           |
+| height                     | **废弃** 画板的高度 ，同上                                   | <em>number</em>  | ``           |
+
+### css
+| 属性名                                                                              | 支持的值或类型                                                                                                                                                                       | 默认值   |
+| ----------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------- |
+| (min\max)width                                                                      | 支持`%`、`rpx`、`px`                                                                                                                                                                 | -        |
+| height                                                                              | 同上                                                                                                                                                                                 | -        |
+| color                                                                               | `string`                                                                                                                                                                             | -        |
+| position                                                                            | 定位，可选值：`absolute`、`fixed`                                                                                                                                                    | -        |
+| ↳ left、top、right、bottom                                                          | 配合`position`才生效，支持`%`、`rpx`、`px`                                                                                                                                           | -        |
+| margin                                                                              | 可简写或各方向分别写，如：`margin-top`，支持`auto`、`rpx`、`px`                                                                                                                      | -        |
+| padding                                                                             | 可简写或各方向分别写，支持`rpx`、`px`                                                                                                                                                | -        |
+| border                                                                              | 可简写或各个值分开写：`border-width`、`border-style` 、`border-color`，简写请按顺序写                                                                                                | -        |
+| line-clamp                                                                          | `number`，超过行数显示省略号                                                                                                                                                         | -        |
+| vertical-align                                                                      | 文字垂直对齐，可选值：`bottom`、`top`、`middle`                                                                                                                                      | `middle` |
+| line-height                                                                         | 文字行高，支持`rpx`、`px`、`em`                                                                                                                                                      | `1.4em`  |
+| font-weight                                                                         | 文字粗细，可选值：`normal`、`bold`                                                                                                                                                   | `normal` |
+| font-size                                                                           | 文字大小，`string`，支持`rpx`、`px`                                                                                                                                                  | `14px`   |
+| text-decoration                                                                     | 文本修饰，可选值：`underline` 、`line-through`、`overline`                                                                                                                           | -        |
+| text-stroke                                                                         | 文字描边，可简写或各个值分开写，如：`text-stroke-color`, `text-stroke-width`                                                                                                              | -        |
+| text-align                                                                          | 文本水平对齐，可选值：`right` 、`center`                                                                                                                                             | `left`   |
+| display                                                                             | 框类型，可选值：`block`、`inline-block`、`flex`、`none`，当为`none`时是不渲染该段, `flex`功能简陋。                                                                                                            | -        |
+| flex                                                                                | 配合 display: flex; 属性定义了在分配多余空间,目前只用为数值如： flex: 1                                                                                                           | -        |
+| align-self                                                                          | 配合 display: flex; 单个项目垂直轴对齐方式: `flex-start` `flex-end` `center`                                                                                                         | `flex-start`        |
+| justify-content                                                                     | 配合 display: flex; 水平轴对齐方式: `flex-start` `flex-end` `center`                                                                                                         | `flex-start`        |
+| align-items                                                                         | 配合 display: flex; 垂直轴对齐方式: `flex-start` `flex-end` `center`                                                                                                  | `flex-start`        |
+| border-radius                                                                       | 圆角边框，支持`%`、`rpx`、`px`                                                                                                                                                       | -        |
+| box-sizing                                                                          | 可选值：`border-box`                                                                                                                                                                 | -        |
+| box-shadow                                                                          | 投影                                                                                                                                                                                 | -        |
+| background(color)                                                                   | 支持渐变，但必须写百分比！如:`linear-gradient(,#ff971b 0%, #ff5000 100%)`、`radial-gradient(#0ff 15%, #f0f 60%)`,目前 radial-gradient 渐变的圆心为元素中点，半径为最长边，不支持设置 | -        |
+| background-clip                                                                	  | 文字渐变，配合`background`背景渐变，设置`background-clip: text` 达到文字渐变效果 | -        |
+| background-image                                                                    | view 元素背景：`url(src)`,若只是设置背景图，请不要设置`background-repeat`                                                                                                                                                           | -        |
+| background-repeat                                                                   | 设置是否及如何重复背景纹理，可选值：`repeat`、`repeat-x`、`repeat-y`、`no-repeat`                                                                                                    | `repeat` |
+| [object-fit](https://developer.mozilla.org/zh-CN/docs/Web/CSS/object-fit/)          | 图片元素适应容器方式,类似于`mode`,可选值：`cover`、 `contain`、 `fill`、 `none`                                                                                                      | -        |
+| [object-position](https://developer.mozilla.org/zh-CN/docs/Web/CSS/object-position) | 图片的对齐方式，配合`object-fit`使用                                                                                                                                                 | -        |
+
+### 图片填充模式 object-fit
+
+| 名称    | 含义                                                   |
+| ------- | ------------------------------------------------------ |
+| contain | 保持宽高缩放图片，使图片的长边能完全显示出来           |
+| cover   | 保持宽高缩放图片，使图片的短边能完全显示出来，裁剪长边 |
+| fill    | 拉伸图片，使图片填满元素                               |
+| none    | 保持图片原有尺寸                                       |
+
+### 事件 Events
+
+| 事件名   | 说明                                                             | 返回值 |
+| -------- | ---------------------------------------------------------------- | ------ |
+| success  | 生成图片成功,若使用`is-canvas-to-temp-filePath` 可以接收图片地址 | path   |
+| fail     | 生成图片失败                                                     | error  |
+| done     | 绘制成功                                                         |        |
+| progress | 绘制进度                                                         | number |
+
+### 暴露函数 Expose
+| 事件名   | 说明                                                             | 返回值 |
+| -------- | ---------------------------------------------------------------- | ------ |
+| render(object)   |  渲染器，传入JSON 绘制海报 | promise   |
+| [canvasToTempFilePath](https://uniapp.dcloud.io/api/canvas/canvasToTempFilePath.html#canvastotempfilepath)(object)   | 把当前画布指定区域的内容导出生成指定大小的图片，并返回文件临时路径。    |   |
+| canvasToTempFilePathSync(object)    | 同步接口，同上                                                         |        |
+
+
+## 常见问题
+
+- 1、H5 端使用网络图片需要解决跨域问题。
+- 2、小程序使用网络图片需要去公众平台增加下载白名单！二级域名也需要配！
+- 3、H5 端生成图片是 base64，有时显示只有一半可以使用原生标签`<IMG/>`
+- 4、发生保存图片倾斜变形或提示 native buffer exceed size limit 时，使用 pixel-ratio="2"参数，降分辨率。
+- 5、h5 保存图片不需要调接口，提示用户长按图片保存。
+- 6、画板不能隐藏，包括`v-if`，`v-show`、`display:none`、`opacity:0`，另外也不要把画板放在弹窗里。如果需要隐藏画板请设置 `custom-style="position: fixed; left: 200%"`
+- 7、微信小程序真机调试请使用 **真机调试2.0**，不支持1.0。
+- 8、微信小程序打开调试时可以生但并闭无法生成时，这种情况一般是没有在公众号配置download域名
+- 9、HBX 3.4.5之前的版本不支持vue3
+- 10、在微信开发工具上 canvas 层级最高无法zindex，并不影响真机
+- 11、请不要导入非uni_modules插件
+- 12、关于QQ小程序 报 Propertyor method"toJSON"is not defined 请把基础库调到 1.50.3
+- 13、支付宝小程序 IDE 不支持 生成图片 请以真机调试结果为准
+- 14、返回值为字符串 `data:,` 大概是尺寸超过限制，设置 pixel-ratio="2"
+- 华为手机 APP 上无法生成图片，请使用 HBX2.9.11++（已过时，忽略这条）
+- IOS APP 请勿使用 HBX2.9.3.20201014 的版本！这个版本无法生成图片。（已过时，忽略这条）
+- 苹果微信 7.0.20 存在闪退和图片无法 onload 为微信 bug（已过时，忽略这条）
+- 微信小程序 IOS 旧接口 如父级设置圆角，子级也设会导致子级的失效，为旧接口BUG。
+- 微信小程序 安卓 旧接口 如使用图片必须加背景色，为旧接口BUG。
+- 微信小程序 安卓端 [图片可能在首次可以加载成功，再次加载会不触发任何事件](https://developers.weixin.qq.com/community/develop/doc/000ee2b8dacf4009337f51f4556800?highLine=canvas%25202d%2520createImage)，临时解决方法是给图片加个时间戳
+## 打赏
+
+如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。
+
+![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/alipay.png)
+![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/wpay.png)

uni_modules/liu-poster/changelog.md

@@ -0,0 +1,22 @@
+## 1.1.0（2023-07-05）
+优化APP端生成逻辑
+## 1.0.9（2023-07-04）
+优化
+## 1.0.8（2023-07-04）
+增加注意事项
+## 1.0.7（2023-07-04）
+修改本地图片不显示问题
+## 1.0.6（2023-06-26）
+优化
+## 1.0.5（2023-06-09）
+增加子集绘制
+## 1.0.4（2023-06-09）
+增加子集绘制
+## 1.0.3（2023-06-08）
+增加预览二维码
+## 1.0.2（2023-05-31）
+增加license
+## 1.0.1（2023-05-30）
+增加示例
+## 1.0.0（2023-05-30）
+初始化发布

uni_modules/liu-poster/components/liu-poster/liu-poster.vue

@@ -0,0 +1,377 @@
+<template>
+	<view class="canvas-main">
+		<canvas :style="'width:'+width+'rpx;height:'+height+'rpx;'" class="canvas-item" disable-scroll="true"
+			canvas-id="canvasId" @error="error"></canvas>
+	</view>
+</template>
+<script>
+	export default {
+		props: {
+			//画布宽度(rpx)
+			width: {
+				type: Number,
+				default: 750
+			},
+			//画布高度(rpx)
+			height: {
+				type: Number,
+				default: 750
+			},
+			//生成的图片格式(jpg或png)
+			fileType: {
+				type: String,
+				default: 'png'
+			},
+		},
+		data() {
+			return {
+				pixelRatio: 0,
+				context: null,
+				canvasList: []
+			}
+		},
+		methods: {
+			async init(list) {
+				uni.showLoading({
+					title: '正在绘制...'
+				})
+				if (this.context) {
+					await this.clear()
+					this.canvasList = []
+					this.context = null
+				}
+				this.canvasList = JSON.parse(JSON.stringify(list))
+				const systemInfo = uni.getSystemInfoSync()
+				this.pixelRatio = systemInfo.pixelRatio
+				this.context = uni.createCanvasContext('canvasId', this)
+				this.start()
+			},
+			clear() {
+				return new Promise(async (resolve, reject) => {
+					await this.context.clearRect(0, 0, this.width, this.height)
+					resolve()
+				})
+			},
+			async start() {
+				await Promise.all(this.canvasList.map(async res => {
+					if (res.type == 'color') {
+						await this.drawBg(res)
+					} else if (res.type == 'image') {
+						await this.drawImage(res)
+					} else if (res.type == 'text') {
+						await this.drawText(res)
+					} else if (res.type == 'line') {
+						await this.drawLine(res)
+					}
+				}))
+				this.save()
+			},
+			drawBg(item) {
+				return new Promise(async (resolve, reject) => {
+					item.width = uni.upx2px(item.width)
+					item.height = uni.upx2px(item.height)
+					item.x = uni.upx2px(item.x)
+					item.y = uni.upx2px(item.y)
+					item.radius = uni.upx2px(item.radius)
+					item.lineWidth = uni.upx2px(item.lineWidth)
+					let gradient = ''
+					if (item.colorObj && item.colorObj.colorList) {
+						if (item.colorObj.colorList.length == 1) {
+							this.context.fillStyle = item.colorObj.colorList[0]
+						} else {
+							if (item.colorObj.direction == 1) {
+								gradient = this.context.createLinearGradient(0, 0, item.height, 0)
+							} else if (item.colorObj.direction == 2) {
+								gradient = this.context.createLinearGradient(0, 0, 0, item.height)
+							} else if (item.colorObj.direction == 3) {
+								gradient = this.context.createLinearGradient(0, 0, item.width, item.height)
+							} else if (item.colorObj.direction == 4) {
+								gradient = this.context.createLinearGradient(item.width, 0, 0, item.height)
+							}
+							gradient.addColorStop(0, item.colorObj.colorList[0])
+							gradient.addColorStop(1, item.colorObj.colorList[1])
+							this.context.fillStyle = gradient
+						}
+					} else {
+						this.context.fillStyle = '#FFFFFF'
+					}
+					this.context.save()
+					if (item.radius > 0) {
+						this.context.beginPath()
+						this.context.moveTo(item.x + item.radius, item.y)
+						this.context.arcTo(item.x + item.width, item.y, item.x + item.width, item.y +
+							item.radius, item.radius)
+						this.context.lineTo(item.x + item.width, item.y + item.height - item.radius)
+						this.context.arcTo(item.x + item.width, item.y + item.height, item.x + item
+							.width - item.radius, item.y + item.height, item.radius)
+						this.context.lineTo(item.x + item.radius, item.y + item.height)
+						this.context.arcTo(item.x, item.y + item.height, item.x, item.y + item
+							.height - item.radius, item.radius)
+						this.context.lineTo(item.x, item.y + item.radius)
+						this.context.arcTo(item.x, item.y, item.x + item.radius, item.y, item.radius)
+						this.context.closePath()
+						this.context.clip()
+					}
+					this.context.fillRect(item.x, item.y, item.width, item.height)
+					if (item.lineWidth) {
+						this.context.setLineDash([])
+						this.context.lineWidth = item.lineWidth
+						this.context.strokeStyle = item.lineColor
+						this.context.beginPath()
+						this.context.moveTo(item.x + item.radius, item.y)
+						this.context.arcTo(item.x + item.width, item.y, item.x + item.width, item.y +
+							item.radius, item.radius)
+						this.context.lineTo(item.x + item.width, item.y + item.height - item.radius)
+						this.context.arcTo(item.x + item.width, item.y + item.height, item.x + item
+							.width - item.radius, item.y + item.height, item.radius)
+						this.context.lineTo(item.x + item.radius, item.y + item.height)
+						this.context.arcTo(item.x, item.y + item.height, item.x, item.y + item
+							.height - item.radius, item.radius)
+						this.context.lineTo(item.x, item.y + item.radius)
+						this.context.arcTo(item.x, item.y, item.x + item.radius, item.y, item.radius)
+						this.context.closePath()
+						this.context.stroke()
+					}
+					this.context.restore()
+					await this.context.draw(true)
+					if (item.childs && item.childs.length > 0) {
+						await Promise.all(item.childs.map(async res => {
+							if (res.type == 'color') {
+								await this.drawBg(res)
+							} else if (res.type == 'image') {
+								await this.drawImage(res)
+							} else if (res.type == 'text') {
+								await this.drawText(res)
+							} else if (res.type == 'line') {
+								await this.drawLine(res)
+							}
+						}))
+					}
+					resolve()
+				})
+			},
+			drawImage(item) {
+				return new Promise(async (resolve, reject) => {
+					item.width = uni.upx2px(item.width)
+					item.height = uni.upx2px(item.height)
+					item.x = uni.upx2px(item.x)
+					item.y = uni.upx2px(item.y)
+					item.radius = uni.upx2px(item.radius)
+					item.lineWidth = uni.upx2px(item.lineWidth)
+					await this.getImageInfo(item.path).then(async res => {
+						this.context.save()
+						if (item.radius > 0) {
+							this.context.beginPath()
+							this.context.moveTo(item.x + item.radius, item.y)
+							this.context.arcTo(item.x + item.width, item.y, item.x + item.width,
+								item.y +
+								item.radius, item.radius)
+							this.context.lineTo(item.x + item.width, item.y + item.height - item
+								.radius)
+							this.context.arcTo(item.x + item.width, item.y + item.height, item.x +
+								item
+								.width - item.radius, item.y + item.height, item.radius)
+							this.context.lineTo(item.x + item.radius, item.y + item.height)
+							this.context.arcTo(item.x, item.y + item.height, item.x, item.y + item
+								.height - item.radius, item.radius)
+							this.context.lineTo(item.x, item.y + item.radius)
+							this.context.arcTo(item.x, item.y, item.x + item.radius, item.y, item
+								.radius)
+							this.context.closePath()
+							this.context.clip()
+						}
+						await this.context.drawImage(res, item.x, item.y, item.width, item
+							.height)
+						if (item.lineWidth) {
+							this.context.setLineDash([])
+							this.context.lineWidth = item.lineWidth
+							this.context.strokeStyle = item.lineColor
+							this.context.beginPath()
+							this.context.moveTo(item.x + item.radius, item.y)
+							this.context.arcTo(item.x + item.width, item.y, item.x + item.width,
+								item.y +
+								item.radius, item.radius)
+							this.context.lineTo(item.x + item.width, item.y + item.height - item
+								.radius)
+							this.context.arcTo(item.x + item.width, item.y + item.height, item.x +
+								item
+								.width - item.radius, item.y + item.height, item.radius)
+							this.context.lineTo(item.x + item.radius, item.y + item.height)
+							this.context.arcTo(item.x, item.y + item.height, item.x, item.y + item
+								.height - item.radius, item.radius)
+							this.context.lineTo(item.x, item.y + item.radius)
+							this.context.arcTo(item.x, item.y, item.x + item.radius, item.y, item
+								.radius)
+							this.context.closePath()
+							this.context.stroke()
+						}
+						this.context.restore()
+						await this.context.draw(true)
+						if (item.childs && item.childs.length > 0) {
+							await Promise.all(item.childs.map(async res => {
+								if (res.type == 'color') {
+									await this.drawBg(res)
+								} else if (res.type == 'image') {
+									await this.drawImage(res)
+								} else if (res.type == 'text') {
+									await this.drawText(res)
+								} else if (res.type == 'line') {
+									await this.drawLine(res)
+								}
+							}))
+						}
+						resolve()
+					})
+				})
+			},
+			drawText(item) {
+				return new Promise(async (resolve, reject) => {
+					item.width = uni.upx2px(item.width)
+					item.height = uni.upx2px(item.height)
+					item.x = uni.upx2px(item.x)
+					item.y = uni.upx2px(item.y)
+					item.fontSize = uni.upx2px(item.fontSize)
+					item.lineHeight = uni.upx2px(item.lineHeight)
+					await this.drawTextInfo(item.content, item.x, item.y, item.fontSize, item.color, item
+						.width, item.height, item.lineHeight, item.bold, true)
+					resolve()
+				})
+			},
+			drawLine(item) {
+				return new Promise(async (resolve, reject) => {
+					item.width = uni.upx2px(item.width)
+					item.startX = uni.upx2px(item.startX)
+					item.startY = uni.upx2px(item.startY)
+					item.endX = uni.upx2px(item.endX)
+					item.endY = uni.upx2px(item.endY)
+					this.context.setStrokeStyle(item.color)
+					this.context.setLineWidth(item.width)
+					this.context.setLineCap('round')
+					if (item.lineType == 'dash') this.context.setLineDash([item.width * 5, item.width * 5], 0)
+					else this.context.setLineDash([])
+					this.context.beginPath()
+					this.context.moveTo(item.startX, item.startY)
+					this.context.lineTo(item.endX, item.endY)
+					this.context.stroke()
+					this.context.closePath()
+					resolve()
+				})
+			},
+			drawTextInfo(text, x, y, fontSize, color, width, height, lineHeight, bold, ellipsis) {
+				return new Promise(async (resolve, reject) => {
+					this.context.setFillStyle(color)
+					if (bold) this.context.font = 'bold ' + fontSize + 'px Arial'
+					else this.context.font = fontSize + 'px Arial'
+					this.context.setTextBaseline('bottom')
+					let textArray = text.split('')
+					let line = ''
+					let lines = []
+					for (let i = 0; i < textArray.length; i++) {
+						let testLine = line + textArray[i]
+						let testWidth = this.context.measureText(testLine).width
+						if (testWidth > width) {
+							lines.push(line)
+							line = textArray[i]
+						} else {
+							line = testLine
+						}
+					}
+					lines.push(line)
+					let firstWidth = this.context.measureText(lines[0]).width
+					if (height >= lineHeight * lines.length) {
+						await Promise.all(lines.map(async (res, i) => {
+							let lineText = res
+							let lineHeights = lineHeight * (i + 1)
+							await this.context.fillText(lineText, x, y + lineHeights)
+						}))
+					} else {
+						let sNum = parseInt(height / lineHeight)
+						lines = lines.slice(0, sNum)
+						await Promise.all(lines.map(async (res, i) => {
+							let lineText = res
+							let lineHeights = lineHeight * (i + 1)
+							if (i == lines.length - 1) {
+								if (this.context.measureText('...').width < fontSize) {
+									lineText = lineText.substring(0, lineText.length - 1)
+									lineText += '...'
+								} else {
+									lineText = lineText.substring(0, lineText.length - 2)
+									lineText += '...'
+								}
+							}
+							await this.context.fillText(lineText, x, y + lineHeights)
+						}))
+					}
+					resolve()
+				})
+			},
+			getImageInfo(src) {
+				return new Promise(async (resolve, reject) => {
+					if (src.indexOf('http') == -1) {
+						setTimeout(() => {
+							resolve(src)
+						})
+					} else {
+						// #ifdef APP-PLUS
+						uni.getImageInfo({
+							src: src,
+							success: (res) => {
+								resolve(res.path)
+							},
+							fail(err) {
+								resolve(src)
+							}
+						})
+						// #endif
+						// #ifndef APP-PLUS
+						uni.downloadFile({
+							url: src,
+							success: (res) => {
+								if (res.statusCode === 200) resolve(res.tempFilePath)
+							},
+							fail: (err) => {
+								resolve(src)
+							}
+						})
+						// #endif
+					}
+				})
+			},
+			save() {
+				let timer = setTimeout(async () => {
+					await this.context.draw(true, setTimeout(() => {
+						uni.canvasToTempFilePath({
+							canvasId: 'canvasId',
+							fileType: this.fileType,
+							quality: 1,
+							width: this.width,
+							height: this.height,
+							destWidth: this.width * this.pixelRatio,
+							destHeight: this.height * this.pixelRatio,
+							success: (res) => {
+								uni.hideLoading()
+								this.$emit('change', res.tempFilePath)
+							},
+							fail: (err) => {
+								console.log('生成图片失败:', err)
+							}
+						}, this)
+					}, 500))
+					clearTimeout(timer)
+				}, 500)
+			},
+			error(e) {
+				console.log('错误信息：', e)
+			}
+		}
+	}
+</script>
+</script>
+<style lang="scss" scoped>
+	.canvas-main {
+		position: fixed;
+		z-index: -999999 !important;
+		opacity: 0;
+		top: -5000rpx;
+	}
+</style>

uni_modules/liu-poster/license.md

@@ -0,0 +1,6 @@
+### 1、本插件可免费下载使用；
+### 2、未经许可，严禁复制本插件派生同类插件上传插件市场；
+### 3、未经许可，严禁在插件市场恶意复制抄袭本插件进行违规获利;
+### 4、对本软件的任何使用都必须遵守这些条款，违反这些条款的个人或组织将面临法律追究。
+
+

uni_modules/liu-poster/package.json

@@ -0,0 +1,85 @@
+{
+	"id": "liu-poster",
+	"displayName": "canvas海报画板、海报生成、海报图",
+	"version": "1.1.0",
+	"description": "canvas海报画板、海报生成、海报图组件，配置简单，支持绘制背景色、绘制图片、绘制文本、绘制线条，自由生成海报图片",
+	"keywords": [
+        "海报",
+        "生成海报",
+        "canvas",
+        "图片合成",
+        "图片处理"
+    ],
+	"repository": "",
+	"engines": {
+		"HBuilderX": "^3.1.0"
+	},
+	"dcloudext": {
+		"type": "component-vue",
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+		"npmurl": ""
+	},
+	"uni_modules": {
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "u"
+				},
+				"App": {
+					"app-vue": "u",
+					"app-nvue": "u"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "u",
+					"IE": "u",
+					"Edge": "u",
+					"Firefox": "u",
+					"Safari": "u"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "u",
+					"百度": "u",
+					"字节跳动": "u",
+					"QQ": "u",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}

uni_modules/liu-poster/readme.md

@@ -0,0 +1,260 @@
+# liu-poster适用于uni-app项目的canvas海报画板、海报生成、海报图组件
+### 本组件目前兼容微信小程序、H5
+### 本组件是canvas海报画板、海报生成、海报图组件，配置简单，支持绘制背景色、绘制图片、绘制文本、绘制线条，自由生成海报图片
+# --- 扫码预览、关注我们 ---
+
+## 扫码关注公众号，查看更多插件信息，预览插件效果！ 
+
+![](https://uni.ckapi.pro/uniapp/publicize.png)
+
+### 属性说明
+| 名称                         | 类型           | 默认值                | 描述            |
+| ----------------------------|--------------- | -------------------- | ---------------|
+| width                       | Number         | 750                  | 画布宽度(rpx)
+| height                      | Number         | 750                  | 画布高度(rpx)
+| fileType                    | String         | png                  | 生成的图片格式(jpg或png)
+| @change                     | Function       |                      | 海报绘制成功回调事件
+
+### 使用示例
+``` 
+<template>
+	<view class="tab-box">
+		<view class="btn-complete" @click="open">一键生成海报</view>
+		<liu-poster ref="liuPoster" :width="750" :height="1300" @change="change"></liu-poster>
+		<image class="success-img" :src="url" @click="previewImg(url)"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				canvasList: [{
+					type: 'color', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+					width: 750, //宽度(rpx)
+					height: 1300, //高度(rpx)
+					x: 0, //x轴位置(离左边的距离rpx)
+					y: 0, //y轴位置(离上边的距离rpx)
+					radius: 100, //圆角(rpx)
+					lineWidth: 40, //边框宽度(rpx)
+					lineColor: '#000000', //边框颜色
+					colorObj: {
+						colorList: ['#6900FF', '#FFFFFF'], //传入1个值为纯色，2个值为渐变色
+						direction: 2 //渐变色绘制方向(1:从左到右;2:从上到下;3:左上角到右下角;4:右上角到左下角)
+					}, //type为color时必填
+				}, {
+					type: 'image', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+					width: 132, //宽度(rpx)
+					height: 132, //高度(rpx)
+					x: 40, //x轴位置(离左边的距离rpx)
+					y: 120, //y轴位置(离上边的距离rpx)
+					radius: 66, //圆角(rpx)
+					lineWidth: 6, //边框宽度(rpx)
+					lineColor: '#FFFFFF', //边框颜色
+					path: 'https://img1.baidu.com/it/u=1471990434,2209509794&fm=253&fmt=auto&app=138&f=JPEG?w=400&h=400', //图片地址(type为image时必填)
+				}, {
+					type: 'text', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+					width: 400, //文本宽度(rpx)
+					height: 40, //文本高度(rpx)
+					x: 200, //x轴位置(离左边的距离rpx)
+					y: 145, //y轴位置(离上边的距离rpx)
+					color: '#FFFFFF', //文本颜色
+					fontSize: 36, //文字大小(rpx)
+					lineHeight: 36, //文字行高(rpx)
+					bold: true, //文字是否加粗
+					content: '好物分享猫猫虫', //文本内容(type为text时必填)
+				}, {
+					type: 'text', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+					width: 400, //文本宽度(rpx)
+					height: 40, //文本高度(rpx)
+					x: 200, //x轴位置(离左边的距离rpx)
+					y: 195, //y轴位置(离上边的距离rpx)
+					color: '#FFFFFF', //文本颜色
+					fontSize: 28, //文字大小(rpx)
+					lineHeight: 28, //文字行高(rpx)
+					bold: false, //文字是否加粗
+					content: '猫猫虫给你分享了一张美图', //文本内容(type为text时必填)
+				}, {
+					type: 'image', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+					width: 670, //宽度(rpx)
+					height: 670, //高度(rpx)
+					x: 40, //x轴位置(离左边的距离rpx)
+					y: 300, //y轴位置(离上边的距离rpx)
+					radius: 20, //圆角(rpx)
+					lineWidth: 12, //边框宽度(rpx)
+					lineColor: '#FFFFFF', //边框颜色
+					path: 'https://img1.baidu.com/it/u=1471990434,2209509794&fm=253&fmt=auto&app=138&f=JPEG?w=400&h=400', //图片地址(type为image时必填)
+					childs: [{
+						type: 'text', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+						width: 400, //文本宽度(rpx)
+						height: 40, //文本高度(rpx)
+						x: 100, //x轴位置(离左边的距离rpx)
+						y: 400, //y轴位置(离上边的距离rpx)
+						color: '#FFFFFF', //文本颜色
+						fontSize: 36, //文字大小(rpx)
+						lineHeight: 36, //文字行高(rpx)
+						bold: true, //文字是否加粗
+						content: '好物分享猫猫虫', //文本内容(type为text时必填)
+					}]
+				}, {
+					type: 'line', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+					width: 4, //线条宽度(rpx)
+					color: '#FFFFFF', //线条颜色
+					startX: 20, //起点x轴位置(离左边的距离rpx)
+					startY: 270, //起点y轴位置(离上边的距离rpx)
+					endX: 730, //终点x轴位置(离左边的距离rpx)
+					endY: 270, //终点y轴位置(离上边的距离rpx)
+					lineType: 'dash', //线条类型(solid:实线;dash:虚线)
+				}, {
+					type: 'line', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+					width: 4, //线条宽度(rpx)
+					color: '#FFFFFF', //线条颜色
+					startX: 20, //起点x轴位置(离左边的距离rpx)
+					startY: 1000, //起点y轴位置(离上边的距离rpx)
+					endX: 730, //终点x轴位置(离左边的距离rpx)
+					endY: 1000, //终点y轴位置(离上边的距离rpx)
+					lineType: 'dash', //线条类型(solid:实线;dash:虚线)
+				}, {
+					type: 'text', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+					width: 500, //文本宽度(rpx)
+					height: 150, //文本高度(rpx)
+					x: 40, //x轴位置(离左边的距离rpx)
+					y: 1050, //y轴位置(离上边的距离rpx)
+					color: '#9043FD', //文本颜色
+					fontSize: 32, //文字大小(rpx)
+					lineHeight: 45, //文字行高(rpx)
+					bold: true, //文字是否加粗
+					content: '这个是一段测试文字，这个是一段测试文字，这个是一段测试文字，这个是一段测试文字，这个是一段测试文字。', //文本内容(type为text时必填)
+				}, {
+					type: 'image', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+					width: 150, //宽度(rpx)
+					height: 150, //高度(rpx)
+					x: 550, //x轴位置(离左边的距离rpx)
+					y: 1050, //y轴位置(离上边的距离rpx)
+					radius: 4, //圆角(rpx)
+					lineWidth: 6, //边框宽度(rpx)
+					lineColor: '#FFFFFF', //边框颜色
+					path: 'https://img1.baidu.com/it/u=1471990434,2209509794&fm=253&fmt=auto&app=138&f=JPEG?w=400&h=400', //图片地址(type为image时必填)
+				}],
+				url: ''
+			};
+		},
+		methods: {
+			//开始绘制
+			open() {
+				this.$nextTick(() => {
+					this.$refs.liuPoster.init(this.canvasList)
+				})
+			},
+			//绘制成功返回生成的海报图片地址
+			change(e) {
+				this.url = e
+			},
+			//预览生成的海报图片
+			previewImg(url) {
+				if (!url) return
+				uni.previewImage({
+					urls: [url]
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.tab-box {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+		background-color: #f0f0f0;
+		padding-top: 20rpx;
+
+		.btn-reset {
+			width: 100%;
+			height: 72rpx;
+			background: #FFFFFF;
+			border-radius: 40rpx;
+			border: 2rpx solid #FD430E;
+			font-size: 30rpx;
+			color: #3E3E3E;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.btn-complete {
+			width: 98%;
+			height: 76rpx;
+			border-radius: 40rpx;
+			font-size: 30rpx;
+			color: #FFFFFF;
+			background-color: #FD430E;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin: 0 auto;
+		}
+
+		.success-img {
+			width: 100%;
+			height: 1300rpx;
+			margin-top: 20rpx;
+		}
+	}
+</style>
+```
+
+### 传入的canvasList参数说明
+### 绘制类型有4种：color:背景色;image:图片;text:文字;line:线条
+``` 
+canvasList: [{
+	type: 'color', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+	width: 750, //宽度(rpx)
+	height: 1500, //高度(rpx)
+	x: 0, //x轴位置(离左边的距离rpx)
+	y: 0, //y轴位置(离上边的距离rpx)
+	radius: 100, //圆角(rpx)
+	lineWidth: 40, //边框宽度(rpx)
+	lineColor: '#000000', //边框颜色
+	colorObj: {
+		colorList: ['#6900FF', '#FFFFFF'], //传入1个值为纯色，2个值为渐变色
+		direction: 2 //渐变色绘制方向(1:从左到右;2:从上到下;3:左上角到右下角;4:右上角到左下角)
+	}, //type为color时必填
+	childs:[],//在背景色上绘制的内容放在childs里面即可
+}, {
+	type: 'image', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+	width: 132, //宽度(rpx)
+	height: 132, //高度(rpx)
+	x: 40, //x轴位置(离左边的距离rpx)
+	y: 150, //y轴位置(离上边的距离rpx)
+	radius: 66, //圆角(rpx)
+	lineWidth: 2, //边框宽度(rpx)
+	lineColor: '#FFFFFF', //边框颜色
+	path: 'https://img1.baidu.com/it/u=1471990434,2209509794&fm=253&fmt=auto&app=138&f=JPEG?w=400&h=400', //图片地址(type为image时必填)
+	childs:[],//如果在图片上绘制其他内容则将要绘制的内容放在childs里面即可
+}, {
+	type: 'text', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+	width: 400, //文本宽度(rpx)
+	height: 100, //文本高度(rpx)
+	x: 200, //x轴位置(离左边的距离rpx)
+	y: 170, //y轴位置(离上边的距离rpx)
+	color: '#FFFFFF', //文本颜色
+	fontSize: 36, //文字大小(rpx)
+	lineHeight: 45, //文字行高(rpx)
+	bold: true, //文字是否加粗
+	content: '好物分享猫猫虫好物分享猫猫虫好物分享猫猫虫好物分享猫猫虫好物分享猫猫虫好物分享猫猫虫好物分享猫猫虫', //文本内容(type为text时必填)
+}, {
+	type: 'line', //绘制类型(color:背景色;image:图片;text:文字;line:线条),
+	width: 2, //线条宽度(rpx)
+	color: '#FFFFFF', //线条颜色
+	startX: 0, //起点x轴位置(离左边的距离rpx)
+	startY: 310, //起点y轴位置(离上边的距离rpx)
+	endX: 750, //终点x轴位置(离左边的距离rpx)
+	endY: 310, //终点y轴位置(离上边的距离rpx)
+	lineType: 'dash', //线条类型(solid:实线;dash:虚线)
+}]
+```
+
+### 注意
+# 1、H5端使用网络图片需要解决跨域问题；
+# 2、小程序使用网络图片需要在微信公众平台配置downloadFile合法域名。

utils/index.js

@@ -10,7 +10,7 @@
  *  修改时间：
  */
 
-import HaloTokenConfig from '@/config/token.config.js'
+import HaloTokenConfig from '@/config/uhalo.config.js'
 import {getAppConfigs} from '@/config/index.js'
 
 const utils = {
@@ -160,7 +160,48 @@ const utils = {
             urls: list,
             loop: true
         })
+    },
+    /**
+     * 检查是否为json字符串
+     * @param {Object} jsonStr 数据源
+     */
+    checkJsonAndParse(jsonStr) {
+        try {
+            const jsonResult = JSON.parse(jsonStr);
+            return {
+                ok: true,
+                jsonData: jsonResult,
+            }
+        } catch (e) {
+            return {
+                ok: false,
+                jsonData: {},
+            }
+        }
+    },
+    isObject(obj) {
+        return obj && typeof obj === 'object' && !Array.isArray(obj);
+    },
+    deepMerge(target, source) {
+        let output = Object.assign({}, target);
+
+        if (this.isObject(target) && this.isObject(source)) {
+            Object.keys(source).forEach(key => {
+                const targetValue = target[key];
+                const sourceValue = source[key];
+
+                if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
+                    output[key] = targetValue.concat(sourceValue);
+                } else if (this.isObject(targetValue) && this.isObject(sourceValue)) {
+                    output[key] = this.deepMerge(targetValue, sourceValue);
+                } else {
+                    output[key] = sourceValue;
+                }
+            });
+        }
+        return output;
     }
+
 };
 
 

utils/plugin.js

@@ -0,0 +1,94 @@
+import utils from '@/utils/index.js'
+import v2Apis from "@/api/v2/all.api.js"
+
+export const NeedPluginIds = Object.freeze({
+	PluginUniHalo: "plugin-uni-halo",
+	PluginPhotos: "PluginPhotos",
+	PluginLinks: "PluginLinks",
+	PluginMoments: "PluginMoments",
+	PluginSearchWidget: "PluginSearchWidget",
+	PluginCommentWidget: "PluginCommentWidget",
+	PluginVote: "vote",
+})
+
+export const NeedPlugins = new Map([
+	[
+		NeedPluginIds.PluginUniHalo, {
+			id: "plugin-uni-halo",
+			name: "UniHalo配置",
+			desc: "uni-halo 核心插件，未安装和启用的情况下，将无法使用 uni-halo，请检查是否已安装和启用",
+			logo: utils.checkUrl("/plugins/plugin-uni-halo/assets/logo.png"),
+			url: "https://www.halo.run/store/apps/app-ryemX"
+		}
+	],
+	[
+		NeedPluginIds.PluginPhotos, {
+			id: "PluginPhotos",
+			name: "图库管理",
+			desc: "图库功能模块所需要的插件",
+			logo: utils.checkUrl("/plugins/PluginPhotos/assets/logo.svg"),
+			url: "https://www.halo.run/store/apps/app-BmQJW"
+		}
+	],
+	[
+		NeedPluginIds.PluginLinks, {
+			id: "PluginLinks",
+			name: "链接管理",
+			desc: "链接管理模块，用于网站友情链接功能模块",
+			logo: utils.checkUrl("/plugins/PluginLinks/assets/logo.svg"),
+			url: "https://www.halo.run/store/apps/app-hfbQg"
+		}
+	],
+	[
+		NeedPluginIds.PluginMoments, {
+			id: "PluginMoments",
+			name: "瞬间",
+			desc: "提供一个轻量级的内容图文、视频、音频等内容展示",
+			logo: utils.checkUrl("/plugins/PluginMoments/assets/logo.svg"),
+			url: "https://www.halo.run/store/apps/app-SnwWD"
+		}
+	],
+	[
+		NeedPluginIds.PluginSearchWidget, {
+			id: "PluginSearchWidget",
+			name: "搜索组件",
+			desc: "为应用提供统一的搜索组件",
+			logo: utils.checkUrl("/plugins/PluginSearchWidget/assets/logo.svg"),
+			url: "https://www.halo.run/store/apps/app-DlacW"
+		}
+	],
+	[
+		NeedPluginIds.PluginCommentWidget, {
+			id: "PluginCommentWidget",
+			name: "评论组件",
+			desc: "为用户前台提供完整的评论解决方案",
+			logo: utils.checkUrl("/plugins/PluginCommentWidget/assets/logo.svg"),
+			url: "https://www.halo.run/store/apps/app-YXyaD"
+		}
+	],
+	[
+		NeedPluginIds.PluginVote, {
+			id: "vote",
+			name: "投票管理",
+			desc: "投票模块所需要的插件，用于展示投票和提交投票",
+			logo: utils.checkUrl("/plugins/vote/assets/logo.png"),
+			url: "https://www.halo.run/store/apps/app-veyvzyhv"
+		}
+	]
+])
+
+/**
+ * 检查插件是否启用、安装
+ * @param {String} pluginId 插件id
+ * @return {Boolean} true = 安装、启用  false= 未安装启用
+ */
+export const checkNeedPluginAvailable = (pluginId) => {
+	return new Promise(async (resolve) => {
+		try {
+			const available = await v2Apis.checkPluginAvailable(pluginId)
+			resolve(available)
+		} catch (err) {
+			resolve(false)
+		}
+	})
+}

utils/random.js

@@ -12,11 +12,11 @@
 
 /**
  * 指定范围生成随机数
- * @param {Number} m
- * @param {Number} n
- * @return {Number}
+ * @param {Number} m 最小值（包含）
+ * @param {Number} n 最大（不包含）
+ * @return {Number} 随机值
  */
-export function GetRandomNumberByRange(m, n) {
+export function getRandomNumberByRange(m, n) {
 	return Math.floor(Math.random() * (m - n) + n);
 }
 
@@ -26,10 +26,10 @@ export function GetRandomNumberByRange(m, n) {
  * @param {*} min 最小值
  * @param {*} max 最大值
  */
-export function GetRandomNumberArray(len, min, max) {
+export function getRandomNumberArray(len, min, max) {
 	let arr = [];
 	for (let index = 0; index < len; index++) {
-		arr.push(GetRandomNumberByRange(min, max));
+		arr.push(getRandomNumberByRange(min, max));
 	}
 	return arr;
 }

utils/restrictRead.js

@@ -0,0 +1,140 @@
+/**
+ * 检查文章是否受限
+ * @param post
+ * @returns {boolean}
+ */
+export function checkPostRestrictRead(post) {
+    const annotations = post?.metadata?.annotations;
+    const restrictReadEnable = annotations?.restrictReadEnable;
+
+    if (restrictReadEnable === 'false') return false;
+
+    const restrictType = restrictReadEnable;
+    const raw = post.content.raw;
+
+    const startTag = `<!-- ${restrictType}:restrict-read-html-tpl start -->`;
+    const endTag = `<!-- ${restrictType}:restrict-read-html-tpl end -->`;
+
+    // 使用正则模糊匹配（允许前后有空白字符）
+    const startRegex = new RegExp(`\\s*${escapeRegExp(startTag)}\\s*`);
+    const endRegex = new RegExp(`\\s*${escapeRegExp(endTag)}\\s*`);
+
+    return startRegex.test(raw) && endRegex.test(raw);
+}
+
+/**
+ * 替换受限内容
+ * @param post
+ * @param replacement
+ * @returns {*}
+ */
+export function replaceRestrictedContent(post, replacement = '') {
+    const annotations = post?.metadata?.annotations;
+    const restrictReadEnable = annotations?.restrictReadEnable;
+
+    if (restrictReadEnable === 'false') return post.content.raw;
+
+    const restrictType = restrictReadEnable;
+    const raw = post.content.raw;
+
+    const startTag = `<!-- ${restrictType}:restrict-read-html-tpl start -->`;
+    const endTag = `<!-- ${restrictType}:restrict-read-html-tpl end -->`;
+
+    const startRegex = new RegExp(`\\s*${escapeRegExp(startTag)}\\s*`, 'g');
+    const endRegex = new RegExp(`\\s*${escapeRegExp(endTag)}\\s*`, 'g');
+
+    // 构造完整匹配的正则
+    const pattern = `${startRegex.source}(.*?)${endRegex.source}`;
+    const regex = new RegExp(pattern, 'gs');
+
+    return raw.replace(regex, replacement);
+}
+
+// 常量定义（可抽离到 constants.js）
+const PLACEHOLDER = 'restrict-read-placeholder';
+
+/**
+ * 获取可展示的HTML内容块
+ * @param {Object} post - 文章对象
+ * @returns {string[]} - 分割后的HTML片段数组
+ */
+export function getShowableContent(post) {
+    const restrictEnabled = checkPostRestrictRead(post);
+    const rawContent = post?.content?.raw || '';
+
+    // 替换受限内容为占位符
+    const processedContent = restrictEnabled
+        ? replaceRestrictedContent(post, PLACEHOLDER)
+        : rawContent;
+
+    // 按占位符分割内容
+    const contentFragments = processedContent
+        .split(PLACEHOLDER)
+        .map(fragment => fragment.trim())
+        .filter(fragment => fragment);
+
+    // 移除最后一个元素如果它只包含HTML标签而无实际文本
+    if (contentFragments.length > 0 && isHtmlEmpty(contentFragments[contentFragments.length - 1])) {
+        contentFragments.pop();
+    }
+
+    console.log('contentFragments:', contentFragments);
+
+    return contentFragments;
+}
+
+/**
+ * 获取受限阅读类型名称
+ * @param post
+ * @returns {string}
+ */
+export function getRestrictReadTypeName(post) {
+    const annotations = post?.metadata?.annotations;
+    const restrictReadEnable = annotations?.restrictReadEnable;
+
+    if (restrictReadEnable === 'false') return '';
+    if (restrictReadEnable === 'password') return '密码';
+    if (restrictReadEnable === 'code') return '验证码';
+    if (restrictReadEnable === 'login') return '登录';
+    if (restrictReadEnable === 'pay') return '付费';
+    if (restrictReadEnable === 'comment') return '评论';
+}
+
+/**
+ * 复制文本到剪贴板
+ * @param text
+ * @returns {Promise<void>}
+ */
+export async function copyToClipboard(text) {
+    try {
+        await uni.setClipboardData({
+            data: text,
+            success: () => {
+                uni.showToast({
+                    title: '复制成功',
+                    icon: 'success'
+                });
+            }
+        });
+    } catch (error) {
+        console.error('复制出错:', error);
+    }
+}
+
+/**
+ * 转义字符串用于正则表达式
+ * @param string
+ * @returns {*}
+ */
+function escapeRegExp(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+/**
+ * 判断字符串去除HTML标签后是否为空
+ * @param {string} html
+ * @returns {boolean}
+ */
+function isHtmlEmpty(html) {
+    return !html || !html.replace(/<[^>]+>/g, '').trim();
+}