修改：优化文章分类添加密码验证功能

修改：修复海报分享因为无图使用随机图在微信小程序下异常bug；
新增：halo.config.template.js 新增一个配置项 defaultStaticThumbnailUrl 默认静态图片用于海报在无图且使用了随机图时候的封面图片地址

.gitignore

@@ -2,4 +2,5 @@ node_modules/
 unpackage/ 
 config/halo.config.js
 config/ad.config.js
+config/love.config.js
 package-lock.json

.hbuilderx/launch.json

@@ -14,6 +14,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"mp-qq" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"mp-weixin" : 
      	{
      		"launchtype" : "local"

App.vue

@@ -64,14 +64,10 @@ export default {
 @import './common/icons/mphtmliconfont.css';
 
 /* #ifndef MP-WEIXIN */
-@import './common/markdown/markdown.scss'; //引入markdown呈现
+@import './common/markdown/markdown.scss';
 /* #endif */
 
 page {
-	// background-color: #f3f5f7;
-	// background-color: #f7f7f7;
-	// background-color: #ffffff;
 	background-color: #fafafa;
-	// background-color: #f4f5f5;
 }
 </style>

README.md

@@ -4,7 +4,7 @@
     </a>
 </p>
 
-<p align="center"><b>uni-halo</b> 基于Halo一款现代化的开源博客/CMS系统API开发的多端系统，值得一试。</p>
+<p align="center"><b>【uni-halo】</b> 基于 uniapp + Halo API 开发的多端项目，值得一试。</p>
  
 <br />
 <p align="center">
@@ -16,95 +16,107 @@
 
 ---
 
-如果您觉得这个项目对您有帮助，可以帮作者买杯饮料鼓励鼓励!
+如果您觉得这个项目对您有帮助，可以帮作者买杯饮料鼓励鼓励，同时为了项目能够持续发展，可以根据您的喜好支持一下本项目哦，非常感谢您的支持，作者也会更有动力持续维护和更新新的功能哦~
+
+|支付宝												|微信												|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)	|
+
+## 🧐 功能介绍
+
+#### 🍻 基础功能
+
+几乎实现PC端后台的全功能，让您在手机端也可以管理您的博客。
+
+- 用户端：文章列表、文章分类、文章详情、图库、留言板、友链、个人日记等
+- 管理端：资料修改、密码修改、日记管理、文章管理、分类管理、标签管理、附件管理、友链管理、评论管理、日志管理等
 
-<table rules="none" align="center" border="0">
-	<tr>
-		<td>
-			<center>
-				<img src="https://uni-halo.925i.cn/qrcode/zfb.png" width="100%" />
 <br/>
-				<font color="AAAAAA">支付宝打赏</font>
+
-			</center>
+#### 💞 特色功能
-		</td>
+
-			<td>
+- 恋爱日记：精心为您设计了秀恩爱的模块，秀出关于你们的故事、情侣甜蜜相册、恋爱记录清单，为您的恋爱保驾护航。
-			<center>
+
-				<img src="https://uni-halo.925i.cn/qrcode/wx.png" width="100%" />
 <br/>
-				<font color="AAAAAA">微信打赏</font>
+
-			</center>
+## 😎 文档源码
-		</td>
+
-			<td>
+- 作者博客：[https://b.925i.cn/](https://b.925i.cn/)
-			<center>
+- 官方文档：[https://uni-halo.925i.cn/](https://uni-halo.925i.cn/)
-				<img src="https://uni-halo.925i.cn/qrcode/qq.png" width="100%" />
+- 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/>
-				<font color="AAAAAA">QQ打赏</font>
-			</center>
-		</td>
-	</tr>
-</table>
 
+## 😏 在线体验
 
-## 🌸 快速开始
+说明：微信扫码、或搜索【小莫唐尼】即可在线体验已上线小程序！！！
 
-详细部署文档请查阅 [uni-halo-doc](https://uni-halo.925i.cn/)
+![https://img.925i.cn/file/a0c1a95b49b5db7f78248.png](https://img.925i.cn/file/a0c1a95b49b5db7f78248.png)
 
-- 1、拉取或下载项目<https://gitee.com/ialley-workshop-open/uni-halo>；
+<br/>
-- 2、通过hbuilderx 导入项目；
-- 3、命令行执行 npm i 安装依赖； 
-- 4、配置运行信息，找到项目根目录config目录，将`halo.config.template.js`修改为 `halo.config.js` 并设置相关信息；
-- 5、点击hbuilderx 工具 右上角预览、或者点击工具栏 运行-内置浏览器运行；
-- 6、项目发行：
--    发行小程序：点击工具栏 发行 -> 小程序-微信
--    发行APP：  点击工具栏 发行 -> 原生App-云打包
 
+## 😘 界面预览
 
-## ⭐️ 功能清单
+##### 📱 用户端
 
-### 用户部分
+说明：以下仅为部分截图
-1. - [x] 文章分类
-2. - [x] 文章详情&海报分享
-3. - [x] 文章归档
-4. - [x] 文章列表和搜索
-5. - [x] 数据统计展示
-6. - [x] 图库
-7. - [x] 友链
-8. - [x] 留言板
-9. - [x] 个人日记
 
-### 管理部分
+|首页|分类|图库|友链|
-1. - [x] 个人信息修改
+|:--:|:--:|:--:|:--:|
-2. - [x] 个人密码修改
+|![首页](https://uni-halo.925i.cn/assets/001.76053f5e.jpg)|![分类](https://uni-halo.925i.cn/assets/002.9479f5e4.jpg)|![相册](https://uni-halo.925i.cn/assets/003.0d1f4694.jpg)|![友链](https://uni-halo.925i.cn/assets/004.22b6a1e3.jpg)|
-3. - [x] 日记管理
-4. - [x] 文章管理
-5. - [x] 分类管理
-6. - [x] 标签管理
-7. - [x] 附件管理
-8. - [x] 友链管理
-9. - [x] 图库管理
-10. - [x] 评论管理
-11. - [x] 日志管理
-12. - [ ] 菜单设置
-13. - [ ] 系统设置
 
-## 📃 TODO
+|我的|归档|详情|留言板|
-1. - [ ] 暗黑模式
+|:--:|:--:|:--:|:--:|
-2. - [ ] 国际化
+|![我的](https://uni-halo.925i.cn/assets/005.d1ccf84e.jpg)|![归档](https://uni-halo.925i.cn/assets/007.e481f0c1.jpg)|![详情](https://uni-halo.925i.cn/assets/008.a4f5af80.jpg)|![留言板](https://uni-halo.925i.cn/assets/006.fc80dc8c.jpg)|
 
+##### 💻 管理端
 
-## 🌈 在线体验
+说明：以下仅为部分截图
 
-- 敬请期待...
+|后台首页|文章管理|
+|:--:|:--:|
+|![后台首页](https://uni-halo.925i.cn/assets/009.707f9a85.jpg)|![文章管理](https://uni-halo.925i.cn/assets/010.0b018b02.jpg)|
 
+##### 📱 恋爱日记
 
-## 🔍 许可证
+说明：以下仅为部分截图
+
+|主页															|恋爱相册															|恋爱清单															|
+|:--:															|:--:																|--																	|
+|![主页](https://uni-halo.925i.cn/assets/love_001.6bf8b4e9.jpg)	|![恋爱相册](https://uni-halo.925i.cn/assets/love_003.b8effd48.jpg)	|![恋爱清单](https://uni-halo.925i.cn/assets/love_002.a08bd8d6.jpg)	|
+
+<br/>
+
+## 🙋 使用交流
+
+- 提交 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群号：632969367](https://img.925i.cn/file/b83b9e79695779c4344f3.png)
+
+<br/>
+
+## 🎉 加入我们
+
+uni-halo 还在持续更新中，本项目欢迎您的参与，共同维护，逐步完善，将项目做得更强。项目采用 AGPL-3.0 开源协议，本着一切免费的原则，原则上不会收取任何费用及版权，可以放心使用。
+
+如果你想加入我们，可以多提供一些好的建议或者提交 pr，我们将会非常乐意接受您的建议和意见。
+
+<br/>
+ 
+## 🔍 开源许可
 
 uni-halo 使用 AGPL-3.0 协议开源，请遵守开源协议。
 
-## 🏭 贡献
+<br/>
 
-贡献代码请查看 [代码贡献规范](https://uni-halo.925i.cn/standard/category.html)
+## 🙋 致谢
+uni-halo 得益于以下优秀的技术支撑，我只是站在巨人的肩膀上捡了几根头发丝，但是非常感谢这些优秀的项目，带给了我们其他开发者和用户非常友好的体验！
 
-## 🙆‍♂ Halo  
+- [Halo：一款好用又强大的开源建站工具](https://halo.run/)
-- 接口文档地址（内容端）：<https://api.halo.run/content-api.html> 
+- [uni-app：是一个使用 Vue.js 开发所有前端应用的框架，开发者编写一套代码可编译到多个平台](https://uniapp.dcloud.net.cn/)
-- 接口文档地址（管理端）：<https://api.halo.run/admin-api.html> 
+- [tm-vuetify：是一个为 uni-app 平台定制的颜值也非常高的 UI 框架](https://www.jx2d.cn/)
+- [mp-html：一个强大的小程序富文本组件](https://jin-yufeng.gitee.io/mp-html/#/)

api/category.js

@@ -4,6 +4,7 @@
  */
 
 import HttpHandler from '@/common/http/request.js'
+import { getCache } from '@/utils/storage.js'
 export default {
 	/**
 	 * 查询分类列表
@@ -19,6 +20,8 @@ export default {
 	 * @param {Object} params  查询参数 
 	 */
 	getCategoryPostList: (slug, params) => {
+		// 从缓存中根据分类获取密码，如果获取到了说明本分类需要密码，避免多个分类需要密码在输入密码后刷新页面点错了分类
+		params.password = getCache('APP_CATEGORY_PWD_' + slug)
 		return HttpHandler.Get(`/api/content/categories/${slug}/posts`, params)
 	},
 }

api/index.js

@@ -16,6 +16,7 @@ import archive from './archive.js'
 import article from './article.js'
 import blogger from './blogger.js'
 import category from './category.js'
+import tag from './tag.js'
 import comment from './comment.js'
 import journal from './journal.js'
 import link from './link.js'
@@ -44,6 +45,7 @@ const ApiManager = {
 	...article,
 	...blogger,
 	...category,
+	...tag,
 	...comment,
 	...journal,
 	...link,

api/tag.js

@@ -0,0 +1,24 @@
+/**
+ * 标签接口
+ * @see https://api.halo.run/content-api.html#tag/tag-controller
+ */
+
+import HttpHandler from '@/common/http/request.js'
+export default {
+	/**
+	 * 查询标签列表
+	 * @param {Object} params  查询参数 
+	 */
+	getTagList: (params) => {
+		return HttpHandler.Get('/api/content/tags', params)
+	},
+
+	/**
+	 * 查询标签下的文章
+	 * @param {String} slug  别名
+	 * @param {Object} params  查询参数 
+	 */
+	getTagPostsList: (slug, params) => {
+		return HttpHandler.Get(`/api/content/tags/${slug}/posts`, params)
+	},
+}

common/http/interceptors.js

@@ -13,8 +13,54 @@ import {
 	getAdminAccessToken
 } from "@/utils/auth.js";
 import {
-	delCache
+	delCache,
+	setCache
 } from "@/utils/storage";
+
+const getCategoryNameByUrl = (url) => {
+	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) {}
+		},
+	})
+}
+
 export const setInterceptors = (http) => {
 	http.interceptors.request.use(
 		(config) => {
@@ -57,6 +103,22 @@ export const setInterceptors = (http) => {
 					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: '提示',
@@ -75,6 +137,13 @@ export const setInterceptors = (http) => {
 							url: '/pages/tabbar/about/about'
 						})
 					})
+				}
+			} 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);
+				}
 			} else {
 				return Promise.reject(response.data);
 			}

common/markdown/markdown.config.js

@@ -44,53 +44,53 @@ export default {
 			color: var(--main);
 			line-height: 24px;
 			position: relative;
-			font-size:1.25em;
+			font-size:1.2em;
 			`,
 		h2: `
 			color: var(--main);
 			line-height: 24px;
 			position: relative;
 			margin: 22px 0 16px;
-			font-size: 1.2em;
+			font-size: 1.16em;
 		`,
 		h3: `
 		    color: var(--main);
 		    line-height: 24px;
 		    position: relative;
 			margin: 26px 0 18px;
-			font-size: 1.3em;
+			font-size: 1.14em;
 		`,
 		h4: `
 			color: var(--main);
 		    line-height: 24px;
 		    margin-bottom: 18px;
 		    position: relative;
-			font-size: 1.18em;
+			font-size: 1.12em;
 		`,
 		h5: `
 			color: var(--main);
 		    line-height: 24px;
 		    margin-bottom: 14px;
 		    position: relative;
-			font-size: 1em;
+			font-size: 1.1em;
 		`,
 		h6: `
 			color: #303133;
 			line-height: 24px;
 			margin-bottom: 14px;
 			position: relative;
-			font-size: 1em;
+			font-size: 14px;
 		`,
 		p: `
 		    line-height: 1.65;
 		    margin-bottom: 14px;
-			font-size: 15px;
+			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: 16px;color: #606266;word-spacing: 0.8px;letter-spacing: 0.8px;border-radius: 6px;background-color:#FFFFFF;',
+	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: HaloConfig.loadingGifUrl,
 	emptyGif: HaloConfig.loadingEmptyUrl,

common/mixins/index.js

@@ -18,14 +18,30 @@ export default {
 				return {
 					author: HaloConfig.author,
 					_isWechat: true,
-					haloAdConfig: HaloAdConfig
+					haloAdConfig: HaloAdConfig,
+					_aniWaitIndex: 0, // 动画索引
 				};
 			},
 			computed: {
 				// 获取全局应用设置
 				globalAppSettings() {
-					return uni.$tm.vx.getters().setting.getSettings;
+					return uni.$tm.vx.getters().getSettings;
+				},
+				// 计算动画索引
+				calcAniWait() {
+					return (index) => {
+						if ((index + 1) % 10 == 0) {
+							this._aniWaitIndex = 1;
+						} else {
+							this._aniWaitIndex += 1;
 						}
+						console.log('this._aniWaitIndex', this._aniWaitIndex);
+						return this._aniWaitIndex * 50
+					}
+				}
+			},
+			onLoad() {
+				this.fnResetSetAniWaitIndex()
 			},
 			created() {
 				// #ifdef MP-WEIXIN
@@ -36,7 +52,9 @@ export default {
 				this._isWechat = false;
 				// #endif
 			},
-
+			onShow() {
+				this.fnResetSetAniWaitIndex()
+			},
 			methods: {
 				/**
 				 * 设置页面标题
@@ -60,6 +78,10 @@ export default {
 							console.log('err：', err);
 						},
 					});
+				},
+				// 初始化动画索引值（需要在每个页面调用）
+				fnResetSetAniWaitIndex() {
+					this._aniWaitIndex = 0
 				}
 			},
 		});

common/mixins/wxshare.mixin.js

@@ -0,0 +1,66 @@
+// 微信分享配置
+import haloConfig from '@/config/halo.config.js'
+import { jsonToUrlParams2 } from '@/utils/url.params.js'
+export const haloWxShareMixin = {
+	data() {
+		return {
+			haloWxShareData: {
+				...haloConfig.wxShareConfig
+			},
+		}
+	},
+
+	//#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: haloConfig.apiUrl,
+				query: {}
+			}, config)
+
+			uni.$tm.vx.commit('setWxShare', _config);
+			this.haloWxShareData = _config;
+		}
+	}
+}

common/styles/app.base.scss

@@ -36,3 +36,139 @@
 		transform: rotateZ(360deg);
 	}
 }
+
+// 自定义广告
+
+.ad-card {
+	position: relative;
+	box-sizing: border-box;
+	padding: 24rpx;
+	box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
+	background-color: #ffffff;
+	border-radius: 12rpx;
+
+	&.is-lr {
+		display: flex;
+		.ad-card_tip {
+			top: initial;
+			left: 288rpx;
+			bottom: 24rpx;
+			// right: 160rpx;
+			padding: 4rpx 20rpx;
+			background-color: transparent;
+			border: 2rpx solid #607d8b;
+			color: #607d8b;
+		}
+		.ad-card_cover {
+			width: 240rpx;
+			height: 180rpx;
+			animation: adLinkAni 1s ease-in-out infinite;
+		}
+		.ad-card_info {
+			width: 0;
+			flex-grow: 1;
+			padding-left: 24rpx;
+			&-title {
+				margin-top: 0;
+				width: 100%;
+				font-size: 30rpx;
+			}
+			&-link {
+				top: initial;
+				// right: 150rpx;
+				bottom: 0;
+				transform: scale(1);
+			}
+		}
+	}
+
+	&_tip {
+		position: absolute;
+		left: 36rpx;
+		top: 36rpx;
+		display: inline-flex;
+		box-sizing: border-box;
+		border-radius: 6rpx;
+		padding: 4rpx 10rpx;
+		background-color: rgba(0, 0, 0, 0.3);
+		color: #ffffff;
+		font-size: 24rpx;
+		z-index: 2;
+	}
+	&_cover {
+		width: 100%;
+		height: 300rpx;
+		border-radius: 6rpx;
+	}
+	&_info {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		position: relative;
+		&-title {
+			width: calc(100% - 120rpx);
+			font-size: 28rpx;
+			font-weight: bold;
+			margin-top: 8rpx;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			color: #333;
+		}
+		&-desc {
+			margin-top: 6rpx;
+			font-size: 24rpx;
+			color: #616161;
+			line-height: 1.8;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+		}
+		&-link {
+			position: absolute;
+			right: 0;
+			top: 6rpx;
+			display: inline-flex;
+			box-sizing: border-box;
+			border-radius: 6rpx;
+			padding: 4rpx 10rpx;
+			border: 2rpx solid #03a9f4;
+			color: #03a9f4;
+			font-size: 24rpx;
+			transform: scale(0.93);
+			// animation: adLinkAni 0.8s ease-in-out infinite;
+		}
+	}
+}
+@keyframes adLinkAni {
+	0% {
+		transform: scale(1);
+	}
+	50% {
+		transform: scale(1.02);
+	}
+	100% {
+		transform: scale(1);
+	}
+}
+
+/* 文本省略样式 开始 */
+.text-sub-one {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+/* 多行文本省略 */
+@for $i from 2 through 30 {
+	.text-sub-more-#{$i} {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: $i;
+		overflow: hidden;
+	}
+}
+
+/* 文本省略样式 结束 */

components/article-card/article-card.vue

@@ -1,18 +1,12 @@
 <template>
 	<view class="article-card " :class="cardType" @click="fnClickEvent('card')">
 		<view class="left">
-			<cache-image
+			<cache-image class="thumbnail" radius="6rpx" :url="$utils.checkThumbnailUrl(article.thumbnail)" :fileMd5="$utils.checkThumbnailUrl(article.thumbnail)" mode="aspectFill"></cache-image>
-				class="thumbnail"
-				radius="12rpx"
-				:url="$utils.checkThumbnailUrl(article.thumbnail)"
-				:fileMd5="$utils.checkThumbnailUrl(article.thumbnail)"
-				mode="aspectFill"
-			></cache-image>
 			<!-- <image class="thumbnail" lazy-load :src="$utils.checkThumbnailUrl(article.thumbnail)" mode="aspectFill"></image> -->
 		</view>
 		<view class="right">
 			<view class="title">
-				<text class="is-top" v-if="article.topped">置顶</text>
+				<text class="is-top bg-gradient-blue-accent" v-if="article.topped">置顶</text>
 				<text class="title-text text-overflow">{{ article.title }}</text>
 			</view>
 			<view class="content text-overflow-2">{{ article.summary }}</view>
@@ -33,8 +27,10 @@
 </template>
 
 <script>
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
 	export default {
 		name: 'article-card',
+		components: { tmTags },
 		props: {
 			from: {
 				type: String,
@@ -71,30 +67,41 @@ export default {
 		display: flex;
 		box-sizing: border-box;
 		margin: 0 24rpx;
-	padding: 32rpx;
+		padding: 24rpx;
 		border-radius: 12rpx;
 		background-color: #ffff;
 		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
 		overflow: hidden;
 		margin-bottom: 24rpx;
+
+		&.h_row_col1 {
+			display: flex;
+			align-items: center;
+		}
+
 		&.home {
 			&.h_row_col2 {
 				margin: 12rpx;
+
 				.left {
 					width: 100%;
 					height: 200rpx;
+
 					.thumbnail {
+
 						::v-deep uni-image {
 							border-radius: 6rpx 6rpx 0 0 !important;
 						}
 					}
 				}
+
 				.right {
 					.title {
 						display: flex;
 						align-items: center;
 						font-size: 26rpx;
 						font-weight: bold;
+
 						.is-top {
 							height: 36rpx;
 							margin-right: 10rpx;
@@ -103,22 +110,28 @@ export default {
 							transform: scale(0.9);
 						}
 					}
+
 					.foot {
 						justify-content: space-between;
+
 						.create-time {
 							font-size: 24rpx;
+
 							.time-label {
 								display: none;
 							}
 						}
+
 						.visits {
 							font-size: 24rpx;
 							margin-left: 0;
 						}
 					}
 				}
+
 				&.tb_text_image {
 					padding: 12rpx;
+
 					.left .thumbnail {
 						::v-deep {
 							uni-image {
@@ -127,14 +140,17 @@ export default {
 						}
 					}
 				}
+
 				&.only_text {
 					padding: 24rpx;
+
 					.right .foot {
 						.create-time {
 							.time-label {
 								display: none;
 							}
 						}
+
 						.visits {
 							font-size: 24rpx;
 						}
@@ -142,91 +158,113 @@ export default {
 				}
 			}
 		}
-	&.lr_image_text {
+
-	}
+		&.lr_image_text {}
 
 		&.lr_text_image {
 			.left {
 				order: 2;
 				padding-left: 30rpx;
 			}
+
 			.right {
 				order: 1;
 				padding-left: 0;
 			}
 		}
+
 		&.tb_image_text {
 			flex-direction: column;
-		padding: 0;
+			padding: 24rpx;
+
 			.left {
 				width: 100%;
-			height: 300rpx;
+				height: 340rpx;
+
 				.thumbnail {
 					::v-deep uni-image {
 						border-radius: 6rpx 6rpx 0 0 !important;
 					}
 				}
 			}
+
 			.right {
 				padding-left: 0;
-			padding: 24rpx;
+				padding: 24rpx 0;
+				padding-bottom: 0;
 				width: 100%;
+
 				.foot {
 					justify-content: flex-start;
+
 					.create-time {
 						.time-label {
 							display: inline-block;
 						}
 					}
+
 					.visits {
 						margin-left: 24rpx;
 					}
 				}
 			}
 		}
+
 		&.tb_text_image {
 			flex-direction: column;
+
 			.left {
 				width: 100%;
-			height: 260rpx;
+				height: 340rpx;
 				order: 2;
 				margin-top: 24rpx;
 			}
+
 			.right {
 				padding-left: 0;
 				width: 100%;
 				order: 1;
+
 				.foot {
 					justify-content: flex-start;
+
 					.create-time {
 						.time-label {
 							display: inline-block;
 						}
 					}
+
 					.visits {
 						margin-left: 24rpx;
 					}
 				}
 			}
 		}
+
 		&.only_text {
 			padding: 36rpx;
+
 			.left {
 				display: none;
 			}
+
 			.right {
 				padding-left: 0;
+
 				.content {
 					margin-top: 24rpx;
 				}
+
 				.foot {
 					justify-content: flex-start;
 					margin-top: 24rpx;
+
 					.create-time {
 						.time-label {
 							display: inline-block;
 						}
 					}
+
 					.visits {
 						margin-left: 24rpx;
 					}
@@ -237,12 +275,14 @@ export default {
 		.left {
 			width: 240rpx;
 			height: 180rpx;
+
 			.thumbnail {
 				width: 100%;
 				height: 100%;
 				border-radius: 12rpx;
 			}
 		}
+
 		.right {
 			width: 0;
 			flex-grow: 1;
@@ -250,10 +290,13 @@ export default {
 			flex-direction: column;
 			padding-left: 30rpx;
 			box-sizing: border-box;
+
 			.title {
 				display: flex;
+				align-items: center;
 				font-size: 30rpx;
 				color: var(--main-text-color);
+
 				.is-top {
 					height: 40rpx;
 					padding: 0 12rpx;
@@ -263,13 +306,16 @@ export default {
 					white-space: nowrap;
 					vertical-align: 4rpx;
 					color: #fff;
-				background-image: -webkit-linear-gradient(0deg, #3ca5f6 0, #a86af9 100%);
+					// background-image: -webkit-linear-gradient(0deg, #3ca5f6 0, #a86af9 100%);
-				border-radius: 4rpx 12rpx;
+					border-radius: 6rpx 12rpx;
+					box-shadow: none !important;
 				}
+
 				&-text {
 					color: #303133;
 				}
 			}
+
 			.content {
 				display: -webkit-box;
 				font-size: 26rpx;
@@ -278,6 +324,7 @@ export default {
 				margin-top: 14rpx;
 				line-height: 42rpx;
 			}
+
 			.foot {
 				display: flex;
 				font-size: 24rpx;
@@ -288,10 +335,12 @@ export default {
 
 				.create-time {
 					font-size: 26rpx;
+
 					.time-label {
 						display: none;
 					}
 				}
+
 				.visits {
 					.number {
 						padding: 0 6rpx;

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

@@ -1,13 +1,7 @@
 <template>
 	<view class="article-min-card" :class="[globalAppSettings.layout.cardType]" @click="fnClickEvent('card')">
 		<view class="left">
-			<cache-image
+			<cache-image class="thumbnail" radius="6rpx" :url="$utils.checkThumbnailUrl(article.thumbnail)" :fileMd5="$utils.checkThumbnailUrl(article.thumbnail)" mode="aspectFill"></cache-image>
-				class="thumbnail"
-				radius="12rpx"
-				: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>
@@ -56,83 +50,102 @@ export default {
 		margin: 12rpx 24rpx;
 		margin-bottom: 24rpx;
 		padding: 16rpx;
-	box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
+		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;
 			}
+
 			.right {
 				order: 1;
 				padding-left: 0;
 			}
 		}
+
 		&.tb_image_text {
 			flex-direction: column;
+
 			.left {
 				width: 100%;
 				height: 220rpx;
 			}
+
 			.right {
 				padding-left: 0;
 				width: 100%;
+
 				.title {
 					margin-top: 24rpx;
 				}
+
 				.foot {
 					justify-content: flex-start;
+
 					.create-time {
 						.time-label {
 							display: inline-block;
 						}
 					}
+
 					.visits {
 						margin-left: 24rpx;
 					}
 				}
 			}
 		}
+
 		&.tb_text_image {
 			flex-direction: column;
+
 			.left {
 				width: 100%;
 				height: 220rpx;
 				order: 2;
 				margin-top: 20rpx;
 			}
+
 			.right {
 				padding-left: 0;
 				width: 100%;
 				order: 1;
+
 				.foot {
 					justify-content: flex-start;
+
 					.create-time {
 						.time-label {
 							display: inline-block;
 						}
 					}
+
 					.visits {
 						margin-left: 24rpx;
 					}
 				}
 			}
 		}
+
 		&.only_text {
 			.left {
 				display: none;
 			}
+
 			.right {
 				padding-left: 0;
+
 				.foot {
 					justify-content: flex-start;
+
 					.create-time {
 						.time-label {
 							display: inline-block;
 						}
 					}
+
 					.visits {
 						margin-left: 24rpx;
 					}
@@ -143,28 +156,33 @@ export default {
 		.left {
 			width: 180rpx;
 			height: 130rpx;
+
 			.thumbnail {
 				width: 100%;
 				height: 100%;
 				border-radius: 12rpx;
 			}
 		}
+
 		.right {
 			width: 0;
 			flex-grow: 1;
 			display: flex;
 			flex-direction: column;
-		padding-left: 24rpx;
+			padding-left: 20rpx;
+
 			.title {
 				font-size: 28rpx;
 				font-weight: 600;
 				color: var(--main-text-color);
 			}
+
 			.content {
 				font-size: 26rpx;
 				color: #909399;
 				margin-top: 14rpx;
 			}
+
 			.foot {
 				display: flex;
 				font-size: 24rpx;
@@ -172,20 +190,25 @@ export default {
 				align-items: center;
 				color: #909399;
 				margin-top: 14rpx;
+
 				.create-time {
 					font-size: 24rpx;
+
 					.time-label {
 						display: none;
 					}
+
 					.icon {
 						font-size: 24rpx;
 						padding-right: 4rpx;
 					}
 				}
+
 				.visits {
 					.icon {
 						font-size: 28rpx;
 					}
+
 					.number {
 						padding: 0 6rpx;
 						font-size: 24rpx;

components/barrage/barrage.vue

@@ -1,15 +1,11 @@
 <template>
-	<view style="overflow: hidden;position: fixed;width: 100%;height: 100%;pointer-events: none; top: 0;">
+	<view class="barrage-wrap" :class="[type]">
-		<view class="danmu-li" v-for="(item, index) in listData" :class="item.type" :style="item.style" :key="index">
+		<view class="danmu-li" v-for="(item, index) in listData" :class="[type, item.type]" :style="[item.style]" :key="index">
 			<view class="danmu-inner">
 				<view class="user-box">
-					<view class="user-img">
+					<view class="user-img"><image class="avatar" :src="item.item.avatar"></image></view>
-						<view class="img-box">
+					<view class="user-text cl1">{{ item.item.author }}</view>
-							<image :src="item.avatar || 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=317894666,3379114684&fm=26&gp=0.jpg'"></image>
+					<view class="user-status cl1">{{ item.item.content }}</view>
-						</view>
-					</view>
-					<view class="user-text cl1">{{ item.nickName }}</view>
-					<view class="user-status cl1">{{ item.text }}</view>
 				</view>
 			</view>
 		</view>
@@ -23,6 +19,12 @@ export default {
 			type: String,
 			default: 'rightToLeft'
 		},
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
 		minTime: {
 			type: Number,
 			default: 4
@@ -43,34 +45,34 @@ export default {
 			//轨道高度
 			type: Number,
 			default: 40
-		},
-		noStacked: {
-			//不允许堆叠(暂不可用)
-			type: Array,
-			default() {
-				return [];
-			}
 		}
 	},
 	data() {
 		return {
+			closeTimer: null,
 			listData: []
 		};
 	},
+
 	mounted() {
-		this.hrackNum = Math.floor((this.maxTop - this.minTop) / this.hrackH);
+		//leftBottom 使用参数
+		if (this.type === 'leftBottom') {
+			this.hrackNum = Math.floor(this.maxTop / this.hrackH);
+		}
 	},
 	methods: {
 		add(obj) {
+			this.isShow = true;
+			this.showFlag = true;
 			let data = {
-				item: obj.item,
+				...obj,
 				id: Date.parse(new Date()),
 				time: Math.ceil(Math.floor(Math.random() * (this.maxTime - this.minTime + 1) + this.minTime)),
 				type: this.type
 			};
 			if (this.type === 'leftBottom') {
 				let objData = {
-					item: data.item,
+					item: data,
 					type: 'leftBottomEnter',
 					style: {
 						transition: `all 0.5s`,
@@ -88,7 +90,7 @@ export default {
 					} else if (this.listData[i].status === 'reset') {
 						//重置
 						this.listData[i].style.transition = 'none';
-						this.listData[i].style.bottom = 0;
+						this.listData[i].style.bottom = '6px';
 						this.listData[i].status = 'reuse';
 					} else if (this.listData[i].status === 'recycle') {
 						//回收
@@ -105,8 +107,16 @@ export default {
 				if (listLen < hrackNum + 2) {
 					this.listData.push(objData);
 				}
-			} else if (this.type === 'rightToLeft' || this.type === 'leftToRight') {
+			} else if (this.type === 'rightToLeft') {
-				let objData = this.horStacked(data);
+				let objData = {
+					item: data,
+					type: 'rightToLeft',
+					style: {
+						animationDuration: `${data.time}s`,
+						top: `${Math.ceil(Math.random() * (this.maxTop - this.minTop + 1) + this.minTop)}px`
+					},
+					delTime: Date.parse(new Date()) + data.time * 1200
+				};
 				for (let i in this.listData) {
 					if (this.listData[i].delTime <= Date.parse(new Date())) {
 						this.repaint(i, objData.type);
@@ -118,16 +128,50 @@ export default {
 				this.listData.push(objData);
 			}
 		},
-		horStacked(data) {
+		async remove(options = {}) {
-			return {
+			if (this.type == 'rightToLeft') {
-				item: data.item,
+				if (this.listData.length != 0) {
-				type: this.type,
+					const last = this.listData[this.listData.length - 1];
-				style: {
+					setTimeout(() => {
-					animationDuration: `${data.time}s`,
+						this.listData = [];
-					top: `${Math.ceil(Math.random() * (this.maxTop - this.minTop + 1) + this.minTop)}px`
+					}, last.item.time * 1200 + 1000);
+				}
+				return;
+			}
+
+			options = Object.assign(
+				{},
+				{
+					duration: 5000, // 延迟关闭的时间
+					speed: 1000 // 弹幕消失的速度
 				},
-				delTime: Date.parse(new Date()) + data.time * 1200
+				options
+			);
+
+			const _fnHandleRemove = item => {
+				return new Promise(resolve => {
+					setTimeout(() => {
+						// item['type'] = 'leftBottomExitLeft';
+						item['type'] = 'is-hide';
+						resolve();
+					}, options.speed);
+				});
 			};
+			const _fnHandleLoop = item => {
+				return new Promise(resolve => {
+					setTimeout(async () => {
+						for (var i = 0; i < this.listData.length; i++) {
+							await _fnHandleRemove(this.listData[i]);
+						}
+						resolve();
+					}, options.duration);
+				});
+			};
+
+			await _fnHandleLoop();
+			setTimeout(() => {
+				this.listData = [];
+			}, options.duration + 200);
 		},
 		repaint(index, type) {
 			setTimeout(() => {
@@ -137,8 +181,8 @@ export default {
 	}
 };
 </script>
-<style></style>
+
-<style lang="scss">
+<style lang="scss" scoped>
 @keyframes leftBottomEnter {
 	0% {
 		transform: translateY(100%);
@@ -163,6 +207,20 @@ export default {
 	}
 }
 
+@keyframes leftBottomExitLeft {
+	0% {
+		transform: translateX(0%);
+		opacity: 1;
+	}
+	50% {
+		transform: translateX(-50%);
+		opacity: 1;
+	}
+	100% {
+		transform: translateX(-100%);
+		opacity: 0;
+	}
+}
 @keyframes leftToRight {
 	0% {
 		transform: translateX(-100%);
@@ -182,13 +240,38 @@ export default {
 		transform: translateX(-100%);
 	}
 }
-
+.barrage-wrap {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	pointer-events: none;
+	top: 0;
+	z-index: 99;
+	transition: all 1s ease-in-out;
+	&.leftBottom {
+		top: initial;
+		/* #ifdef H5 */
+		bottom: 130rpx;
+		/* #endif */
+		/* #ifndef H5 */
+		bottom: 36rpx;
+		/* #endif */
+	}
+}
 .danmu-li {
 	position: absolute;
 	width: 100%;
 	transform: translateX(100%);
 	animation-timing-function: linear;
-
+	transition: all 0.5s ease-in-out;
+	opacity: 1;
+	&.is-hide {
+		opacity: 0;
+		// transform: translateX(-100%) !important;
+	}
+	&.leftBottom {
+		left: 24rpx;
+	}
 	&.leftBottomEnter {
 		animation-name: leftBottomEnter;
 	}
@@ -196,53 +279,59 @@ export default {
 		animation-name: leftBottomExit;
 		animation-fill-mode: forwards;
 	}
-
+	&.leftBottomExitLeft {
+		animation-name: leftBottomExitLeft;
+		animation-fill-mode: forwards;
+	}
 	&.rightToLeft {
 		animation-name: rightToLeft;
 	}
 
 	&.leftToRight {
-		animation-name: leftToRight;
+		animation-name: rightToLeft;
 	}
 
 	.danmu-inner {
 		display: inline-block;
-
+		font-size: 24rpx;
 		.user-box {
 			display: flex;
-			padding: 3rpx 40rpx 3rpx 10rpx;
+			padding: 6rpx 40rpx 6rpx 10rpx;
 			background: rgba(0, 0, 0, 0.3);
 			border-radius: 32rpx;
 			align-items: center;
 
 			.user-img {
-				.img-box {
 				display: flex;
-
+				align-items: center;
-					image {
+				justify-content: center;
-						width: 58rpx;
+				.avatar {
-						height: 58rpx;
+					width: 42rpx;
+					height: 42rpx;
 					background: rgba(55, 55, 55, 1);
 					border-radius: 50%;
 				}
 			}
-			}
 
 			.user-status {
 				margin-left: 10rpx;
 				white-space: nowrap;
-				font-size: 28rpx;
 				font-weight: 400;
 				color: rgba(255, 255, 255, 1);
+				max-width: 320rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
 			}
 
 			.user-text {
+				max-width: 100rpx;
 				margin-left: 10rpx;
-				// white-space: nowrap;
-				font-size: 28rpx;
 				font-weight: 400;
-				width: 80rpx;
 				color: rgba(255, 255, 255, 1);
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
 			}
 		}
 	}

components/cache-image/cache-image.vue

@@ -1,24 +1,16 @@
 <template>
-	<view class="cache-image">
+	<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="[imgStyle]" mode="aspectFit"></image>
+			<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-err-icon iconfont icon-exclamation-circle"></text>
-			<text class="img-load-text">{{ loadErrText }}</text>
+			<text class="img-load-text">{{ loadErrText }}</text> -->
+			<image class="img-error-img" :src="loadingErrorImageSrc" mode="scaleToFill"></image>
 		</view>
-		<image
+		<image v-show="loadStatus == 'success'" :src="src" @load="fnOnLoad" @error="fnOnError" :lazy-load="lazyLoad" :style="[imgStyle]" :mode="mode" @click="$emit('on-click', url)"></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>
 
@@ -91,6 +83,9 @@ export default {
 		data() {
 			return {
 				imgStyle: {},
+				loadingImgStyle: {
+					width: '120rpx',
+				},
 				src: '', // 图片地址
 				loadStatus: 'loading'
 			};
@@ -98,6 +93,9 @@ export default {
 		computed: {
 			loadingImgSrc() {
 				return getApp().globalData.loadingGifUrl;
+			},
+			loadingErrorImageSrc() {
+				return getApp().globalData.loadingErrUrl
 			}
 		},
 		watch: {
@@ -108,7 +106,6 @@ export default {
 			}
 		},
 		created() {
-		console.log('cache-image', this.url);
 			this.imgStyle = {
 				width: this.width,
 				height: this.height,
@@ -137,7 +134,7 @@ export default {
 			fnOnLoad() {
 				this.loadStatus = 'success';
 			},
-		fnOnError() {
+			fnOnError(e) {
 				this.loadStatus = 'error';
 			}
 		}
@@ -145,10 +142,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.cache-image {
+	.cache-image-wrap {
 		width: 100%;
 		height: 100%;
 	}
+
 	.img-loading,
 	.img-error {
 		display: flex;
@@ -158,21 +156,31 @@ export default {
 		box-sizing: border-box;
 		background-color: #f2f2f2;
 	}
+
 	.img-load-icon {
 		font-size: 36rpx;
 		animation: xhRote 0.8s infinite linear;
 	}
+
 	.img-load-text {
 		font-size: 28rpx;
 		margin-top: 8rpx;
 		color: inherit;
 	}
+
 	.img-error {
 		font-size: 28rpx;
+
+		&-img {
+			width: 100%;
+			border-radius: 12rpx;
 		}
+	}
+
 	.img-err-icon {
 		font-size: 36rpx;
 	}
+
 	@keyframes xhRote {
 		0% {
 			transform: rotate(0deg);

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

@@ -1,6 +1,5 @@
 <template>
 	<view class="category-mini-card">
-		<!-- 	<image class="img" lazy-load :src="$utils.checkThumbnailUrl(category.thumbnail)" mode="aspectFill"></image> -->
 		<cache-image
 			class="img"
 			height="120rpx"
@@ -35,12 +34,13 @@ export default {
 	border-radius: 12rpx;
 	background-color: #fff;
 	overflow: hidden;
-	// border: 2rpx solid #f7f7f7;
 	box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+	position: relative;
 	.img {
 		width: 100%;
 		height: 120rpx;
 		border: 6rpx 6rpx 0 0;
+		overflow: hidden;
 	}
 	.label {
 		position: absolute;
@@ -55,9 +55,13 @@ export default {
 		padding-right: 24rpx;
 	}
 	.name {
+		position: absolute;
+		bottom: 16rpx;
+		left: 0;
+		right: 0;
 		font-size: 24rpx;
 		text-align: center;
-		color: var(--main-text-color);
+		color: #333;
 	}
 }
 </style>

components/comment-item/comment-item.vue

@@ -1,8 +1,22 @@
 <template>
 	<view class=" comment-item flex flex-col mt-30 pt-24" :class="{ 'child-comment-item': isChild, 'no-solid': !useSolid, classItem }">
 		<view class="comment-item_user flex">
-			<image v-if="comment.isAdmin" class="user-avatar" :src="bloggerInfo.avatar" mode="aspectFill" @error="fnOnImageError(comment)"></image>
+			<image
-			<image v-else class="user-avatar" :src="comment.avatar" mode="aspectFill" @error="fnOnImageError(comment)"></image>
+				v-if="comment.isAdmin"
+				class="user-avatar"
+				:class="{ 'is-radius': globalAppSettings.isAvatarRadius }"
+				:src="bloggerInfo.avatar"
+				mode="aspectFill"
+				@error="fnOnImageError(comment)"
+			></image>
+			<image
+				v-else
+				class="user-avatar"
+				:class="{ 'is-radius': globalAppSettings.isAvatarRadius }"
+				:src="comment.avatar"
+				mode="aspectFill"
+				@error="fnOnImageError(comment)"
+			></image>
 			<view class="user-info pl-14">
 				<view class="author">
 					<text class="mr-6 text-grey-darken-1 text-size-m">{{ comment.author }}</text>
@@ -11,7 +25,7 @@
 					<tm-tags v-else :dense="true" color="bg-gradient-light-blue-lighten " size="xs" model="fill">游客</tm-tags>
 				</view>
 				<view class="flex mt-4">
-					<view v-if="false" class="text-size-s text-grey mr-12">IP属地：浙江省杭州市</view>
+					<view v-if="false" class="text-size-s text-grey mr-12">IP属地：暂无信息</view>
 					<view class="time text-size-xs text-grey">
 						<text class="">{{ $tm.dayjs(comment.createTime).format('YYYY年MM月DD日') }}</text>
 						<text class="ml-12">{{ $tm.dayjs(comment.createTime).fromNow(true) }}前</text>
@@ -19,13 +33,12 @@
 				</view>
 			</view>
 			<view v-if="useActions" class="">
-				<tm-button size="s" text theme="blue" @click="$emit('on-comment', { type: 'user', comment: comment })">回复</tm-button>
+				<tm-button v-if="!disallowComment" size="s" text theme="blue" @click="$emit('on-comment', { type: 'user', comment: comment })">回复</tm-button>
 				<tm-button size="s" text theme="grey" @click="$emit('on-copy', comment.content)">复制</tm-button>
 			</view>
 		</view>
 
 		<view class="comment-item_content mt-12" :class="{ 'has-bg': useContentBg, 'not-ml': isChild }" @click="$emit('on-detail', comment)" v-html="comment.content"></view>
-
 		<!-- 	<view v-if="useActions" class="comment-item_info text-size-s text-grey">
 			<text v-if="false" @click="$emit('on-todo')">点赞</text>
 			<text @click="$emit('on-comment', { type: 'user', comment: comment })">回复</text>
@@ -46,6 +59,10 @@ export default {
 			type: Array,
 			default: () => []
 		},
+		disallowComment: {
+			type: Boolean,
+			default: false
+		},
 		useActions: {
 			type: Boolean,
 			default: true
@@ -74,7 +91,7 @@ export default {
 	computed: {
 		// 获取博主信息
 		bloggerInfo() {
-			let blogger = this.$tm.vx.getters().blogger.getBlogger;
+			let blogger = this.$tm.vx.getters().getBlogger;
 			blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
 			return blogger;
 		}
@@ -111,10 +128,13 @@ export default {
 		.user-avatar {
 			width: 70rpx;
 			height: 70rpx;
-			border-radius: 50%;
 			box-sizing: border-box;
-			border: 4rpx solid #ffffff;
 			box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
+			border: 4rpx solid #ffffff;
+			border-radius: 12rpx;
+			&.is-radius {
+				border-radius: 50%;
+			}
 		}
 		.user-info {
 			width: 0;

components/comment-list/comment-list.vue

@@ -12,7 +12,6 @@
 				<!-- <text class="filter-item">全部</text> -->
 			</view>
 		</view>
-		<!-- <view v-if="disallowComment" class="disallow-comment"><tm-empty icon="icon-shiliangzhinengduixiang-" label="文章已开启禁止评论"></tm-empty></view> -->
 		<!-- 内容区域 -->
 		<view class="comment-list_content">
 			<view v-if="loading != 'success'" class="loading-wrap flex">
@@ -27,9 +26,21 @@
 				</view>
 			</view>
 			<block v-else>
+				<tm-alerts
+					v-if="disallowComment && dataList.length !== 0"
+					color="red"
+					text
+					:margin="[0, 0]"
+					:shadow="0"
+					label="Ծ‸Ծ博主已设置该文章禁止评论!"
+					:round="3"
+				></tm-alerts>
 				<view class="empty pt-50" v-if="dataList.length == 0">
-					<tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无评论">
+					<tm-empty v-if="disallowComment" icon="icon-shiliangzhinengduixiang-" label="暂无评论">
-						<tm-button theme="bg-gradient-light-blue-accent" size="m" v-if="!disallowComment" @click="fnToComment(null)">抢沙发</tm-button>
+						<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>
 					</tm-empty>
 				</view>
 				<block v-else>
@@ -40,6 +51,7 @@
 							:isChild="false"
 							:comment="comment"
 							:postId="postId"
+							:disallowComment="disallowComment"
 							@on-copy="fnCopyContent"
 							@on-comment="fnToComment"
 							@on-todo="fnToDo"
@@ -54,6 +66,7 @@
 									:isChild="true"
 									:comment="childComment"
 									:postId="postId"
+									:disallowComment="disallowComment"
 									@on-copy="fnCopyContent"
 									@on-comment="fnToComment"
 									@on-todo="fnToDo"
@@ -74,9 +87,11 @@
 <script>
 import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
 import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+import tmAlerts from '@/tm-vuetify/components/tm-alerts/tm-alerts.vue';
+
 export default {
 	name: 'comment-list',
-	components: { tmEmpty, tmButton },
+	components: { tmEmpty, tmButton, tmAlerts },
 	props: {
 		// 是否禁用评论
 		disallowComment: {
@@ -127,6 +142,7 @@ export default {
 						this.result = res.data;
 						this.dataList = res.data.content;
 						this.loading = 'success';
+						this.$emit('on-loaded', this.dataList);
 					} else {
 						this.loading = 'error';
 					}
@@ -200,7 +216,7 @@ export default {
 		position: relative;
 		box-sizing: border-box;
 		padding-left: 24rpx;
-		font-size: 34rpx;
+		font-size: 30rpx;
 		font-weight: bold;
 
 		&:before {
@@ -209,7 +225,7 @@ export default {
 			left: 0rpx;
 			top: 8rpx;
 			width: 8rpx;
-			height: 30rpx;
+			height: 26rpx;
 			background-color: rgb(3, 174, 252);
 			border-radius: 6rpx;
 		}

components/journal-card/journal-card.vue

@@ -96,7 +96,7 @@ export default {
 	computed: {
 		// 获取博主信息
 		bloggerInfo() {
-			let blogger = this.$tm.vx.getters().blogger.getBlogger;
+			let blogger = this.$tm.vx.getters().getBlogger;
 			blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
 			return blogger;
 		}

components/lff-barrage/markdown.md

@@ -1,15 +0,0 @@
-#如何使用
-###js
-```javascript
-import lffBarrage from '@/components/lff-barrage/lff-barrage.vue'
-components:{lffBarrage},
-methods:{
-	colrdo(){ //插入一条弹幕
-		this.$refs.lffBarrage.add({item:'你好呀小伙子'});
-	}
-}
-```
-###HTML
-```html
-<lff-barrage ref="lffBarrage"></lff-barrage>
-```

components/scroll-btn/scroll-btn.vue

@@ -0,0 +1,85 @@
+<template>
+	<view class="scroll-btn" :style="{ bottom: bottom }" @click.stop="fnScroll()">
+		<text v-if="_scrollTop >= 180" class="iconfont icon-long-arrow-up"></text>
+		<text v-else class="iconfont icon-long-arrow-down"></text>
+	</view>
+</template>
+
+<script>
+import throttle from '@/utils/throttle.js';
+export default {
+	name: 'scroll-btn',
+	props: {
+		bottom: {
+			type: String,
+			default: '180rpx'
+		},
+		scrollTop: {
+			type: Number,
+			default: 0
+		}
+	},
+	data() {
+		return { timer: null, _scrollTop: 0 };
+	},
+	watch: {
+		scrollTop(val) {
+			this._scrollTop = val;
+			this.$forceUpdate();
+		}
+	},
+	created() {
+		this._scrollTop = this.scrollTop;
+	},
+	methods: {
+		fnScroll() {
+			throttle(() => {
+				this.$emit('on-status', false);
+				const isTop = this._scrollTop >= 180;
+				this._scrollTop = isTop ? 0 : 999999999999;
+				uni.pageScrollTo({
+					duration: 500,
+					scrollTop: this._scrollTop,
+					success: () => {
+						clearTimeout(this.timer);
+						this.timer = setTimeout(() => {
+							this.$emit('on-status', true);
+						}, 500);
+					}
+				});
+				this.$emit('update:scrollTop', this._scrollTop);
+			});
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+.scroll-btn {
+	position: fixed;
+	// bottom: 200rpx;
+	// right: -90rpx;
+	right: 52rpx;
+	width: 80rpx;
+	height: 80rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	border-radius: 50%;
+	border: 4rpx solid #ffffff;
+	background-color: #bfe9ef;
+	box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.1);
+	z-index: 99;
+	transition: right 0.5s ease-in-out;
+
+	&.is-show {
+		right: 52rpx;
+	}
+
+	.iconfont {
+		font-size: 36rpx;
+		color: #555;
+	}
+}
+</style>

config/ad.config.template.js

@@ -15,6 +15,16 @@ export default {
 	},
 	// 文章详情广告
 	articleDetail: {
-		use: false, // 是否启用
+		// 微信广告/dclound申请的广告
+		use: true,
+
+		// 自定义广告
+		custom: {
+			use: true,
+			cover: 'https://b.925i.cn/uni_halo/uni_halo_ad_cover.png',
+			title: 'uni-halo 正式开源啦，欢迎来使用和体验！',
+			content: '基于 uni-app + halo1.x API 实现一款现代化的开源博客 / CMS 系统API开发的多端应用。功能包括：前台博客系统 和 后台管理系统，同时满足浏览和管理两端合一的需求，真正实现一个应用实现博客浏览和后台管理。',
+			url: 'https://uni-halo.925i.cn'
+		}
 	}
 }

config/halo.config.template.js

@@ -14,14 +14,18 @@ export default {
 	showAbout: true, // 显示关于项目入口
 	uni_halo_logo: 'https://b.925i.cn/uni_halo/uni_halo_logo.png', // uni-halo的logo
 
-	apiUrl: '', // Api基础域名（您的halo博客基础域名或者是Halo后台管理系统api地址）
+	apiUrl: '', // Api基础域名 [必填] ：你的Halo博客基础域名
-	apiAuthorization: '', // Halo中-系统-博客设置-切换到高级选项-API设置-Access key 
+	apiAuthorization: '', // Api认证key [必填]： Halo中-系统-博客设置-切换到高级选项-API设置-Access key
 
-	title: '', // 博客标题
+	title: '', // 博客标题 [建议必填]：在某些页面没有设置具体的页面名称时候，使用该值显示
-	miniCodeImageUrl: '', // 小程序码地址
+	miniCodeImageUrl: '', // 小程序的太阳码/二维码的图片地址 [建议必填]
 
-	start: { // 首次启动页配置
+	aboutProfileImageUrl: '', // 关于页面中的资料卡背景图 [建议必填]
-		title: 'uni-halo', // 标题
+
+	// 启动页面的配置（页面地址`/pagesA/start/start`）
+	start: {
+		use: true, // 是否使用首次启动页：用户第一次使用你的应用会显示否则不显示
+		title: 'uni-halo', // 启动页面中的文字标题
 		bg: '', // 留空则使用默认 开屏首页背景，可以是颜色值或者图片图片地址
 		logo: 'https://b.925i.cn/uni_halo/uni_halo_logo.png', // logo
 		desc1: '全新UI，准备出发', // 描述信息1
@@ -29,12 +33,25 @@ export default {
 		btnText: '全新触发' // 按钮文字
 	},
 
+	// 博主信息 
 	author: {
-		name: '', // 昵称
+		use: true, // 是否启用这里配置的信息，不启用则获取PC端博客设置的信息
-		avatar: '', // 头像地址
+		nickname: '', // 昵称
-		motto: '', // 格言
+		avatar: '', // 头像
+		email: '', // 邮箱
+		description: '', // 介绍
 	},
 
+	// 版权信息（用于文章详情）
+	copyright: {
+		use: true, // 是否使用版权描述
+		author: '', // 版权归属说明
+		description: '', // 版权描述
+		violation: '', // 侵权处理说明
+	},
+
+	// 社交信息(将会在`/pagesA/contact/contact`页面中展示)
+	// 具体的某个参数值留空则不展示
 	social: {
 		qq: "", // qq号
 		wechat: "", // 微信号
@@ -49,6 +66,7 @@ export default {
 	},
 
 	defaultThumbnailUrl: '', // 默认封面图地址 
+	defaultStaticThumbnailUrl: '', // 静态默认封面图（不可以是随机图地址）
 	defaultImageUrl: '', // 默认图片地址 
 	defaultAvatarUrl: '', // 默认头像地址
 
@@ -63,8 +81,8 @@ export default {
 		list: [],
 	},
 
-	quickNav: { // 快捷导航配置
+	quickNav: { // 快捷导航配置（如不需要恋爱日记，请注释或删除94-101行的代码）
-		use: true,
+		use: true, // 是否在个人中心显示以下页面的入口
 		list: [{
 				icon: 'halocoloricon-classify',
 				text: '文章归档',
@@ -105,8 +123,8 @@ export default {
 		title: '', // 小程序分享标题[非必填]
 		desc: '', // 小程序分享描述[非必填]
 		imageUrl: '', // 小程序分享时候图片地址[非必填]
-		path: '/pages/start/start', // 分享路径[非必填] - 基本不需要修改
+		path: '/pages/index/index', // 分享路径[非必填] - 基本不需要修改
-		copyLink: '/pages/start/start', // 复制链接[非必填]  - 基本不需要修改
+		copyLink: '/pages/index/index', // 复制链接[非必填]  - 基本不需要修改
 		query: {}, // 分享参数[非必填]  - 基本不需要填写
 	},
 

config/love.config.js

@@ -0,0 +1,148 @@
+/**
+ * 恋爱日记配置
+ */
+export default {
+	waveImageUrl: 'https://b.925i.cn/uni_halo/uni_halo_about_wave.gif', // 波浪图片地址
+	bgImageUrl: 'https://b.925i.cn/uni_halo_love/love_bg1.png', // 背景图片
+	loveImageUrl: 'https://b.925i.cn/uni_halo_love/like.png', // 爱心图片
+
+	boy: {
+		name: '未知男主',
+		avatar: 'https://b.925i.cn/uni_halo_love/love_boy.png',
+		birthday: '2022-09-25', // 生日
+	},
+
+	girl: {
+		name: '未知女主',
+		avatar: 'https://b.925i.cn/uni_halo_love/love_girl.png',
+		birthday: '2022-04-19', // 生日
+	},
+	timeTitle: '这是我们一起走过的',
+	loveStartDate: '2022-04-10 13:14:20', // 恋爱开始时间 
+
+	nav: [{
+			key: 'journey',
+			use: true,
+			iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
+			title: '关于我们',
+			desc: '我们一起度过的那些经历'
+		},
+		{
+			key: 'album',
+			use: true,
+			iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
+			title: '恋爱相册',
+			desc: '定格了我们的那些小美好'
+		},
+		{
+			key: 'list',
+			use: true,
+			iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
+			title: '恋爱清单',
+			desc: '你我之间的约定我们都在努力实现'
+		},
+	],
+
+	// 关于我们：支持富文本内容
+	journey: `
+		准备晚安啦,睡觉前讲个故事吧~<p>槐树庄的村口有一棵大槐树，树下的村口第一家就是猫奶奶的家。</p><p>猫奶奶是一位孤寡老人，因为她经常收留和救治周围的流浪猫，所以村民就都管她叫“猫奶奶”。</p><p>一个月圆之夜，猫奶奶走到院门口，忽然发现门口石级上放着一个红毯子，里面包着一个啼（tí）哭的女婴。</p><p>猫奶奶找不到女婴的父母，只好收留了她，并给她起了个名字叫樱红。</p><p>猫奶奶辛苦地抚育着樱红成长，转眼之间，樱红已经九岁，上小学三年级了。</p><p>从樱红懂事起，猫奶奶就爱给她讲一个睡前故事，那是当地一个古老的传说。</p><p>在浓郁的树影深处有一个百花园，百花园里生长着奇花异草，还住了一个会唱歌的花仙子。花仙子的歌声美丽动人，能治百病。但是那里有一条奇怪的规矩，寻找花仙子的人在进入百花园后，见到花仙子之前，都不能发出一点声音，不然花仙子就不会出来见他。</p><p>受这个故事的影响，樱红特别喜欢唱歌。</p><p>这天晚上，樱红放学回家，家家户户炊烟袅（niǎo）袅，而自家烟囱却连一丝一缕（lǚ）的炊烟都没有。</p><p>樱红一惊，冲进院门一看，果然出事了！只见猫奶奶呻吟着倒在灶台前，双目紧闭，两只小脚也在不停地抽搐（chù）。</p><p>樱红慌了，好在有邻居的帮助，猫奶奶被送到了医院。经过抢救，猫奶奶总算醒过来，但是却半身不遂（suí），说话也不利落了。</p><p>猫奶奶不能下地行走做家务，小小的樱红，一夜之间就挑起了家庭的重担。</p><p>樱红一面求助于村委会，四处寻医问药，让猫奶奶获得进一步的治疗；一面在课余学做家务，悉心照顾猫奶奶，端水喂饭，不辞辛苦。</p><p>自从猫奶奶病倒以后，樱红每天早晨推开院门就会看见门前放着一朵小花，有时还会有一两尾鲜活的鲑（guī）鱼。</p><p>这样过了三个月，好奇的樱红在一个夜晚悄悄躲在院门的后面，想看看到底是谁。</p><p>到了午夜十二点，只见一只花猫衔着一棵风铃草来到院门前，把风铃草放下，转身就走。（浪漫童话小故事）樱红认出这只小花猫曾经被猫奶奶救助过，于是，她悄悄地尾随小花猫往前走。</p><p>不一会儿，她就发现自己进入了一个从未见过的世界：蔚蓝的天空飘着七色的云，阳光千丝万缕地落下来，鲜花盛开，彩蝶飞舞，百鸟齐鸣。</p><p>这到底是什么地方？她忽然想起了那个传说，这该不会就是花仙子住的百花园吧？</p><p>樱红几乎惊叫起来，但她立即想起了那条在见到花仙子之前，不能发出一点声音的规矩。于是她捂紧了嘴巴。</p><p>这时，她发现百花园里除了自己还有一个面色苍白的男孩子，闭着眼睛，右手攥着一根竹竿摸索着前行，应该是眼睛看不见了。</p><p>只见男孩子慢慢地偏离了路径，马上就要掉进路边的水沟里了。</p><p>樱红下意识地大声呼喊：“站住，小心脚底下！”一张口，樱红才想起来，自己已经坏了规矩！</p><p>此时，“轰隆”一声巨响后，眼前的一切都消失了，樱红仍然站在自家院门前的大槐树下。</p><p>真遗憾啊！樱红深深叹了口气，可为了救人，她并不觉得后悔。</p><p>第二天早上，樱红被一种美妙的歌声唤醒。</p><p>唱歌的人就是美丽的花仙子，她乘坐着奇花异草编成的花篮，飘进了她家的院子里。</p><p>奇迹发生了，只见猫奶奶起身下床，像健康人一样走出房门。</p><p>猫奶奶看到了花仙子，不敢相信地揉着眼睛说：“你就是传说中的花仙子吗？是你治好了我的病？”</p><p>花仙子说：“是的！是这个小女孩的善良打动了我，连我那不能出声的规矩都要为她破例了。”</p><p>樱红高兴地看着猫奶奶。从此，她和猫奶奶继续幸福地生活着。</p>
+	`,
+	// 恋爱相册
+	albumKeyName: '恋爱相册', // 对应后台的图库分组名称
+	// 恋爱清单
+	loveList: {
+		useApi: false, // 是否启用api接口
+		api: '', // api 接口（如果使用api接口的方式，则下方的data可以留空，但是api接口必须按照对应的数据格式返回）
+		data: [{
+				index: 0, // 序号
+				finish: true, // 是否已完成
+				title: '偷偷记录对方熟睡的模样', // 事件名称
+				desc: '偷偷观察对方熟睡的模样，记录下来', // 事件描述
+				detail: {
+					start: '2022年05月20日', // 计划开始时间
+					desc: '偷偷观察对方熟睡的模样，记录下来', // 事件详细描述
+					end: '每天', // 完成时间，
+					moment: '', // 完成瞬间的记录
+					other: '', // 其他说明
+				}
+			}, {
+				index: 1,
+				finish: false,
+				title: '陪对方过生日',
+				desc: '陪对方一起过生日',
+				detail: {
+					start: '2023年05月20日',
+					desc: '陪对方一起过生日，他和我的生日',
+					end: '',
+					moment: '',
+					other: '他 生日5月20日 我生日9月25日',
+				}
+			},
+			{
+				index: 2,
+				finish: false,
+				title: '一起去旅行',
+				desc: '一起来一场说走就走的旅行，希望去的是大理',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '一起来一场说走就走的旅行，希望去的是大理',
+					other: '',
+				}
+			},
+			{
+				index: 3,
+				finish: false,
+				title: '一起穿情侣装逛街',
+				desc: '一起穿情侣装逛街',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '',
+					other: '',
+				}
+			},
+			{
+				index: 4,
+				finish: false,
+				title: '一起看日出',
+				desc: '一起看日出',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '',
+					other: '',
+				}
+			},
+			{
+				index: 5,
+				finish: false,
+				title: '一起看日落',
+				desc: '一起看日落',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '',
+					other: '', // 其他说明
+				}
+			},
+			{
+				index: 6,
+				finish: false,
+				title: '一起买菜、做饭、刷碗',
+				desc: '一起买菜、做饭、刷碗',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '',
+					other: '',
+				}
+			}
+		],
+	}
+}

config/love.config.template.js

@@ -0,0 +1,150 @@
+/**
+ * 恋爱日记配置
+ */
+export default {
+	waveImageUrl: 'https://b.925i.cn/uni_halo/uni_halo_about_wave.gif', // 波浪图片地址
+	bgImageUrl: 'https://b.925i.cn/uni_halo_love/love_bg1.png', // 背景图片
+	loveImageUrl: 'https://b.925i.cn/uni_halo_love/like.png', // 爱心图片
+
+	boy: {
+		name: '未知男主',
+		avatar: 'https://b.925i.cn/uni_halo_love/love_boy.png',
+		birthday: '2022-09-25', // 生日
+	},
+
+	girl: {
+		name: '未知女主',
+		avatar: 'https://b.925i.cn/uni_halo_love/love_girl.png',
+		birthday: '2022-07-25', // 生日
+	},
+
+	timeTitle: '这是我们一起走过的', // 恋爱时间标题
+	loveStartDate: '2022-05-20 13:14:20', // 恋爱开始时间 
+
+	// 恋爱日记首页导航（除了 key 以外都可以修改）
+	nav: [{
+			key: 'journey',
+			use: true,
+			iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
+			title: '关于我们',
+			desc: '我们一起度过的那些经历'
+		},
+		{
+			key: 'album',
+			use: true,
+			iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
+			title: '恋爱相册',
+			desc: '定格了我们的那些小美好'
+		},
+		{
+			key: 'list',
+			use: true,
+			iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
+			title: '恋爱清单',
+			desc: '你我之间的约定我们都在努力实现'
+		},
+	],
+
+	// 关于我们：支持富文本内容
+	journey: `
+		    <p>有一只马，它的邻居是一只驴。</p><p>有一天，马和驴都被主人牵到外面晒太阳，马和驴聊起了天。</p><p>马说：“我叫马，你呢？”</p><p>驴说：“我叫驴。（哄小宝贝睡觉的甜甜睡前故事）”</p><p>马说：“为什么我俩的名字不一样呢？”</p><p>驴说：“因为我和你不一样。”</p><p>马说：“我们俩什么地方不一样呢？”</p><p>驴说：“我身材小巧，而你却比较粗壮，不如我耐看。”马看了看比自已矮小很多的驴，认为驴说的话有点道理。</p><p>马说：“我们俩除了身材不一样，还有什么不同呢？”</p><p>驴说：“我们俩的声音不一样，我的声音多动听呀！”说着驴伸长脖子叫了两声。“不信，你也叫两声试试。”马也伸长脖子嘶鸣了两声，的确和驴的声音有点不同，马不好意思地低下了头。</p><p>过了一会儿，马又说：“我们俩除了身材和声音不一样外，还有什么不同呢？”</p><p>驴说：“我的步伐多么优雅呀。”说着，驴迈开蹄子走了两步，“而你呢，却昂首阔步，一点儿也不优雅，（如何哄女朋友睡觉的睡前故事爱情浪漫）不信你走两步试试。”</p><p>马听驴这么一说，就高昂着头走了两步，旋即，马飞奔了起来，转了一圈回来后，驴得意地说：“怎么样，我没说错罢，你就是急性子，和优雅不沾边。”马听了驴的话，有点感到惭愧。</p><p>最后，马又鼓起勇气说：“我们俩还有什么不同呢？”</p><p>驴说：“我的家庭意识比你强，主人抽我一鞭子，我就跟着主人回家，而你呢？恐怕不会吧……”</p><p>马还没有来得及回答，马和驴的主人同时来到了马和驴的身边。只见驴的主人抽了驴一鞭子后，驴乖乖地跟着主人回家了。马把这一切都看在了眼里，它为自已和驴的诸多不同而感到惭愧，只见马的主人也抽了马一鞭子，马犹豫了一下，终于象驴一样乖乖地跟着主人回了家。</p><p>一个伯乐站在远处看到了这一幕后，叹口气离开了。</p>
+	`,
+	// 恋爱相册
+	albumKeyName: '恋爱相册', // 对应后台的图库分组名称
+	// 恋爱清单
+	loveList: {
+		useApi: false, // 是否启用api接口
+		api: '', // api 接口（如果使用api接口的方式，则下方的data可以留空，但是api接口必须按照对应的数据格式返回）
+		data: [{
+				index: 0, // 序号
+				finish: true, // 是否已完成
+				title: '偷偷记录对方熟睡的模样', // 事件名称
+				desc: '偷偷观察对方熟睡的模样，记录下来', // 事件描述
+				detail: {
+					start: '2022年05月20日', // 计划开始时间
+					desc: '偷偷观察对方熟睡的模样，记录下来', // 事件详细描述
+					end: '每天', // 完成时间，
+					moment: '', // 完成瞬间的记录
+					other: '', // 其他说明
+				}
+			}, {
+				index: 1,
+				finish: false,
+				title: '陪对方过生日',
+				desc: '陪对方一起过生日',
+				detail: {
+					start: '2023年05月20日',
+					desc: '陪对方一起过生日，他和我的生日',
+					end: '',
+					moment: '',
+					other: '他 生日5月20日 我生日9月25日',
+				}
+			},
+			{
+				index: 2,
+				finish: false,
+				title: '一起去旅行',
+				desc: '一起来一场说走就走的旅行，希望去的是大理',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '一起来一场说走就走的旅行，希望去的是大理',
+					other: '',
+				}
+			},
+			{
+				index: 3,
+				finish: false,
+				title: '一起穿情侣装逛街',
+				desc: '一起穿情侣装逛街',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '',
+					other: '',
+				}
+			},
+			{
+				index: 4,
+				finish: false,
+				title: '一起看日出',
+				desc: '一起看日出',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '',
+					other: '',
+				}
+			},
+			{
+				index: 5,
+				finish: false,
+				title: '一起看日落',
+				desc: '一起看日落',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '',
+					other: '', // 其他说明
+				}
+			},
+			{
+				index: 6,
+				finish: false,
+				title: '一起买菜、做饭、刷碗',
+				desc: '一起买菜、做饭、刷碗',
+				detail: {
+					start: '',
+					desc: '',
+					end: '',
+					moment: '',
+					other: '',
+				}
+			}
+		],
+	}
+}

manifest.json

@@ -110,6 +110,9 @@
                     }
                 }
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
     /* 快应用特有相关 */
@@ -121,25 +124,37 @@
             "urlCheck" : false,
             "minified" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     "mp-alipay" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     "mp-baidu" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     "mp-toutiao" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     "uniStatistics" : {
-        "enable" : false
+        "enable" : true,
+        "version" : "2"
     },
     "vueVersion" : "2",
     "h5" : {
         "title" : "uni-halo",
         "devServer" : {
-            "https" : false,
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
@@ -147,11 +162,56 @@
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {
-                        "^/api" : ""
+                        "^/api" : "/api"
-                    }
                     }
                 }
             }
         },
-    "_spaceID" : "699a26a5-a6cd-4b54-b603-5155b312a5f5"
+        "optimization" : {
+            "preload" : true,
+            "treeShaking" : {
+                "enable" : true
+            }
+        },
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "_spaceID" : "699a26a5-a6cd-4b54-b603-5155b312a5f5",
+    "mp-qq" : {
+        "appid" : "1112285420",
+        "setting" : {
+            "minified" : true,
+            "postcss" : true,
+            "es6" : true
+        },
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-jd" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-kuaishou" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-lark" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-huawei" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-union" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    }
 }

package.json

@@ -1,4 +1,18 @@
 {
+	"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"
 	},

pages.json

@@ -110,7 +110,28 @@
 			}, {
 				"path": "love/love",
 				"style": {
-					"navigationBarTitleText": "",
+					"navigationBarTitleText": "恋爱日记",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": false,
+					"app-plus": {
+						"pullToRefresh": {
+							"color": "#03a9f4",
+							"style": "circle"
+						}
+					}
+				}
+			}, {
+				"path": "love/list",
+				"style": {
+					"navigationBarTitleText": "恋爱清单",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+
+			}, {
+				"path": "love/album",
+				"style": {
+					"navigationBarTitleText": "恋爱相册",
 					"enablePullDownRefresh": true,
 					"app-plus": {
 						"pullToRefresh": {
@@ -119,7 +140,13 @@
 						}
 					}
 				}
-
+			}, {
+				"path": "love/journey",
+				"style": {
+					"navigationBarTitleText": "我们的故事",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": false
+				}
 			}, {
 				"path": "archives/archives",
 				"style": {
@@ -215,6 +242,24 @@
 					"navigationBarTitleText": "设置",
 					"enablePullDownRefresh": false
 				}
+			}, {
+				"path": "tags/tags",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "tag-detail/tag-detail",
+				"style": {
+					"navigationBarTitleText": "标签详情",
+					"enablePullDownRefresh": true,
+					"app-plus": {
+						"pullToRefresh": {
+							"color": "#03a9f4",
+							"style": "circle"
+						}
+					}
+				}
 			}]
 		},
 		{
@@ -504,7 +549,7 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"backgroundColor": "white",
+		"backgroundColor": "#fff",
 		"borderStyle": "white",
 		"color": "#303133",
 		"selectedColor": "#03a9f4",

pages/index/index.vue

@@ -5,11 +5,17 @@
 <script>
 export default {
 	onLoad() {
-		this.fnCheckHadStarted();
+		this.fnCheckShowStarted();
 	},
 	methods: {
-		// 检查是否已经启动过
+		// 检查是否需要跳转到启动页
-		fnCheckHadStarted() {
+		fnCheckShowStarted() {
+			if (!getApp().globalData.start.use) {
+				uni.switchTab({
+					url: '/pages/tabbar/home/home'
+				});
+				return;
+			}
 			if (uni.getStorageSync('APP_HAS_STARTED')) {
 				uni.switchTab({
 					url: '/pages/tabbar/home/home'

pages/tabbar/about/about.vue

@@ -1,11 +1,13 @@
 <template>
 	<view class="app-page pb-24">
 		<!-- 博主信息 -->
-		<view class="blogger-info">
+		<view class="blogger-info" :style="[calcProfileStyle]">
-			<image class="avatar" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)" mode="aspectFill" @click="miniProfileCard.show = true"></image>
+			<image class="avatar" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)" mode="aspectFill"></image>
 			<view class="profile">
 				<view class="author mt-24 text-size-g text-weight-b">{{ bloggerInfo.nickname }}</view>
-				<view class="desc mt-24 text-size-m">{{ bloggerInfo.description || '这个博主很懒，竟然没写介绍~' }}</view>
+				<view class="desc mt-24 text-size-m">
+					{{ bloggerInfo.description || '这个博主很懒，竟然没写介绍~' }}
+				</view>
 			</view>
 			<image v-if="calcWaveUrl" :src="calcWaveUrl" mode="scaleToFill" class="gif-wave"></image>
 		</view>
@@ -17,19 +19,34 @@
 					<view class="statistics flex pt-24 pb-24" :class="{ 'has-solid': statisticsShowMore }">
 						<view class="item flex-1 text-align-center">
 							<view class="number text-size-xl text-bg-gradient-orange-accent">
-								<tm-flop :startVal="0" :decimals="0" :endVal="statistics.postCount" :duration="3000"></tm-flop>
+								<tm-flop
+									:startVal="0"
+									:decimals="0"
+									:endVal="statistics.postCount"
+									:duration="3000"
+								></tm-flop>
 							</view>
 							<view class="mt-6 text-align-center text-size-s text-grey-darken-1">文章总数</view>
 						</view>
 						<view class="item flex-1 text-align-center">
 							<view class="number text-size-xl text-bg-gradient-blue-accent">
-								<tm-flop :startVal="0" :decimals="0" :endVal="statistics.categoryCount" :duration="3000"></tm-flop>
+								<tm-flop
+									:startVal="0"
+									:decimals="0"
+									:endVal="statistics.categoryCount"
+									:duration="3000"
+								></tm-flop>
 							</view>
 							<view class="mt-6 text-align-center text-size-s text-grey-darken-1">分类总数</view>
 						</view>
 						<view class="item flex-1 text-align-center">
 							<view class="number text-size-xl text-bg-gradient-green-accent">
-								<tm-flop :startVal="0" :decimals="0" :endVal="statistics.tagCount" :duration="3000"></tm-flop>
+								<tm-flop
+									:startVal="0"
+									:decimals="0"
+									:endVal="statistics.tagCount"
+									:duration="3000"
+								></tm-flop>
 							</view>
 							<view class="mt-6 text-size-s text-grey-darken-1">标签总数</view>
 						</view>
@@ -37,19 +54,34 @@
 					<view class="statistics solid-top has-solid flex pt-24 pb-24">
 						<view class="item flex-1 text-align-center">
 							<view class="number text-size-xl text-bg-gradient-orange-accent">
-								<tm-flop :startVal="0" :decimals="0" :endVal="statistics.commentCount" :duration="3000"></tm-flop>
+								<tm-flop
+									:startVal="0"
+									:decimals="0"
+									:endVal="statistics.commentCount"
+									:duration="3000"
+								></tm-flop>
 							</view>
 							<view class="mt-6 text-align-center text-size-s text-grey-darken-1">评论数量</view>
 						</view>
 						<view class="item flex-1 text-align-center">
 							<view class="number text-size-xl text-bg-gradient-blue-accent">
-								<tm-flop :startVal="0" :decimals="0" :endVal="statistics.linkCount" :duration="3000"></tm-flop>
+								<tm-flop
+									:startVal="0"
+									:decimals="0"
+									:endVal="statistics.linkCount"
+									:duration="3000"
+								></tm-flop>
 							</view>
 							<view class="mt-6 text-align-center text-size-s text-grey-darken-1">点赞数量</view>
 						</view>
 						<view class="item flex-1 text-align-center">
 							<view class="number text-size-xl text-bg-gradient-green-accent">
-								<tm-flop :startVal="0" :decimals="0" :endVal="statistics.visitCount" :duration="3000"></tm-flop>
+								<tm-flop
+									:startVal="0"
+									:decimals="0"
+									:endVal="statistics.visitCount"
+									:duration="3000"
+								></tm-flop>
 							</view>
 							<view class="mt-6 text-size-s text-grey-darken-1">访客数量</view>
 						</view>
@@ -60,7 +92,12 @@
 
 		<!-- 快捷导航 -->
 		<view v-if="useQuickNav" class="quick-nav flex flex-between round-3  ma-24 pa-24 pl-40 pr-40">
-			<view class="quick-nav-item flex flex-col flex-center" v-for="(nav, index) in quickNavList" :key="index" @click="fnToNavPage(nav)">
+			<view
+				class="quick-nav-item flex flex-col flex-center"
+				v-for="(nav, index) in quickNavList"
+				:key="index"
+				@click="fnToNavPage(nav)"
+			>
 				<view class="icon round-24 halocoloricon" :class="[nav.icon]"></view>
 				<view class="name text-size-s mt-8">{{ nav.text }}</view>
 			</view>
@@ -80,7 +117,9 @@
 						@click="fnOnNav(nav)"
 					>
 						<template slot="rightValue">
-							<button class="right-value-btn" v-if="nav.openType" :open-type="nav.openType">{{ nav.rightText }}</button>
+							<button class="right-value-btn" v-if="nav.openType" :open-type="nav.openType">
+								{{ nav.rightText }}
+							</button>
 							<text v-else>{{ nav.rightText }}</text>
 						</template>
 					</tm-listitem>
@@ -88,7 +127,9 @@
 			</tm-grouplist>
 		</view>
 		<!-- 版权 -->
-		<view v-if="showCopyright" class="copyright mt-40 text-size-xs text-align-center"><view class="">「 2022 uni-halo 丨 开源项目@小莫唐尼 」</view></view>
+		<view v-if="showCopyright" class="copyright mt-40 text-size-xs text-align-center">
+			<view class="">「 2022 uni-halo 丨 开源项目@小莫唐尼 」</view>
+		</view>
 
 		<!-- 名片 -->
 		<tm-poup v-model="miniProfileCard.show" width="94vw" height="auto" :round="3" position="center">
@@ -97,17 +138,35 @@
 				<view class="left flex flex-col flex-center">
 					<image class="avatar" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)" mode="aspectFill"></image>
 					<view class="name mt-10 text-size-m text-weight-b">{{ bloggerInfo.nickname }}</view>
-					<view class="mt-10 round-a-1 pa-2 pl-12 pr-12 text-size-s bg-gradient-light-blue-accent">前端摸鱼大师</view>
+					<view class="mt-10 round-a-1 pa-2 pl-12 pr-12 text-size-s bg-gradient-light-blue-accent">
-					<view class="mt-6 text-size-xs text-align-center text-grey-darken-2">一个爱凑热闹的、喜欢捣鼓前端的博主。</view>
+						前端摸鱼大师
+					</view>
+					<view class="mt-6 text-size-xs text-align-center text-grey-darken-2">
+						一个爱凑热闹的、喜欢捣鼓前端的博主。
+					</view>
 				</view>
 				<view class="right flex flex-col pl-12">
 					<view class="label text-size-s text-weight-b">爱好：摸鱼、打游戏、听音乐、逛B站</view>
-					<view class="motto mt-12 text-size-s text-grey-darken-1">如果不是在空闲着的时候就能挣到钱，那就不算摸鱼！</view>
+					<view class="motto mt-12 text-size-s text-grey-darken-1">
+						如果不是在空闲着的时候就能挣到钱，那就不算摸鱼！
+					</view>
 					<view class="mt-12 text-size-m text-weight-b text-grey-darken-2">精选图片</view>
 					<view class="photos mt-6 flex ">
-						<image class="photos-img round-2" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)" mode="aspectFill"></image>
+						<image
-						<image class="photos-img round-2" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)" mode="aspectFill"></image>
+							class="photos-img round-2"
-						<image class="photos-img round-2" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)" mode="aspectFill"></image>
+							:src="$utils.checkAvatarUrl(bloggerInfo.avatar)"
+							mode="aspectFill"
+						></image>
+						<image
+							class="photos-img round-2"
+							:src="$utils.checkAvatarUrl(bloggerInfo.avatar)"
+							mode="aspectFill"
+						></image>
+						<image
+							class="photos-img round-2"
+							:src="$utils.checkAvatarUrl(bloggerInfo.avatar)"
+							mode="aspectFill"
+						></image>
 					</view>
 				</view>
 			</view>
@@ -168,7 +227,19 @@ export default {
 	},
 	computed: {
 		bloggerInfo() {
-			return this.$tm.vx.getters().blogger.getBlogger;
+			return this.$tm.vx.getters().getBlogger;
+		},
+		calcProfileStyle() {
+			let _imgUrlOr = getApp().globalData.aboutProfileImageUrl;
+			if (this.$utils.checkIsUrl(_imgUrlOr)) {
+				return {
+					backgroundImage: `url(${_imgUrlOr})`
+				};
+			} else {
+				return {
+					background: _imgUrlOr
+				};
+			}
 		},
 		calcWaveUrl() {
 			return getApp().globalData.waveImageUrl;
@@ -206,6 +277,10 @@ export default {
 		},
 		fnGetNavList() {
 			const systemInfo = uni.getSystemInfoSync();
+			let _isWx = false;
+			// #ifdef MP-WEIXIN
+			_isWx = true;
+			// #endif
 			this.navList = [
 				{
 					key: 'disclaimers',
@@ -239,7 +314,7 @@ export default {
 					isAdmin: false,
 					type: 'page',
 					openType: 'contact',
-					show: true
+					show: _isWx
 				},
 				{
 					key: 'feedback',
@@ -251,7 +326,7 @@ export default {
 					isAdmin: false,
 					type: 'page',
 					openType: 'feedback',
-					show: true
+					show: _isWx
 				},
 				{
 					key: 'about',
@@ -374,7 +449,8 @@ export default {
 						})
 							.then(res => {
 								uni.clearStorageSync();
-								this.navList.find(x => x.key == 'cache').rightText = uni.getStorageInfoSync().currentSize + 'KB';
+								this.navList.find(x => x.key == 'cache').rightText =
+									uni.getStorageInfoSync().currentSize + 'KB';
 							})
 							.catch(err => {});
 						break;
@@ -405,6 +481,18 @@ export default {
 
 		// 快捷导航页面跳转
 		fnToNavPage(item) {
+			// 判断是内置页面还是网页
+			if (this.$utils.checkIsUrl(item.path)) {
+				uni.navigateTo({
+					url:
+						'/pagesC/website/website?data=' +
+						JSON.stringify({
+							title: item.text || this.$haloConfig.title,
+							url: item.path
+						})
+				});
+				return;
+			}
 			switch (item.type) {
 				case 'tabbar':
 					uni.switchTab({
@@ -437,10 +525,8 @@ export default {
 	position: relative;
 	width: 100%;
 	height: 600rpx;
-	background-image: url('@/static/summer.jpg');
 	background-size: cover;
 	background-repeat: no-repeat;
-	// box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
 	&:before {
 		content: '';
 		width: 100%;

pages/tabbar/category/category.vue

@@ -11,23 +11,8 @@
 				<tm-empty icon="icon-shiliangzhinengduixiang-" label="博主还没有文章分类~"></tm-empty>
 			</view>
 			<block v-else>
-				<tm-sliderNav :list="categoryList" color="light-blue" rang-key="name" @change="fnOnCategoryChange"></tm-sliderNav>
+				<tm-sliderNav :list="categoryList" bg-color="white" color="light-blue" rang-key="name" @change="fnOnCategoryChange"></tm-sliderNav>
-				<scroll-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="fnGetData(true)" @scrolltolower="fnGetData(false)" @scroll="fnOnScroll" @touchmove.stop @touchstart="fnOnTouchStart" @touchend="fnOnTouchEnd" @touchcancel="fnOnTouchEnd">
-					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"
-					@refresherrefresh="fnGetData(true)"
-					@scrolltolower="fnGetData(false)"
-					@scroll="fnOnScroll"
-					@touchmove.stop
-					@touchstart="fnOnTouchStart"
-					@touchend="fnOnTouchEnd"
-					@touchcancel="fnOnTouchEnd"
-				>
 					<view v-if="dataList.length == 0" class="article-empty flex flex-center">
 						<tm-empty icon="icon-shiliangzhinengduixiang-" label="该分类下暂无文章~"></tm-empty>
 					</view>
@@ -35,7 +20,7 @@
 					<block v-else>
 						<block v-for="(article, index) in dataList" :key="article.createTime">
 							<!-- 文章卡片 -->
-							<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+							<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 								<article-min-card :article="article" @on-click="fnToArticleDetail"></article-min-card>
 							</tm-translate>
 						</block>
@@ -111,6 +96,7 @@ export default {
 		},
 		methods: {
 			fnOnCategoryChange(e) {
+				this.fnResetSetAniWaitIndex();
 				this.queryParams.slug = this.categoryList[e].slug;
 				this.fnToTopScroll();
 				this.dataList = [];
@@ -119,10 +105,10 @@ export default {
 
 			fnGetAllCategory() {
 				this.loading = 'loading';
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				this.$httpApi
 					.getCategoryList({ more: true })
 					.then(res => {
@@ -217,25 +203,31 @@ export default {
 		flex-direction: column;
 		background-color: #fff;
 	}
+
 	.content {
 		height: 100vh;
 		background-color: #fafafa;
 	}
+
 	.category-empty {
 		width: 100%;
 		height: 70vh;
 	}
+
 	.article-empty {
 		width: 100%;
 		height: 70vh;
 	}
+
 	.right-content {
 		// width: calc(100vw - 144rpx);
 		width: calc(100vw - 190rpx);
 		height: 100vh;
 		background-color: #fff;
 		white-space: nowrap;
+		background-color: #fafafa;
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
 	}

pages/tabbar/gallery/gallery.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="app-page" :class="{ 'is-balck grey-darken-6': isBlackTheme }">
+	<view class="app-page">
 		<!-- 顶部切换 -->
 		<view class="e-fixed" v-if="category.list.length > 2">
 			<tm-tabs color="light-blue" v-model="category.activeIndex" :list="category.list" align="left" @change="fnOnCategoryChange"></tm-tabs>
@@ -9,14 +9,12 @@
 		<!-- 加载区域 -->
 		<view v-if="loading != 'success'" class="loading-wrap">
 			<tm-skeleton model="card"></tm-skeleton>
-			<tm-skeleton model="cardActions"></tm-skeleton>
+			<tm-skeleton model="card"></tm-skeleton>
-			<tm-skeleton model="list"></tm-skeleton>
+			<tm-skeleton model="card"></tm-skeleton>
-			<tm-skeleton model="listAvatr"></tm-skeleton>
+			<tm-skeleton model="card"></tm-skeleton>
-			<tm-skeleton model="listAvatr"></tm-skeleton>
-			<tm-skeleton model="listAvatr"></tm-skeleton>
 		</view>
 		<!-- 内容区域 -->
-		<view class="content" v-else :class="{ 'bg-white': dataList.length !== 0 }">
+		<view class="content" v-else>
 			<view v-if="dataList.length == 0" class="content-empty">
 				<!-- 空布局 -->
 				<tm-empty icon="icon-shiliangzhinengduixiang-" label="博主还没有分享图片~"></tm-empty>
@@ -25,8 +23,8 @@
 				<tm-flowLayout v-if="globalAppSettings.gallery.useWaterfull" @click="fnOnClick" ref="wafll">
 					<template v-slot:left="{ hdata }">
 						<tm-translate animation-name="fadeUp">
-							<view class="round-3 shadow-2 overflow white">
+							<view class="card round-3 overflow white">
-								<tm-images :previmage="true" :src="hdata.item.image"></tm-images>
+								<tm-images :previmage="false" :src="hdata.item.image" @click="fnPreview(hdata.item)"></tm-images>
 								<view class="pa-10 text-size-s">
 									<view class="text-overflow-2">
 										<tm-tags color="bg-gradient-amber-accent" :shadow="0" :dense="true" size="s" model="fill">{{ hdata.item.team }}</tm-tags>
@@ -50,8 +48,8 @@
 					</template>
 					<template v-slot:right="{ hdata }">
 						<tm-translate animation-name="fadeUp">
-							<view class="round-3 shadow-2 overflow white">
+							<view class="card round-3  overflow white">
-								<tm-images :previmage="true" :src="hdata.item.image"></tm-images>
+								<tm-images :previmage="false" :src="hdata.item.image" @click="fnPreview(hdata.item)"></tm-images>
 								<view class="pa-10 text-size-s">
 									<view class="text-overflow-2">
 										<tm-tags :shadow="0" :dense="true" color="bg-gradient-amber-accent" size="s" model="fill">{{ hdata.item.team }}</tm-tags>
@@ -76,9 +74,9 @@
 				</tm-flowLayout>
 				<block v-else>
 					<block v-for="(item, index) in dataList" :key="index">
-						<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+						<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 							<view class="round-3 shadow-2 overflow white mb-24">
-								<tm-images :previmage="false" :src="item.image" @click="fnPreview(item, index)"></tm-images>
+								<tm-images :previmage="false" :src="item.image" @click="fnPreview(item)"></tm-images>
 								<view class="pa-24 text-size-m">
 									<view class="text-overflow-2">
 										<tm-tags :shadow="0" :dense="true" color="bg-gradient-amber-accent" size="s" model="fill">{{ item.team }}</tm-tags>
@@ -199,6 +197,7 @@ export default {
 		},
 		methods: {
 			fnOnCategoryChange(index) {
+				this.fnResetSetAniWaitIndex();
 				this.dataList = [];
 				if (index == 0) {
 					this.queryParams.team = null;
@@ -215,10 +214,10 @@ export default {
 				});
 			},
 			fnGetData() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -281,10 +280,11 @@ export default {
 				console.log('点击数据', data);
 			},
 			// 预览
-		fnPreview(item, index) {
+			fnPreview(item) {
+				const index = this.cache.dataList.findIndex(x => x.id == item.id);
 				uni.previewImage({
 					current: index,
-				urls: this.dataList.map(x => x.image),
+					urls: this.cache.dataList.map(x => x.image),
 					indicator: 'number',
 					loop: true
 				});
@@ -293,19 +293,20 @@ export default {
 	};
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
 		flex-direction: column;
 		padding-bottom: 24rpx;
-	background-color: #fafafd;
+		background-color: #fafafa;
 
 		&.is-balck {
 			background-color: #212121;
 		}
 	}
+
 	.content {
 		box-sizing: border-box;
 		padding: 0 24rpx;
@@ -318,8 +319,13 @@ export default {
 			justify-content: center;
 		}
 	}
+
 	.loading-wrap {
 		box-sizing: border-box;
 		padding: 24rpx;
 	}
+
+	.card {
+		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
+	}
 </style>

pages/tabbar/home/home.vue

@@ -22,13 +22,7 @@
 			<view class="bg-white pb-24">
 				<!-- 轮播图+广告 -->
 				<view class="banner bg-white ml-24 mr-24 mt-12 round-3" v-if="bannerList.length != 0">
-					<e-swiper
+					<e-swiper :dotPosition="globalAppSettings.banner.dotPosition" :autoplay="true" :useDot="globalAppSettings.banner.useDot" :list="bannerList" @on-click="fnOnBannerClick"></e-swiper>
-						:dotPosition="globalAppSettings.banner.dotPosition"
-						:autoplay="true"
-						:useDot="globalAppSettings.banner.useDot"
-						:list="bannerList"
-						@on-click="fnOnBannerClick"
-					></e-swiper>
 				</view>
 				<!-- 快捷导航 -->
 				<!-- <view v-if="useQuickNav" class="quick-nav flex-between round-3 flex mt-12 ml-12 mr-12 pa-24">
@@ -73,7 +67,7 @@
 			<block v-else>
 				<view :class="globalAppSettings.layout.home">
 					<block v-for="(article, index) in articleList" :key="article.createTime">
-						<tm-translate class="ani-item" animation-name="fadeUp" :wait="(index + 1) * 50">
+						<tm-translate class="ani-item" animation-name="fadeUp" :wait="calcAniWait(index)">
 							<article-card from="home" :article="article" @on-click="fnToArticleDetail"></article-card>
 							<!-- 广告区域 -->
 							<view v-if="haloAdConfig.home.use && (index + 1) % haloAdConfig.frequency == 0" class="ad-wrap ma-24">
@@ -136,12 +130,12 @@ export default {
 		},
 
 		computed: {
-		// 获取博主信息
 			bloggerInfo() {
-			let blogger = this.$tm.vx.getters().blogger.getBlogger;
+				let blogger = this.$tm.vx.getters().getBlogger;
 				blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
 				return blogger;
-		}
+			},
+
 		},
 		onLoad() {
 			this.fnSetPageTitle();
@@ -150,13 +144,6 @@ export default {
 
 		created() {
 			this.fnQuery();
-		this.$httpApi
-			.getOptionList()
-			.then(result => {
-				console.log('配置列表：');
-				console.log(result);
-			})
-			.catch(err => {});
 		},
 		onPullDownRefresh() {
 			this.isLoadMore = false;
@@ -177,7 +164,6 @@ export default {
 			}
 		},
 		methods: {
-		// 查询数据
 			fnQuery() {
 				this.fnGetBanner();
 				this.fnGetArticleList();
@@ -276,10 +262,10 @@ export default {
 			},
 			// 文章列表
 			fnGetArticleList() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -389,50 +375,60 @@ export default {
 			}
 		}
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
 	}
+
 	.search-input {
 		background-color: #f5f5f5;
 		align-items: center;
 		/* #ifdef MP-WEIXIN */
 		margin-right: 24rpx;
+
 		/* #endif */
-	&_icon {
+		&_icon {}
-	}
+
-	&_text {
+		&_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;
 		}
@@ -445,6 +441,7 @@ export default {
 			font-size: 32rpx;
 			z-index: 1;
 			color: var(--main-text-color);
+
 			&:before {
 				content: '';
 				position: absolute;
@@ -464,6 +461,7 @@ export default {
 		flex-wrap: wrap;
 		box-sizing: border-box;
 		padding: 0 12rpx;
+
 		.ani-item {
 			width: 50%;
 		}

pages/tabbar/links/links.vue

@@ -7,49 +7,34 @@
 			<tm-skeleton model="listAvatr"></tm-skeleton>
 			<tm-skeleton model="listAvatr"></tm-skeleton>
 		</view>
-		<view v-else class="content">
+		<view v-else class="content" :class="{ 'bg-white': result.length !== 0 }">
 			<!-- 空数据 -->
-			<view v-if="result.length == 0" class="content-empty flex flex-center"><tm-empty icon="icon-shiliangzhinengduixiang-" label="啊偶,博主还没有朋友呢~"></tm-empty></view>
+			<view v-if="result.length == 0" class="content-empty flex flex-center">
+				<tm-empty icon="icon-shiliangzhinengduixiang-" label="啊偶,博主还没有朋友呢~"></tm-empty>
+			</view>
 
 			<!-- 如果只有一个分组：使用列表的形式 result.length == 1 -->
 			<view v-else-if="result.length == 1" class="flex flex-col pb-24">
-				<block v-for="(item, index) in result[0].children" :key="index">
+				<block v-for="(link, index) in result[0].children" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
-						<view class="link-card one round-a-6 flex ma-24 mb-0 pa-24" @click="fnOnLinkEvent(item)">
+						<!-- 色彩版本 -->
-							<cache-image class="logo shadow-2" radius="12rpx" width="80rpx" height="80rpx" :url="item.logo" :fileMd5="item.logo" mode="aspectFill"></cache-image>
+						<view v-if="!globalAppSettings.links.useSimple" class="info flex pt-24 pb-24 pl-12 pr-12" :class="{ 'border-b-1': index != result[0].children.length - 1 }" @click="fnOnLinkEvent(link)">
-							<view class="info pl-24">
+							<view class="link-logo">
-								<view class="name text-size-g">{{ item.name }}</view>
+								<cache-image class="link-logo_img" radius="12rpx" :url="link.logo" :fileMd5="link.logo" mode="aspectFill"></cache-image>
-								<view class="desc mt-12 text-size-s text-grey-darken-1">{{ item.description }}</view>
-								<view class="link mt-12 text-size-m text-grey-darken-1">
-									<text class="iconfont icon-link mr-6 text-size-s"></text>
-									{{ item.url }}
 							</view>
-							</view>
-						</view>
-					</tm-translate>
-				</block>
-			</view>
-
-			<!-- 如果大于一个分组：使用联系人的索引形式 result.length > 1 -->
-			<block v-else>
-				<block v-for="(team, index) in result" :key="index">
-					<view class="grey-lighten-4 text  text-size-s text-weight-b px-32 py-12">{{ team.title }}</view>
-					<block v-for="(link, linkIndex) in team.children" :key="link.id">
-						<!-- 艳丽版本 -->
-						<view
-							v-if="!globalAppSettings.links.useSimple"
-							class="info flex pa-36"
-							:class="{ 'border-b-1': linkIndex != team.children.length - 1 }"
-							@click="fnOnLinkEvent(link)"
-						>
-							<view class="link-logo"><cache-image class="link-logo_img" radius="12rpx" :url="link.logo" :fileMd5="link.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">{{ link.name }}</view>
 								<view class="poup-tag ml--10 mt-6">
-									<tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">ID：{{ link.id }}</tm-tags>
+									<tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">
-									<tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">{{ link.team }}</tm-tags>
+										ID：{{ link.id }}
+									</tm-tags>
+									<tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">
+										{{ link.team || '暂未分组' }}
+									</tm-tags>
+								</view>
+								<view class="link-card_desc text-overflow text-size-s mt-4">
+									博客简介：{{ link.description || '这个博主很懒，没写简介~' }}
 								</view>
-								<view class="link-card_desc text-overflow text-size-s mt-4">博客简介：{{ link.description || '这个博主很懒，没写简介~' }}</view>
 							</view>
 						</view>
 						<!-- 简洁版本 -->
@@ -64,7 +49,59 @@
 								</view>
 							</view>
 						</view>
+					</tm-translate>
 				</block>
+			</view>
+
+			<!-- 如果大于一个分组：使用联系人的索引形式 result.length > 1 -->
+			<block v-else>
+				<block v-for="(team, index) in result" :key="index">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
+						<view class="grey-lighten-4 text  text-size-s text-weight-b px-32 py-12">{{ team.title }}</view>
+						<block v-for="(link, linkIndex) in team.children" :key="link.id">
+							<tm-translate animation-name="fadeUp" :wait="calcAniWait(linkIndex)">
+								<!-- 色彩版本 -->
+								<view v-if="!globalAppSettings.links.useSimple" class="info flex pt-24 pb-24 pl-12 pr-12" :class="{
+										'border-b-1':
+											linkIndex != team.children.length - 1 || index == result.length - 1
+									}" @click="fnOnLinkEvent(link)">
+									<view class="link-logo">
+										<cache-image class="link-logo_img" radius="12rpx" :url="link.logo" :fileMd5="link.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">
+											{{ link.name }}
+										</view>
+										<view class="poup-tag ml--10 mt-6">
+											<tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">
+												ID：{{ link.id }}
+											</tm-tags>
+											<tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">
+												{{ link.team || '暂未分组' }}
+											</tm-tags>
+										</view>
+										<view class="link-card_desc text-overflow text-size-s mt-4">
+											博客简介：{{ link.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.logo" mode="aspectFill"></image>
+									<view class="info pl-24">
+										<view class="name text-size-g">{{ link.name }}</view>
+										<view class="desc mt-12 text-size-s text-grey-darken-1">
+											{{ link.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.url }}
+										</view>
+									</view>
+								</view>
+							</tm-translate>
+						</block>
+					</tm-translate>
 				</block>
 			</block>
 
@@ -75,12 +112,18 @@
 			<tm-poup v-model="detail.show" :width="640" height="auto" position="center" :round="6">
 				<view class="poup pa-36">
 					<view class="info flex">
-						<view class="poup-logo bg-gradient-amber-accent pa-4 shadow-24"><image class="poup-logo_img" :src="detail.data.logo" mode="aspectFill"></image></view>
+						<view class="poup-logo bg-gradient-amber-accent pa-4 shadow-24">
+							<image class="poup-logo_img" :src="detail.data.logo" mode="aspectFill"></image>
+						</view>
 						<view class="pl-24 info-detail">
 							<view class="poup-name text-size-lg text-weight-b">{{ detail.data.name }}</view>
 							<view class="poup-tag ml--10">
-								<tm-tags color="bg-gradient-amber-accent" size="n" model="fill">ID：{{ detail.data.id }}</tm-tags>
+								<tm-tags color="bg-gradient-amber-accent" size="n" model="fill">
-								<tm-tags color="bg-gradient-light-blue-lighten" size="n" model="fill">{{ detail.data.team }}</tm-tags>
+									ID：{{ detail.data.id }}
+								</tm-tags>
+								<tm-tags color="bg-gradient-light-blue-lighten" size="n" model="fill">
+									{{ detail.data.team || '暂未分组' }}
+								</tm-tags>
 							</view>
 							<view class="poup-link text-size-m" @click="fnCopyLink(detail.data)">
 								<text class="text-orange">{{ detail.data.url }}</text>
@@ -89,10 +132,14 @@
 						</view>
 					</view>
 
-					<view class="poup-desc mt-20">博客简介：{{ detail.data.description || '这个博主很懒，没写简介~' }}</view>
+					<view class="poup-desc mt-20">
+						博客简介：{{ detail.data.description || '这个博主很懒，没写简介~' }}
+					</view>
 
 					<!-- 博客预览图 -->
-					<view class="mt-24"><tm-images :width="568" :round="2" :src="caclSiteThumbnail(detail.data.url)" mode="aspectFill"></tm-images></view>
+					<view class="mt-24">
+						<tm-images :width="568" :round="2" :src="caclSiteThumbnail(detail.data.url)" mode="aspectFill"></tm-images>
+					</view>
 				</view>
 			</tm-poup>
 		</view>
@@ -109,7 +156,6 @@ import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
 	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
 
 	import { GetRandomNumberByRange } from '@/utils/random.js';
-import findCnChart from '@/tm-vuetify/tool/function/findCnChart.js';
 	export default {
 		components: {
 			tmSkeleton,
@@ -164,10 +210,10 @@ export default {
 			fnGetData() {
 				this.linkTotal = 0;
 				this.loading = 'loading';
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				this.$httpApi
 					.getLinkListByTeam()
 					.then(res => {
@@ -177,7 +223,6 @@ export default {
 							// 处理数据
 							const _result = res.data.map(item => {
 								const _team = item.team || '未分组';
-							const _firstChart = _team ? _team.substring(0, 1) : '';
 								const _links = item.links.map(link => {
 									this.linkTotal += 1;
 									link.logo = this.$utils.checkAvatarUrl(link.logo);
@@ -185,19 +230,16 @@ export default {
 								});
 								return {
 									title: _team,
-								index: findCnChart(_firstChart),
 									children: _links
 								};
 							});
 
-						// this.result = _result.reverse();
+							this.result = _result.reverse();
 							setTimeout(() => {
 								this.loading = 'success';
 							}, 500);
 						} else {
-						setTimeout(() => {
 							this.loading = 'error';
-						}, 500);
 						}
 					})
 					.catch(err => {
@@ -247,6 +289,7 @@ export default {
 		flex-direction: column;
 		background-color: #fafafd;
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
 		min-height: 100vh;
@@ -263,16 +306,20 @@ export default {
 			justify-content: center;
 		}
 	}
+
 	.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);
+
 			.logo {
 				box-shadow: 0rpx 2rpx 12rpx rgba(0, 0, 0, 0.1);
 			}
 		}
+
 		.logo {
 			// width: 126rpx;
 			// height: 126rpx;
@@ -286,6 +333,7 @@ export default {
 		.info {
 			width: 0;
 			flex-grow: 1;
+
 			.name {
 				white-space: nowrap;
 				overflow: hidden;
@@ -294,6 +342,7 @@ export default {
 				font-size: 30rpx;
 				font-weight: bold;
 			}
+
 			.desc {
 				white-space: nowrap;
 				overflow: hidden;
@@ -303,43 +352,52 @@ export default {
 			}
 		}
 	}
+
 	.link-card_name {
 		// color: #303133;
 		// color: #0080fe;
 	}
+
 	.link-card_desc {
 		font-size: 24rpx;
 		line-height: 1.6;
 		color: #303133;
 	}
+
 	.link-logo {
 		width: 140rpx;
 		height: 140rpx;
+
 		&_img {
 			width: 100%;
 			height: 100%;
 		}
 	}
+
 	.poup-logo {
 		width: 140rpx;
 		height: 140rpx;
 		border-radius: 50%;
+
 		&_img {
 			width: 100%;
 			height: 100%;
 			border-radius: 50%;
 		}
 	}
+
 	.info-detail {
 		width: 0;
 		flex-grow: 1;
 		justify-content: center;
 	}
+
 	.poup-desc {
 		font-size: 28rpx;
 		line-height: 1.6;
 		color: #555 !important;
 	}
+
 	.preview-site {
 		width: 100%;
 		height: 300rpx;

pagesA/archives/archives.vue

@@ -18,16 +18,8 @@
 				<block v-for="(item, index) in dataList" :key="index">
 					<view class="tm-timeline-item tm-timeline-item--leftDir">
 						<view style="width: 160rpx;">
-							<view
+							<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>
-								:style="{ width: '24rpx', height: '24rpx' }"
+							<view :style="{ marginTop: '-24rpx' }" :class="[index !== dataList.length - 1 ? 'tm-timeline-item-boder' : '', black_tmeme ? 'bk' : '']" class="grey-lighten-2"></view>
-								:class="[black_tmeme ? 'bk' : '']"
-								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">
@@ -38,7 +30,7 @@
 								</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="(postIndex + 1) * 50">
+										<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">
@@ -115,7 +107,7 @@ export default {
 
 		methods: {
 			fnOnTabChange(index) {
-			// todo:
+				this.fnResetSetAniWaitIndex();
 				const _api = ['getMonthArchives', 'getYearArchives'];
 				this.api = _api[index];
 				this.queryParams.page = 0;
@@ -123,10 +115,10 @@ export default {
 			},
 			fnGetData() {
 				this.loading = 'loading';
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				this.$httpApi[this.api](this.queryParams)
 					.then(res => {
 						this.result = res.data;
@@ -165,21 +157,26 @@ export default {
 		flex-direction: column;
 		background-color: #fafafd;
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
 	}
+
 	.list-empty {
 		width: 100vw;
 		height: 100vh;
 	}
+
 	.statistics {
 		background-color: #ffffff;
 	}
+
 	.e-timeline {
 		::v-deep {
 			.tm-timeline-item>view:first-child {
 				width: 110rpx !important;
 			}
+
 			.tm-timeline-item-left {
 				max-width: 580rpx !important;
 				width: 100% !important;
@@ -189,6 +186,7 @@ export default {
 
 	.tm-timeline {
 		.tm-timeline-item {
+
 			.tm-timeline-item-left,
 			.tm-timeline-item-right {
 				width: 200rpx;
@@ -201,30 +199,37 @@ export default {
 				align-items: flex-start;
 				align-content: flex-start;
 			}
+
 			.tm-timeline-jidian {
 				margin: auto;
 			}
+
 			&.tm-timeline-item--leftDir {
 				display: flex;
 				flex-flow: row;
+
 				&.endright {
 					justify-content: flex-end;
 				}
+
 				.tm-timeline-item-left,
 				.tm-timeline-item-right {
 					width: auto;
 					max-width: 400rpx;
 				}
+
 				.tm-timeline-item-boder {
 					height: 100%;
 					width: 1px;
 					margin: auto;
 				}
+
 				.tm-timeline-jidian {
 					position: relative;
 					margin: auto;
 					z-index: 2;
 				}
+
 				.tm-timeline-item-content {
 					display: flex;
 					justify-content: flex-start;
@@ -239,48 +244,59 @@ export default {
 		width: 560rpx;
 		border-radius: 12rpx;
 		background-color: #fff;
-	&.lr_image_text {
+
-	}
+		&.lr_image_text {}
+
 		&.lr_text_image {
 			.post-thumbnail {
 				order: 2;
 			}
+
 			.post-info {
 				order: 1;
 				padding-left: 0;
 				padding-right: 24rpx;
 			}
 		}
+
 		&.tb_image_text {
 			flex-direction: column;
+
 			.post-thumbnail {
 				width: 100%;
 				height: 220rpx;
 			}
+
 			.post-info {
 				width: 100%;
 				padding-left: 0;
+
 				&_title {
 					margin-top: 12rpx;
 				}
+
 				&_time {
 					.iconfont {
 						display: none;
 					}
+
 					.time-label {
 						display: inline-block;
 					}
 				}
 			}
 		}
+
 		&.tb_text_image {
 			flex-direction: column;
+
 			.post-thumbnail {
 				order: 2;
 				width: 100%;
 				height: 220rpx;
 				margin-top: 12rpx;
 			}
+
 			.post-info {
 				order: 1;
 				width: 100%;
@@ -290,47 +306,58 @@ export default {
 					.iconfont {
 						display: none;
 					}
+
 					.time-label {
 						display: inline-block;
 					}
 				}
 			}
 		}
+
 		&.only_text {
 			.post-info {
 				padding: 6rpx;
+
 				&_time {
 					margin-top: 20rpx;
+
 					.iconfont {
 						display: none;
 					}
+
 					.time-label {
 						display: inline-block;
 					}
 				}
 			}
+
 			.post-thumbnail {
 				display: none;
 			}
 		}
 	}
+
 	.post-thumbnail {
 		border-radius: 6rpx;
 		width: 200rpx;
 		height: 170rpx;
 	}
+
 	.post-info {
 		width: 0;
 		flex-grow: 1;
+
 		&_title {
 			color: #303133;
 			font-size: 28rpx;
 			font-weight: bold;
 		}
+
 		&_summary {
 			display: -webkit-box;
 			line-height: 1.6;
 		}
+
 		&_time {
 			.time-label {
 				display: none;

pagesA/article-detail/article-detail.vue

@@ -11,14 +11,15 @@
 				<view class="title">{{ result.title }}</view>
 				<view class="detail">
 					<view class="author">
-						<text class="author-name">{{ author.name }}</text>
+						<text class="author-name">博主：{{ author.nickname }}</text>
-						<text class="author-time">发布于：{{ { d: result.createTime, f: 'yyyy年MM月dd日 星期w' } | formatTime }}</text>
+						<text class="author-time">
+							时间：{{ { d: result.createTime, f: 'yyyy年MM月dd日 星期w' } | formatTime }}
+						</text>
 					</view>
 
-					<view class="cover" v-if="result.thumbnail"><image class="cover-img" mode="aspectFill" :src="calcUrl(result.thumbnail)"></image></view>
+					<view class="cover" v-if="result.thumbnail">
-					<!-- <view class="mt-24">
+						<image class="cover-img" mode="aspectFill" :src="calcUrl(result.thumbnail)"></image>
-						<text class="category-tag" v-for="(item, index) in result.tags" :key="index">{{ item.name }}</text>
+					</view>
-					</view> -->
 					<view class="count" :class="{ 'no-thumbnail': !result.thumbnail }">
 						<view class="count-item">
 							<text class="value">{{ result.visits }}</text>
@@ -41,17 +42,34 @@
 			</view>
 			<!-- 分类 -->
 			<view class="category">
-				<view class="">
+				<view class="category-type">
-					分类：
+					<text class="text-weight-b">分类：</text>
-					<text class="category-tag" v-for="(item, index) in result.categories" :key="index">{{ item.name }}</text>
+					<text v-if="result.categories.length == 0" class="category-tag is-empty">未选择分类</text>
+					<block v-else>
+						<text class="category-tag" v-for="(item, index) in result.categories" :key="index" @click="fnToCate(item)">
+							{{ item.name }}
+						</text>
+					</block>
+				</view>
+				<view class="mt-18 category-type">
+					<text class="text-weight-b">标签：</text>
+					<text v-if="result.tags.length == 0" class="category-tag is-empty">未选择标签</text>
+					<block v-else>
+						<text class="category-tag" :style="{ backgroundColor: item.color }" v-for="(item, index) in result.tags" :key="index" @click="fnToTag(item)">
+							{{ item.name }}
+						</text>
+					</block>
+				</view>
+				<view v-if="originalURL" class="mt-18 category-type original-url">
+					<view class="original-url_left text-weight-b">原文：</view>
+					<view class="original-url_right text-grey">
+						<text class="original-url_right__link" @click.stop="fnToOriginal(originalURL)">{{ originalURL }}</text>
+						<text class="original-url_right__btn" @click.stop="fnToOriginal(originalURL)">阅读原文<text class="iconfont icon-angle-right ml-5 text-size-s"></text> </text>
 					</view>
-				<view class="mt-18">
-					标签：
-					<text class="category-tag" v-for="(item, index) in result.tags" :key="index">{{ item.name }}</text>
 				</view>
 			</view>
 			<!-- 广告区域 -->
-			<view v-if="haloAdConfig.articleDetail.use" class="ad-wrap ma-24 mb-0">
+			<view v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)" class="ad-wrap ma-24 mb-0">
 				<!-- #ifdef MP-WEIXIN -->
 				<ad v-if="haloAdConfig.unitId" :unit-id="haloAdConfig.unitId"></ad>
 				<!-- #endif -->
@@ -62,24 +80,19 @@
 			<!-- 内容区域 -->
 			<view class="content ml-24 mr-24">
 				<!-- markdown渲染 -->
-				<mp-html
+				<view class="markdown-wrap">
-					class="evan-markdown"
+					<tm-more :disabled="true" :maxHeight="1500" :isRemovBar="true" :open="showValidVisitMore" @click="fnOnShowValidVisitMore">
-					lazy-load
+						<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="result.content || result.formatContent" :markdown="true" :showLineNumber="true" :showLanguageName="true" :copyByLongPress="true" />
-					:domain="markdownConfig.domain"
+						<template v-slot:more="{ data }">
-					:loading-img="markdownConfig.loadingGif"
+							<view class="">
-					:scroll-table="true"
+								<text class="text-blue text-size-m text-weight-b">文章部分内容已加密点击解锁</text>
-					:selectable="true"
+								<text class="text-blue iconfont icon-lock-fill text-size-s ml-5"></text>
-					:tag-style="markdownConfig.tagStyle"
+							</view>
-					:container-style="markdownConfig.containStyle"
+						</template>
-					:content="result.content"
+					</tm-more>
-					:markdown="true"
+				</view>
-					:showLineNumber="true"
+				<!-- 广告区域：微信/decloud申请 -->
-					:showLanguageName="true"
+				<view v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)" class="ad-wrap mt-24 mb-24 ">
-					:copyByLongPress="true"
-				/>
-
-				<!-- 广告区域 -->
-				<view v-if="haloAdConfig.articleDetail.use" class="ad-wrap mt-24 mb-24 ">
 					<!-- #ifdef MP-WEIXIN -->
 					<ad v-if="haloAdConfig.unitId" :unit-id="haloAdConfig.unitId"></ad>
 					<!-- #endif -->
@@ -88,12 +101,43 @@
 					<!-- #endif -->
 				</view>
 
-				<!-- 免责声明：todo -->
+				<!-- 广告区域：自定义广告位 -->
-
+				<view class="ad-card mt-24" v-if="haloAdConfig.articleDetail.custom.use">
-				<!-- 评论展示区域 -->
+					<text class="ad-card_tip">广告</text>
-				<view class="comment-wrap mt-24 pa-24 round-4"><commentList :postId="result.id" :post="result" @on-comment-detail="fnOnShowCommentDetail"></commentList></view>
+					<image class="ad-card_cover" :src="haloAdConfig.articleDetail.custom.cover" mode="scaleToFill"></image>
+					<view class="ad-card_info">
+						<view class="ad-card_info-title">{{ haloAdConfig.articleDetail.custom.title }}</view>
+						<view class="ad-card_info-desc">{{ haloAdConfig.articleDetail.custom.content }}</view>
+						<view v-if="haloAdConfig.articleDetail.custom.url" class="ad-card_info-link" @click="fnToWebview(haloAdConfig.articleDetail.custom)">
+							立即查看
+						</view>
+					</view>
 				</view>
 
+				<!-- 版权声明 -->
+				<view v-if="copyright.use" class="copyright-wrap bg-white mt-24 pa-24 round-4">
+					<view class="copyright-title text-weight-b">版权声明</view>
+					<view class="copyright-content mt-12  grey-lighten-5 text-grey-darken-2 round-4 pt-12 pb-12 pl-24 pr-24 ">
+						<view v-if="copyright.author" class="copyright-text text-size-s ">
+							版权归属：{{ copyright.author }}
+						</view>
+						<view v-if="copyright.description" class="copyright-text text-size-s mt-12">
+							版权说明：{{ copyright.description }}
+						</view>
+						<view v-if="copyright.violation" class="copyright-text text-size-s mt-12 text-red">
+							侵权处理：{{ copyright.violation }}
+						</view>
+					</view>
+				</view>
+
+				<!-- 评论展示区域 -->
+				<view class="comment-wrap bg-white mt-24 pa-24 round-4">
+					<commentList :disallowComment="result.disallowComment" :postId="result.id" :post="result" @on-comment-detail="fnOnShowCommentDetail" @on-loaded="fnOnCommentLoaded"></commentList>
+				</view>
+			</view>
+
+			<!-- 弹幕效果 -->
+			<barrage ref="barrage" :maxTop="240" :type="globalAppSettings.barrage.type"></barrage>
 			<!-- 返回顶部 -->
 			<tm-flotbutton :offset="[16, 80]" icon="icon-angle-up" color="bg-gradient-light-blue-accent" @click="fnToTopPage()"></tm-flotbutton>
 			<tm-flotbutton :actions="btnOption.actions" actions-pos="left" :show-text="true" color="bg-gradient-orange-accent" @change="fnOnFlotButtonChange"></tm-flotbutton>
@@ -115,7 +159,9 @@
 						</view>
 						<view v-else-if="commentDetail.loading == 'error'" class="error">
 							<tm-empty icon="icon-wind-cry" label="加载失败">
-								<tm-button theme="bg-gradient-light-blue-accent" size="m" v-if="!disallowComment" @click="fnGetChildComments()">刷新试试</tm-button>
+								<tm-button theme="bg-gradient-light-blue-accent" size="m" v-if="!disallowComment" @click="fnGetChildComments()">
+									刷新试试
+								</tm-button>
 							</tm-empty>
 						</view>
 					</view>
@@ -125,16 +171,7 @@
 						</view>
 
 						<block v-else>
-							<comment-item
+							<comment-item v-for="(comment, index) in commentDetail.list" :useContentBg="false" :useSolid="false" :useActions="false" :key="index" :isChild="false" :comment="comment" :postId="result.id"></comment-item>
-								v-for="(comment, index) in commentDetail.list"
-								:useContentBg="false"
-								:useSolid="false"
-								:useActions="false"
-								:key="index"
-								:isChild="false"
-								:comment="comment"
-								:postId="result.id"
-							></comment-item>
 						</block>
 					</block>
 				</scroll-view>
@@ -151,13 +188,23 @@
 				<block v-if="poster.showCanvas">
 					<r-canvas ref="rCanvas"></r-canvas>
 					<view class="poster-save ma-24 mt-0 pt-20 flex flex-center">
-						<tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnSavePoster()">保存到相册</tm-button>
+						<tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnSavePoster()">
-						<tm-button v-if="false" theme="bg-gradient-orange-accent" size="m" @click="fnShareTo()">分享给好友</tm-button>
+							保存到相册
-						<tm-button theme="bg-gradient-blue-grey-accent" size="m" @click="fnOnPosterClose()">关 闭</tm-button>
+						</tm-button>
+						<tm-button v-if="false" theme="bg-gradient-orange-accent" size="m" @click="fnShareTo()">
+							分享给好友
+						</tm-button>
+						<tm-button theme="bg-gradient-blue-grey-accent" size="m" @click="fnOnPosterClose()">
+							关 闭
+						</tm-button>
 					</view>
 				</block>
 			</view>
 		</tm-poup>
+
+		<!-- 密码访问解密弹窗 -->
+		<tm-dialog :disabled="true" :input-val.sync="validVisitModal.value" title="验证提示" confirmText="立即验证" :showCancel="validVisitModal.useCancel" model="confirm" v-model="validVisitModal.show" content="博主设置了需要密码才能查看该文章内容,请输入文章密码进行验证" theme="split" confirmColor="blue shadow-blue-0" @cancel="fnOnValidVisitCancel" @confirm="fnOnValidVisitConfirm"></tm-dialog>
+
 	</view>
 </template>
 
@@ -169,12 +216,17 @@ import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.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 tmDialog from '@/tm-vuetify/components/tm-dialog/tm-dialog.vue';
+	import tmMore from '@/tm-vuetify/components/tm-more/tm-more.vue';
 
 	import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
 	import commentList from '@/components/comment-list/comment-list.vue';
 	import commentItem from '@/components/comment-item/comment-item.vue';
 
 	import rCanvas from '@/components/r-canvas/r-canvas.vue';
+	import barrage from '@/components/barrage/barrage.vue';
+
+	import { haloWxShareMixin } from '@/common/mixins/wxshare.mixin.js';
 	export default {
 		components: {
 			tmSkeleton,
@@ -182,18 +234,21 @@ export default {
 			tmFlotbutton,
 			tmButton,
 			tmEmpty,
+			tmDialog,
+			tmMore,
 			mpHtml,
 			commentList,
 			commentItem,
-		rCanvas
+			rCanvas,
+			barrage
 		},
+		mixins: [haloWxShareMixin],
 		data() {
 			return {
 				loading: 'loading',
 				markdownConfig: MarkdownConfig,
 				btnOption: {
-				actions: [
+					actions: [{
-					{
 							icon: 'icon-like',
 							color: 'bg-gradient-orange-accent'
 						},
@@ -224,10 +279,22 @@ export default {
 					showCanvas: false,
 					loading: true,
 					res: null
-			}
+				},
+
+				metas: [], // 自定义元数据
+				// 文章加密（弹窗输入密码解密）
+				validVisitModal: {
+					show: false,
+					useCancel: false,
+					value: undefined
+				},
+				showValidVisitMore: true,
 			};
 		},
 		computed: {
+			copyright() {
+				return getApp().globalData.copyright;
+			},
 			calcUrl() {
 				return url => {
 					if (this.$utils.checkIsUrl(url)) {
@@ -238,9 +305,51 @@ export default {
 			},
 			// 获取博主信息
 			bloggerInfo() {
-			let blogger = this.$tm.vx.getters().blogger.getBlogger;
+				let blogger = this.$tm.vx.getters().getBlogger;
 				blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
 				return blogger;
+			},
+			// 原文链接：个人资质=可以打开公众号文章；非个人：任意链接地址（需在小程序后台配置）
+			originalURL() {
+				const target = this.metas.find(x => x.key == 'unihalo_originalURL');
+				if (!target) return '';
+				return target.value || '';
+			},
+			// 是否使用文章密码功能，如果值不为空，则优先于 useVisitMore：unihalo_useVisitPwd
+			useVisitPwd() {
+				const target = this.metas.find(x => x.key == 'unihalo_useVisitPwd');
+				if (!target) return false;
+				return target.value || false;
+			},
+			// 是否启用查看完整文章的功能的密码：unihalo_useVisitMorePwd
+			useVisitMorePwd() {
+				const target = this.metas.find(x => x.key == 'unihalo_useVisitMorePwd');
+				if (!target) return false;
+				return target.value || false;
+			},
+			// 当前是使用哪一种类型的密码验证 0=不使用任何 1=默认弹窗密码 2=查看部分内容 
+			useVisitMode() {
+				if (this.useVisitPwd != false) {
+					return 1
+				}
+				if (this.useVisitMorePwd != false) {
+					return 2
+				}
+				return 0
+			}
+		},
+		watch: {
+			useVisitPwd(val) {
+				if (val) {
+					this.validVisitModal.show = true
+				}
+			},
+			useVisitMode(val) {
+				if (val != 2) {
+					this.showValidVisitMore = true
+				} else {
+					this.showValidVisitMore = false
+				}
 			}
 		},
 		onLoad(e) {
@@ -255,17 +364,29 @@ export default {
 		methods: {
 			fnGetData() {
 				this.loading = 'loading';
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				this.$httpApi
 					.getArticleDetail(this.queryParams.articleId)
 					.then(res => {
+						if (res.status == 200) {
 							this.result = res.data;
+							this.metas = res.data.metas;
 							this.fnSetPageTitle('文章详情');
 							this.loading = 'success';
-					this.fnSetWxShareInfo();
+							this.fnSetWxShareConfig({
+								title: this.result.title,
+								desc: this.result.summary,
+								imageUrl: this.$utils.checkThumbnailUrl(this.result.thumbnail),
+								path: `/pagesA/article-detail/article-detail?articleId=${this.queryParams.articleId}`,
+								copyLink: this.$haloConfig.apiUrl,
+								query: {}
+							});
+						} else {
+							this.loading = 'error';
+						}
 					})
 					.catch(err => {
 						this.loading = 'error';
@@ -275,19 +396,7 @@ export default {
 						uni.stopPullDownRefresh();
 					});
 			},
-		fnSetWxShareInfo() {
+
-			// #ifdef MP-WEIXIN
-			uni.$tm.vx.commit('setWxShare', {
-				title: this.result.title,
-				desc: this.result.summary,
-				// imageUrl: this.poster.res.tempFilePath,
-				imageUrl: this.$utils.checkThumbnailUrl(this.result.thumbnail),
-				path: `/pagesA/article-detail/article-detail?articleId=${this.queryParams.articleId}`,
-				copyLink: this.$haloConfig.apiUrl,
-				query: {}
-			});
-			// #endif
-		},
 			// 浮动按钮点击
 			fnOnFlotButtonChange(index) {
 				switch (index) {
@@ -304,6 +413,9 @@ export default {
 			},
 
 			fnToComment() {
+				if (this.result.disallowComment) {
+					return uni.$tm.toast('文章已开启禁止评论！');
+				}
 				this.$Router.push({
 					path: '/pagesA/comment/comment',
 					query: {
@@ -361,6 +473,8 @@ export default {
 			fnCreatePoster(callback) {
 				this.$nextTick(async () => {
 					const systemInfo = await uni.getSystemInfoSync();
+					const _bloggerAvatar = this.$utils.checkAvatarUrl(this.bloggerInfo.avatar, true);
+					const _articleCover = this.$utils.checkThumbnailUrl(this.result.thumbnail, true);
 					// 初始化
 					await this.$refs.rCanvas.init({
 						canvas_id: 'rCanvas',
@@ -385,11 +499,10 @@ export default {
 								icon: 'none'
 							});
 						});
-				console.log(this.$utils.checkAvatarUrl(this.bloggerInfo.avatar, true));
 					// 博主信息
 					await this.$refs.rCanvas
 						.drawImage({
-						url: this.$utils.checkAvatarUrl(this.bloggerInfo.avatar, true),
+							url: _bloggerAvatar,
 							x: 12,
 							y: 12,
 							w: 48,
@@ -436,7 +549,7 @@ export default {
 					// 文章封面图
 					await this.$refs.rCanvas
 						.drawImage({
-						url: this.$utils.checkThumbnailUrl(this.result.thumbnail),
+							url: _articleCover,
 							x: 12,
 							y: 75,
 							w: 312,
@@ -487,7 +600,6 @@ export default {
 						});
 
 					this.drawDashedLine(this.$refs.rCanvas.ctx, 14, 356, 332, 0.5, [8, 5, 5, 5], '#999');
-
 					// 小程序信息
 					await this.$refs.rCanvas
 						.drawImage({
@@ -551,6 +663,7 @@ export default {
 			},
 			fnSavePoster() {
 				this.$refs.rCanvas.saveImage(this.poster.res.tempFilePath);
+				uni.$tm.toast('保存成功');
 			},
 			fnShareTo() {
 				// #ifdef MP-WEIXIN
@@ -598,6 +711,99 @@ export default {
 					.catch(err => {
 						this.commentDetail.loading = 'error';
 					});
+			},
+			fnToCate(category) {
+				uni.navigateTo({
+					url: `/pagesA/category-detail/category-detail?slug=${category.slug}&name=${category.name}`
+				});
+			},
+			fnToTag(tag) {
+				uni.navigateTo({
+					url: `/pagesA/tag-detail/tag-detail?id=${tag.id}&slug=${tag.slug}&name=${tag.name}`
+				});
+			},
+			async fnOnCommentLoaded(data) {
+				const _list = [];
+				const _handleData = list => {
+					return new Promise(resolve => {
+						if (list.length == 0) {
+							resolve();
+						} else {
+							list.forEach(item => {
+								_list.push(item);
+								if (item.children && item.children.length != 0) {
+									_handleData(item.children);
+								}
+								resolve();
+							});
+						}
+					});
+				};
+				await _handleData(data);
+				if (this.globalAppSettings.barrage.use) {
+					this.$nextTick(() => {
+						if (_list.length != 0) {
+							_handleAddBarrage();
+						}
+					});
+				}
+				const _handleRemove = () => {
+					this.$refs['barrage'] && this.$refs['barrage'].remove({
+						duration: 5000, // 延迟关闭的时间
+						speed: 600 // 弹幕消失的速度
+					});
+				};
+				let index = 0;
+				const _handleAddBarrage = () => {
+					setTimeout(() => {
+						this.$refs['barrage'] && this.$refs['barrage'].add(_list[index]);
+						index += 1;
+						if (index < _list.length - 1) {
+							_handleAddBarrage();
+						} else {
+							_handleRemove();
+						}
+					}, 1000);
+				};
+			},
+			fnToWebview(data) {
+				uni.navigateTo({
+					url: '/pagesC/website/website?data=' +
+						JSON.stringify({
+							title: data.title,
+							url: data.url
+						})
+				});
+			},
+			fnToOriginal(originalURL) {
+				this.fnToWebview({ title: this.result.title, url: originalURL });
+			},
+			// 查看密码验证确认
+			fnOnValidVisitConfirm() {
+				if (this.useVisitMode == 1) {
+					if (this.validVisitModal.value === this.useVisitPwd) {
+						this.validVisitModal.show = false;
+						return;
+					}
+				} else if (this.useVisitMode == 2) {
+					if (this.validVisitModal.value === this.useVisitMorePwd) {
+						this.showValidVisitMore = true;
+						this.validVisitModal.show = false;
+						return;
+					}
+				}
+				uni.$tm.toast("验证密码不正确！")
+			},
+			fnOnValidVisitCancel() {
+				this.validVisitModal.show = false;
+				this.validVisitModal.useCancel = true;
+				this.validVisitModal.value = undefined;
+			},
+			// 点击解锁弹出密码输入框
+			fnOnShowValidVisitMore() {
+				this.validVisitModal.useCancel = true;
+				this.validVisitModal.value = undefined;
+				this.validVisitModal.show = true;
 			}
 		}
 	};
@@ -611,7 +817,20 @@ export default {
 		flex-direction: column;
 		box-sizing: border-box;
 		background-color: #fafafd;
+		padding-bottom: 24rpx;
 	}
+
+	.bg-image {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 0;
+	}
+
 	.loading-wrap {
 		padding: 0 24rpx;
 		height: inherit;
@@ -627,26 +846,28 @@ export default {
 		background-color: #ffffff;
 		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
 		// box-shadow: 0rpx 6rpx 30rpx rgba(182, 223, 255, 0.3);
+		border-radius: 12rpx;
 
-	border-radius: 24rpx;
 		.title {
 			font-size: 36rpx;
 			font-weight: 600;
 			text-align: center;
 		}
+
 		.detail {
 			width: 100%;
 			margin-top: 24rpx;
 			font-size: 26rpx;
+
 			.author {
 				text-align: center;
 				font-size: 24rpx;
 				color: #666;
 
-			&-name {
+				&-name {}
-			}
+
 				&-time {
-				margin-left: 12rpx;
+					margin-left: 36rpx;
 				}
 			}
 
@@ -654,22 +875,27 @@ export default {
 				margin-top: 24rpx;
 				width: 100%;
 				height: 280rpx;
+
 				&-img {
 					width: 100%;
 					height: 100%;
 					border-radius: 12rpx;
 				}
 			}
+
 			.count {
 				margin-top: 24rpx;
 				display: flex;
 				justify-content: space-between;
+
 				&.no-thumbnail {
 					border-top: 2rpx solid #f2f2f2;
 					padding-top: 12rpx;
+
 					.count-item {
 						position: relative;
 						color: #666;
+
 						&::after {
 							content: '';
 							position: absolute;
@@ -678,6 +904,7 @@ export default {
 							width: 2rpx;
 							height: 32rpx;
 						}
+
 						&:last-child {
 							&::after {
 								display: none;
@@ -685,16 +912,19 @@ export default {
 						}
 					}
 				}
+
 				&-item {
 					flex: 1;
 					display: flex;
 					align-items: flex-end;
 					justify-content: center;
 					color: #666;
+
 					.label {
 						font-size: 24rpx;
 						padding-left: 8rpx;
 					}
+
 					.value {
 						font-size: 32rpx;
 					}
@@ -702,6 +932,7 @@ export default {
 			}
 		}
 	}
+
 	.category {
 		margin: 0 24rpx;
 		padding: 24rpx;
@@ -711,36 +942,76 @@ export default {
 		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
 		// border: 2rpx solid #f8f8f8;
 		font-size: 28rpx;
+
+		&-type {
+			line-height: 55rpx;
+		}
+
 		&-tag {
 			background-color: #5bb8fa;
 			color: #fff;
 			padding: 6rpx 12rpx;
 			border-radius: 6rpx;
 			font-size: 24rpx;
+
+			&.is-empty {
+				background-color: #607d8b;
 			}
 		}
+	}
+
 	.category-tag+.category-tag {
 		margin-left: 12rpx;
 	}
+
 	.content {
 		margin-top: 24rpx;
 	}
-.ad-wrap {
+
+	.markdown-wrap,
+	.evan-markdown,
+	.ad-wrap,
+	.copyright-wrap,
+	.comment-wrap {
 		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
 	}
-.comment-wrap {
+
-	background-color: #fff;
+	.markdown-wrap {
+		overflow: hidden;
+		border-radius: 12rpx;
 	}
+
+	.copyright-title {
+		position: relative;
+		box-sizing: border-box;
+		padding-left: 24rpx;
+		font-size: 30rpx;
+
+		&:before {
+			content: '';
+			position: absolute;
+			left: 0rpx;
+			top: 8rpx;
+			width: 8rpx;
+			height: 26rpx;
+			background-color: rgb(3, 174, 252);
+			border-radius: 6rpx;
+		}
+	}
+
 	.poup-head {
 		border-bottom: 2rpx solid #f5f5f5;
 	}
+
 	.poup-body {
 		height: 50vh;
 	}
+
 	.poup-empty {
 		width: 100%;
 		height: 40vh;
 	}
+
 	.poup-loading-wrap {
 		width: 100%;
 		height: 40vh;
@@ -749,11 +1020,17 @@ export default {
 			font-size: 80rpx;
 		}
 	}
+
 	.poster-content {
 		width: 100%;
 		min-height: 60vh;
 		overflow: hidden;
 	}
+
+	.copyright-text {
+		line-height: 1.7;
+	}
+
 	.poster-loading {
 		width: 100%;
 		position: absolute;
@@ -764,8 +1041,39 @@ export default {
 		// background-color: rgba(0, 0, 0, 0.1);
 		z-index: 666;
 	}
+
 	.poster-save {
 		box-sizing: border-box;
 		border-top: 2rpx dashed #eee;
 	}
+
+	.original-url {
+		display: flex;
+
+		&_left {
+			flex-shrink: 0;
+			width: 84rpx;
+		}
+
+		&_right {
+			flex-grow: 1;
+			display: inline-flex;
+			align-items: center;
+
+			&__link {
+				width: 410rpx;
+				display: inline-block;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+
+			&__btn {
+				flex-grow: 1;
+				flex-shrink: 0;
+				display: block;
+				text-align: right;
+			}
+		}
+	}
 </style>

pagesA/articles/articles.vue

@@ -23,7 +23,7 @@
 			<block v-else>
 				<block v-for="(article, index) in dataList" :key="article.id">
 					<!-- 文章卡片 -->
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<article-card :article="article" @on-click="fnToArticleDetail"></article-card>
 						<!-- 广告区域 -->
 						<view v-if="haloAdConfig.articles.use && (index + 1) % haloAdConfig.frequency == 0" class="ad-wrap ma-24">
@@ -111,6 +111,7 @@ export default {
 		},
 		methods: {
 			fnOnTabChange(index) {
+				this.fnResetSetAniWaitIndex();
 				this.dataList = [];
 				const _sorts = {
 					0: '',
@@ -126,15 +127,16 @@ export default {
 				this.fnGetData();
 			},
 			fnOnSearch() {
+				this.fnResetSetAniWaitIndex();
 				this.queryParams.page = 0;
 				this.isLoadMore = false;
 				this.fnGetData();
 			},
 			fnGetData() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -193,6 +195,7 @@ export default {
 			background-color: #212121;
 		}
 	}
+
 	.content {
 		padding-top: 24rpx;
 

pagesA/category-detail/category-detail.vue

@@ -11,7 +11,7 @@
 			<block v-else>
 				<block v-for="(article, index) in dataList" :key="article.createTime">
 					<!-- 文章卡片 -->
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50"><article-card :article="article" @on-click="fnToArticleDetail"></article-card></tm-translate>
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)"><article-card :article="article" @on-click="fnToArticleDetail"></article-card></tm-translate>
 				</block>
 				<view class="load-text">{{ loadMoreText }}</view>
 			</block>
@@ -75,10 +75,10 @@ export default {
 		},
 		methods: {
 			fnGetData() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -87,7 +87,7 @@ export default {
 				this.$httpApi
 					.getCategoryPostList(this.slug, this.queryParams)
 					.then(res => {
-					this.fnSetPageTitle(this.pageTitle + ` （共${res.data.total}篇）`);
+						this.fnSetPageTitle(`分类：${this.pageTitle} （共${res.data.total}篇）`);
 						this.result = res.data;
 						if (this.isLoadMore) {
 							this.dataList = this.dataList.concat(res.data.content);
@@ -131,10 +131,12 @@ export default {
 		padding: 24rpx 0;
 		background-color: #fafafd;
 	}
+
 	.loading-wrap {
 		padding: 0 24rpx;
 		min-height: 100vh;
 	}
+
 	.empty {
 		height: 60vh;
 		display: flex;

pagesA/comment/comment.vue

@@ -3,19 +3,7 @@
 		<view class="content pt-24 pb-24 round-4">
 			<!-- 表单区域 -->
 			<tm-form @submit="fnOnSubmit">
-				<tm-input
+				<tm-input :auto-focus="true" 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>
-					:auto-focus="true"
-					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="请输入您的昵称..." v-model="form.author"></tm-input>
 				<tm-input name="email" align="right" title="邮箱地址" placeholder="请输入您的邮箱..." v-model="form.email"></tm-input>
 				<tm-input name="authorUrl" align="right" title="我的网站" placeholder="请输入您的网址..." v-model="form.authorUrl"></tm-input>
@@ -67,7 +55,7 @@ export default {
 		computed: {
 			// 评论游客信息
 			wxLoginVisitorUser() {
-			return uni.$tm.vx.getters().user.getWxLoginInfo;
+				return uni.$tm.vx.getters().getWxLoginInfo;
 			}
 		},
 		onLoad() {
@@ -87,6 +75,7 @@ export default {
 		},
 		methods: {
 			fnOnSubmit(e) {
+				console.log('提交评论');
 				if (e === false) {
 					return uni.$tm.toast('请检查所有的必填项是否填写完整！');
 				}
@@ -151,6 +140,7 @@ export default {
 			// box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
 		}
 	}
+
 	.poup-content {
 		width: 500rpx;
 

pagesA/contact/contact.vue

@@ -4,14 +4,18 @@
 		<view class="profile flex flex-col flex-center pa-36">
 			<view class="avatar"><image class="avatar-img" :src="bloggerInfo.avatar" mode="aspectFill"></image></view>
 			<view class="nickname mt-24 text-weight-b text-size-g">{{ bloggerInfo.nickname }}</view>
-			<view class="desc mt-24 text-size-m text-grey-darken-3">{{ bloggerInfo.description || '这个博主很懒，竟然没写介绍~' }}</view>
+			<view class="desc mt-24 text-size-m text-grey-darken-3">
+				{{ bloggerInfo.description || '这个博主很懒，竟然没写介绍~' }}
+			</view>
 			<!-- 联系图标 -->
 			<view class="mt-24 contact-icons">
 				<!-- 放全部：似乎显得有点拥挤 -->
 				<!-- <block v-for="(item, index) in result" :key="index"><text v-if="item.value" class="halocoloricon" :class="[item.icon, { 'ml-12': index != 0 }]"></text></block> -->
 				<!-- 考虑放几个常用的就行 -->
 				<text class="halocoloricon halocoloricon-qq"></text>
+				<!-- #ifndef MP-QQ -->
 				<text class="ml-12 halocoloricon halocoloricon-wechat"></text>
+				<!-- #endif -->
 				<text class="ml-12 halocoloricon halocoloricon-GitHub"></text>
 				<text class="ml-12 halocoloricon halocoloricon-gitee"></text>
 				<text class="ml-12 halocoloricon halocoloricon-ic_email_round"></text>
@@ -120,7 +124,7 @@ export default {
 	computed: {
 		// 获取博主信息
 		bloggerInfo() {
-			let blogger = this.$tm.vx.getters().blogger.getBlogger;
+			let blogger = this.$tm.vx.getters().getBlogger;
 			blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
 			return blogger;
 		}

pagesA/disclaimers/disclaimers.vue

@@ -27,7 +27,7 @@
 export default {
 	computed: {
 		bloggerInfo() {
-			return this.$tm.vx.getters().blogger.getBlogger;
+			return this.$tm.vx.getters().getBlogger;
 		}
 	}
 };

pagesA/journal/journal.vue

@@ -13,7 +13,7 @@
 			</view>
 			<block v-else>
 				<block v-for="(journal, index) in dataList" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<!-- 日记卡片 -->
 						<journal-card :journal="journal" :useLike="true"></journal-card>
 					</tm-translate>
@@ -78,10 +78,10 @@ export default {
 		},
 		methods: {
 			fnGetData() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -123,10 +123,11 @@ export default {
 		display: flex;
 		flex-direction: column;
 	}
-.loading-wrap {
+
-}
+	.loading-wrap {}
-.app-page-content {
+
-}
+	.app-page-content {}
+
 	.content-empty {
 		height: 60vh;
 	}

pagesA/leaving/leaving.vue

@@ -4,6 +4,7 @@
 			<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="app-page-content pa-24" :class="{ 'bg-white': dataList.length !== 0 }">
@@ -13,18 +14,9 @@
 			</view>
 			<block v-else>
 				<block v-for="(item, index) in dataList" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<!-- 列表项 -->
-						<comment-item
+						<comment-item class="mb-12" :isChild="false" :comment="item" :postId="sheetId" :useSolid="false" @on-copy="fnCopyContent" @on-comment="fnToComment" @on-detail="fnOnShowCommentDetail"></comment-item>
-							class="mb-12"
-							:isChild="false"
-							:comment="item"
-							:postId="sheetId"
-							:useSolid="false"
-							@on-copy="fnCopyContent"
-							@on-comment="fnToComment"
-							@on-detail="fnOnShowCommentDetail"
-						></comment-item>
 					</tm-translate>
 				</block>
 				<tm-flotbutton :offset="[16, 80]" @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
@@ -59,15 +51,7 @@
 						</view>
 
 						<block v-else>
-							<comment-item
+							<comment-item v-for="(comment, index) in commentDetail.list" :useSolid="false" :useActions="false" :key="index" :isChild="false" :comment="comment" :postId="sheetId"></comment-item>
-								v-for="(comment, index) in commentDetail.list"
-								:useSolid="false"
-								:useActions="false"
-								:key="index"
-								:isChild="false"
-								:comment="comment"
-								:postId="sheetId"
-							></comment-item>
 						</block>
 					</block>
 				</scroll-view>
@@ -77,7 +61,7 @@
 </template>
 
 <script>
-import AppKeys from '@/config//keys.js';
+	import AppKeys from '@/config/keys.js';
 	import SheetConfig from '@/config/sheets.config.js';
 
 	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
@@ -150,10 +134,10 @@ export default {
 
 		methods: {
 			fnGetData() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -255,14 +239,17 @@ export default {
 		flex-direction: column;
 		background-color: #fafafd;
 	}
+
 	.app-page-content {
 		box-sizing: border-box;
 		// box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
 	}
+
 	.content-empty {
 		width: 100%;
 		height: 60vh;
 	}
+
 	.loading-wrap {
 		box-sizing: border-box;
 		padding: 24rpx;

pagesA/love/album.vue

@@ -0,0 +1,377 @@
+<template>
+	<view class="app-page">
+		<view v-if="loading != 'success'" class="loading-wrap">
+			<view v-if="loading == 'loading'" class="loading">
+				<view class="loading-icon flex flex-center"><text class="e-loading-icon iconfont icon-loading"></text></view>
+				<view class="loadig-text ">相册正在努力加载中啦~</view>
+			</view>
+			<tm-empty v-else icon="icon-shiliangzhinengduixiang-" color="red" label="啊偶,加载失败了呢~">
+				<tm-button theme="red" :shadow="0" size="m" @click="fnRefresh()">刷新试试</tm-button>
+			</tm-empty>
+		</view>
+		<!-- 内容区域 -->
+		<view v-else class="app-page-content">
+			<view v-if="dataList.length == 0" color="light-blue" class="content-empty flex flex-center">
+				<tm-empty icon="icon-shiliangzhinengduixiang-" label="相册暂时还没有数据~">
+					<tm-button :shadow="0" size="m" theme="light-blue" @click="fnRefresh()">刷新试试</tm-button>
+				</tm-empty>
+			</view>
+			<block v-else>
+				<swiper
+					class="swiper-album"
+					:current="swiperIndex"
+					:acceleration="true"
+					:circular="true"
+					:vertical="false"
+					:indicator-dots="false"
+					:autoplay="false"
+					@change="fnOnChange"
+				>
+					<block v-for="(item, index) in dataList" :key="index">
+						<swiper-item class="swiper-album-item">
+							<view class="scroll-wrap">
+								<view class="card">
+									<cache-image
+										class="card-image"
+										width="100%"
+										height="46vh"
+										radius="12rpx"
+										:url="item.image"
+										:fileMd5="item.image"
+										mode="aspectFill"
+										@on-click="fnOnPreview(item)"
+									></cache-image>
+									<view v-if="item.description" class="card-desc">{{ item.description }}</view>
+									<view v-else class="card-desc is-empty flex flex-col">
+										<view class="text-grey-darken-1">该照片没有记录任何信息</view>
+										<view class="text-size-m mt-24 text-grey-darken-1">记录一下拍照的瞬间，会更精彩哟</view>
+									</view>
+								</view>
+							</view>
+						</swiper-item>
+					</block>
+				</swiper>
+				<view class="tabbar">
+					<view class="pre" @click="fnChange(false)">
+						<text class="icon"><text class="iconfont icon-arrow-left"></text></text>
+						<text class="text">上一张</text>
+					</view>
+					<view class="refresh" @click="fnRefresh()">
+						<text class="refresh-text">点击</text>
+						<text class="refresh-heart iconfont icon-diagnose"></text>
+						<text class="refresh-text">刷新</text>
+					</view>
+					<view class="next" @click="fnChange(true)">
+						<text class="text">下一张</text>
+						<text class="icon"><text class="iconfont icon-arrow-right"></text></text>
+					</view>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+import LoveConfig from '@/config/love.config.js';
+import throttle from '@/utils/throttle.js';
+import tmButton from '@/tm-vuetify/components/tm-button/tm-button.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: {
+		tmButton,
+		tmFlotbutton,
+		tmTranslate,
+		tmEmpty
+	},
+	data() {
+		return {
+			loading: 'loading',
+			loveConfig: LoveConfig,
+			queryParams: {
+				size: 99,
+				page: 0,
+				sort: 'takeTime',
+				team: LoveConfig.albumKeyName
+			},
+			result: {},
+			dataList: [],
+			cache: {
+				dataList: [],
+				total: 0
+			},
+			swiperIndex: 0,
+			tabbar: {
+				list: []
+			}
+		};
+	},
+
+	onLoad() {
+		this.fnSetPageTitle('恋爱相册');
+	},
+	created() {
+		this.fnGetData();
+	},
+	onPullDownRefresh() {
+		this.fnRefresh();
+	},
+
+	methods: {
+		fnRefresh() {
+			this.queryParams.page = 0;
+			this.fnGetData();
+		},
+		fnGetData() {
+			this.loading = 'loading';
+			this.$httpApi
+				.getPhotoListByPage(this.queryParams)
+				.then(res => {
+					if (res.status == 200) {
+						this.loading = 'success';
+						if (res.data.content.length != 0) {
+							const _list = res.data.content.map((item, index) => {
+								item['image'] = this.$utils.checkImageUrl(item.thumbnail);
+								item['takeTime'] = this.$tm.dayjs(item['takeTime']).format('DD/MM/YYYY');
+								return item;
+							});
+							this.dataList = _list;
+							this.swiperIndex = 0;
+						}
+					} else {
+						this.loading = 'error';
+						uni.$tm.toast('加载失败，请下拉刷新重试！');
+					}
+				})
+				.catch(err => {
+					console.error(err);
+					this.loading = 'error';
+					uni.$tm.toast('加载失败，请下拉刷新重试！');
+				})
+				.finally(() => {
+					setTimeout(() => {
+						uni.stopPullDownRefresh();
+					}, 200);
+				});
+		},
+		// 缓存数据
+		fnCacheDataList(dataList) {
+			if (this.queryParams.page == 0) {
+				this.cache.dataList = dataList;
+			} else {
+				this.cache.dataList = [...this.cache.dataList, ...dataList];
+			}
+		},
+		fnOnPreview(item) {
+			uni.previewImage({
+				current: item.image,
+				urls: this.dataList.map(x => x.image)
+			});
+		},
+		fnOnChange(e) {
+			this.swiperIndex = e.detail.current;
+		},
+		fnChange(isNext) {
+			throttle(() => {
+				if (isNext) {
+					if (this.swiperIndex == this.dataList.length - 1) {
+						this.swiperIndex = 0;
+					} else {
+						this.swiperIndex += 1;
+					}
+				} else {
+					if (this.swiperIndex == 0) {
+						this.swiperIndex = this.dataList.length - 1;
+					} else {
+						this.swiperIndex -= 1;
+					}
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.app-page {
+	width: 100vw;
+	min-height: 100vh;
+	display: flex;
+	flex-direction: column;
+	box-sizing: border-box;
+	padding: 24rpx 0;
+	padding-bottom: 144rpx;
+	background: linear-gradient(
+		-135deg,
+		rgba(247, 149, 51, 0.1),
+		rgba(243, 112, 85, 0.1) 15%,
+		rgba(239, 78, 123, 0.1) 30%,
+		rgba(161, 102, 171, 0.1) 44%,
+		rgba(80, 115, 184, 0.1) 58%,
+		rgba(16, 152, 173, 0.1) 72%,
+		rgba(7, 179, 155, 0.1) 86%,
+		rgba(109, 186, 130, 0.1)
+	);
+}
+.app-page-content {
+}
+.loading-wrap {
+	width: 100vw;
+	height: 60vh;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	padding: 36rpx;
+
+	::v-deep {
+		.tm-icons {
+			margin-right: -20rpx;
+		}
+	}
+}
+.e-loading-icon {
+	font-size: 120rpx;
+	// color: #f88ca2;
+	color: #56bbf9;
+}
+
+.loadig-text {
+	margin-top: 28rpx;
+	font-size: 28rpx;
+	// color: #f88ca2;
+	color: #56bbf9;
+}
+.content-empty {
+	width: 100%;
+	height: 60vh;
+}
+
+.swiper-album {
+	width: 100vw;
+	height: calc(100vh - 24rpx - 144rpx);
+}
+.swiper-album-item {
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	padding: 36rpx;
+	/* #ifdef H5 */
+	padding-bottom: 110rpx;
+	/* #endif */
+	/* #ifndef H5 */
+	padding-bottom: 60rpx;
+	/* #endif */
+}
+.scroll-wrap {
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+	padding: 36rpx;
+	background-color: #ffffff;
+	border-radius: 12rpx;
+	box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
+}
+.card {
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+	// height: 65vh;
+	height: 100%;
+	max-height: 100%;
+	border-radius: 12rpx;
+	background-color: #ffffff;
+	box-sizing: border-box;
+	// box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
+	overflow: hidden;
+	overflow-y: auto;
+	::v-deep {
+		.cache-image {
+			height: initial !important;
+		}
+	}
+	&-image {
+		width: 100%;
+		height: initial !important;
+		border-radius: 12rpx;
+	}
+	&-desc {
+		margin-top: 24rpx;
+		line-height: 1.6;
+		font-size: 30rpx;
+		color: rgba(26, 26, 26, 0.9);
+		&.is-empty {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-grow: 1;
+			font-size: 32rpx;
+		}
+	}
+}
+.tabbar {
+	width: 90vw;
+	position: fixed;
+	left: 50%;
+	bottom: 40rpx;
+	transform: translateX(-50%);
+	border-radius: 25rpx;
+	box-sizing: border-box;
+	padding: 24rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	// background-color: rgba(0, 0, 0, 0.5);
+	background-color: #ffffff;
+	color: #333;
+	box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
+	.refresh {
+		animation: refreshAni 6s ease-in-out infinite;
+		color: #56bbf9;
+		&-heart {
+			font-size: 42rpx;
+			color: inherit;
+			margin: 0 6rpx;
+		}
+		&-text {
+			font-size: 24rpx;
+		}
+	}
+	.pre {
+		color: #56bbf9;
+		transition: transform 0.1s ease-in-out;
+		&:hover {
+			transform: scale(1.05);
+		}
+		.text {
+			padding-left: 12rpx;
+		}
+	}
+	.next {
+		color: #f88ca2;
+		transition: transform 0.1s ease-in-out;
+		&:hover {
+			transform: scale(1.03);
+		}
+		.text {
+			padding-right: 12rpx;
+		}
+	}
+}
+@keyframes refreshAni {
+	0% {
+		color: #f88ca2;
+	}
+	50% {
+		color: #56bbf9;
+	}
+	100% {
+		color: #f88ca2;
+	}
+}
+</style>

pagesA/love/journey.vue

@@ -0,0 +1,92 @@
+<template>
+	<view class="app-page">
+		<view class="page-title">我们的故事</view>
+		<view class="html-typed" v-html="html">内容渲染</view>
+
+		<scroll-btn bottom="160rpx" :scrollTop.sync="scrollTop"></scroll-btn>
+	</view>
+</template>
+
+<script>
+import LoveConfig from '@/config/love.config.js';
+import ScrollBtn from '@/components/scroll-btn/scroll-btn.vue';
+export default {
+	components: { ScrollBtn },
+	data() {
+		return {
+			scrollTop: 0,
+			html: '',
+			timer: null
+		};
+	},
+	created() {
+		this.fnInit();
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop;
+	},
+	onBackPress() {
+		clearTimeout(this.timer);
+	},
+	methods: {
+		fnInit() {
+			clearTimeout(this.timer);
+			const _html = LoveConfig.journey;
+			let _index = 0;
+			const _typing = () => {
+				this.timer = setTimeout(() => {
+					if (_index >= _html.length) {
+						clearTimeout(this.timer);
+					} else {
+						this.html += _html.substring(_index, _index + 1);
+						_index += 1;
+						_typing();
+					}
+				}, 100);
+			};
+			_typing();
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+.app-page {
+	width: 100vw;
+	min-height: 100vh;
+	box-sizing: border-box;
+	padding: 36rpx;
+	/* #ifdef APP-PLUS */
+	padding-top: 100rpx;
+	/* #endif */
+	/* #ifdef H5 */
+	padding-top: 80rpx;
+	/* #endif */
+	/* #ifdef MP-WEIXIN */
+	padding-top: 120rpx;
+	/* #endif */
+	background: linear-gradient(
+		-45deg,
+		rgba(247, 149, 51, 0.1),
+		rgba(243, 112, 85, 0.1) 15%,
+		rgba(239, 78, 123, 0.1) 30%,
+		rgba(161, 102, 171, 0.1) 44%,
+		rgba(80, 115, 184, 0.1) 58%,
+		rgba(16, 152, 173, 0.1) 72%,
+		rgba(7, 179, 155, 0.1) 86%,
+		rgba(109, 186, 130, 0.1)
+	);
+	color: rgba(26, 26, 26, 1);
+}
+.page-title {
+	font-size: 42rpx;
+	font-weight: bold;
+	text-align: center;
+	text-shadow: 0rpx 4rpx 24rpx #bfe9ef;
+}
+.html-typed {
+	margin-top: 52rpx;
+	line-height: 1.8;
+	font-size: 30rpx;
+}
+</style>

pagesA/love/list.vue

@@ -0,0 +1,421 @@
+<template>
+	<view class="app-page" @touchstart="fnOnTouchstart" @touchend="fnOnTouchend" @touchcancel="fnOnTouchend">
+		<view class="love-card" :class="{ ani: isDoAni }">
+			<view class="head">
+				<image class="avatar" :src="loveConfig.boy.avatar" mode="scaleToFill"></image>
+				<view class="love-days">
+					<view class="tip-text">相恋</view>
+					<view class="number">
+						<text class="boy">-</text>
+						<text class="days">{{ calcLoveDays }}</text>
+						<text class="girl">-</text>
+					</view>
+					<view class="tip-text">天</view>
+				</view>
+				<image class="avatar" :src="loveConfig.girl.avatar" mode="scaleToFill"></image>
+			</view>
+			<view class="foot">
+				<view class="text" v-if="false">
+					我们已经相恋
+					<text class="number">- {{ calcLoveDays }} -</text>
+					天啦
+				</view>
+				看看我们的恋爱清单都完成了哪些吧
+			</view>
+		</view>
+		<view v-if="list.length == 0" class="list empty">
+			<view class="card">
+				<image class="empty-image" :src="loveConfig.loveImageUrl" mode="scaleToFill"></image>
+				<view class="empty-text">暂时还没有恋爱清单，快去制定你们的恋爱清单吧~</view>
+			</view>
+		</view>
+		<view v-else class="list">
+			<block v-for="(item, index) in list" :key="index">
+				<view class="card" :class="{ ani: isDoAni }" :style="{ '--delay': calcCardDelay(index) }">
+					<view class="head">
+						<view class="status">
+							<view v-if="!item.finish" class="text">进行中</view>
+							<view v-else class="text finish">已完成</view>
+						</view>
+						<view class="title">
+							<view class="title-name">{{ item.title }}</view>
+							<view class="title-desc">{{ item.desc }}</view>
+						</view>
+						<view class="actions" @click="fnOnItemOpen(item)">
+							<text class="icon">{{ item.open ? '-' : '+' }}</text>
+						</view>
+					</view>
+					<view v-if="item.open" class="body">
+						<view class="desc">
+							<view class="desc-label">开始时间：</view>
+							<view class="desc-value">{{ item.detail.start || '暂无计划' }}</view>
+						</view>
+						<view class="desc" v-if="item.detail.desc">
+							<view class="desc-label">事件描述：</view>
+							<view class="desc-value">{{ item.detail.desc }}</view>
+						</view>
+						<view class="desc">
+							<view class="desc-label">完成时间：</view>
+							<view class="desc-value">{{ item.detail.end || '未开始或正在进行中...' }}</view>
+						</view>
+						<view class="desc">
+							<view class="desc-label">完成打卡：</view>
+							<view class="desc-value">{{ item.detail.moment || '未开始或正在进行中...' }}</view>
+						</view>
+						<view class="desc" v-if="item.detail.other">
+							<view class="desc-label">爱心备注：</view>
+							<view class="desc-value">{{ item.detail.other }}</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<scroll-btn :scrollTop.sync="scrollTop" @on-status="fnOnScrollStatus"></scroll-btn>
+	</view>
+</template>
+
+<script>
+import LoveConfig from '@/config/love.config.js';
+import ScrollBtn from '@/components/scroll-btn/scroll-btn.vue';
+export default {
+	components: { ScrollBtn },
+	data() {
+		return {
+			isDoAni: true,
+			scrollTop: 0,
+			loveConfig: LoveConfig,
+			list: []
+		};
+	},
+	computed: {
+		calcLoveDays() {
+			const formatStartDate = this.loveConfig.loveStartDate.replace(/-/g, '/');
+			const start = new Date(formatStartDate),
+				now = new Date();
+			const T = now.getTime() - start.getTime();
+			const i = 24 * 60 * 60 * 1000;
+			const d = T / i;
+			const D = Math.floor(d);
+			return D;
+		},
+		calcCardDelay() {
+			return index => {
+				return Math.random() * index + 1 + 's';
+			};
+		}
+	},
+	created() {
+		this.fnGetList();
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop;
+	},
+	methods: {
+		fnGetList() {
+			if (LoveConfig.loveList.useApi && LoveConfig.loveList.api) {
+				uni.request({
+					url: LoveConfig.loveList.api,
+					header: {
+						ContentType: 'application/json'
+					},
+					method: 'GET',
+					dataType: 'json',
+					success: res => {
+						if (res.statusCode == 200 && res.data.status == 200) {
+							this.list = res.data.data.map(item => {
+								item['open'] = false;
+								return item;
+							});
+						} else {
+							uni.$tm.toast('数据请求失败，请检查接口！');
+						}
+					},
+					fail: err => {
+						uni.$tm.toast('数据请求失败，请检查接口！');
+					}
+				});
+			} else {
+				this.list = LoveConfig.loveList.data.map(item => {
+					item['open'] = false;
+					return item;
+				});
+			}
+		},
+		fnOnItemOpen(item) {
+			item.open = !item.open;
+			this.$forceUpdate();
+		},
+		fnOnScrollStatus(isEnd) {
+			this.isDoAni = isEnd;
+		},
+		fnOnTouchstart() {
+			this.isDoAni = false;
+		},
+		fnOnTouchend() {
+			this.isDoAni = true;
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+.app-page {
+	width: 100vw;
+	min-height: 100vh;
+	box-sizing: border-box;
+	padding: 36rpx;
+	/* #ifdef H5 */
+	padding-top: 60rpx;
+	/* #endif */
+	/* #ifndef H5 */
+	padding-top: 180rpx;
+	/* #endif */
+
+	background: linear-gradient(
+		135deg,
+		rgba(247, 149, 51, 0.1),
+		rgba(243, 112, 85, 0.1) 15%,
+		rgba(239, 78, 123, 0.1) 30%,
+		rgba(161, 102, 171, 0.1) 44%,
+		rgba(80, 115, 184, 0.1) 58%,
+		rgba(16, 152, 173, 0.1) 72%,
+		rgba(7, 179, 155, 0.1) 86%,
+		rgba(109, 186, 130, 0.1)
+	);
+}
+
+.love-card {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	box-sizing: border-box;
+	padding: 0 24rpx;
+	padding-top: 66rpx;
+	padding-bottom: 52rpx;
+	border-radius: 50rpx;
+	border: 4rpx solid rgba(96, 77, 68, 0.9);
+	border-color: #faf8eb;
+	background-color: rgba(255, 199, 184, 0.9);
+	margin-bottom: 52rpx;
+	box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.1);
+	&.ani {
+		animation: loveCardAni 3s ease-in-out infinite;
+	}
+
+	.head {
+		display: flex;
+		.avatar {
+			width: 150rpx;
+			height: 150rpx;
+			box-sizing: border-box;
+			border-radius: 50%;
+			border: 6rpx solid rgba(255, 255, 255, 0.7);
+
+			&.boy {
+				border-color: #56bbf9;
+			}
+			&.girl {
+				border-color: #f88ca2;
+			}
+		}
+		.love-days {
+			margin: 0 12rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			font-size: 26rpx;
+			.tip-text {
+				color: #333;
+			}
+			.number {
+				font-size: 46rpx;
+				padding: 12rpx 0;
+				> .boy {
+					color: #56bbf9;
+					margin-right: 12rpx;
+				}
+				> .girl {
+					color: #f88ca2;
+					margin-left: 12rpx;
+				}
+			}
+			.days {
+				animation: daysAni 6s ease-in-out infinite;
+				font-weight: bold;
+			}
+		}
+	}
+	.foot {
+		display: none;
+		margin-top: 36rpx;
+		font-size: 24rpx;
+	}
+}
+@keyframes daysAni {
+	0% {
+		color: #f88ca2;
+	}
+	50% {
+		color: #56bbf9;
+	}
+	100% {
+		color: #f88ca2;
+	}
+}
+@keyframes loveCardAni {
+	0% {
+		transform: scale(1);
+	}
+	50% {
+		transform: scale(1.03);
+	}
+	100% {
+		transform: scale(1);
+	}
+}
+.list {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+}
+.empty {
+	height: calc(100vh - 180rpx - 280rpx - 36rpx);
+	.card {
+		height: 100%;
+		padding: 100rpx;
+		margin-bottom: 0;
+		text-align: center;
+		justify-content: center;
+		color: rgba(96, 77, 68, 0.9);
+	}
+	&-image {
+		width: 300rpx;
+		height: 300rpx;
+	}
+	&-text {
+		margin-top: 36rpx;
+		line-height: 50rpx;
+	}
+}
+.card {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	box-sizing: border-box;
+	padding: 24rpx;
+	border-radius: 50rpx;
+	border: 4rpx solid rgba(96, 77, 68, 0.9);
+	border-color: #fff;
+	// background-color: #faf8eb;
+	background-color: #ffffff;
+	margin-bottom: 36rpx;
+	box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
+	animation-delay: var(--delay);
+	&.ani {
+		animation: cardAni 3s ease-in-out infinite;
+	}
+	.head {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		box-sizing: border-box;
+		.status {
+			width: 100rpx;
+			display: flex;
+			.text {
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 50%;
+				background-color: #ffc6ba;
+				font-size: 24rpx;
+				line-height: 100rpx;
+				text-align: center;
+				color: #55423b;
+				&.finish {
+					background-color: #bfe9ef;
+				}
+			}
+		}
+		.title {
+			width: 0;
+			flex-grow: 1;
+			box-sizing: border-box;
+			padding-left: 30rpx;
+			padding-right: 24rpx;
+			&-name {
+				font-weight: bold;
+				font-size: 30rpx;
+				color: #333;
+			}
+			&-desc {
+				margin-top: 8rpx;
+				font-size: 26rpx;
+				color: #555;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+			}
+		}
+		.actions {
+			width: 50rpx;
+			.icon {
+				display: inline-block;
+				width: 45rpx;
+				height: 45rpx;
+				background-color: rgba(96, 77, 68, 0.2);
+				border-radius: 50%;
+				text-align: center;
+				line-height: 45rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+		}
+	}
+
+	.body {
+		margin-top: 24rpx;
+		width: 100%;
+		background-color: #ffffff;
+		// background-color: #faf8eb;
+		background-color: rgba(96, 77, 68, 0.05);
+		border-radius: 24rpx;
+		box-sizing: border-box;
+		padding: 24rpx;
+		padding-bottom: 12rpx;
+		font-size: 26rpx;
+	}
+}
+@keyframes cardAni {
+	0% {
+		transform: translateY(0rpx);
+	}
+
+	50% {
+		transform: translateY(-10rpx);
+	}
+
+	100% {
+		transform: translateY(0rpx);
+	}
+}
+.desc {
+	display: flex;
+	margin-bottom: 12rpx;
+	&-label {
+		color: #333;
+		width: 140rpx;
+		// font-weight: bold;
+	}
+	&-value {
+		width: 0;
+		flex-grow: 1;
+		line-height: 1.5;
+		color: #333;
+	}
+}
+</style>

pagesA/love/love.vue

@@ -1,22 +1,358 @@
 <template>
-	<view class="app-page bg-white flex flex-center"><text class="text-bg-gradient-red-accent-b">祝有情人👩‍❤‍👨终成眷属</text></view>
+	<view class="app-page bg-white">
+		<!-- 情侣信息 -->
+		<view class="lover-wrap" :style="[loveWrapStyle]">
+			<view class="lover-card">
+				<view class="boy">
+					<image class="avatar" :src="loveConfig.boy.avatar" mode="aspectFit"></image>
+					<view class="name">{{ loveConfig.boy.name }}</view>
+				</view>
+				<image class="like" :src="loveConfig.loveImageUrl" mode="scaleToFill"></image>
+				<view class="girl">
+					<image class="avatar" :src="loveConfig.girl.avatar" mode="aspectFit"></image>
+					<view class="name">{{ loveConfig.girl.name }}</view>
+				</view>
+			</view>
+			<image class="wave-image" :src="loveConfig.waveImageUrl" mode="scaleToFill"></image>
+		</view>
+		<!-- 恋爱记时 -->
+		<view class="love-time-wrap">
+			<view class="title">{{ loveConfig.timeTitle }}</view>
+			<view class="content">
+				<text class="text">
+					第
+					<text class="number">{{ loveDayCount.d }}</text>
+					天
+				</text>
+				<text class="text">
+					<text class="number">{{ loveDayCount.h }}</text>
+					小时
+				</text>
+				<text class="text">
+					<text class="number">{{ loveDayCount.m }}</text>
+					分钟
+				</text>
+				<text class="text">
+					<text class="number">{{ loveDayCount.s }}</text>
+					秒
+				</text>
+			</view>
+		</view>
+		<!-- 功能导航 -->
+		<view class="list-wrap">
+			<block v-for="(nav, index) in loveConfig.nav" :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></view>
+					<view class="right">
+						<view class="name">{{ nav.title }}</view>
+						<view class="desc">{{ nav.desc }}</view>
+					</view>
+				</view>
+			</block>
+		</view>
+	</view>
 </template>
 
 <script>
+import LoveConfig from '@/config/love.config.js';
 export default {
 	data() {
-		return {};
+		return {
+			loveConfig: LoveConfig,
+			loveDayTimer: null,
+			loveDayCount: {
+				d: 0,
+				h: 0,
+				m: 0,
+				s: 0
+			}
+		};
+	},
+	computed: {
+		loveWrapStyle() {
+			return {
+				backgroundImage: `url(${this.loveConfig.bgImageUrl})`
+			};
+		}
 	},
 	onLoad() {
 		this.fnSetPageTitle('恋爱日记');
+		this.fnInitLoveDayCount();
 	},
-	methods: {}
+	methods: {
+		fnInitLoveDayCount() {
+			clearTimeout(this.loveDayTimer);
+			const _countDownFn = () => {
+				this.loveDayTimer = setTimeout(_countDownFn, 1000);
+				const formatStartDate = this.loveConfig.loveStartDate.replace(/-/g, '/');
+				const start = new Date(formatStartDate),
+					now = new Date();
+				const T = now.getTime() - start.getTime();
+				const i = 24 * 60 * 60 * 1000;
+				const d = T / i;
+				const D = Math.floor(d);
+				const h = (d - D) * 24;
+				const H = Math.floor(h);
+				const m = (h - H) * 60;
+				const M = Math.floor(m);
+				const s = (m - M) * 60;
+				const S = Math.floor(s);
+				this.loveDayCount = {
+					d: D,
+					h: H,
+					m: M,
+					s: S
+				};
+			};
+			_countDownFn();
+		},
+		fnToPage(pageName) {
+			uni.navigateTo({
+				url: `/pagesA/love/${pageName}`
+			});
+		}
+	}
 };
 </script>
 
 <style scoped lang="scss">
 .app-page {
 	width: 100vw;
-	height: 100vh;
+	min-height: 100vh;
+	background: linear-gradient(
+		-45deg,
+		rgba(247, 149, 51, 0.1),
+		rgba(243, 112, 85, 0.1) 15%,
+		rgba(239, 78, 123, 0.1) 30%,
+		rgba(161, 102, 171, 0.1) 44%,
+		rgba(80, 115, 184, 0.1) 58%,
+		rgba(16, 152, 173, 0.1) 72%,
+		rgba(7, 179, 155, 0.1) 86%,
+		rgba(109, 186, 130, 0.1)
+	);
+}
+
+.lover-wrap {
+	position: relative;
+	width: 100vw;
+	height: 50vh;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-size: cover;
+	background-repeat: no-repeat;
+	background-position: 50% 50%;
+
+	&::before {
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		content: '';
+		background-color: rgba(255, 255, 255, 0.1);
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAKUlEQVQImU3IMREAIAgAwJfNkQCEsH8cijjpMf6vnXlQaIiJFx+omEBfmqIEZLe2jzcAAAAASUVORK5CYII=);
+		z-index: 0;
+		backdrop-filter: blur(4rpx);
+		overflow: hidden;
+	}
+	&::after {
+		content: '';
+		position: absolute;
+		left: 0;
+		bottom: -60rpx;
+		width: 100vw;
+		height: 60rpx;
+		background-image: linear-gradient(to bottom, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0));
+	}
+	.lover-card {
+		position: absolute;
+		left: 50%;
+		top: 58%;
+		transform: translate(-50%, -50%);
+		width: 90vw;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		border-radius: 12rpx;
+		z-index: 2;
+		.avatar {
+			width: 180rpx;
+			height: 180rpx;
+			border-radius: 50%;
+			box-sizing: border-box;
+			// border: 8rpx solid transparent;
+			// border: 8rpx solid rgba(255, 255, 255, 0.7) !important;
+			border: 8rpx solid rgba(255, 255, 255, 1) !important;
+		}
+		.name {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #ffffff;
+			text-align: center;
+			letter-spacing: 2rpx;
+		}
+		.boy {
+			color: #3ab8e4;
+			.avatar {
+				border-color: rgba(58, 184, 228, 0.7);
+			}
+		}
+		.girl {
+			color: #f57ab3;
+			.avatar {
+				border-color: rgba(245, 122, 179, 0.7);
+			}
+		}
+
+		.like {
+			width: 120rpx;
+			height: 120rpx;
+			animation: likeani 1s ease-in-out infinite;
+		}
+	}
+	.wave-image {
+		width: 100%;
+		height: 120rpx;
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		mix-blend-mode: screen;
+	}
+}
+
+.love-time-wrap {
+	margin-top: 80rpx;
+	width: 100vw;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+
+	.title {
+		font-size: 46rpx;
+		letter-spacing: 4rpx;
+		// background-image: linear-gradient(270deg, #ff4500, #ffa500, #ffd700, #90ee90, #00ffff, #1e90ff, #9370db, #ff69b4, #ff4500);
+		// -webkit-background-clip: text;
+		// color: #000;
+		color: #333;
+		font-size: 42rpx;
+		font-weight: bold;
+		// animation: loveTimeTitleAni 80s linear infinite;
+	}
+	.content {
+		margin-top: 24rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.text {
+			font-size: 28rpx;
+		}
+		.number {
+			margin: 0 8rpx;
+			font-size: 46rpx;
+			// color: #ff69b4;
+			color: #f83856;
+			font-weight: bold;
+		}
+	}
+}
+
+.list-wrap {
+	margin-top: 75rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	padding: 0 36rpx;
+
+	.list-item {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		box-sizing: border-box;
+		padding: 28rpx 32rpx;
+		background-color: #ffffff;
+		border-radius: 50rpx;
+		margin-bottom: 32rpx;
+		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
+
+		&:nth-child(1) {
+			animation: listItemAni1 3s ease-in-out infinite;
+		}
+		&:nth-child(2) {
+			animation: listItemAni1 3s ease-in-out infinite;
+			animation-delay: 1.5s;
+		}
+		&:nth-child(3) {
+			animation: listItemAni1 3s ease-in-out infinite;
+			animation-delay: 2s;
+		}
+		.left {
+			width: 120rpx;
+			height: 120rpx;
+			.icon {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.right {
+			flex-grow: 1;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			box-sizing: border-box;
+			padding-left: 40rpx;
+			.name {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #333333;
+			}
+			.desc {
+				margin-top: 8px;
+				font-size: 26rpx;
+				color: #777777;
+			}
+		}
+	}
+}
+
+@keyframes likeani {
+	0% {
+		transform: scale(1);
+	}
+	25% {
+		transform: scale(1.2);
+	}
+	50% {
+		transform: scale(1.1);
+	}
+	75% {
+		transform: scale(1.3);
+	}
+	100% {
+		transform: scale(1);
+	}
+}
+@keyframes loveTimeTitleAni {
+	to {
+		background-position: -200rem;
+	}
+}
+@keyframes listItemAni1 {
+	0% {
+		transform: translateY(0rpx);
+	}
+
+	50% {
+		transform: translateY(-10rpx);
+	}
+
+	100% {
+		transform: translateY(0rpx);
+	}
 }
 </style>

pagesA/setting/setting.vue

@@ -9,8 +9,8 @@
 					<view class="sheet-content">内容区域</view>
 				</tm-sheet> -->
 			<tm-sheet :shadow="6" :padding="[12, 24]" :margin="[24, 24]">
-				<view class="py-12 px-24 mx-12 round-3 border-b-1 grey text">
+				<view class="py-12 px-24 mx-12 round-3  grey text">
-					<text class="text-size-n text-weight-b ">布局</text>
+					<text class="text-size-n text-weight-b text-grey-darken-3">布局</text>
 					<text class="text-grey text-size-xs px-10 ml-12">应用以及文章列表布局设置</text>
 				</view>
 				<view class="sheet-content">
@@ -25,9 +25,10 @@
 						<tm-input
 							name="status"
 							required
-							title="首页布局"
+							title="首页文章布局"
-							placeholder="请选择首页布局"
+							placeholder="请选择首页文章布局"
 							disabled
+							align="right"
 							:value="homeLayout.selectLabel"
 							right-icon="icon-angle-right"
 						></tm-input>
@@ -43,9 +44,10 @@
 						<tm-input
 							name="status"
 							required
-							title="卡片样式"
+							title="文章卡片样式"
 							placeholder="请选择文章卡片样式"
 							disabled
+							align="right"
 							:value="articleCardStyle.selectLabel"
 							right-icon="icon-angle-right"
 						></tm-input>
@@ -54,7 +56,7 @@
 			</tm-sheet>
 
 			<tm-sheet v-if="false" :shadow="24" :padding="[12, 24]" :margin="[24, 24]">
-				<view class="py-12 px-24 mx-12 round-3 border-b-1 grey text">
+				<view class="py-12 px-24 mx-12 round-3 grey text">
 					<text class="text-size-n text-weight-b ">外观</text>
 					<text class="text-grey text-size-xs px-10">设置应用主题色/暗黑模式等</text>
 				</view>
@@ -65,19 +67,11 @@
 			</tm-sheet>
 
 			<tm-sheet :shadow="6" :padding="[12, 24]" :margin="[24, 24]">
-				<view class="py-12 px-24 mx-12 round-3 border-b-1 grey text">
+				<view class="py-12 px-24 mx-12 round-3 grey text">
-					<text class="text-size-n text-weight-b ">功能</text>
+					<text class="text-size-n text-weight-b text-grey-darken-3">功能</text>
 					<text class="text-grey text-size-xs px-10  ml-12">一些常用的功能性设置</text>
 				</view>
 				<view class="sheet-content">
-					<view class="mx-32 my-24 border-b-1  pb-24 flex-between">
-						<text class="text-size-m">显示完整统计</text>
-						<tm-switch v-model="appSettings.about.showAllCount" color="light-blue" :text="['是', '否']"></tm-switch>
-					</view>
-					<view class="mx-32 my-24 border-b-1  pb-24 flex-between">
-						<text class="text-size-m ">链接直接打开</text>
-						<tm-switch v-model="appSettings.contact.isLinkCopy" color="light-blue" :text="['是', '否']"></tm-switch>
-					</view>
 					<view class="mx-32 my-24 border-b-1  pb-24 flex-between">
 						<text class="text-size-m ">图库瀑布流模式</text>
 						<tm-switch v-model="appSettings.gallery.useWaterfull" color="light-blue" :text="['是', '否']"></tm-switch>
@@ -86,6 +80,33 @@
 						<text class="text-size-m ">友链简洁模式</text>
 						<tm-switch v-model="appSettings.links.useSimple" color="light-blue" :text="['是', '否']"></tm-switch>
 					</view>
+					<view class="mx-32 mt-24 mb-0 border-b-1 pb-24 flex-between">
+						<text class="text-size-m">启用评论弹幕</text>
+						<tm-switch v-model="appSettings.barrage.use" color="light-blue" :text="['是', '否']"></tm-switch>
+					</view>
+					<tm-pickers
+						v-if="appSettings.barrage.use"
+						title="评论弹幕位置"
+						btn-color="light-blue"
+						:default-value.sync="barrage.selectDefault"
+						rang-key="name"
+						:list="barrage.list"
+						@confirm="fnOnBarrageConfirm"
+					>
+						<tm-input
+							name="status"
+							title="评论弹幕位置"
+							placeholder="请选择评论弹幕位置"
+							disabled
+							align="right"
+							:value="barrage.selectLabel"
+							right-icon="icon-angle-right"
+						></tm-input>
+					</tm-pickers>
+					<view class="mx-32 my-24 border-b-1  pb-24 flex-between">
+						<text class="text-size-m">是否圆形头像</text>
+						<tm-switch v-model="appSettings.isAvatarRadius" color="light-blue" :text="['是', '否']"></tm-switch>
+					</view>
 					<view class="mx-32 my-24 border-b-1  pb-24 flex-between">
 						<text class="text-size-m ">轮播图指示器</text>
 						<tm-switch v-model="appSettings.banner.useDot" color="light-blue" :text="['是', '否']"></tm-switch>
@@ -104,6 +125,15 @@
 							></tm-radio>
 						</tm-groupradio>
 					</view>
+
+					<view class="mx-32 my-24 border-b-1  pb-24 flex-between">
+						<text class="text-size-m">显示完整统计</text>
+						<tm-switch v-model="appSettings.about.showAllCount" color="light-blue" :text="['是', '否']"></tm-switch>
+					</view>
+					<view class="mx-32 my-24 border-b-1  pb-24 flex-between">
+						<text class="text-size-m ">链接直接打开</text>
+						<tm-switch v-model="appSettings.contact.isLinkCopy" color="light-blue" :text="['是', '否']"></tm-switch>
+					</view>
 					<view class="mx-32 my-24 border-b-1  pb-24 flex-between">
 						<text class="text-size-m ">显示后台入口</text>
 						<tm-switch v-model="appSettings.about.showAdmin" color="light-blue" :text="['是', '否']"></tm-switch>
@@ -168,7 +198,13 @@ export default {
 				selectLabel: '左图右文',
 				selectValue: 'lr_image_text'
 			},
-			dotPositionList: [{ name: '右边', value: 'right', checked: true }, { name: '下边', value: 'bottom', checked: false }]
+			dotPositionList: [{ name: '右边', value: 'right', checked: true }, { name: '下边', value: 'bottom', checked: false }],
+			barrage: {
+				list: [{ name: '顶部', value: 'rightToLeft' }, { name: '左下', value: 'leftBottom' }],
+				selectDefault: ['顶部'],
+				selectLabel: '顶部',
+				selectValue: 'rightToLeft'
+			}
 		};
 	},
 
@@ -189,7 +225,7 @@ export default {
 		this.fnSetPageTitle('应用设置');
 	},
 	created() {
-		this.appSettings = uni.$tm.vx.getters().setting.getSettings;
+		this.appSettings = Object.assign({}, _DefaultAppSettings, uni.$tm.vx.getters().getSettings);
 		this.fnHandleFormatSelect();
 		uni.showLoading({
 			title: '加载中...',
@@ -214,6 +250,11 @@ export default {
 			this.articleCardStyle.selectDefault = [_articleCardStyle.name];
 			this.articleCardStyle.selectLabel = _articleCardStyle.name;
 			this.articleCardStyle.selectValue = _articleCardStyle.value;
+
+			const _barrage = this.fnFindObjInList(this.barrage.list, 'value', this.appSettings.barrage.type);
+			this.barrage.selectDefault = [_barrage.name];
+			this.barrage.selectLabel = _barrage.name;
+			this.barrage.selectValue = _barrage.value;
 		},
 		// 在集合中找匹配的对象
 		fnFindObjInList(list, key, value) {
@@ -244,6 +285,14 @@ export default {
 			this.articleCardStyle.selectValue = _select.value;
 			this.appSettings.layout.cardType = _select.value;
 		},
+		// 弹幕设置
+		fnOnBarrageConfirm(e) {
+			const _select = e[0].data;
+			this.barrage.selectDefault = [_select.name];
+			this.barrage.selectLabel = _select.name;
+			this.barrage.selectValue = _select.value;
+			this.appSettings.barrage.type = _select.value;
+		},
 		// 保存
 		fnOnSave() {
 			this.isSaved = true;
@@ -271,6 +320,7 @@ export default {
 		fnOnBack() {
 			if (this.isSaved) {
 				uni.navigateBack();
+				return;
 			}
 			uni.$eShowModal({
 				title: '提示',

pagesA/tag-detail/tag-detail.vue

@@ -0,0 +1,146 @@
+<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 class="empty" v-if="dataList.length == 0"><tm-empty icon="icon-shiliangzhinengduixiang-" label="该标签下暂无文章"></tm-empty></view>
+			<block v-else>
+				<block v-for="(article, index) in dataList" :key="article.createTime">
+					<!-- 文章卡片 -->
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)"><article-card :article="article" @on-click="fnToArticleDetail"></article-card></tm-translate>
+				</block>
+				<view class="load-text">{{ loadMoreText }}</view>
+			</block>
+
+			<tm-flotbutton @click="fnToTopPage" color="light-blue" size="m" icon="icon-angle-up"></tm-flotbutton>
+		</block>
+	</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 tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import ArticleCard from '@/components/article-card/article-card.vue';
+	export default {
+		components: {
+			tmSkeleton,
+			tmTranslate,
+			tmFlotbutton,
+			tmEmpty,
+			ArticleCard
+		},
+		data() {
+			return {
+				loading: 'loading',
+				queryParams: {
+					size: 10,
+					page: 0
+				},
+				slug: '',
+				pageTitle: '加载中...',
+				result: null,
+				dataList: [],
+				isLoadMore: false,
+				loadMoreText: ''
+			};
+		},
+
+		onLoad(e) {
+			this.slug = e.slug;
+			this.pageTitle = e.name;
+			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() {
+				// uni.showLoading({
+				// 	mask: true,
+				// 	title: '加载中...'
+				// });
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi
+					.getTagPostsList(this.slug, this.queryParams)
+					.then(res => {
+						this.fnSetPageTitle(`标签：${this.pageTitle} （共${res.data.total}篇）`);
+						this.result = res.data;
+						if (this.isLoadMore) {
+							this.dataList = this.dataList.concat(res.data.content);
+						} else {
+							this.dataList = res.data.content;
+						}
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						setTimeout(() => {
+							this.loading = 'success';
+						}, 500);
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
+					});
+			},
+			//跳转文章详情
+			fnToArticleDetail(article) {
+				uni.navigateTo({
+					url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					animationType: 'slide-in-right'
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.app-page {
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		padding: 24rpx 0;
+		background-color: #fafafd;
+	}
+
+	.loading-wrap {
+		padding: 0 24rpx;
+		min-height: 100vh;
+	}
+
+	.empty {
+		height: 60vh;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+</style>

pagesA/tags/tags.vue

@@ -0,0 +1,14 @@
+<template>
+	<view>文章标签页面</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	methods: {}
+};
+</script>
+
+<style></style>

pagesB/admin/admin.vue

@@ -146,13 +146,12 @@ export default {
 	},
 	computed: {
 		bloggerInfo() {
-			return this.$tm.vx.getters().blogger.getBlogger;
+			return this.$tm.vx.getters().getBlogger;
 		}
 	},
 	created() {
 		// this.fnGetData();
 		this.fnSetPageTitle('欢迎登录工作台');
-		console.log(this.bloggerInfo);
 	},
 	onPullDownRefresh() {
 		uni.stopPullDownRefresh();

pagesB/articles/article-edit.vue

@@ -540,10 +540,10 @@ export default {
 			if (this.form.id) {
 				this.$Router.push({
 					path: '/pagesB/articles/article-setting',
-					query: { postsId: this.form.id, postTitle: this.form.title, isEdit: true, from: 'edit' }
+					query: { postsId: this.form.id, postTitle: this.form.title, isEdit: 1, from: 'edit' }
 				});
 			} else {
-				this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: '', postTitle: '', isEdit: false, from: 'edit' } });
+				this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: '', postTitle: '', isEdit: 0, from: 'edit' } });
 			}
 
 			return;

pagesB/articles/article-setting.vue

@@ -60,9 +60,7 @@
 						<view>
 							<tm-groupcheckbox name="categoryIds">
 								<tm-checkbox :dense="true" :name="item.id" v-for="(item, index) in categories" :key="index" v-model="item.checked">
-									<template v-slot:default="{ checkData }">
+									<tm-button v-slot:default :flat="true" size="s" :theme="item.checked ? 'light-blue' : 'grey-lighten-4'" :plan="true">{{ item.name }}</tm-button>
-										<tm-button :flat="true" size="s" :theme="checkData.checked ? 'light-blue' : 'grey-lighten-4'" :plan="true">{{ item.name }}</tm-button>
-									</template>
 								</tm-checkbox>
 							</tm-groupcheckbox>
 						</view>
@@ -76,9 +74,7 @@
 						<view>
 							<tm-groupcheckbox name="tagIds">
 								<tm-checkbox :dense="true" :name="item.id" v-for="(item, index) in tags" :key="index" v-model="item.checked">
-									<template v-slot:default="{ checkData }">
+									<tm-button v-slot:default :flat="true" size="s" :theme="item.checked ? 'light-blue' : 'grey-lighten-4'" :plan="true">{{ item.name }}</tm-button>
-										<tm-button :flat="true" size="s" :theme="checkData.checked ? 'light-blue' : 'grey-lighten-4'" :plan="true">{{ item.name }}</tm-button>
-									</template>
 								</tm-checkbox>
 							</tm-groupcheckbox>
 						</view>
@@ -404,13 +400,10 @@ export default {
 		const from = this.$Route.query.from;
 		this.postsId = postsId;
 		this.postTitle = postTitle || '';
-		this.isEdit = isEdit;
+		this.isEdit = isEdit == 1 ? true : false;
 		this.from = from;
 		this.createTime = uni.$tm.dayjs(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss');
 		this.fnGetSettings();
-
-		console.log(uni.getStorageSync('posts-content'));
-		console.log(uni.getStorageSync('posts-content-source'));
 	},
 	onPullDownRefresh() {
 		if (this.isEdit == false) {
@@ -591,7 +584,6 @@ export default {
 				})
 				.catch(err => {
 					this.$tm.toast('数据加载失败，请重试！');
-					console.log(err);
 					this.loading = 'error';
 				})
 				.finally(() => {

pagesB/articles/articles.vue

@@ -29,7 +29,7 @@
 			</view>
 			<block v-else>
 				<block v-for="(article, index) in dataList" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<!-- 文章卡片 -->
 						<view class="article-card mt-24 bg-white pa-24 round-3">
 							<view class="thumbnail round-2" @click="fnToArticleDetail(article)">
@@ -229,10 +229,12 @@ export default {
 			},
 			// 显示分类选择
 			fnOnCategoryConfirm(e) {
+				this.fnResetSetAniWaitIndex();
 				this.category.selected = [e[0].index];
 				this.queryParams.categoryId = e[0].data.id;
 			},
 			fnOnSearch() {
+				this.fnResetSetAniWaitIndex();
 				this.queryParams.page = 0;
 				this.isLoadMore = false;
 				this.fnToTopPage();
@@ -306,7 +308,7 @@ export default {
 			},
 			// 设置文章信息
 			fnOnSetArticle(article, index) {
-			this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: article.id, postTitle: article.title, isEdit: true, from: 'list' } });
+				this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: article.id, postTitle: article.title, isEdit: 1, from: 'list' } });
 			},
 			// 删除文章
 			fnOnDelArticle(article, index) {
@@ -357,8 +359,10 @@ export default {
 			background-color: #212121;
 		}
 	}
+
 	.app-page-content {
 		box-sizing: border-box;
+
 		.content-empty {
 			height: 60vh;
 		}
@@ -367,20 +371,24 @@ export default {
 	.article-card {
 		box-sizing: border-box;
 		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
+
 		.thumbnail {
 			width: 100%;
 			height: 280rpx;
+
 			&-img {
 				width: 100%;
 				height: 100%;
 				background-color: rgba(0, 0, 0, 0.03);
 			}
+
 			&-not {
 				width: 100%;
 				height: 100%;
 				background-color: rgba(0, 0, 0, 0.03);
 			}
 		}
+
 		.title {
 			overflow: hidden;
 			white-space: nowrap;
@@ -388,6 +396,7 @@ export default {
 			word-wrap: break-word;
 			word-break: break-all;
 		}
+
 		.summary {
 			display: -webkit-box;
 			-webkit-box-orient: vertical;
@@ -396,6 +405,7 @@ export default {
 			word-wrap: break-word;
 			word-break: break-all;
 		}
+
 		.foot {
 			box-sizing: border-box;
 			border-top: 2rpx solid rgba(0, 0, 0, 0.03);

pagesB/attachment/attachment.vue

@@ -25,7 +25,7 @@
 			<block v-else>
 				<!-- 内容区域 -->
 				<block v-for="(item, index) in dataList" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<view class="attachment-card mb-24 flex bg-white pa-24 round-3" @click="fnShowDetail(item)">
 							<view class="cover round-3 flex flex-center" :class="[fnGetIconClass(item.mediaType)]">
 								<text class="icon iconfont">{{ item.suffix }}</text>
@@ -52,22 +52,9 @@
 					<scroll-view class="poup-body pa-24 pt-0" :scroll-y="true" @touchmove.stop>
 						<view class="preview-file pl-24 pr-24">
 							<!-- 图片预览 -->
-							<tm-images
+							<tm-images v-if="$utils.fnCheckIsFileType('image', detail.form)" :width="700" :height="350" :round="3" :src="$utils.checkThumbnailUrl(detail.form.path)" model="aspectFill"></tm-images>
-								v-if="$utils.fnCheckIsFileType('image', detail.form)"
-								:width="700"
-								:height="350"
-								:round="3"
-								:src="$utils.checkThumbnailUrl(detail.form.path)"
-								model="aspectFill"
-							></tm-images>
 							<!-- 视频 -->
-							<video
+							<video v-else-if="$utils.fnCheckIsFileType('video', detail.form)" class="round-3" style="width: 100%;height: 350rpx;" :src="$utils.checkUrl(detail.form.path)" controls></video>
-								v-else-if="$utils.fnCheckIsFileType('video', detail.form)"
-								class="round-3"
-								style="width: 100%;height: 350rpx;"
-								:src="$utils.checkUrl(detail.form.path)"
-								controls
-							></video>
 							<view v-else class="flex flex-center border-a-1 round-3 text-align-center text-grey-darken-1" style="height: 280rpx;background-color: #f2f2f2;">
 								该文件暂不支持预览
 							</view>
@@ -78,17 +65,7 @@
 						<tm-input :disabled="true" color="grey" title="附件位置" v-model="detail.form.type"></tm-input>
 						<tm-input :disabled="true" color="grey" title="附件大小" v-model="detail.form.sizeText"></tm-input>
 						<tm-input :disabled="true" color="grey" title="上传日期" v-model="detail.form.createTime"></tm-input>
-						<tm-input
+						<tm-input :disabled="true" :vertical="true" :borderBottom="false" input-type="textarea" title="文件地址" color="grey" bg-color="grey-lighten-5" :height="120" v-model="detail.form.path">
-							:disabled="true"
-							:vertical="true"
-							:borderBottom="false"
-							input-type="textarea"
-							title="文件地址"
-							color="grey"
-							bg-color="grey-lighten-5"
-							:height="120"
-							v-model="detail.form.path"
-						>
 							<template v-slot:default="{ title }">
 								{{ title }}
 								<tm-button text theme="light-blue" size="xs" @click="$utils.copyText(detail.form.path, '复制成功！')">复制</tm-button>
@@ -153,8 +130,7 @@ export default {
 				loading: 'loading',
 				filterLoading: 'loading',
 				btnOption: {
-				actions: [
+					actions: [{
-					{
 							icon: 'icon-like',
 							color: 'bg-gradient-orange-accent'
 						},
@@ -168,28 +144,23 @@ export default {
 						}
 					]
 				},
-			filterList: [
+				filterList: [{
-				{
 						title: '存储位置',
-					children: [
+						children: [{
-						{
 							title: '',
 							name: 'attachmentType',
 							model: 'radio',
 							children: []
-						}
+						}]
-					]
 					},
 					{
 						title: '文件类型',
-					children: [
+						children: [{
-						{
 							title: '',
 							name: 'mediaType',
 							model: 'radio',
 							children: []
-						}
+						}]
-					]
 					}
 				],
 				queryParams: {
@@ -307,11 +278,13 @@ export default {
 
 			// 搜索区域确定
 			fnOnConfirm(e) {
+				this.fnResetSetAniWaitIndex();
 				this.queryParams.attachmentType = e[0].children.map(x => x.id).join('') || undefined;
 				this.queryParams.mediaType = e[1].children.map(x => x.id).join('') || undefined;
 				this.fnOnSearch();
 			},
 			fnOnSearch() {
+				this.fnResetSetAniWaitIndex();
 				this.queryParams.page = 0;
 				this.dataList = [];
 				this.fnGetData();
@@ -524,12 +497,10 @@ export default {
 					case 2:
 						// 上传文件：
 						// todo:使用第三方控件
-					AfDocument.openMode(
+						AfDocument.openMode({
-						{
 								size: 1,
 								isDown: true,
-							types: [
+								types: [{
-								{
 										name: '文档',
 										value: ['doc', 'wps', 'docx', 'xls', 'xlsx', 'pdf']
 									},
@@ -689,9 +660,11 @@ export default {
 		width: 100vw;
 		min-height: 100vh;
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
 	}
+
 	.filter-wrap {
 		position: fixed;
 		left: 0;
@@ -705,29 +678,36 @@ export default {
 		width: 100vw;
 		z-index: 6;
 	}
-.page-content {
+
-}
+	.page-content {}
+
 	.content-empty {
 		width: 100vw;
 		height: 65vh;
 	}
+
 	.attachment-card {
 		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
+
 		.cover {
 			width: 170rpx;
 			height: 160rpx;
 			background-color: rgb(104, 136, 151);
+
 			// box-shadow: 0 6rpx 10rpx rgba(51, 154, 204, 0.2);
 			&.is-video {
 				background-color: rgb(3, 174, 252);
 			}
+
 			&.is-image {
 				background-color: #1cbcb4;
 			}
+
 			.icon {
 				font-size: 40rpx;
 				color: #fff;
 			}
+
 			.thumbnai {
 				width: 100%;
 				height: 100%;
@@ -736,6 +716,7 @@ export default {
 				border: 6rpx solid #fff;
 			}
 		}
+
 		.info {
 			width: 0;
 			flex-grow: 1;
@@ -750,13 +731,16 @@ export default {
 		box-sizing: border-box;
 		height: 66vh;
 	}
+
 	.poup-content {
 		width: 100%;
 		overflow: hidden;
 	}
+
 	.btn-wrap {
 		width: 100%;
 	}
+
 	.file-name {
 		white-space: nowrap;
 		overflow: hidden;

pagesB/category/category.vue

@@ -16,7 +16,7 @@
 			<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="(category, index) in dataList" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<view class="category-card flex round-3 bg-white pa-24 mb-24" @click="fnShowFormModal(category)">
 							<text class="del-icon flex flex-center" @click.stop="fnDelete(category, index)">×</text>
 							<view class="left">
@@ -52,49 +52,13 @@
 			<view class="poup-content">
 				<view class="poup-head text-align-center text-weight-b text-size-g ma-24">{{ form.id != undefined ? '编辑分类' : '新增分类' }}</view>
 				<scroll-view class="poup-body pa-24 pt-0" :scroll-y="true" @touchmove.stop>
-					<tm-input
+					<tm-input required :adjust-position="true" :round="3" :borderBottom="false" title="名称" bg-color="grey-lighten-5" v-model="form.name" placeholder="请输入分类名称"></tm-input>
-						required
-						:adjust-position="true"
-						:round="3"
-						:borderBottom="false"
-						title="名称"
-						bg-color="grey-lighten-5"
-						v-model="form.name"
-						placeholder="请输入分类名称"
-					></tm-input>
 					<view class="pl-32 mb-24 input-tips text-grey text-size-s">填写提示：页面上所显示的名称</view>
-					<tm-input
+					<tm-input :borderBottom="false" :adjust-position="true" :round="3" title="别名" bg-color="grey-lighten-5" v-model="form.slug" placeholder="请输入分类别名"></tm-input>
-						:borderBottom="false"
-						:adjust-position="true"
-						:round="3"
-						title="别名"
-						bg-color="grey-lighten-5"
-						v-model="form.slug"
-						placeholder="请输入分类别名"
-					></tm-input>
 					<view class="pl-32 mb-24 input-tips text-grey text-size-s">填写提示：一般为单个分类页面的标识，最好为英文</view>
-					<tm-input
+					<tm-input :borderBottom="false" :adjust-position="true" :round="3" title="密码" bg-color="grey-lighten-5" v-model="form.password" placeholder="请输入分类密码"></tm-input>
-						:borderBottom="false"
-						:adjust-position="true"
-						:round="3"
-						title="密码"
-						bg-color="grey-lighten-5"
-						v-model="form.password"
-						placeholder="请输入分类密码"
-					></tm-input>
 					<view class="pl-32 mb-24 input-tips text-grey text-size-s">填写提示：分类的访问密码</view>
-					<tm-input
+					<tm-input :borderBottom="false" :vertical="true" :adjust-position="true" inputType="textarea" :round="3" title="描述" :height="160" bg-color="grey-lighten-5" v-model="form.description" placeholder="请输入分类描述"></tm-input>
-						:borderBottom="false"
-						:vertical="true"
-						:adjust-position="true"
-						inputType="textarea"
-						:round="3"
-						title="描述"
-						:height="160"
-						bg-color="grey-lighten-5"
-						v-model="form.description"
-						placeholder="请输入分类描述"
-					></tm-input>
 					<view class="pl-32 mb-24 input-tips text-grey text-size-s">填写提示：分类的描述信息</view>
 					<view class="ma-30 mt-12 pb-12">
 						<view class="mb-12">
@@ -342,11 +306,13 @@ export default {
 		width: 100vw;
 		min-height: 100vh;
 	}
+
 	.loading-wrap {
 		.loading-error {
 			height: 65vh;
 		}
 	}
+
 	.content-empty {
 		width: 100%;
 		height: 60vh;
@@ -355,19 +321,23 @@ export default {
 	.poup-content {
 		overflow: hidden;
 	}
+
 	.poup-body {
 		height: 71vh;
 		box-sizing: border-box;
 		touch-action: none;
 	}
+
 	.thumbnail {
 		width: 100%;
 		height: 260rpx;
 	}
+
 	.category-card {
 		position: relative;
 		box-sizing: border-box;
 		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+
 		.del-icon {
 			width: 46rpx;
 			height: 46rpx;
@@ -382,6 +352,7 @@ export default {
 			font-size: 32rpx;
 			color: #fff;
 		}
+
 		.left {
 			width: 200rpx;
 			height: 190rpx;
@@ -392,10 +363,12 @@ export default {
 				background-color: #607d8b;
 			}
 		}
+
 		.right {
 			width: 0;
 			flex-grow: 1;
 			box-sizing: border-box;
+
 			.color {
 				color: #fff;
 			}
@@ -404,9 +377,11 @@ export default {
 
 	.desc-box {
 		box-sizing: border-box;
+
 		.label {
 			width: 86rpx;
 		}
+
 		.value {
 			width: 0;
 			flex-grow: 1;

pagesB/comments/comments.vue

@@ -19,7 +19,7 @@
 			<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="(comment, index) in dataList" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<view class="comment-card bg-white round-3 pt-24 pb-24">
 							<view class="head flex flex-between pl-24 pr-24">
 								<view class="left flex flex-center">
@@ -96,17 +96,7 @@
 							<view class="mb-24">评论内容</view>
 							<view class="pa-24 pt-12 pb-12 grey-lighten-5 text-grey round-3">{{ reply.data.content }}</view>
 						</view>
-						<tm-input
+						<tm-input :vertical="true" :borderBottom="false" input-type="textarea" title="我的回复" bg-color="grey-lighten-5" v-model="reply.form.content" :height="150" :focus="true" :adjustPosition="true"></tm-input>
-							:vertical="true"
-							:borderBottom="false"
-							input-type="textarea"
-							title="我的回复"
-							bg-color="grey-lighten-5"
-							v-model="reply.form.content"
-							:height="150"
-							:focus="true"
-							:adjustPosition="true"
-						></tm-input>
 					</scroll-view>
 					<view class="btn-wrap flex flex-center">
 						<!-- 审核状态 -->
@@ -185,7 +175,7 @@ export default {
 		computed: {
 			// 获取博主信息
 			bloggerInfo() {
-			return this.$tm.vx.getters().blogger.getBlogger;
+				return this.$tm.vx.getters().getBlogger;
 			}
 		},
 		onLoad() {
@@ -193,7 +183,6 @@ export default {
 		},
 		created() {
 			this.fnGetData();
-		console.log(this.bloggerInfo);
 		},
 		onPullDownRefresh() {
 			this.isLoadMore = false;
@@ -214,6 +203,7 @@ export default {
 		},
 		methods: {
 			fnOnTabChange(index) {
+				this.fnResetSetAniWaitIndex();
 				this.fnResetReply();
 				this.dataList = [];
 				this.queryType = ['Posts', 'Sheets', 'Journals'][index];
@@ -439,12 +429,15 @@ export default {
 		width: 100vw;
 		min-height: 100vh;
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
+
 		.loading-error {
 			height: 65vh;
 		}
 	}
+
 	.content-empty {
 		width: 100%;
 		height: 60vh;
@@ -462,13 +455,16 @@ export default {
 			border: 4rpx solid #fff;
 			box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.15);
 		}
+
 		.comment-content {
 			line-height: 1.6;
 		}
 	}
+
 	.poup-content {
 		overflow: hidden;
 	}
+
 	.poup-body {
 		height: 60vh;
 		box-sizing: border-box;

pagesB/journal/journal-edit.vue

@@ -177,7 +177,7 @@ export default {
 	},
 	computed: {
 		journalInfo() {
-			return uni.$tm.vx.getters().journal.getJournalInfo;
+			return uni.$tm.vx.getters().getJournalInfo;
 		}
 	},
 	onLoad() {

pagesB/journal/journal.vue

@@ -17,16 +17,8 @@
 			</view>
 			<block v-else>
 				<block v-for="(journal, index) in dataList" :key="journal.id">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
-						<journal-card
+						<journal-card :isAdmin="true" :journal="journal" :useLike="false" :useEdit="true" :useDel="true" @on-del="fnOnJournalDel" @on-edit="fnOnJournalEdit"></journal-card>
-							:isAdmin="true"
-							:journal="journal"
-							:useLike="false"
-							:useEdit="true"
-							:useDel="true"
-							@on-del="fnOnJournalDel"
-							@on-edit="fnOnJournalEdit"
-						></journal-card>
 					</tm-translate>
 				</block>
 				<tm-flotbutton :offset="[16, 80]" @click="fnToTopPage" color="light-blue" size="m" icon="icon-angle-up"></tm-flotbutton>
@@ -163,12 +155,15 @@ export default {
 		width: 100vw;
 		min-height: 100vh;
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
+
 		.loading-error {
 			height: 40vh;
 		}
 	}
+
 	.edit-wrap {
 		box-sizing: border-box;
 		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);

pagesB/links/links.vue

@@ -23,10 +23,12 @@
 			<view v-if="filterList.lenght == 0" class="empty"><tm-empty icon="icon-wind-cry" label="无数据"></tm-empty></view>
 			<block v-else>
 				<block v-for="(item, index) in filterList" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<view class="link-card round-3 bg-white flex flex-col mt-24 ml-24 mr-24 pa-24">
 							<view class="head flex">
-								<view class="left round-2 flex flex-col flex-center"><image class="logo round-2 " :src="item.logo" mode="aspectFill"></image></view>
+								<view class="left round-2 flex flex-col flex-center">
+									<image class="logo round-2 " :src="item.logo" mode="aspectFill"></image>
+								</view>
 								<view class="right pl-24 text-size-m">
 									<view class="title flex flex-between ">
 										<view class="name flex text-overflow mr-6 text-weight-b">
@@ -71,27 +73,9 @@
 				<view class="poup-content">
 					<view class="poup-head text-align-center text-weight-b text-size-g ma-24">{{ form.id != undefined ? '编辑友链' : '新增友链' }}</view>
 					<scroll-view class="poup-body pa-24 pt-0" :scroll-y="true" @touchmove.stop>
-						<tm-input
+						<tm-input required :adjust-position="true" :round="3" :borderBottom="false" title="网站名称" bg-color="grey-lighten-5" v-model="form.name" placeholder="请输入网站名称"></tm-input>
-							required
-							:adjust-position="true"
-							:round="3"
-							:borderBottom="false"
-							title="网站名称"
-							bg-color="grey-lighten-5"
-							v-model="form.name"
-							placeholder="请输入网站名称"
-						></tm-input>
 
-						<tm-input
+						<tm-input required :borderBottom="false" :adjust-position="true" :round="3" title="网站地址" bg-color="grey-lighten-5" v-model="form.url" placeholder="请输入网站地址"></tm-input>
-							required
-							:borderBottom="false"
-							:adjust-position="true"
-							:round="3"
-							title="网站地址"
-							bg-color="grey-lighten-5"
-							v-model="form.url"
-							placeholder="请输入网站地址"
-						></tm-input>
 						<view class="pl-32 mb-24 input-tips text-grey text-size-s">填写提示：需要加上 http://</view>
 
 						<tm-input :borderBottom="false" :round="3" bg-color="grey-lighten-5" title="网站分组" placeholder="请输入选择网站分组" :value="form.team">
@@ -101,38 +85,10 @@
 								</tm-pickers>
 							</template>
 						</tm-input>
-						<tm-input
+						<tm-input input-type="number" :borderBottom="false" :adjust-position="true" :round="3" title="排序编号" bg-color="grey-lighten-5" v-model.number="form.priority" placeholder="请输入排序"></tm-input>
-							input-type="number"
+						<tm-input :borderBottom="false" :vertical="true" :adjust-position="true" inputType="textarea" :round="3" title="网站描述" :height="120" bg-color="grey-lighten-5" v-model="form.description" placeholder="请输入描述"></tm-input>
-							:borderBottom="false"
-							:adjust-position="true"
-							:round="3"
-							title="排序编号"
-							bg-color="grey-lighten-5"
-							v-model.number="form.priority"
-							placeholder="请输入排序"
-						></tm-input>
-						<tm-input
-							:borderBottom="false"
-							:vertical="true"
-							:adjust-position="true"
-							inputType="textarea"
-							:round="3"
-							title="网站描述"
-							:height="120"
-							bg-color="grey-lighten-5"
-							v-model="form.description"
-							placeholder="请输入描述"
-						></tm-input>
 
-						<tm-input
+						<tm-input :borderBottom="false" :adjust-position="true" :round="3" title="LOGO" bg-color="grey-lighten-5" v-model="form.logo" placeholder="请输入LOGO地址"></tm-input>
-							:borderBottom="false"
-							:adjust-position="true"
-							:round="3"
-							title="LOGO"
-							bg-color="grey-lighten-5"
-							v-model="form.logo"
-							placeholder="请输入LOGO地址"
-						></tm-input>
 						<view class="ma-30 mt-12 pb-12 bg-grey">
 							<image v-if="form.logo" class="thumbnail round-3" :src="form.logo" mode="aspectFill" @click="$utils.previewImage([form.logo])"></image>
 							<view v-else class="thumbnail round-3 text-grey grey-lighten-5 flex flex-col flex-center ">
@@ -217,6 +173,7 @@ export default {
 		},
 		methods: {
 			fnOnTabChange(index) {
+				this.fnResetSetAniWaitIndex();
 				this.fnToTopPage();
 				let _filterData = [];
 				if (index == 0) {
@@ -381,24 +338,30 @@ export default {
 		width: 100vw;
 		min-height: 100vh;
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
+
 		.loading-error {
 			height: 65vh;
 		}
 	}
+
 	.link-card {
 		box-sizing: border-box;
 		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
+
 		.head {
 			.left {
 				width: 166rpx;
 				height: 166rpx;
+
 				.logo {
 					width: 100%;
 					height: 100%;
 				}
 			}
+
 			.right {
 				width: 0;
 				flex-grow: 1;
@@ -409,15 +372,18 @@ export default {
 					display: flex;
 					align-items: center;
 				}
+
 				.label {
 					width: 84rpx;
 				}
+
 				.value {
 					width: 0;
 					flex-grow: 1;
 				}
 			}
 		}
+
 		.foot {
 			box-sizing: border-box;
 			// border-top: 2rpx solid rgba(0, 0, 0, 0.03);
@@ -427,11 +393,13 @@ export default {
 	.poup-content {
 		overflow: hidden;
 	}
+
 	.poup-body {
 		height: 71vh;
 		box-sizing: border-box;
 		touch-action: none;
 	}
+
 	.thumbnail {
 		width: 100%;
 		height: 260rpx;
@@ -440,6 +408,7 @@ export default {
 	.update-btn {
 		background-color: rgba(240, 250, 255, 1);
 	}
+
 	.del-btn {
 		background-color: rgba(254, 241, 240, 1) !important;
 	}

pagesB/login/login.vue

@@ -85,7 +85,7 @@ export default {
 	},
 	computed: {
 		bloggerInfo() {
-			return this.$tm.vx.getters().blogger.getBlogger;
+			return this.$tm.vx.getters().getBlogger;
 		},
 		showCopyright() {
 			return getApp().globalData.showCopyright;

pagesB/logs/logs.vue

@@ -12,7 +12,7 @@
 
 			<block v-else>
 				<block v-for="(item, index) in dataList" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<view class="card mb-24 bg-white pa-24 round-3">
 							<view class="border-b-1 pb-20 text-size-l text-weight-b">
 								<tm-tags :dense="true" :shadow="0" color="bg-gradient-light-blue-accent" size="s" model="fill">ID：{{ item.id }}</tm-tags>
@@ -271,22 +271,27 @@ export default {
 		width: 100vw;
 		min-height: 100vh;
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
 	}
-.page-content {
+
-}
+	.page-content {}
+
 	.content-empty {
 		width: 100vw;
 		height: 65vh;
 	}
+
 	.card {
 		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
 	}
+
 	.desc-item {
 		.desc-label {
 			width: 150rpx;
 			position: relative;
+
 			&::after {
 				content: '：';
 				position: absolute;
@@ -294,6 +299,7 @@ export default {
 				top: 0rpx;
 			}
 		}
+
 		.desc-value {
 			word-wrap: break-word;
 			word-break: break-all;

pagesB/photos/photos.vue

@@ -1,17 +1,7 @@
 <template>
 	<view class="app-page flex flex-col">
 		<view class="e-fixed shadow-2 bg-white">
-			<tm-search
+			<tm-search :clear="true" v-model="queryParams.keyword" :round="24" :shadow="0" confirmText="搜索" color="light-blue" insertColor="light-blue" align="center" @confirm="fnOnSearch()"></tm-search>
-				:clear="true"
-				v-model="queryParams.keyword"
-				:round="24"
-				:shadow="0"
-				confirmText="搜索"
-				color="light-blue"
-				insertColor="light-blue"
-				align="center"
-				@confirm="fnOnSearch()"
-			></tm-search>
 			<tm-tabs v-if="team.list.length != 0" color="light-blue" :shadow="0" v-model="team.activeIndex" :list="team.list" align="center" @change="fnOnTabChange"></tm-tabs>
 		</view>
 
@@ -35,7 +25,7 @@
 			<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">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<view class="card mb-24 flex flex-col bg-white pa-24 round-3">
 							<view class="thumbnail round-2" @click="fnPreview(item, index)">
 								<image class="thumbnail-img round-2" :src="item.showThumbnail" mode="aspectFill"></image>
@@ -66,99 +56,23 @@
 			<view class="poup-content">
 				<view class="poup-head text-align-center text-weight-b text-size-g ma-24">{{ form.id != undefined ? '编辑图片' : '新增图片' }}</view>
 				<scroll-view :enable-flex="true" class="poup-body pa-24 pt-0 pb-0" :scroll-y="true" :scroll-top="poupBodyScrollTop" @touchmove.stop @scroll="fnOnPoupBodyScroll">
-					<tm-input
+					<tm-input :adjust-position="true" :round="3" clear :borderBottom="false" title="图片名称" bg-color="grey-lighten-5" v-model="form.name" placeholder="请输入图片名称"></tm-input>
-						:adjust-position="true"
-						:round="3"
-						clear
-						:borderBottom="false"
-						title="图片名称"
-						bg-color="grey-lighten-5"
-						v-model="form.name"
-						placeholder="请输入图片名称"
-					></tm-input>
 
-					<tm-input
+					<tm-input name="team" :adjust-position="true" :round="3" bg-color="grey-lighten-5" :borderBottom="false" title="图片分组" placeholder="请选择输入或分组" v-model="form.team">
-						name="team"
-						:adjust-position="true"
-						:round="3"
-						bg-color="grey-lighten-5"
-						:borderBottom="false"
-						title="图片分组"
-						placeholder="请选择输入或分组"
-						v-model="form.team"
-					>
 						<tm-pickers slot="rightBtn" rang-key="name" :default-value.sync="team.selected" :list="team.selectList" @confirm="fnOnSelectTeamConfirm">
 							<tm-button size="m" :dense="true" :shadow="0" theme="bg-gradient-light-blue-accent">选择</tm-button>
 						</tm-pickers>
 					</tm-input>
 					<view class="pl-32 mb-24 input-tips text-grey text-size-s">填写提示：图片分组可选择，也可以输入新的分组名称</view>
-					<tm-pickersDate
+					<tm-pickersDate :full-number="true" :show-detail="{ year: true, month: true, day: true, hour: true, min: true, sec: true }" :default-value="takeTime" @confirm="fnOnTakeTimeConfirm">
-						:full-number="true"
+						<tm-input title="拍摄时间" :adjust-position="true" :round="3" bg-color="grey-lighten-5" :borderBottom="false" placeholder="请选择拍摄时间" disabled :value="takeTime"></tm-input>
-						:show-detail="{ year: true, month: true, day: true, hour: true, min: true, sec: true }"
-						:default-value="takeTime"
-						@confirm="fnOnTakeTimeConfirm"
-					>
-						<tm-input
-							title="拍摄时间"
-							:adjust-position="true"
-							:round="3"
-							bg-color="grey-lighten-5"
-							:borderBottom="false"
-							placeholder="请选择拍摄时间"
-							disabled
-							:value="takeTime"
-						></tm-input>
 					</tm-pickersDate>
-					<tm-input
+					<tm-input :borderBottom="false" :adjust-position="true" :round="3" clear title="拍摄地点" bg-color="grey-lighten-5" v-model="form.location" placeholder="请输入拍摄地点"></tm-input>
-						:borderBottom="false"
+					<tm-input :borderBottom="false" :vertical="false" clear :adjust-position="true" inputType="textarea" :round="3" title="图片描述" :height="160" bg-color="grey-lighten-5" v-model="form.description" placeholder="请输入图片描述"></tm-input>
-						:adjust-position="true"
+					<tm-input name="url" clear :borderBottom="false" :adjust-position="true" :round="3" title="图片地址" bg-color="grey-lighten-5" v-model="form.url" placeholder="请输入或选择图片" @clear="fnOnUrlInputChange" @blur="fnOnUrlInputChange" @input="fnOnUrlInputChange">
-						:round="3"
-						clear
-						title="拍摄地点"
-						bg-color="grey-lighten-5"
-						v-model="form.location"
-						placeholder="请输入拍摄地点"
-					></tm-input>
-					<tm-input
-						:borderBottom="false"
-						:vertical="false"
-						clear
-						:adjust-position="true"
-						inputType="textarea"
-						:round="3"
-						title="图片描述"
-						:height="160"
-						bg-color="grey-lighten-5"
-						v-model="form.description"
-						placeholder="请输入图片描述"
-					></tm-input>
-					<tm-input
-						name="url"
-						clear
-						:borderBottom="false"
-						:adjust-position="true"
-						:round="3"
-						title="图片地址"
-						bg-color="grey-lighten-5"
-						v-model="form.url"
-						placeholder="请输入或选择图片"
-						@clear="fnOnUrlInputChange"
-						@blur="fnOnUrlInputChange"
-						@input="fnOnUrlInputChange"
-					>
 						<tm-button slot="rightBtn" size="m" :dense="true" :shadow="0" theme="bg-gradient-light-blue-accent" @click="fnShowAttachmentsSelect('url')">选择</tm-button>
 					</tm-input>
-					<tm-input
+					<tm-input name="thumbnail" :borderBottom="false" :adjust-position="true" :round="3" clear title="缩略图片" bg-color="grey-lighten-5" v-model="form.thumbnail" placeholder="请输入或选择缩略图">
-						name="thumbnail"
-						:borderBottom="false"
-						:adjust-position="true"
-						:round="3"
-						clear
-						title="缩略图片"
-						bg-color="grey-lighten-5"
-						v-model="form.thumbnail"
-						placeholder="请输入或选择缩略图"
-					>
 						<tm-button slot="rightBtn" size="m" :dense="true" :shadow="0" theme="bg-gradient-light-blue-accent" @click="fnShowAttachmentsSelect('thumbnail')">
 							选择
 						</tm-button>
@@ -297,12 +211,14 @@ export default {
 					.catch(err => {});
 			},
 			fnOnSearch() {
+				this.fnResetSetAniWaitIndex();
 				this.queryParams.page = 0;
 				this.isLoadMore = false;
 				this.fnToTopPage();
 				this.fnGetData();
 			},
 			fnOnTabChange(index) {
+				this.fnResetSetAniWaitIndex();
 				this.queryParams.team = index == 0 ? undefined : this.team.list[index];
 				this.queryParams.page = 0;
 				this.dataList = [];
@@ -519,23 +435,29 @@ export default {
 		width: 100vw;
 		min-height: 100vh;
 	}
+
 	.loading-wrap {
 		padding: 24rpx;
+
 		.loading-error {
 			height: 65vh;
 		}
 	}
+
 	.btn-wrap {
 		box-sizing: border-box;
 		padding-top: 12rpx;
 		padding-bottom: 12rpx;
 		box-shadow: 0rpx -4rpx 24rpx rgba(0, 0, 0, 0.05);
 	}
+
 	.card {
 		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
 	}
+
 	.thumbnail {
 		width: 100%;
+
 		&-img {
 			width: 100%;
 			height: 300rpx;
@@ -545,6 +467,7 @@ export default {
 	.poup-content {
 		overflow: hidden;
 	}
+
 	.poup-body {
 		height: 69vh;
 		box-sizing: border-box;

pagesB/profile/profile.vue

@@ -97,7 +97,7 @@ export default {
 	},
 
 	onLoad() {
-		this.fnSetPageTitle('我的个人信息');
+		this.fnSetPageTitle('个人资料');
 	},
 	created() {
 		this.fnGetData();

pagesB/tags/tags.vue

@@ -14,7 +14,7 @@
 			<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="(tag, index) in dataList" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
 						<view class="tags-card flex round-3 bg-white pa-24 mb-24" @click="fnShowFormModal(tag)">
 							<text class="del-icon flex flex-center" @click.stop="fnDelete(tag, index)">×</text>
 							<view class="left">
@@ -46,36 +46,11 @@
 			<view class="poup-content">
 				<view class="poup-head text-align-center text-weight-b text-size-g ma-24">{{ form.id != undefined ? '编辑标签' : '新增标签' }}</view>
 				<scroll-view class="poup-body pa-24 pt-0" :scroll-y="true" @touchmove.stop>
-					<tm-input
+					<tm-input required :adjust-position="true" :round="3" :borderBottom="false" title="名称" bg-color="grey-lighten-5" v-model="form.name" placeholder="请输入标签名称"></tm-input>
-						required
-						:adjust-position="true"
-						:round="3"
-						:borderBottom="false"
-						title="名称"
-						bg-color="grey-lighten-5"
-						v-model="form.name"
-						placeholder="请输入标签名称"
-					></tm-input>
 					<view class="pl-32 mb-24 input-tips text-grey text-size-s">填写提示：页面上所显示的名称</view>
-					<tm-input
+					<tm-input :borderBottom="false" :adjust-position="true" :round="3" title="别名" bg-color="grey-lighten-5" v-model="form.slug" placeholder="请输入标签别名"></tm-input>
-						:borderBottom="false"
-						:adjust-position="true"
-						:round="3"
-						title="别名"
-						bg-color="grey-lighten-5"
-						v-model="form.slug"
-						placeholder="请输入标签别名"
-					></tm-input>
 					<view class="pl-32 mb-24 input-tips text-grey text-size-s">填写提示：一般为单个标签页面的标识，最好为英文</view>
-					<tm-input
+					<tm-input bg-color="grey-lighten-5" :border-bottom="false" :adjust-position="true" :round="3" title="颜色" placeholder="点击右侧选择标签颜色" v-model="form.color">
-						bg-color="grey-lighten-5"
-						:border-bottom="false"
-						:adjust-position="true"
-						:round="3"
-						title="颜色"
-						placeholder="点击右侧选择标签颜色"
-						v-model="form.color"
-					>
 						<template v-slot:rightBtn>
 							<tm-button class="ml-12" theme="bg-gradient-blue-accent" :round="3" :font-size="24" :height="66" block :width="120" @click="fnSelectColor">
 								选择颜色
@@ -327,11 +302,13 @@ export default {
 		width: 100vw;
 		min-height: 100vh;
 	}
+
 	.loading-wrap {
 		.loading-error {
 			height: 65vh;
 		}
 	}
+
 	.content-empty {
 		width: 100%;
 		height: 60vh;
@@ -340,18 +317,22 @@ export default {
 	.poup-content {
 		overflow: hidden;
 	}
+
 	.poup-body {
 		height: 58vh;
 		box-sizing: border-box;
 	}
+
 	.thumbnail {
 		width: 100%;
 		height: 260rpx;
 	}
+
 	.tags-card {
 		position: relative;
 		box-sizing: border-box;
 		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+
 		.del-icon {
 			width: 46rpx;
 			height: 46rpx;
@@ -366,6 +347,7 @@ export default {
 			font-size: 32rpx;
 			color: #fff;
 		}
+
 		.left {
 			width: 160rpx;
 			height: 140rpx;
@@ -377,8 +359,10 @@ export default {
 				background-color: #607d8b;
 			}
 		}
+
 		.right {
 			box-sizing: border-box;
+
 			.color {
 				color: #fff;
 			}

store/blogger.js

@@ -10,6 +10,7 @@
  *  修改时间：
  */
 import Blogger from '@/api/blogger.js'
+import HaloConfig from '@/config/halo.config.js';
 export default {
 	state: {
 		blogger: {},
@@ -25,18 +26,17 @@ export default {
 		},
 	},
 	actions: {
-		//通过actions提交更新数据
+		fnGetBlogger(context) {
-		fnGetBlogger({
+			if (HaloConfig.author.use) {
-			commit
+				context.commit("setBlogger", HaloConfig.author);
-		}) {
+			} else {
 				Blogger.getBloggerInfo().then((res) => {
-				console.log('获取博主信息成功：');
+					context.commit("setBlogger", res.data);
-				console.log(res);
-				commit("setBlogger", res.data);
 				}).catch((err) => {
-				console.log('哈哈，获取博主信息失败啦！');
+					// 如果失败，则加载默认配置信息
-				console.log(err);
+					context.commit("setBlogger", HaloConfig.author);
 				});
+			}
 		},
 	},
 };

store/setting.js

@@ -24,17 +24,13 @@ export default {
 	mutations: {
 		setSettings(state, data) {
 			state.settings = data;
-			console.log('设置：', data);
 			setAppSettings(data)
 		},
 	},
 	actions: {
 		// 设置默认的数据
-		updateDefaultAppSettings({
+		updateDefaultAppSettings(context) {
-			commit
+			context.commit('setSettings', JSON.parse(JSON.stringify(_DefaultAppSettings)))
-		}) {
-			console.log(_DefaultAppSettings);
-			commit('setSettings', JSON.parse(JSON.stringify(_DefaultAppSettings)))
 		},
 		// 检查并设置默认的数据
 		checkAndSetDefaultAppSettings(context) {

store/user.js

@@ -45,14 +45,11 @@ export default {
 		},
 	},
 	actions: {
-		// 登录
+		adminLogin(context, data) {
-		adminLogin({
-			commit
-		}, data) {
 			return new Promise((resolve, reject) => {
 				User.login(data).then((res) => {
 					if (res.status == 200) {
-						commit("setAdminToken", res.data);
+						context.commit("setAdminToken", res.data);
 						resolve(res)
 					} else {
 						reject(err)
@@ -72,11 +69,8 @@ export default {
 				})
 			}
 		},
-		// 登出
+		adminLogout(context) {
-		adminLogout({
+			context.commit("setAdminToken", null);
-			commit
-		}) {
-			commit("setAdminToken", null);
 		}
 	},
 };

tm-vuetify/changelog.md

@@ -1,3 +1,23 @@
+## 2.0.1（2022-12-8）
+* 修复 tm-icons在小程序下可能图标与文字无法对齐
+* 优化 tm-album性能,修复可能在嵌套组件中,无法计算宽高信息.
+* 优化 tm-dragList性能
+* 优化 tm-row性能
+* 优化 tm-segTabs性能
+* 优化 tm-sheet性能
+* 优化 tm-slider,tm-sliders性能
+* 优化 tm-more性能
+* 优化 tm-propress性能,修复可能在嵌套组件中,无法计算宽高信息.
+* 优化 tm-dialog，tm-poup,动效及样式
+* 微调 tm-button
+* 美化了tm-calendar，tm-calendar-view，选中改成圆形，范围改成椭圆形。
+* 修复 tm-countdown 完成的时机逻辑有误，修改后默认为完成状态。
+* 增强 tm-upload 新增showSort属性，用于上传的文件排序功能。
+* 修复 tm-swiper圆角失效。
+* 修复 tm-weekbar日期问题。
+* 修复 tm-dragGrid 动态修改数据后的判断逻辑问题。
+* 优化 tm-grouplist 渲染性能，现在已经是秒渲染。
+* 修复$tm.vx.getters()下的属性丢失。
 ## 2.0.0（2022-6-7）
 * tm-card修复点击操作按钮时返回的参数非index，而是项目标题。修复动态配置一些属性不生效的问题。
 * tm-dropDownMenu 优化，当重置项时，默认将使用你初始的选中数据来进行填充，默认选中。

tm-vuetify/components/tm-album/tm-album.vue

@@ -159,7 +159,10 @@
 			}
 		},
 		async mounted() {
-			await this.setInits();
+			this.setInits();
+		},
+		updated() {
+			this.setInits();
 		},
 		methods: {
 			//处理数据，以标准化。
@@ -186,8 +189,7 @@
 			async setInits(){
 				this.$nextTick(async function() {
 					let t = this;
-					this.$tm.sleep(150).then(async function(){
+					let p = await t.$Querey('.tm-album',t,0).catch(e =>{});
-						let p = await t.$Querey('.tm-album',t).catch(e =>{});
 					if (!p[0]) return;
 					let grid = t.grid || 1;
 					let size = (p[0].width+t.gutter)/grid;
@@ -197,9 +199,6 @@
 					t.alb_body_size = size * ratio;
 					t.alb_wk_body_size = p[0].width*ratio+t.gutter*2+(grid*2);
 					t.alb_size = blv;
-					})
-					
-					
 				
 				});
 			},

tm-vuetify/components/tm-button/tm-button.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="tm-button " :class="[block ? 'd-block' : 'd-inline-block ']">
+	<view class="tm-button " :class="[block ? 'd-block' : 'd-inline-block ']" hover-class="opacity-6">
 		<view
 			class="flex-center tm-button-btn fulled-height"
 			:class="[block ? '' : customDense_puted ? '' : 'ma-10', block ? 'd-block' : 'd-inline-block', black_tmeme ? 'bk' : '', customStyleTm]"
@@ -54,7 +54,7 @@
 					<block v-if="vtype == true">
 						<text
 							v-if="!fab && icon"
-							:class="[`${prefx_computed} ${icon}`, fontColor ? `text-${colors.color}` : '', black_tmeme ? 'opacity-6' : '', 'px-12']"
+							:class="[`${prefx_computed} ${icon}`, fontColor ? `text-${colors.color}` : '', black_tmeme ? 'opacity-6' : '', 'px-12','flex-shrink']"
 							:style="{
 								fontSize: `${icon_size.px}px`,
 								lineHeight:'normal'
@@ -62,7 +62,7 @@
 						></text>
 						<text
 							v-if="fab && icon && !loading && !titl"
-							:class="[`${prefx_computed} ${icon}`, fontColor ? `text-${colors.color}` : '', black_tmeme ? 'opacity-6' : '']"
+							:class="[`${prefx_computed} ${icon}`, fontColor ? `text-${colors.color}` : '', black_tmeme ? 'opacity-6' : '','flex-shrink']"
 							:style="{
 								fontSize: `${icon_size.px}px`,
 								lineHeight:'normal'
@@ -70,7 +70,7 @@
 						></text>
 						<text
 							v-if="fab && icon && !loading && titl"
-							:class="[`${prefx_computed} ${icon}`, fontColor ? `text-${color_tmeme}` : '', black_tmeme ? 'opacity-6' : '']"
+							:class="[`${prefx_computed} ${icon}`, fontColor ? `text-${color_tmeme}` : '', black_tmeme ? 'opacity-6' : '','flex-shrink']"
 							:style="{
 								fontSize: `${icon_size.px}px`,
 								lineHeight:'normal'
@@ -80,7 +80,7 @@
 					<block v-if="vtype == false"><tm-icons :size="icon_size.upx" :name="icon"></tm-icons></block>
 				</slot>
 
-				<view v-if="!fab || showValue" class="d-inline-block tm-button-label flex-shrink" :style="{ fontSize: font_size }" :class="[fontColor ? `text-${colors.color}` : '']">
+				<view v-if="!fab || showValue" class="d-inline-block tm-button-label flex-shrink" :style="{ fontSize: font_size }" :class="[fontColor ? `text-${colors.color}` : '',vertical ? 'full ' : '',]">
 					<slot name="default" :data="label">{{ label }}</slot>
 				</view>
 			</button>
@@ -556,11 +556,13 @@ export default {
 		line-height: 88upx;
 		height: 88upx;
 		vertical-align: middle;
+		
 		// #ifdef H5
 		transition: all 0.3s;
 		// #endif
 		.tm-button-label {
 			vertical-align: middle;
+			
 		}
 		&::after {
 			border: none;
@@ -671,6 +673,7 @@ export default {
 		}
 		&.showValue {
 			line-height: inherit !important;
+			padding: 0 !important;
 		}
 
 		&.noGutter {

tm-vuetify/components/tm-calendar/tm-calendar.vue

@@ -54,13 +54,21 @@
 						:key="index+'_acv'"><text class="text-size-s py-16">{{item}}</text>
 						</tm-col>
 						<!-- #endif -->
-						<tm-col :round="(item.start||item.end||item.checked)?4:0" @click="day_danxuanclick(item,index)"  
+						<tm-col 
-						:color="item.beginEnd?(item.checked===true||item.start||item.end?color_tmeme+(black_tmeme?' bk ':''):(item.guocheng?color_tmeme+' text  opacity-7 '+(black_tmeme?'bk':''):'')):''" 
+						@click="day_danxuanclick(item,index)"  
+						color="" 
 						:custom-class="isSelectedDateClass(item)"
-						align="middle" width="14.28%" v-for="(item,index) in nowData"
+						justify="center" width="14.28%" 
-						:key="index">
+						v-for="(item,index) in nowData"
-						
+						:key="index"
-							<view  class="tm-calendar-col flex-center flex-col py-4" :class="[black_tmeme&&!item.beginEnd?' opacity-2 ':'']">
+						>
+							<view  class="tm-calendar-col flex-center flex-col "
+							 :style="[mode=='rang'?{width:'100%',height:'90rpx'}:{width:'90rpx',height:'90rpx',overflow: 'hidden','border-radius': '50% !important'}]"
+							:class="[
+								item.start?'round-l-24':'',
+								item.end?'round-r-24':'',
+								item.beginEnd?(item.checked===true||item.start||item.end?color_tmeme+(black_tmeme?' bk ':''):(item.guocheng?color_tmeme+' text  opacity-7 '+(black_tmeme?'bk':''):'')):'',
+								black_tmeme&&!item.beginEnd?' opacity-2 ':'']">
 								
 								<text class="text-size-n "
 								:class="[
@@ -70,19 +78,14 @@
 									!item.beginEnd?'text-grey-lighten-3':''
 								]"
 								>{{item.day}}</text>
-								<!-- 
+
-								 !item.nowMonth&&!item.guocheng&&!item.checked&&!item.start&&!item.end?(black?'text-grey-darken-3':'text-grey-lighten-1'):'',
-								 item.checked||item.start||item.end?'text-white':(item.guocheng?'':'text-grey-lighten-1'),
-								 item.guocheng?'text-'+color:'',
-								 !item.beginEnd?'text-grey-lighten-3':'',
-								 -->
 								<view class="text-size-xs  text_bl"
 								>
 								<block v-if="item.start">
-									开始
+									始
 								</block>
 								<block v-if="item.end">
-									结束
+									-止
 								</block>
 								
 								<block v-if="!item.start&&!item.end">
@@ -134,6 +137,11 @@
 	import tmRow from "@/tm-vuetify/components/tm-row/tm-row.vue"
 	import tmButton from "@/tm-vuetify/components/tm-button/tm-button.vue"
 	import tmPoup from "@/tm-vuetify/components/tm-poup/tm-poup.vue"
+	import * as dayjs from "@/tm-vuetify/tool/function/dayjs/dayjs.min.js"
+	const calendar = require("@/tm-vuetify/tool/function/dayjs/calendar.js")
+	dayjs.extend(calendar)
+	const DayJs = dayjs.default
+	
 	export default {
 		components:{tmIcons,tmCol,tmRow,tmButton,tmPoup},
 		name: "tm-calendar",
@@ -262,7 +270,7 @@
 				if(!this.cal) return;
 				// 自动更新默认的显示时间。
 				if(this.mode=='day'){
-					let d = new Date().toLocaleDateString().replace(/\//g,'-');
+					let d = DayJs().format("YYYY/MM/DD HH:mm:ss");
 					if(this.defaultValue){
 						d = this.defaultValue;
 					}
@@ -343,10 +351,9 @@
 		},
 		methods: {
 			watchRangeTime(){
-				
+				let d =   DayJs().format("YYYY/MM/DD HH:mm:ss")
-				let d = new Date().toLocaleDateString().replace(/\//g,'-');
 				if(this.defaultValue){
-					d = this.defaultValue;
+					d = DayJs(this.defaultValue).format("YYYY/MM/DD HH:mm:ss");
 				}
 				this.cal = new this.$tm.calendar({value:d,start:this.timeStart,end:this.timeEnd})
 				if(this.txt){
@@ -366,8 +373,8 @@
 					if(this.bingStart&&this.bingEnd){
 						
 						this.fanxuanxuanwuBydate(
-						new Date(this.bingStart.replace(/-/g,'/')),
+						DayJs(this.bingStart),
-						new Date(this.bingEnd.replace(/-/g,'/')),
+						DayJs(this.bingEnd),
 						)
 					}
 				}
@@ -609,13 +616,14 @@
 			// 通过外围 时间默认的选中
 			fanxuanxuanwuBydate(start,end){
 				if(!start||!end) return;
+				// .format("YYYY/MM/DD HH:mm:ss")
 				
 				this.$nextTick(function(){
-					if(start.getTime()>end.getTime()) return;
+					if(start.valueOf()>end.valueOf()) return;
 					// 获取开始月份的数据。
-					let sobj = new this.$tm.calendar({value:start.toLocaleDateString().replace(/\//g,'-')});
+					let sobj = new this.$tm.calendar({value:start.format("YYYY/MM/DD HH:mm:ss")});
 					// 获取结束月份的数据。
-					let eobj = new this.$tm.calendar({value:end.toLocaleDateString().replace(/\//g,'-')});
+					let eobj = new this.$tm.calendar({value:end.format("YYYY/MM/DD HH:mm:ss")});
 					function findItemToindex_only(obj,type){
 						let item=null;
 						for(let i=0;i<obj.length;i++){
@@ -657,7 +665,7 @@
 					this.start = start_obj
 					this.end = end_obj
 					// 如果结束和开始相等。
-					if(start.getTime()==end.getTime()){
+					if(start.valueOf()==end.valueOf()){
 						this.start = {...this.start,start:true,end:true}
 						this.end = {...this.end,start:true,end:true}
 					}

tm-vuetify/components/tm-calendarView/tm-calendarView.vue

@@ -48,12 +48,21 @@
 						:key="index"><text class="text-size-s py-16">{{item}}</text>
 						</tm-col>
 						<!-- #endif -->
-						<tm-col :round="(item.start||item.end||item.checked)?4:0" @click="day_danxuanclick(item,index)"
+						<tm-col 
-						:color="item.beginEnd?(item.checked===true||item.start||item.end?color_tmeme+(black_tmeme?' bk ':''):(item.guocheng?color_tmeme+' text  opacity-7 '+(black_tmeme?'bk':''):'')):''" 
+						@click="day_danxuanclick(item,index)"
+						color="" 
 						:custom-class="isSelectedDateClass(item)"
-						align="middle" width="14.28%" v-for="(item,index) in nowData"
+						justify="center" width="14.28%" 
-						:key="index">
+						v-for="(item,index) in nowData"
-							<view class="tm-calendarView-col flex-center flex-col" :class="[black&&!item.beginEnd?' opacity-2 ':'']">
+						:key="index"
+						>
+							<view  class="tm-calendar-col flex-center flex-col "
+							 :style="[mode=='rang'?{width:'100%',height:'90rpx'}:{width:'90rpx',height:'90rpx',overflow: 'hidden','border-radius': '50% !important'}]"
+							:class="[
+								item.start?'round-l-24':'',
+								item.end?'round-r-24':'',
+								item.beginEnd?(item.checked===true||item.start||item.end?color_tmeme+(black_tmeme?' bk ':''):(item.guocheng?color_tmeme+' text  opacity-7 '+(black_tmeme?'bk':''):'')):'',
+								black_tmeme&&!item.beginEnd?' opacity-2 ':'']">
 								<text class="text-size-n"
 								:class="[
 									!item.nowMonth&&!item.guocheng&&!item.checked&&!item.start&&!item.end?(black_tmeme?'text-grey-darken-3':'text-grey-lighten-1'):'',
@@ -65,10 +74,10 @@
 								<view class="text-size-xs  text_bl"
 								>
 								<block v-if="item.start">
-									开始
+									始
 								</block>
 								<block v-if="item.end">
-									结束
+									-止
 								</block>
 								
 								<block v-if="!item.start&&!item.end">

tm-vuetify/components/tm-countdown/tm-countdown.vue

@@ -53,7 +53,7 @@
 				return ps;
 			},
 			isfinish:function(){
-				if(this.now == this.time) return true;
+				if(this.now == this.time||this.now==0) return true;
 				return false;
 			}
 		},

tm-vuetify/components/tm-dialog/tm-dialog.vue

@@ -302,19 +302,19 @@ export default {
 .tm-dialog {
 	width: 100%;
 	z-index: 600;
-	background-color: rgba(0, 0, 0, 0.35);
+	background-color: rgba(0, 0, 0, 0.3);
 	left: 0;
 	top: 0;
 	
-	backdrop-filter: blur(10px);
+	backdrop-filter: blur(3px);
-	transition: all 0.35s;
+	transition: all 0.24s;
 	.success {
-		animation: success 0.35s linear;
+		animation: success 0.24s ease;
 		
 		// transform: scale(1);
 	}
 	.clickover {
-		animation: clickover 0.35s linear;
+		animation: clickover 0.24s ease;
 	}
 }
 @keyframes clickover {

tm-vuetify/components/tm-dragGrid/tm-dragGrid.vue

@@ -253,10 +253,10 @@
 				this.$emit('change',elList);
 			},
 			inits() {
+				this.grid = this.list.length;
 				if(this.grid==0) return;
 				this.$nextTick(async function() {
 					let p = await this.$Querey(".tm-dragGrid", this).catch(e => {})
-					this.grid = this.list.length;
 					this.listData = [];
 					//组件的宽度
 					this.w = uni.upx2px(this.width) || p[0].width || 300;

tm-vuetify/components/tm-dragList/tm-dragList.vue

@@ -140,7 +140,6 @@
 			jishunTopData() {
 				this.$nextTick(async function() {
 					this.listData = [];
-
 					let p = await this.$Querey(".tm-dragList", this).catch(e => {})
 					this.w = uni.upx2px(this.width) || p[0].width;
 					this.h = uni.upx2px(this.height)

tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue

@@ -20,6 +20,7 @@
 					@touchcancel="$emit('touchcancel', $event)"
 					:open-type="openType"
 					@click="click"
+					:padding="[0,0]"
 					 :showValue="showText" vertical :label="label" :fontSize="fontSize"
 						 :iconSize="iconSize" :theme="color_tmeme" round="rouned" :font-color="fontColor"  :bgcolor="bgcolor"
 						:size="size" :width="width" :height="width" :icon="icon" fab>

tm-vuetify/components/tm-grouplist/tm-grouplist.vue

@@ -6,7 +6,7 @@
 			<view v-if="title&&title!='true'" class="px-32 py-16  text-weight-b " :class="[`text-size-${fontSize}`,titleTheme, black_tmeme ? 'bk' : '']">
 				<slot name="title" :title="title">{{ title }}</slot>
 			</view>
-			<view  v-show="chuliWsok==true">
+			<view  >
 				<slot></slot>
 			</view>
 		</view>
@@ -77,6 +77,20 @@ export default {
 			return this.$tm.vx.state().tmVuetify.black;
 		}
 	},
+	provide(){
+		let t = this;
+		return {
+			GroupListStyles:()=>{
+				return {
+					margin: [0,0],
+					padding: [32,24],
+					shadow: 0,
+					round: 0,
+					borderBottom: true
+				}
+			}
+		}
+	},
 	data() {
 		return {
 			targ:'tm-grouplist',
@@ -99,47 +113,7 @@ export default {
 	},
 	methods: {
 		inits(){
-			let t = this;
-			this.$nextTick(function () {
-				let ch = this.$children;
-				// #ifdef H5
-					ch = [];
-					let cld = this.$children[0].$children
 			
-					while(cld){
-						if(cld[0].$children.length>0){
-							let ods = cld[0].$children;
-							ch =ods[ods.length-1].$children;
-							
-							break;
-						}else{
-							cld = cld[0]?.$children
-						}
-						
-					}
-				// #endif
-				
-						
-				ch.forEach((item,index)=>{
-					
-					if(item.$options.name==="tm-listitem"){
-						item.setConfig({
-							margin: [0,0],
-							padding: [32,24],
-							shadow: 0,
-							round: 0,
-							borderBottom: index===ch.length-1?false:t.borderBottom
-						})
-					}
-				})
-				
-				// #ifndef H5
-					setTimeout(function() {
-						t.chuliWsok = true;
-					}, 30);
-				// #endif
-				
-			})
 		},
 		// 事件一定是子项目tm-listitem为group模式时，才会触发。
 		change(vue_uid) {

tm-vuetify/components/tm-icons/tm-icons.vue

@@ -1,40 +1,47 @@
 <template>
 	<!-- 图标 -->
-	<view @click="onclick" v-if="name" class="tm-icons  vertical-align-top" style="display: inline-block;font-size: 0;" >
+	<view @click="onclick" v-if="name" class="tm-icons " >
-		<view class="flex-center " :style="{
+		<view
+			class="tm-icons-item "
+			:style="{
 				width: sizes,
 				height: sizes,
-						lineHeight:sizes,
+				lineHeight: sizes
-						
+			}"
-					}">
+		>
 			<block v-if="vtype == false">
-				<image :src="name" :style="{
+				<image
+					:src="name"
+					:style="{
 						width: sizes,
 						height: sizes
-					}" mode="scaleToFill"></image>
+					}"
+					mode="scaleToFill"
+				></image>
 			</block>
 			<block v-if="vtype == true">
 				<!-- #ifdef APP-NVUE -->
-				<text :style="{
+				<text
+					:style="{
 						fontSize: sizes,
 						fontFamily: 'iconfontTM'
-					}" class="icons "
+					}"
-					:class="[ black_tmeme ? colors+'-bk':colors, dense ? '' : 'pa-10', black ? 'opacity-6' : '']">{{iconName}}</text>
+					class="icons "
+					:class="[black_tmeme ? colors + '-bk' : colors, dense ? '' : 'pa-10', black ? 'opacity-6' : '']"
+				>
+					{{ iconName }}
+				</text>
 				<!-- #endif -->
-				
+				<!-- #ifndef APP-NVUE -->
-				<!-- #ifdef MP -->
+				<text
-				<text :style="{
+					:style="{
 						fontSize: sizes,
-					}" class="icons mt--4"
-					:class="[prefx_computed, black_tmeme ? 'bk' : '', iconName, colorTheme ? colors : '', dense ? '' : 'pa-10', black ? 'opacity-6' : '']"></text>
-				<!-- #endif -->
-				<!-- #ifndef MP -->
-				<text :style="{
-						fontSize: sizes,
-					}" class="icons "
-					:class="[prefx_computed, black_tmeme ? 'bk' : '', iconName, colorTheme ? colors : '', dense ? '' : 'pa-10', black ? 'opacity-6' : '']"></text>
-				<!-- #endif -->
 						
+					}"
+					class="icons "
+					:class="[prefx_computed, black_tmeme ? 'bk' : '', iconName, colorTheme ? colors : '', dense ? '' : 'pa-10', black ? 'opacity-6' : '']"
+				></text>
+				<!-- #endif -->
 			</block>
 		</view>
 	</view>
@@ -75,7 +82,7 @@
 			default: 28
 		},
 		color: {
-				type: String, //颜色名称或者颜色值。
+			type: String|null, //颜色名称或者颜色值。
 			default: 'primary'
 		},
 		//强制转换图标类型，不通过内置判定，解决自己引用图片svg图标时当作字体图标的错误。
@@ -98,7 +105,7 @@
 			// fontList.glyphs
 			let itemIcon = fontList.glyphs.find((item, index) => {
 				return item.font_class == name;
-				})
+			});
 			return eval('"\\u' + itemIcon.unicode + '"');
 			// #endif
 			return this.name;
@@ -111,16 +118,10 @@
 			return prefix;
 		},
 		black_tmeme: function() {
-
 			return this.$tm.vx.state().tmVuetify.black;
 		},
 		vtype: function() {
-				if (this.name[0] == "." ||
+			if (this.name[0] == '.' || this.name[0] == '/' || this.name.substring(0, 4) == 'http' || this.name.substring(0, 5) == 'https' || this.name.substring(0, 3) == 'ftp') {
-					this.name[0] == "/" ||
-					this.name.substring(0, 4) == 'http' ||
-					this.name.substring(0, 5) == 'https' ||
-					this.name.substring(0, 3) == 'ftp'
-				) {
 				return false;
 			}
 			return true;
@@ -137,9 +138,7 @@
 			}
 		},
 		color_tmeme: function() {
-
+			if (this.$tm.vx.state().tmVuetify.color !== null && this.$tm.vx.state().tmVuetify.color && this.fllowTheme) {
-				if (this.$tm.vx.state().tmVuetify.color !== null && this.$tm.vx.state().tmVuetify.color && this
-					.fllowTheme) {
 				return this.$tm.vx.state().tmVuetify.color;
 			}
 			return this.color;
@@ -176,8 +175,12 @@
 
 <style lang="scss" scoped>
 .tm-icons {
-		vertical-align: middle;
+	display: inline-block;
-
+	.tm-icons-item{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
 	.icons {
 		&.black {
 			color: #fff;

tm-vuetify/components/tm-input/tm-input.vue

@@ -25,7 +25,7 @@
 					<view v-if="title" class="d-inline-block  "
 					:style="{fontSize:title_size}"
 						:class="[titleClass,black_tmeme?'bk  text-grey-lighten-3':'']">
-						<text v-if="required" class="text-red">*</text>
+						<text v-if="_required" class="text-red">*</text>
 						<slot name="default" :title="title">
 							{{title}}
 						</slot>
@@ -368,6 +368,9 @@
 			};
 		},
 		computed: {
+			_required(){
+				return this.required
+			},
 			height_rpx:function(){
 				return this.height;
 			},
@@ -430,7 +433,7 @@
 				set:function(val){
 					this.$emit('input', val)
 					this.$emit('update:value', val)
-					if (this.required) {
+					if (this._required) {
 						this.$nextTick(function(){
 							this.verifyInput();
 						})

tm-vuetify/components/tm-listitem/tm-listitem.vue

@@ -1,6 +1,6 @@
 <!-- 列表项目，类似单元格。 -->
 <template>
-	<view class="tm-listitem ">
+	<view class="tm-listitem " :hover-class="url?'opacity-6':''">
 		<view
 
 			@click="click"
@@ -280,9 +280,15 @@ export default {
 				return this.$tm.vx.state().tmVuetify.color;
 			}
 			return this.leftIconColor;
+		},
+		groupPublickStyle:function(){
+			if(!this.GroupListStyles) return null
+			return this.GroupListStyles()
 		}
 	},
-
+	inject:{
+		GroupListStyles:{default:null}
+	},
 	data() {
 		return {
 			pz_theme: {
@@ -296,6 +302,15 @@ export default {
 		};
 	},
 	created() {
+		if(this.groupPublickStyle){
+			this.pz_themeCus = {
+				margin: this.groupPublickStyle.margin,
+				padding: this.groupPublickStyle.padding,
+				shadow: this.groupPublickStyle.shadow,
+				round: this.groupPublickStyle.round,
+				borderBottom: this.groupPublickStyle.borderBottom||this.borderBottom
+			};
+		}else{
 			this.pz_themeCus = {
 				margin: this.margin,
 				padding: this.padding,
@@ -303,6 +318,9 @@ export default {
 				round: this.round,
 				borderBottom: this.borderBottom
 			};
+		}
+		
+		
 	},
 	mounted() {
 		

tm-vuetify/components/tm-menubars/tm-menubars.vue

@@ -22,7 +22,6 @@
 							<text class="iconfont icon-angle-left" :class="[`text-${fontColorTheme}`]" :style="{ fontSize: '28rpx' }"></text>
 						</navigator>
 					</block>
-
 					<slot name="left" :data="{ style: widths, isTransparent: isTransparent, title: title }"></slot>
 				</view>
 				<view class="center flex-center text-size-g text-overflow text-align-center" :class="[`text-${fontColorTheme}`]">
@@ -36,6 +35,7 @@
 			</view>
 		</view>
 	</view>
+	
 </template>
 
 <script>
@@ -61,6 +61,9 @@
 		components: {
 			tmIcons
 		},
+		options:{
+			multipleSlots: true
+		},
 		name: 'tm-menubars',
 		props: {
 			// 是否开启暗黑模式

tm-vuetify/components/tm-more/tm-more.vue

@@ -109,18 +109,12 @@ import tmIcons from "@/tm-vuetify/components/tm-icons/tm-icons.vue"
 	mounted() {
 		this.$nextTick(function(){
 			this.downOpen = this.open;
-			
+			this.getRect()
-			let t = this;
-			
-			t.$Querey('.tm-more-content',t).then(syninfo=>{
-				if (syninfo[0].height - 40 <= t.hs) {
-					t.show = false;
-				}
-			}).catch(e => {});
-			
-			
 		})
 	},
+	updated() {
+		this.getRect()
+	},
 	computed: {
 		hs: function() {
 			return uni.upx2px(this.maxHeight) || 100;
@@ -131,6 +125,14 @@ import tmIcons from "@/tm-vuetify/components/tm-icons/tm-icons.vue"
 		}
 	},
 	methods: {
+		getRect(){
+			let t = this;
+			t.$Querey('.tm-more-content',t,0).then(syninfo=>{
+				if (syninfo[0].height - 40 <= t.hs) {
+					t.show = false;
+				}
+			}).catch(e => {});
+		},
 		openMore() {
 			this.$emit('click');
 			if (this.disabled) return;

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

@@ -232,7 +232,7 @@
 				this.aniData = '';
 				let aniData = uni.createAnimation({
 					duration:240,
-					timingFunction: 'linear',
+					timingFunction: 'ease',
 				})
 				this.aniData = aniData;
 				if(pos=='bottom'){
@@ -327,15 +327,15 @@
 			pointer-events: none;
 		}
 		&.blur {
-			backdrop-filter: blur(10px);
+			backdrop-filter: blur(3px);
 		}
 
 		&.on {
-			animation: opta 1s linear;
+			animation: opta 1s ease;
 		}
 
 		&.off {
-			animation: opta_off 0.35s linear;
+			animation: opta_off 0.24s ease;
 		}
 		.tm-poup-wk {
 			position: absolute;
@@ -393,7 +393,7 @@
 
 	@keyframes opta {
 		from {
-			opacity: 0.6;
+			opacity: 0.3;
 		}
 
 		to {
@@ -495,7 +495,7 @@
 	@keyframes Centerleft {
 		from {
 			transform: scale(0.65);
-			opacity: 0.65;
+			opacity: 0.3;
 		}
 
 		to {
@@ -512,7 +512,7 @@
 
 		to {
 			transform: scale(0.65);
-			opacity: 0.65;
+			opacity: 0.3;
 
 		}
 	}

tm-vuetify/components/tm-propress/tm-propress.vue

@@ -166,19 +166,25 @@ export default {
 	destroyed() {
 		clearInterval(this.tmiddd)
 	},
-	async mounted() {
+	mounted() {
-		
+		this.getRect()
-		this.$nextTick(async function(){
-			let p = await this.$Querey(".tm-propress",this).catch(e=>{})
-			
-			this.width_upx = p[0].width+'px';
-			if(this.loading){
-				await this.startAni();
-			}
-		})
 		
 	},
+	updated() {
+		this.getRect()
+	},
 	methods: {
+		getRect(){
+			let t =this
+			this.$Querey(".tm-propress",this,0).then((p)=>{
+				if(!p) return;
+				if(!p[0].width) return;
+				t.width_upx = p[0].width+'px';
+				if(t.loading){
+					t.startAni();
+				}
+			}).catch(e=>{})
+		},
 		async startAni(){
 			// clearInterval(this.tmiddd)
 			let t = this;

tm-vuetify/components/tm-row/tm-row.vue

@@ -1,11 +1,8 @@
 <template>
 	<view @click="$emit('click',$event)" :gutter="gutter" class="tm--row" :class="[preatClass]" >
 		<view   class="tm--row--body" :style="style" :class="[customClass]">
-			<view  v-show="chuliWsok==true">
 			<slot></slot>
 		</view>
-			
-		</view>
 	</view>
 </template>
 
@@ -64,13 +61,18 @@
 				width_px:0,
 				children_num:0,
 				style:'',
-				chuliWsok:false,//处理完宽度计算信息再进行显示内部内容。
 			};
 		},
-		async mounted() {
+		updated() {
+			this.getContinaRect()
+		},
+		mounted() {
+			this.getContinaRect()
+		},
+		methods:{
+			getContinaRect(){
 				let t = this;
-			
+				this.$Querey('.tm--row',this).then(preantw=>{
-			await this.$Querey('.tm--row',this).then(preantw=>{
 					t.width_px = preantw[0].width;
 					// #ifndef H5
 					t.children_num = t.$children.length;
@@ -85,9 +87,8 @@
 						'height':!t.height?'default':(uni.upx2px(t.height)+'px')
 					},';');
 					
-				t.chuliWsok = true;
 				}).catch(e=>{})
-			
+			}
 		}
 	}
 </script>

tm-vuetify/components/tm-segTabs/tm-segTabs.vue

@@ -191,10 +191,10 @@
 		},
 		mounted() {
 			let t = this;
-			uni.$tm.sleep(30).then(()=>{
 			t.setInits();
-				
+		},
-			})
+		updated() {
+			this.setInits();
 		},
 		methods: {
 			setInits() {

tm-vuetify/components/tm-sheet/tm-sheet.vue

@@ -25,7 +25,7 @@
 		]"
 		
 	>
-		<view class="fulled" v-if="showSheet">
+		<view class="fulled" >
 			<slot name="default"></slot>
 		</view>
 	</view>
@@ -151,25 +151,7 @@ export default {
 			return this.$tm.vx.state().tmVuetify.black;
 		}
 	},
-	data() {
-		return {
-			showSheet:true,
-		};
-	},
-	created() {
-		// #ifdef APP-VUE || APP-PLUS || MP
-		this.showSheet = false;
-		// #endif
-	},
-	mounted() {
-		let t= this;
 
-		// #ifdef APP-VUE || APP-PLUS || MP
-		setTimeout(function() {
-			t.showSheet = true;
-		}, 30);
-		// #endif
-	}
 };
 </script>
 <style lang="scss" scoped>

tm-vuetify/components/tm-signBoard/tm-signBoard.vue

@@ -12,7 +12,6 @@
 			@touchstart="touchstart"
 			@touchmove.stop.prevent="touchsmove"
 			@touchend="touchsend"
-			
 			@mousedown="touchstart"
 			@mousemove.stop.prevent="touchsmove"
 			@mouseup="touchsend"

tm-vuetify/components/tm-slider/tm-slider.vue

@@ -244,6 +244,17 @@
 				this.barLeft = rdl >= this.sliderWidth || rdl < 0 ? this.sliderWidth : rdl;
 			});
 		},
+		async updated() {
+			this.$nextTick(async function() {
+				await this.getwidth();
+				if (Math.abs(this.value) > Math.abs(this.max)) {
+					this.isError = true;
+					return;
+				}
+				let rdl = this.sliderWidth * (Math.abs(this.value) / Math.abs(this.max));
+				this.barLeft = rdl >= this.sliderWidth || rdl < 0 ? this.sliderWidth : rdl;
+			});
+		},
 		methods: {
 			barStart(e) {
 				
@@ -306,7 +317,7 @@
 				
 			},
 			async getwidth() {
-				let res = await this.$Querey('.tm-slider-id', this).catch(e=>{});
+				let res = await this.$Querey('.tm-slider-id', this,0).catch(e=>{});
 				res[0].width = res[0].width||uni.upx2px(this.width);
 				res[0].height = res[0].height||uni.upx2px(this.height);
 				if (this.showLeft === false && this.showRight === false) {

tm-vuetify/components/tm-sliders/tm-sliders.vue

@@ -297,6 +297,20 @@
 				this.barLeft_1 = rdl_1 >= this.sliderWidth || rdl_1 < 0 ? this.sliderWidth : rdl_1;
 			});
 		},
+		updated() {
+			this.$nextTick(async function() {
+				await this.getwidth();
+			
+				if (Math.abs(this.value[1]) > Math.abs(this.max)) {
+					this.isError = true;
+					return;
+				}
+				let rdl = this.sliderWidth * (Math.abs(this.value[0]) / Math.abs(this.max));
+				this.barLeft = rdl >= this.sliderWidth || rdl < 0 ? this.sliderWidth : rdl;
+				let rdl_1 = this.sliderWidth * (Math.abs(this.value[1]) / Math.abs(this.max));
+				this.barLeft_1 = rdl_1 >= this.sliderWidth || rdl_1 < 0 ? this.sliderWidth : rdl_1;
+			});
+		},
 		methods: {
 			barStart(e) {
 				if (this.disabled || this.isError) return;
@@ -407,7 +421,7 @@
 			},
 			
 			async getwidth() {
-				let res = await this.$Querey('.tm-slider-id', this).catch(e=>{});
+				let res = await this.$Querey('.tm-slider-id', this,0).catch(e=>{});
 				res[0].width = res[0].width||uni.upx2px(this.width);
 				res[0].height = res[0].height||uni.upx2px(this.height);
 				

tm-vuetify/components/tm-swiper/tm-swiper.vue

@@ -1,82 +1,42 @@
 <template>
 	<view class="tm-swiper " :class="[inline ? 'd-inline-block' : '']">
-		<swiper
+		<swiper :previous-margin="`${ani3d}rpx`" :next-margin="`${ani3d}rpx`" :style="{
-			:previous-margin="`${ani3d}rpx`"
-			:next-margin="`${ani3d}rpx`"
-			:style="{
 				width: w_s + 'rpx',
 				height: h_s + 'rpx'
-			}"
+			}" :vertical="vertical" :autoplay="autoplay&&!isPlayVedio" :circular="circular" :interval="interval" :duration="duration"
-			:vertical="vertical"
+			:indicator-active-color="color_tmeme" :current="nowIndex" @change="change" :class="[round_num > 0 ? ` round-${round_num} overflow` : '']">
-			:autoplay="autoplay && !isPlayVedio"
-			:circular="circular"
-			:interval="interval"
-			:duration="duration"
-			:indicator-active-color="color_tmeme"
-			:current="nowIndex"
-			@change="change"
-		>
 			<block v-for="(item, index) in dataList" :key="index">
-				<swiper-item
+				<swiper-item :style="{
-					:style="{
 						width: w_s + 'rpx',
 						height: h_s + 'rpx'
-					}"
+					}" class="shadow-24" :class="[round_num > 0 ? ` round-${round_num} overflow` : '']">
-					class="shadow-24"
-					:class="[round_num > 0 ? ` round-${round_num} overflow` : '']"
-				>
 					<view
-						:class="[
+						:class="[nowIndex !== index&&ani3d>0?'a3d':'',round_num > 0 ? ` round-${round_num} overflow` : '',nowIndex<index&&ani3d>0?'a3dL':'',nowIndex>index&&ani3d>0?'a3dR':'']"
-							nowIndex !== index && ani3d > 0 ? 'a3d' : '',
+						class="tm-swiper-ik fulled fulled-height" :key="index">
-							round_num > 0 ? ` round-${round_num} overflow` : '',
-							nowIndex < index && ani3d > 0 ? 'a3dL' : '',
-							nowIndex > index && ani3d > 0 ? 'a3dR' : ''
-						]"
-						class="tm-swiper-ik fulled fulled-height"
-						:key="index"
-					>
 						<view class="actvieMarginDh">
-							<view class="actvieMarginDh-item" :class="[round_num > 0 ? ` round-${round_num} overflow` : '']">
+							<view class="actvieMarginDh-item"
-								<image
+								:class="[round_num > 0 ? ` round-${round_num} overflow` : '']">
-									v-if="item.dtype != 'video'"
+								<image v-if="item.dtype!='video'" @click="itemClick(item)" :style="{
-									@click="itemClick(item)"
-									:style="{
 										height: h_s + 'rpx',
-										width: w_s - margin_px + 'rpx'
+										width: (w_s - margin_px) + 'rpx'
-									}"
+									}" @load="imgload($event, index)" :src="item.url"
-									@load="imgload($event, index)"
+									:class="[round_num > 0 ? ` round-${round_num} overflow` : '']"></image>
-									:src="item.url"
+								<video @play="isPlayVedio = true" @pause="isPlayVedio=false" @ended="isPlayVedio=false" :autoplay="nowIndex == index?true:false" :style="{
-									:class="[round_num > 0 ? ` round-${round_num} overflow` : '']"
-								></image>
-								<video
-									@play="isPlayVedio = true"
-									@pause="isPlayVedio = false"
-									@ended="isPlayVedio = false"
-									:autoplay="nowIndex == index ? true : false"
-									:style="{
 										height: h_s + 'rpx',
-										width: w_s - margin_px + 'rpx'
+										width: (w_s - margin_px) + 'rpx'
-									}"
+									}" v-if="item.dtype=='video'" :src="item.url"></video>
-									v-if="item.dtype == 'video'"
-									:src="item.url"
-								></video>
 
-								<view
+								<view v-if="item.title" :style="{
-									v-if="item.title"
+										width: (w_s - margin_px) + 'rpx'
-									:style="{
+									}" class="flex-start relative ">
-										width: w_s - margin_px + 'rpx'
-									}"
-									class="flex-start relative "
-								>
 									<view
 										class="text-size-s px-16 absolute b-0 l-0 zIndex-14 flex-start text-overflow text-white"
 										:style="{
 										height: '66rpx',
-											width: w_s - margin_px - 32 + 'rpx',
+										width: (w_s - margin_px-32) + 'rpx',
 										lineHeight:'66rpx',
 										background:'rgba(0,0,0,0.4)'
-										}"
+									}">
-									>
 										{{item.title}}
 									</view>
 								</view>
@@ -87,23 +47,18 @@
 			</block>
 		</swiper>
 		<view class="tm-swiper-dot" v-if="indicatorDots&&nowshowDot" :class="[dotDirection]">
+		
 			<block v-if="dotModel != 'round'">
-				<view
+				<view @click="nowIndex = index" v-for="(item, index) in dataList" :key="index"
-					@click="nowIndex = index"
-					v-for="(item, index) in dataList"
-					:key="index"
 					class="tm-swiper-dot-item  flex-center  mx-8"
-					:class="[nowIndex == index ? color_tmeme : 'unactive', dotModel]"
+					:class="[nowIndex == index ? color_tmeme : 'unactive', dotModel]">
-				>
 					<text v-if="dotModel === 'number'" class="text-size-xs">{{ index + 1 }}</text>
 				</view>
 			</block>
 			<block v-if="dotModel == 'round'">
-				<view
+				<view :class="[dotModel]"
-					:class="[dotModel]"
 					class="text-size-xs balck text-white  round-24 px-24 tm-swiper-dot-item  flex-center flex-shrink"
-					:style="{ height: '40rpx', minWidth: '60rpx' }"
+					:style="{ height: '40rpx', minWidth: '60rpx' }">
-				>
 					{{ nowIndex + 1 + '/' + dataList.length }}
 				</view>
 			</block>
@@ -223,11 +178,11 @@ export default {
 		},
 		watch: {
 			current: function(newval) {
-			// if (newval >= this.dataList.length) {
+				if (newval >= this.dataList.length) {
-			// 	this.nowIndex = 0;
+					this.nowIndex = 0;
-			// 	return;
+					return;
-			// }
+				}
-			// this.nowIndex = newval;
+				this.nowIndex = newval;
 			},
 			list: {
 				deep: true,
@@ -238,7 +193,8 @@ export default {
 		},
 		computed: {
 			color_tmeme: function() {
-			if (this.$tm.vx.state().tmVuetify.color !== null && this.$tm.vx.state().tmVuetify.color && this.fllowTheme) {
+				if (this.$tm.vx.state().tmVuetify.color !== null && this.$tm.vx.state().tmVuetify.color && this
+					.fllowTheme) {
 					return this.$tm.vx.state().tmVuetify.color;
 				}
 				return this.color;
@@ -259,6 +215,7 @@ export default {
 			},
 			nowshowDot:function(){
 				return this.showdot();
+				
 			},
 			w_s: {
 				get: function() {
@@ -278,7 +235,8 @@ export default {
 			},
 			margin_px: function() {
 				return this.margin * 2;
-		}
+			},
+
 		},
 
 		data() {
@@ -287,11 +245,11 @@ export default {
 				h_h: 0,
 				dataList: [],
 				dotIndex: 0,
-			isPlayVedio: false
+				isPlayVedio:false,
 			};
 		},
 		async mounted() {
-		// this.nowIndex = this.current;
+			this.nowIndex = this.current;
 
 			let w = this.width;
 			if (String(w).indexOf('px') > -1 && typeof w == 'string') {
@@ -321,6 +279,7 @@ export default {
 			});
 		},
 		methods: {
+			
 			showdot(){
 				if(typeof this.dataList[this.nowIndex]=='string') return true;
 				if(typeof this.dataList[this.nowIndex]=='object'){
@@ -392,11 +351,11 @@ export default {
 		}
 
 		.a3dL {
-		transform: scale(0.76) translateX(-24rpx);
+			transform: scale(0.76) translateX(-24rpx)
 		}
 
 		.a3dR {
-		transform: scale(0.76) translateX(24rpx);
+			transform: scale(0.76) translateX(24rpx)
 		}
 
 		.actvieMarginDh {

tm-vuetify/components/tm-translate/tm-translate.vue

@@ -13,7 +13,7 @@
 	 * @property {Number} wait 延时
 	 * @property {String} animation-name = [fadeUp|fadeDown|fadeLeft|fadeRight|zoomIn|zoomOut|fadeIn|fadeOut] 动画效果名称.
 	 * @property {String|Boolean} auto = [true|false] 默认:true,是否自动播放动画.
-	 * @example <tm-translate wait="500" animation-name="fadeUp"><tm-upload></tm-upload></tm-translate>
+	 * @example <tm-translate wait="500" animation-name="fadeDown"><tm-upload></tm-upload></tm-translate>
 	 */
 	export default {
 		name:"tm-translate",

tm-vuetify/components/tm-upload/tm-upload.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="tm-upload flex-start " id="tm-upload">
+	<view class="tm-upload flex-start relative" id="tm-upload">
 		<view v-for="(item,index) in list" :key="index" class="tm-upload-item  " :class="[grid!=1?'ma-4':'']" :style="{
 			width:itemWidth+'px',
 			height:itemHeight+'px'
@@ -31,9 +31,18 @@
 			<!-- 上传的进度。 -->
 			<view v-if="item.progress>0&&item.progress!=100&&!disabled" class="tm-upload-pro green"
 				:style="{width:item.progress+'%'}"></view>
+			<!-- 上传的排序。 -->
+			<view v-if="showSort" class="absolute  l-0 fulled flex-between" :class="[disabled?'b-0':'b-40']" :style="{height:'46rpx'}">
+				<view @click.stop="prevSort(item,index,'prev')" class="round-r-24 flex-center px-16 py-6" :class="[index==0?'opacity-0':'']" style="background-color: rgba(0, 0, 0, 0.3);">
+					<tm-icons name="icon-angle-left" size="24" :color="color_tmeme"></tm-icons>
+				</view>
+				<view @click.stop="prevSort(item,index,'next')" class="round-l-24 flex-center px-16 py-6" :class="[index==list.length-1?'opacity-0':'']" style="background-color: rgba(0, 0, 0, 0.3);">
+					<tm-icons name="icon-angle-right" size="24" :color="color_tmeme"></tm-icons>
+				</view>
+			</view>
 		</view>
 
-		<view  @click="addfile" v-if="list.length<max&&!disabled&&showSheet" class="tm-upload-item  ma-4 grey-lighten-4 " :class="[`round-${round}`]" :style="{
+		<view  @click="addfile" v-if="list.length<max&&!disabled" class="tm-upload-item  ma-4 grey-lighten-4 " :class="[`round-${round}`]" :style="{
 			width:itemWidth+'px',
 			height:itemHeight+'px'
 		}">
@@ -79,6 +88,10 @@
 		components:{tmIcons},
 		name: "tm-upload",
 		props: {
+			showSort:{
+				type:Boolean|String,
+				default:false
+			},
 			model:{
 				type:String,
 				default:'scaleToFill'
@@ -216,8 +229,7 @@
 				itemWidth: 0,
 				itemHeight: 0,
 				list: [],
-				//兼容app使用.
+				
-				showSheet:true,
 				upObje:null,
 			};
 		},
@@ -228,21 +240,6 @@
 		},
 		async mounted() {
 			let t = this;
-			
-			this.$nextTick(async function(){
-				
-				this.$Querey('.tm-upload', this,30).then(o=>{
-						// #ifdef APP-VUE || APP-PLUS  || MP
-						t.showSheet = true;
-						// #endif
-						t.maxWidth = o[0].width||t.width;
-						let itemWidth = (t.maxWidth - (parseInt(t.grid) - 1) * uni.upx2px(12)) / parseInt(t.grid);
-						t.itemWidth = itemWidth;
-						t.itemHeight = t.itemWidth;
-						if (t.imgHeight > 0) {
-							t.itemHeight = parseInt(uni.upx2px(t.imgHeight));
-						}
-						
 			if (typeof t.filelist === 'object' && Array.isArray(t.filelist)) {
 				let plist = [...t.filelist];
 				plist.forEach((item, index) => {
@@ -263,12 +260,40 @@
 				})
 			
 			}
-					})
+			this.getRect()
-				})
 				
 
+		},
+		updated() {
+			this.getRect()
 		},
 		methods: {
+			prevSort(item,index,type){
+				if((index==0&&type=='prev')||(index==this.list.length-1&&type=='next')){
+					return;
+				}
+				let nowindex = type=='prev'?index-1:index+1
+				let nowItem = this.list[index];
+				let newnowItem = this.list[nowindex];
+				let nowfilelist= [...this.list]
+				nowfilelist.splice(index,1,newnowItem)
+				nowfilelist.splice(nowindex,1,nowItem)
+				this.list = [...nowfilelist]
+				this.$emit('update:filelist', nowfilelist);
+			},
+			getRect(){
+				let t = this;
+				this.$Querey('.tm-upload', this,0).then(o=>{
+						if(!o[0].width&&t.maxWidth) return;
+						t.maxWidth = o[0].width||t.width;
+						let itemWidth = (t.maxWidth - (parseInt(t.grid) - 1) * uni.upx2px(12)) / parseInt(t.grid);
+						t.itemWidth = itemWidth;
+						t.itemHeight = t.itemWidth;
+						if (t.imgHeight > 0) {
+							t.itemHeight = parseInt(uni.upx2px(t.imgHeight));
+						}
+					})
+			},
 			errorFile(item,index){
 				let id = item;
 				id['loaderror'] = true;

tm-vuetify/components/tm-weekbar/tm-weekbar.vue

@@ -134,8 +134,10 @@
 				let day = nwod.getDate();
 				let week = nwod.getDay();
 				let new_weekDay = [nwod];
+				
 				let timcha = Math.abs(week-7);
 				let zcha = Math.abs(7-timcha);
+				
 				let weekCn=["周日","周一","周二","周三","周四","周五","周六"];
 				for(let i=1;i<zcha;i++){
 					let d = new Date(year,month,day-i);
@@ -157,9 +159,17 @@
 					}
 					weekDay.push(sc);
 				}
+				
 				weekDay.sort(function(a, b){return a.week - b.week}); 
+				
 				weekDay.push(weekDay[0])
 				weekDay.splice(0,1)
+				if(weekDay.length==8){
+					weekDay.splice(0,1)
+					weekDay.unshift(weekDay[weekDay.length-1])
+					weekDay.splice(weekDay.length-1,1)
+				}
+				
 				let t=  this;
 				this.timeList = [];
 				this.$nextTick(function(){

tm-vuetify/package.json

@@ -1,7 +1,7 @@
 {
   "id": "tm-vuetify",
   "displayName": "tmUI-vuetify",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "tm-vuetify是一个新势力由主题驱动的UI组件库,相比其它优势大,组件全,设计趋势紧跟未来。具有主题生成，主题实时切换，暗黑实时切换,lottie动画,图表等新颖功能,tmui TMUI",
   "keywords": [
     "tmUI-vuetify",

tm-vuetify/scss/theme.css

@@ -9,20 +9,20 @@
 /**用户自定主题,默认主题，不可删除，可通过工具生成覆盖**/
 @import "./theme/amber.css";
 @import "./theme/blue.css";
-@import "./theme/brown.css";
+/* @import "./theme/brown.css"; */
 @import "./theme/cyan.css";
 @import "./theme/green.css";
-@import "./theme/indigo.css";
+/* @import "./theme/indigo.css"; */
-@import "./theme/lime.css";
+/* @import "./theme/lime.css"; */
 @import "./theme/orange.css";
-@import "./theme/pink.css";
+/* @import "./theme/pink.css"; */
-@import "./theme/purple.css";
+/* @import "./theme/purple.css"; */
 @import "./theme/red.css";
 /**组件库，必要的主题，不可删除**/
-@import "./theme/teal.css";
+/* @import "./theme/teal.css"; */
 @import "./theme/yellow.css";
 @import "./theme/blue-grey.css";
 @import "./theme/deep-orange.css";
-@import "./theme/deep-purple.css";
+/*@import "./theme/deep-purple.css";*/
 @import "./theme/light-blue.css";
-@import "./theme/light-green.css";
+/*@import "./theme/light-green.css"; */