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

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

.hbuilderx/launch.json

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

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端后台的全功能，让您在手机端也可以管理您的博客。
+
+- 用户端：文章列表、文章分类、文章详情、图库、留言板、友链、个人日记等
+- 管理端：资料修改、密码修改、日记管理、文章管理、分类管理、标签管理、附件管理、友链管理、评论管理、日志管理等
+
+<br/>
+
+#### 💞 特色功能
+
+- 恋爱日记：精心为您设计了秀恩爱的模块，秀出关于你们的故事、情侣甜蜜相册、恋爱记录清单，为您的恋爱保驾护航。
+
+<br/>
+
+## 😎 文档源码
+
+- 作者博客：[https://b.925i.cn/](https://b.925i.cn/)
+- 官方文档：[https://uni-halo.925i.cn/](https://uni-halo.925i.cn/)
+- Gitee    ：[https://gitee.com/ialley-workshop-open/uni-halo](https://gitee.com/ialley-workshop-open/uni-halo)
+- Github ：[https://github.com/ialley-workshop-open/uni-halo](https://github.com/ialley-workshop-open/uni-halo)
   
-<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>
-			<center>
-				<img src="https://uni-halo.925i.cn/qrcode/qq.png" width="100%" />
-				<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)
 	},
 }

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

@@ -65,14 +65,14 @@ export default {
 		    line-height: 24px;
 		    margin-bottom: 18px;
 		    position: relative;
-			font-size: 1.2em;
+			font-size: 1.12em;
 		`,
 		h5: `
 			color: var(--main);
 		    line-height: 24px;
 		    margin-bottom: 14px;
 		    position: relative;
-			font-size: 16px;
+			font-size: 1.1em;
 		`,
 		h6: `
 			color: #303133;
@@ -90,7 +90,7 @@ export default {
 		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().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>
-export default {
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	export default {
 		name: 'article-card',
+		components: { tmTags },
 		props: {
 			from: {
 				type: String,
@@ -63,38 +59,49 @@ export default {
 				this.$emit('on-click', this.article);
 			}
 		}
-};
+	};
 </script>
 
 <style scoped lang="scss">
-.article-card {
+	.article-card {
 		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,92 +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: 24rpx;
+
 			.left {
 				width: 100%;
 				height: 340rpx;
+
 				.thumbnail {
 					::v-deep uni-image {
 						border-radius: 6rpx 6rpx 0 0 !important;
 					}
 				}
 			}
+
 			.right {
 				padding-left: 0;
 				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: 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;
 					}
@@ -238,12 +275,14 @@ export default {
 		.left {
 			width: 240rpx;
 			height: 180rpx;
+
 			.thumbnail {
 				width: 100%;
 				height: 100%;
 				border-radius: 12rpx;
 			}
 		}
+
 		.right {
 			width: 0;
 			flex-grow: 1;
@@ -251,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;
@@ -264,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;
@@ -279,6 +324,7 @@ export default {
 				margin-top: 14rpx;
 				line-height: 42rpx;
 			}
+
 			.foot {
 				display: flex;
 				font-size: 24rpx;
@@ -289,10 +335,12 @@ export default {
 
 				.create-time {
 					font-size: 26rpx;
+
 					.time-label {
 						display: none;
 					}
 				}
+
 				.visits {
 					.number {
 						padding: 0 6rpx;
@@ -301,5 +349,5 @@ export default {
 				}
 			}
 		}
-}
+	}
 </style>

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>
@@ -30,7 +24,7 @@
 </template>
 
 <script>
-export default {
+	export default {
 		name: 'article-min-card',
 		props: {
 			article: {
@@ -43,11 +37,11 @@ export default {
 				this.$emit('on-click', this.article);
 			}
 		}
-};
+	};
 </script>
 
 <style scoped lang="scss">
-.article-min-card {
+	.article-min-card {
 		display: flex;
 		box-sizing: border-box;
 		border-radius: 12rpx;
@@ -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;
@@ -193,5 +216,5 @@ export default {
 				}
 			}
 		}
-}
+	}
 </style>

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>
@@ -18,11 +14,17 @@
 <script>
 export default {
 	props: {
-		//rightToLeft leftToRight leftBottom
+		// rightToLeft leftToRight leftBottom
 		type: {
 			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

@@ -3,28 +3,20 @@
 		<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>
 
 <script>
-import imageCache from '@/utils/imageCache.js';
+	import imageCache from '@/utils/imageCache.js';
-export default {
+	export default {
 		name: 'cache-image',
 		props: {
 			url: {
@@ -37,7 +29,7 @@ export default {
 			},
 			loadStyle: {
 				type: Object,
-			default() {
+				default () {
 					return {
 						backgroundColor: '#ffffff',
 						color: '#333'
@@ -46,7 +38,7 @@ export default {
 			},
 			loadErrStyle: {
 				type: Object,
-			default() {
+				default () {
 					return {
 						color: 'rgba(244, 67, 54,1)'
 						// backgroundColor: 'rgba(244, 67, 54,0.2)'
@@ -71,7 +63,7 @@ export default {
 			},
 			styles: {
 				type: Object,
-			default() {
+				default () {
 					return {};
 				}
 			},
@@ -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,43 +134,54 @@ export default {
 			fnOnLoad() {
 				this.loadStatus = 'success';
 			},
-		fnOnError() {
+			fnOnError(e) {
 				this.loadStatus = 'error';
 			}
 		}
-};
+	};
 </script>
 
 <style scoped lang="scss">
-.cache-image-wrap {
+	.cache-image-wrap {
 		width: 100%;
 		height: 100%;
-}
+	}
-.img-loading,
+
-.img-error {
+	.img-loading,
+	.img-error {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
 		box-sizing: border-box;
 		background-color: #f2f2f2;
-}
+	}
-.img-load-icon {
+
+	.img-load-icon {
 		font-size: 36rpx;
 		animation: xhRote 0.8s infinite linear;
-}
+	}
-.img-load-text {
+
+	.img-load-text {
 		font-size: 28rpx;
 		margin-top: 8rpx;
 		color: inherit;
-}
+	}
-.img-error {
+
+	.img-error {
 		font-size: 28rpx;
-}
+
-.img-err-icon {
+		&-img {
+			width: 100%;
+			border-radius: 12rpx;
+		}
+	}
+
+	.img-err-icon {
 		font-size: 36rpx;
-}
+	}
-@keyframes xhRote {
+
+	@keyframes xhRote {
 		0% {
 			transform: rotate(0deg);
 		}
@@ -181,5 +189,5 @@ export default {
 		100% {
 			transform: rotate(360deg);
 		}
-}
+	}
 </style>

components/comment-list/comment-list.vue

@@ -34,14 +34,13 @@
 					:shadow="0"
 					label="Ծ‸Ծ博主已设置该文章禁止评论!"
 					:round="3"
-					close
 				></tm-alerts>
 				<view class="empty pt-50" v-if="dataList.length == 0">
 					<tm-empty v-if="disallowComment" icon="icon-shiliangzhinengduixiang-" label="暂无评论">
 						<text class="text-red text-size-s">- 文章已开启禁止评论 -</text>
 					</tm-empty>
 					<tm-empty v-else icon="icon-shiliangzhinengduixiang-" label="暂无评论">
-						<tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnToComment(null)">抢沙发</tm-button>
+						<tm-button theme="light-blue" :dense="true" :shadow="0" size="m" @click="fnToComment(null)">抢沙发</tm-button>
 					</tm-empty>
 				</view>
 				<block v-else>
@@ -143,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';
 					}

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

@@ -20,12 +20,11 @@ export default {
 		}
 	},
 	data() {
-		return { _scrollTop: 0 };
+		return { timer: null, _scrollTop: 0 };
 	},
 	watch: {
 		scrollTop(val) {
 			this._scrollTop = val;
-			console.log('监听1：', val);
 			this.$forceUpdate();
 		}
 	},
@@ -35,11 +34,18 @@ export default {
 	methods: {
 		fnScroll() {
 			throttle(() => {
+				this.$emit('on-status', false);
 				const isTop = this._scrollTop >= 180;
-				this._scrollTop = isTop ? 0 : 999999;
+				this._scrollTop = isTop ? 0 : 999999999999;
 				uni.pageScrollTo({
 					duration: 500,
-					scrollTop: this._scrollTop
+					scrollTop: this._scrollTop,
+					success: () => {
+						clearTimeout(this.timer);
+						this.timer = setTimeout(() => {
+							this.$emit('on-status', true);
+						}, 500);
+					}
 				});
 				this.$emit('update:scrollTop', this._scrollTop);
 			});

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

@@ -18,7 +18,8 @@ export default {
 	apiAuthorization: '', // Api认证key [必填]： Halo中-系统-博客设置-切换到高级选项-API设置-Access key
 
 	title: '', // 博客标题 [建议必填]：在某些页面没有设置具体的页面名称时候，使用该值显示
-	miniCodeImageUrl: '', // 小程序的太阳码/二维码的图片地址 [建议必填]：主要用于文章详情页面的生成海报的功能
+	miniCodeImageUrl: '', // 小程序的太阳码/二维码的图片地址 [建议必填]
+
 	aboutProfileImageUrl: '', // 关于页面中的资料卡背景图 [建议必填]
 
 	// 启动页面的配置（页面地址`/pagesA/start/start`）
@@ -65,6 +66,7 @@ export default {
 	},
 
 	defaultThumbnailUrl: '', // 默认封面图地址 
+	defaultStaticThumbnailUrl: '', // 静态默认封面图（不可以是随机图地址）
 	defaultImageUrl: '', // 默认图片地址 
 	defaultAvatarUrl: '', // 默认头像地址
 
@@ -79,8 +81,8 @@ export default {
 		list: [],
 	},
 
-	quickNav: { // 快捷导航配置
+	quickNav: { // 快捷导航配置（如不需要恋爱日记，请注释或删除94-101行的代码）
-		use: true,
+		use: true, // 是否在个人中心显示以下页面的入口
 		list: [{
 				icon: 'halocoloricon-classify',
 				text: '文章归档',
@@ -121,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

@@ -15,10 +15,10 @@ export default {
 	girl: {
 		name: '未知女主',
 		avatar: 'https://b.925i.cn/uni_halo_love/love_girl.png',
-		birthday: '2022-07-25', // 生日
+		birthday: '2022-04-19', // 生日
 	},
 	timeTitle: '这是我们一起走过的',
-	loveStartDate: '2022-05-20 13:14:20', // 恋爱开始时间 
+	loveStartDate: '2022-04-10 13:14:20', // 恋爱开始时间 
 
 	nav: [{
 			key: 'journey',

manifest.json

@@ -110,6 +110,9 @@
                     }
                 }
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
     /* 快应用特有相关 */
@@ -121,19 +124,32 @@
             "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" : {
@@ -146,7 +162,7 @@
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {
-                        "^/api" : ""
+                        "^/api" : "/api"
                     }
                 }
             }
@@ -156,7 +172,46 @@
             "treeShaking" : {
                 "enable" : true
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
-    "_spaceID" : "699a26a5-a6cd-4b54-b603-5155b312a5f5"
+    "_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
+        }
+    }
 }

pages.json

@@ -549,7 +549,7 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"backgroundColor": "white",
+		"backgroundColor": "#fff",
 		"borderStyle": "white",
 		"color": "#303133",
 		"selectedColor": "#03a9f4",

pages/tabbar/about/about.vue

@@ -2,10 +2,12 @@
 	<view class="app-page pb-24">
 		<!-- 博主信息 -->
 		<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>
@@ -218,6 +277,10 @@ export default {
 		},
 		fnGetNavList() {
 			const systemInfo = uni.getSystemInfoSync();
+			let _isWx = false;
+			// #ifdef MP-WEIXIN
+			_isWx = true;
+			// #endif
 			this.navList = [
 				{
 					key: 'disclaimers',
@@ -251,7 +314,7 @@ export default {
 					isAdmin: false,
 					type: 'page',
 					openType: 'contact',
-					show: true
+					show: _isWx
 				},
 				{
 					key: 'feedback',
@@ -263,7 +326,7 @@ export default {
 					isAdmin: false,
 					type: 'page',
 					openType: 'feedback',
-					show: true
+					show: _isWx
 				},
 				{
 					key: 'about',
@@ -386,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;
@@ -417,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({

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>
@@ -49,16 +34,16 @@
 </template>
 
 <script>
-import throttle from '@/utils/throttle.js';
+	import throttle from '@/utils/throttle.js';
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmFlowLayout from '@/tm-vuetify/components/tm-flowLayout/tm-flowLayout.vue';
+	import tmFlowLayout from '@/tm-vuetify/components/tm-flowLayout/tm-flowLayout.vue';
-import tmSliderNav from '@/tm-vuetify/components/tm-sliderNav/tm-sliderNav.vue';
+	import tmSliderNav from '@/tm-vuetify/components/tm-sliderNav/tm-sliderNav.vue';
 
-import ArticleMinCard from '@/components/article-min-card/article-min-card.vue';
+	import ArticleMinCard from '@/components/article-min-card/article-min-card.vue';
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmTranslate,
@@ -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 => {
@@ -206,37 +192,43 @@ export default {
 				}, 500);
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
 		flex-direction: column;
 		background-color: #fff;
-}
+	}
-.content {
+
+	.content {
 		height: 100vh;
 		background-color: #fafafa;
-}
+	}
-.category-empty {
+
+	.category-empty {
 		width: 100%;
 		height: 70vh;
-}
+	}
-.article-empty {
+
+	.article-empty {
 		width: 100%;
 		height: 70vh;
-}
+	}
-.right-content {
+
+	.right-content {
 		// width: calc(100vw - 144rpx);
 		width: calc(100vw - 190rpx);
 		height: 100vh;
 		background-color: #fff;
 		white-space: nowrap;
-}
+		background-color: #fafafa;
-.loading-wrap {
+	}
+
+	.loading-wrap {
 		padding: 24rpx;
-}
+	}
 </style>

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,7 +23,7 @@
 				<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="false" :src="hdata.item.image" @click="fnPreview(hdata.item)"></tm-images>
 								<view class="pa-10 text-size-s">
 									<view class="text-overflow-2">
@@ -50,7 +48,7 @@
 					</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="false" :src="hdata.item.image" @click="fnPreview(hdata.item)"></tm-images>
 								<view class="pa-10 text-size-s">
 									<view class="text-overflow-2">
@@ -76,7 +74,7 @@
 				</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)"></tm-images>
 								<view class="pa-24 text-size-m">
@@ -109,17 +107,17 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue';
+	import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue';
-import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
+	import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
-import tmFlowLayout from '@/tm-vuetify/components/tm-flowLayout/tm-flowLayout.vue';
+	import tmFlowLayout from '@/tm-vuetify/components/tm-flowLayout/tm-flowLayout.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
 
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmTranslate,
@@ -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';
@@ -291,23 +290,24 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.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 {
+
+	.content {
 		box-sizing: border-box;
 		padding: 0 24rpx;
 		padding-top: 24rpx;
@@ -318,9 +318,14 @@ export default {
 			align-items: center;
 			justify-content: center;
 		}
-}
+	}
-.loading-wrap {
+
+	.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">
@@ -96,16 +90,16 @@
 </template>
 
 <script>
-import tmMenubars from '@/tm-vuetify/components/tm-menubars/tm-menubars.vue';
+	import tmMenubars from '@/tm-vuetify/components/tm-menubars/tm-menubars.vue';
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue';
+	import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
 
-import eSwiper from '@/components/e-swiper/e-swiper.vue';
+	import eSwiper from '@/components/e-swiper/e-swiper.vue';
 
-export default {
+	export default {
 		components: {
 			tmMenubars,
 			tmSkeleton,
@@ -140,7 +134,8 @@ export default {
 				let blogger = this.$tm.vx.getters().getBlogger;
 				blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
 				return blogger;
-		}
+			},
+
 		},
 		onLoad() {
 			this.fnSetPageTitle();
@@ -267,10 +262,10 @@ export default {
 			},
 			// 文章列表
 			fnGetArticleList() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -357,11 +352,11 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
@@ -379,63 +374,74 @@ export default {
 				min-width: initial;
 			}
 		}
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 24rpx;
-}
+	}
-.search-input {
+
+	.search-input {
 		background-color: #f5f5f5;
 		align-items: center;
 		/* #ifdef MP-WEIXIN */
 		margin-right: 24rpx;
+
 		/* #endif */
-	&_icon {
+		&_icon {}
+
+		&_text {}
 	}
-	&_text {
+
-	}
+	.show-more {
-}
-.show-more {
 		width: 42rpx;
 		height: 42rpx;
 		box-sizing: border-box;
 		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
-}
+	}
-.banner {
+
+	.banner {
 		overflow: hidden;
-}
+	}
-.quick-nav {
+
+	.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 {
+
+	.category {
 		width: 94vw;
 		display: flex;
 		height: 200rpx;
 		white-space: nowrap;
 		margin: 0 24rpx;
+
 		.content {
 			display: inline-block;
 			padding-left: 24rpx;
+
 			&:first-child {
 				padding-left: 0;
 			}
 		}
+
 		.cate-empty {
 			height: inherit;
 		}
-}
+	}
 
-.page-item {
+	.page-item {
 		&_title {
 			position: relative;
 			padding-left: 24rpx;
 			font-size: 32rpx;
 			z-index: 1;
 			color: var(--main-text-color);
+
 			&:before {
 				content: '';
 				position: absolute;
@@ -448,15 +454,16 @@ export default {
 				z-index: 0;
 			}
 		}
-}
+	}
 
-.h_row_col2 {
+	.h_row_col2 {
 		display: flex;
 		flex-wrap: wrap;
 		box-sizing: border-box;
 		padding: 0 12rpx;
+
 		.ani-item {
 			width: 50%;
 		}
-}
+	}
 </style>

pages/tabbar/links/links.vue

@@ -9,20 +9,43 @@
 		</view>
 		<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="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">{{ item.name }}</view>
+								<view class="name text-size-g">{{ link.name }}</view>
-								<view class="desc mt-12 text-size-s text-grey-darken-1">{{ item.description }}</view>
+								<view class="desc mt-12 text-size-s text-grey-darken-1">{{ link.description }}</view>
-								<view class="link mt-12 text-size-m text-grey-darken-1">
+								<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>
-									{{ item.url }}
+									{{ link.url }}
 								</view>
 							</view>
 						</view>
@@ -33,27 +56,33 @@
 			<!-- 如果大于一个分组：使用联系人的索引形式 result.length > 1 -->
 			<block v-else>
 				<block v-for="(team, index) in result" :key="index">
-					<tm-translate animation-name="fadeUp" :wait="(index + 1) * 50">
+					<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="(linkIndex + 1) * 50">
+							<tm-translate animation-name="fadeUp" :wait="calcAniWait(linkIndex)">
 								<!-- 色彩版本 -->
-								<view
+								<view v-if="!globalAppSettings.links.useSimple" class="info flex pt-24 pb-24 pl-12 pr-12" :class="{
-									v-if="!globalAppSettings.links.useSimple"
+										'border-b-1':
-									class="info flex pt-24 pb-24 pl-12 pr-12"
+											linkIndex != team.children.length - 1 || index == result.length - 1
-									:class="{ 'border-b-1': linkIndex != team.children.length - 1 || index == result.length - 1 }"
+									}" @click="fnOnLinkEvent(link)">
-									@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="link-card_name text-size-l text-weight-b text-red">
-										<view class="poup-tag ml--10 mt-6">
+											{{ link.name }}
-											<tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">ID：{{ link.id }}</tm-tags>
+										</view>
-											<tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">{{ link.team }}</tm-tags>
+										<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 class="link-card_desc text-overflow text-size-s mt-4">博客简介：{{ link.description || '这个博主很懒，没写简介~' }}</view>
 									</view>
 								</view>
 								<!-- 简洁版本 -->
@@ -61,7 +90,9 @@
 									<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 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 }}
@@ -81,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>
@@ -95,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>
@@ -106,16 +147,16 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
+	import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
 
-import { GetRandomNumberByRange } from '@/utils/random.js';
+	import { GetRandomNumberByRange } from '@/utils/random.js';
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmTranslate,
@@ -169,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 => {
@@ -237,23 +278,24 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
 		flex-direction: column;
 		background-color: #fafafd;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 24rpx;
 		min-height: 100vh;
-}
+	}
 
-.content {
+	.content {
 		padding: 0 24rpx;
 		padding-top: 24rpx;
 
@@ -263,17 +305,21 @@ export default {
 			align-items: center;
 			justify-content: center;
 		}
-}
+	}
-.link-card {
+
+	.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;
@@ -287,6 +333,7 @@ export default {
 		.info {
 			width: 0;
 			flex-grow: 1;
+
 			.name {
 				white-space: nowrap;
 				overflow: hidden;
@@ -295,6 +342,7 @@ export default {
 				font-size: 30rpx;
 				font-weight: bold;
 			}
+
 			.desc {
 				white-space: nowrap;
 				overflow: hidden;
@@ -303,46 +351,55 @@ export default {
 				font-size: 28rpx;
 			}
 		}
-}
+	}
-.link-card_name {
+
+	.link-card_name {
 		// color: #303133;
 		// color: #0080fe;
-}
+	}
-.link-card_desc {
+
+	.link-card_desc {
 		font-size: 24rpx;
 		line-height: 1.6;
 		color: #303133;
-}
+	}
-.link-logo {
+
+	.link-logo {
 		width: 140rpx;
 		height: 140rpx;
+
 		&_img {
 			width: 100%;
 			height: 100%;
 		}
-}
+	}
-.poup-logo {
+
+	.poup-logo {
 		width: 140rpx;
 		height: 140rpx;
 		border-radius: 50%;
+
 		&_img {
 			width: 100%;
 			height: 100%;
 			border-radius: 50%;
 		}
-}
+	}
-.info-detail {
+
+	.info-detail {
 		width: 0;
 		flex-grow: 1;
 		justify-content: center;
-}
+	}
-.poup-desc {
+
+	.poup-desc {
 		font-size: 28rpx;
 		line-height: 1.6;
 		color: #555 !important;
-}
+	}
-.preview-site {
+
+	.preview-site {
 		width: 100%;
 		height: 300rpx;
-}
+	}
 </style>

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">
@@ -67,13 +59,13 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
 
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmTranslate,
@@ -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;
@@ -154,41 +146,47 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
 		flex-direction: column;
 		background-color: #fafafd;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 24rpx;
-}
+	}
-.list-empty {
+
+	.list-empty {
 		width: 100vw;
 		height: 100vh;
-}
+	}
-.statistics {
+
+	.statistics {
 		background-color: #ffffff;
-}
+	}
-.e-timeline {
+
+	.e-timeline {
 		::v-deep {
-		.tm-timeline-item > view:first-child {
+			.tm-timeline-item>view:first-child {
 				width: 110rpx !important;
 			}
+
 			.tm-timeline-item-left {
 				max-width: 580rpx !important;
 				width: 100% !important;
 			}
 		}
-}
+	}
 
-.tm-timeline {
+	.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;
@@ -233,54 +238,65 @@ export default {
 				}
 			}
 		}
-}
+	}
 
-.post {
+	.post {
 		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,51 +306,62 @@ 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 {
+
+	.post-thumbnail {
 		border-radius: 6rpx;
 		width: 200rpx;
 		height: 170rpx;
-}
+	}
-.post-info {
+
+	.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;
 			}
 		}
-}
+	}
 </style>

pagesA/article-detail/article-detail.vue

@@ -12,10 +12,14 @@
 				<view class="detail">
 					<view class="author">
 						<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">
+						<image class="cover-img" mode="aspectFill" :src="calcUrl(result.thumbnail)"></image>
+					</view>
 					<view class="count" :class="{ 'no-thumbnail': !result.thumbnail }">
 						<view class="count-item">
 							<text class="value">{{ result.visits }}</text>
@@ -42,7 +46,9 @@
 					<text class="text-weight-b">分类：</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>
+						<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">
@@ -54,9 +60,16 @@
 						</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>
 			</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 -->
@@ -67,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 -->
@@ -93,22 +101,43 @@
 					<!-- #endif -->
 				</view>
 
+				<!-- 广告区域：自定义广告位 -->
+				<view class="ad-card mt-24" v-if="haloAdConfig.articleDetail.custom.use">
+					<text class="ad-card_tip">广告</text>
+					<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-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.author" class="copyright-text text-size-s ">
-						<view v-if="copyright.description" class="copyright-text text-size-s mt-12">版权说明：{{ copyright.description }}</view>
+							版权归属：{{ copyright.author }}
-						<view v-if="copyright.violation" class="copyright-text text-size-s mt-12 text-red">侵权处理：{{ copyright.violation }}</view>
+						</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"></commentList>
+					<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>
@@ -130,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>
@@ -140,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>
@@ -166,49 +188,67 @@
 				<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>
 
 <script>
-import MarkdownConfig from '@/common/markdown/markdown.config.js';
+	import MarkdownConfig from '@/common/markdown/markdown.config.js';
 
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.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 mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
-import commentList from '@/components/comment-list/comment-list.vue';
+	import commentList from '@/components/comment-list/comment-list.vue';
-import commentItem from '@/components/comment-item/comment-item.vue';
+	import commentItem from '@/components/comment-item/comment-item.vue';
 
-import rCanvas from '@/components/r-canvas/r-canvas.vue';
+	import rCanvas from '@/components/r-canvas/r-canvas.vue';
-export default {
+	import barrage from '@/components/barrage/barrage.vue';
+
+	import { haloWxShareMixin } from '@/common/mixins/wxshare.mixin.js';
+	export default {
 		components: {
 			tmSkeleton,
 			tmPoup,
 			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'
 						},
@@ -239,7 +279,16 @@ export default {
 					showCanvas: false,
 					loading: true,
 					res: null
-			}
+				},
+
+				metas: [], // 自定义元数据
+				// 文章加密（弹窗输入密码解密）
+				validVisitModal: {
+					show: false,
+					useCancel: false,
+					value: undefined
+				},
+				showValidVisitMore: true,
 			};
 		},
 		computed: {
@@ -259,6 +308,48 @@ export default {
 				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) {
@@ -273,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';
@@ -293,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) {
@@ -382,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',
@@ -406,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,
@@ -457,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,
@@ -508,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({
@@ -572,6 +663,7 @@ export default {
 			},
 			fnSavePoster() {
 				this.$refs.rCanvas.saveImage(this.poster.res.tempFilePath);
+				uni.$tm.toast('保存成功');
 			},
 			fnShareTo() {
 				// #ifdef MP-WEIXIN
@@ -629,27 +721,123 @@ export default {
 				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;
+			}
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
 		flex-direction: column;
 		box-sizing: border-box;
 		background-color: #fafafd;
-}
+		padding-bottom: 24rpx;
-.loading-wrap {
+	}
+
+	.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;
 		background-color: #fff;
-}
+	}
 
-.head {
+	.head {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -658,24 +846,26 @@ 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: 36rpx;
 				}
@@ -685,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;
@@ -709,6 +904,7 @@ export default {
 							width: 2rpx;
 							height: 32rpx;
 						}
+
 						&:last-child {
 							&::after {
 								display: none;
@@ -716,24 +912,28 @@ 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;
 					}
 				}
 			}
 		}
-}
+	}
-.category {
+
+	.category {
 		margin: 0 24rpx;
 		padding: 24rpx;
 		background-color: #ffffff;
@@ -742,37 +942,51 @@ 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 {
+
+	.category-tag+.category-tag {
 		margin-left: 12rpx;
-}
+	}
-.content {
+
+	.content {
 		margin-top: 24rpx;
-}
+	}
-.evan-markdown,
+
-.ad-wrap,
+	.markdown-wrap,
-.copyright-wrap,
+	.evan-markdown,
-.comment-wrap {
+	.ad-wrap,
+	.copyright-wrap,
+	.comment-wrap {
 		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
-}
+	}
-.copyright-title {
+
+	.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;
@@ -783,34 +997,41 @@ export default {
 			background-color: rgb(3, 174, 252);
 			border-radius: 6rpx;
 		}
-}
+	}
-.poup-head {
+
+	.poup-head {
 		border-bottom: 2rpx solid #f5f5f5;
-}
+	}
-.poup-body {
+
+	.poup-body {
 		height: 50vh;
-}
+	}
-.poup-empty {
+
+	.poup-empty {
 		width: 100%;
 		height: 40vh;
-}
+	}
-.poup-loading-wrap {
+
+	.poup-loading-wrap {
 		width: 100%;
 		height: 40vh;
 
 		.e-loading-icon {
 			font-size: 80rpx;
 		}
-}
+	}
-.poster-content {
+
+	.poster-content {
 		width: 100%;
 		min-height: 60vh;
 		overflow: hidden;
-}
+	}
-.copyright-text {
+
+	.copyright-text {
 		line-height: 1.7;
-}
+	}
-.poster-loading {
+
+	.poster-loading {
 		width: 100%;
 		position: absolute;
 		left: 0;
@@ -819,9 +1040,40 @@ export default {
 		bottom: 0;
 		// background-color: rgba(0, 0, 0, 0.1);
 		z-index: 666;
-}
+	}
-.poster-save {
+
+	.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">
@@ -45,14 +45,14 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
+	import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
 
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmSearch,
@@ -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';
@@ -177,11 +179,11 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
@@ -192,12 +194,13 @@ export default {
 		&.is-balck {
 			background-color: #212121;
 		}
-}
+	}
-.content {
+
+	.content {
 		padding-top: 24rpx;
 
 		.content-empty {
 			height: 60vh;
 		}
-}
+	}
 </style>

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>
@@ -22,12 +22,12 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import ArticleCard from '@/components/article-card/article-card.vue';
+	import ArticleCard from '@/components/article-card/article-card.vue';
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmTranslate,
@@ -75,10 +75,10 @@ export default {
 		},
 		methods: {
 			fnGetData() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -119,26 +119,28 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss">
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
 		flex-direction: column;
 		padding: 24rpx 0;
 		background-color: #fafafd;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 0 24rpx;
 		min-height: 100vh;
-}
+	}
-.empty {
+
+	.empty {
 		height: 60vh;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-}
+	}
 </style>

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>
@@ -30,12 +18,12 @@
 </template>
 
 <script>
-import tmForm from '@/tm-vuetify/components/tm-form/tm-form.vue';
+	import tmForm from '@/tm-vuetify/components/tm-form/tm-form.vue';
-import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
+	import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
-import tmSwitch from '@/tm-vuetify/components/tm-switch/tm-switch.vue';
+	import tmSwitch from '@/tm-vuetify/components/tm-switch/tm-switch.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
 
-export default {
+	export default {
 		components: {
 			tmForm,
 			tmInput,
@@ -87,6 +75,7 @@ export default {
 		},
 		methods: {
 			fnOnSubmit(e) {
+				console.log('提交评论');
 				if (e === false) {
 					return uni.$tm.toast('请检查所有的必填项是否填写完整！');
 				}
@@ -134,11 +123,11 @@ export default {
 					});
 			}
 		}
-};
+	};
 </script>
 
 <style scoped lang="scss">
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		box-sizing: border-box;
@@ -150,8 +139,9 @@ export default {
 			background-color: #fff;
 			// box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
 		}
-}
+	}
-.poup-content {
+
+	.poup-content {
 		width: 500rpx;
 
 		::v-deep {
@@ -159,5 +149,5 @@ export default {
 				width: 100% !important;
 			}
 		}
-}
+	}
 </style>

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>

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>
@@ -27,16 +27,16 @@
 </template>
 
 <script>
-import MarkdownConfig from '@/common/markdown/markdown.config.js';
+	import MarkdownConfig from '@/common/markdown/markdown.config.js';
-import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
+	import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
-import journalCard from '@/components/journal-card/journal-card.vue';
+	import journalCard from '@/components/journal-card/journal-card.vue';
 
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
 
-export default {
+	export default {
 		components: { mpHtml, tmSkeleton, tmEmpty, tmTranslate, tmFlotbutton, journalCard },
 		data() {
 			return {
@@ -78,10 +78,10 @@ export default {
 		},
 		methods: {
 			fnGetData() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -114,20 +114,21 @@ export default {
 					});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		display: flex;
 		flex-direction: column;
-}
+	}
-.loading-wrap {
+
-}
+	.loading-wrap {}
-.app-page-content {
+
-}
+	.app-page-content {}
-.content-empty {
+
+	.content-empty {
 		height: 60vh;
-}
+	}
 </style>

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,18 +61,18 @@
 </template>
 
 <script>
-import AppKeys from '@/config/keys.js';
+	import AppKeys from '@/config/keys.js';
-import SheetConfig from '@/config/sheets.config.js';
+	import SheetConfig from '@/config/sheets.config.js';
 
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import commentItem from '@/components/comment-item/comment-item.vue';
+	import commentItem from '@/components/comment-item/comment-item.vue';
 
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmFlotbutton,
@@ -150,10 +134,10 @@ export default {
 
 		methods: {
 			fnGetData() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -245,26 +229,29 @@ export default {
 					});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		display: flex;
 		flex-direction: column;
 		background-color: #fafafd;
-}
+	}
-.app-page-content {
+
+	.app-page-content {
 		box-sizing: border-box;
 		// box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
-}
+	}
-.content-empty {
+
+	.content-empty {
 		width: 100%;
 		height: 60vh;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		box-sizing: border-box;
 		padding: 24rpx;
-}
+	}
 </style>

pagesA/love/album.vue

@@ -303,7 +303,8 @@ export default {
 	&-desc {
 		margin-top: 24rpx;
 		line-height: 1.6;
-		font-size: 28rpx;
+		font-size: 30rpx;
+		color: rgba(26, 26, 26, 0.9);
 		&.is-empty {
 			display: flex;
 			align-items: center;

pagesA/love/journey.vue

@@ -3,7 +3,7 @@
 		<view class="page-title">我们的故事</view>
 		<view class="html-typed" v-html="html">内容渲染</view>
 
-		<scroll-btn bottom="60rpx" :scrollTop.sync="scrollTop"></scroll-btn>
+		<scroll-btn bottom="160rpx" :scrollTop.sync="scrollTop"></scroll-btn>
 	</view>
 </template>
 
@@ -76,6 +76,7 @@ export default {
 		rgba(7, 179, 155, 0.1) 86%,
 		rgba(109, 186, 130, 0.1)
 	);
+	color: rgba(26, 26, 26, 1);
 }
 .page-title {
 	font-size: 42rpx;

pagesA/love/list.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="app-page">
+	<view class="app-page" @touchstart="fnOnTouchstart" @touchend="fnOnTouchend" @touchcancel="fnOnTouchend">
-		<view class="love-card">
+		<view class="love-card" :class="{ ani: isDoAni }">
 			<view class="head">
 				<image class="avatar" :src="loveConfig.boy.avatar" mode="scaleToFill"></image>
 				<view class="love-days">
@@ -31,7 +31,7 @@
 		</view>
 		<view v-else class="list">
 			<block v-for="(item, index) in list" :key="index">
-				<view class="card" :style="{ '--delay': calcCardDelay(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>
@@ -70,7 +70,7 @@
 				</view>
 			</block>
 		</view>
-		<scroll-btn :scrollTop.sync="scrollTop"></scroll-btn>
+		<scroll-btn :scrollTop.sync="scrollTop" @on-status="fnOnScrollStatus"></scroll-btn>
 	</view>
 </template>
 
@@ -81,6 +81,7 @@ export default {
 	components: { ScrollBtn },
 	data() {
 		return {
+			isDoAni: true,
 			scrollTop: 0,
 			loveConfig: LoveConfig,
 			list: []
@@ -88,7 +89,8 @@ export default {
 	},
 	computed: {
 		calcLoveDays() {
-			const start = new Date(this.loveConfig.loveStartDate),
+			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;
@@ -142,6 +144,15 @@ export default {
 		fnOnItemOpen(item) {
 			item.open = !item.open;
 			this.$forceUpdate();
+		},
+		fnOnScrollStatus(isEnd) {
+			this.isDoAni = isEnd;
+		},
+		fnOnTouchstart() {
+			this.isDoAni = false;
+		},
+		fnOnTouchend() {
+			this.isDoAni = true;
 		}
 	}
 };
@@ -188,7 +199,9 @@ export default {
 	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;
@@ -302,8 +315,10 @@ export default {
 	background-color: #ffffff;
 	margin-bottom: 36rpx;
 	box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
-	animation: cardAni 3s ease-in-out infinite;
 	animation-delay: var(--delay);
+	&.ani {
+		animation: cardAni 3s ease-in-out infinite;
+	}
 	.head {
 		width: 100%;
 		display: flex;

pagesA/love/love.vue

@@ -84,7 +84,8 @@ export default {
 			clearTimeout(this.loveDayTimer);
 			const _countDownFn = () => {
 				this.loveDayTimer = setTimeout(_countDownFn, 1000);
-				const start = new Date(this.loveConfig.loveStartDate),
+				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;

pagesA/setting/setting.vue

@@ -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>
@@ -78,6 +80,29 @@
 						<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>
@@ -173,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'
+			}
 		};
 	},
 
@@ -219,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) {
@@ -249,10 +285,17 @@ 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;
-			console.log('this.appSettings', this.appSettings);
 			this.$tm.vx.commit('setting/setSettings', this.appSettings);
 			uni.$tm.toast('保存成功，部分设置在重启后生效！');
 		},

pagesA/tag-detail/tag-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>
@@ -22,12 +22,12 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import ArticleCard from '@/components/article-card/article-card.vue';
+	import ArticleCard from '@/components/article-card/article-card.vue';
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmTranslate,
@@ -75,10 +75,10 @@ export default {
 		},
 		methods: {
 			fnGetData() {
-			uni.showLoading({
+				// uni.showLoading({
-				mask: true,
+				// 	mask: true,
-				title: '加载中...'
+				// 	title: '加载中...'
-			});
+				// });
 				// 设置状态为加载中
 				if (!this.isLoadMore) {
 					this.loading = 'loading';
@@ -119,26 +119,28 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss">
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
 		flex-direction: column;
 		padding: 24rpx 0;
 		background-color: #fafafd;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 0 24rpx;
 		min-height: 100vh;
-}
+	}
-.empty {
+
+	.empty {
 		height: 60vh;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-}
+	}
 </style>

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)">
@@ -110,17 +110,17 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
+	import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmPickers from '@/tm-vuetify/components/tm-pickers/tm-pickers.vue';
+	import tmPickers from '@/tm-vuetify/components/tm-pickers/tm-pickers.vue';
 
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmSearch,
@@ -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();
@@ -341,11 +343,11 @@ export default {
 					.catch(err => {});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
 		display: flex;
@@ -356,31 +358,37 @@ export default {
 		&.is-balck {
 			background-color: #212121;
 		}
-}
+	}
-.app-page-content {
+
+	.app-page-content {
 		box-sizing: border-box;
+
 		.content-empty {
 			height: 60vh;
 		}
-}
+	}
 
-.article-card {
+	.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,9 +405,10 @@ 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);
 		}
-}
+	}
 </style>

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>
@@ -111,27 +88,27 @@
 </template>
 
 <script>
-// #ifdef APP-PLUS
+	// #ifdef APP-PLUS
-const AfDocument = uni.requireNativePlugin('Aq-ChooseFile'); // 临时替代
+	const AfDocument = uni.requireNativePlugin('Aq-ChooseFile'); // 临时替代
-// #endif
+	// #endif
-import { getAdminAccessToken } from '@/utils/auth.js';
+	import { getAdminAccessToken } from '@/utils/auth.js';
 
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
+	import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
-import tmDropDownMenu from '@/tm-vuetify/components/tm-dropDownMenu/tm-dropDownMenu.vue';
+	import tmDropDownMenu from '@/tm-vuetify/components/tm-dropDownMenu/tm-dropDownMenu.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmCheckbox from '@/tm-vuetify/components/tm-checkbox/tm-checkbox.vue';
+	import tmCheckbox from '@/tm-vuetify/components/tm-checkbox/tm-checkbox.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-import tmForm from '@/tm-vuetify/components/tm-form/tm-form.vue';
+	import tmForm from '@/tm-vuetify/components/tm-form/tm-form.vue';
-import tmUpload from '@/tm-vuetify/components/tm-upload/tm-upload.vue';
+	import tmUpload from '@/tm-vuetify/components/tm-upload/tm-upload.vue';
-import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
+	import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
-import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
+	import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmActionSheetMenu from '@/tm-vuetify/components/tm-actionSheetMenu/tm-actionSheetMenu.vue';
+	import tmActionSheetMenu from '@/tm-vuetify/components/tm-actionSheetMenu/tm-actionSheetMenu.vue';
 
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmSearch,
@@ -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']
 									},
@@ -681,18 +652,20 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 24rpx;
-}
+	}
-.filter-wrap {
+
+	.filter-wrap {
 		position: fixed;
 		left: 0;
 		right: 0;
@@ -704,30 +677,37 @@ export default {
 		/* #endif */
 		width: 100vw;
 		z-index: 6;
-}
+	}
-.page-content {
+
-}
+	.page-content {}
-.content-empty {
+
+	.content-empty {
 		width: 100vw;
 		height: 65vh;
-}
+	}
-.attachment-card {
+
+	.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;
@@ -744,24 +725,27 @@ export default {
 				font-size: 24rpx;
 			}
 		}
-}
+	}
 
-.poup-body {
+	.poup-body {
 		box-sizing: border-box;
 		height: 66vh;
-}
+	}
-.poup-content {
+
+	.poup-content {
 		width: 100%;
 		overflow: hidden;
-}
+	}
-.btn-wrap {
+
+	.btn-wrap {
 		width: 100%;
-}
+	}
-.file-name {
+
+	.file-name {
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		word-wrap: break-word;
 		word-break: break-all;
-}
+	}
 </style>

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">
@@ -122,15 +86,15 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
+	import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
-import AttachmentSelect from '@/components/attachment-select/attachment-select.vue';
+	import AttachmentSelect from '@/components/attachment-select/attachment-select.vue';
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmButton,
@@ -334,40 +298,46 @@ export default {
 					.catch(err => {});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		.loading-error {
 			height: 65vh;
 		}
-}
+	}
-.content-empty {
+
+	.content-empty {
 		width: 100%;
 		height: 60vh;
-}
+	}
 
-.poup-content {
+	.poup-content {
 		overflow: hidden;
-}
+	}
-.poup-body {
+
+	.poup-body {
 		height: 71vh;
 		box-sizing: border-box;
 		touch-action: none;
-}
+	}
-.thumbnail {
+
+	.thumbnail {
 		width: 100%;
 		height: 260rpx;
-}
+	}
-.category-card {
+
+	.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,21 +363,25 @@ export default {
 				background-color: #607d8b;
 			}
 		}
+
 		.right {
 			width: 0;
 			flex-grow: 1;
 			box-sizing: border-box;
+
 			.color {
 				color: #fff;
 			}
 		}
-}
+	}
 
-.desc-box {
+	.desc-box {
 		box-sizing: border-box;
+
 		.label {
 			width: 86rpx;
 		}
+
 		.value {
 			width: 0;
 			flex-grow: 1;
@@ -416,5 +391,5 @@ export default {
 			word-wrap: break-word;
 			word-break: break-all;
 		}
-}
+	}
 </style>

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">
 						<!-- 审核状态 -->
@@ -129,17 +119,17 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
+	import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
 
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmButton,
@@ -213,6 +203,7 @@ export default {
 		},
 		methods: {
 			fnOnTabChange(index) {
+				this.fnResetSetAniWaitIndex();
 				this.fnResetReply();
 				this.dataList = [];
 				this.queryType = ['Posts', 'Sheets', 'Journals'][index];
@@ -430,26 +421,29 @@ export default {
 					.catch(err => {});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 24rpx;
+
 		.loading-error {
 			height: 65vh;
 		}
-}
+	}
-.content-empty {
+
+	.content-empty {
 		width: 100%;
 		height: 60vh;
-}
+	}
 
-.comment-card {
+	.comment-card {
 		box-sizing: border-box;
 		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
 		margin-bottom: 24rpx;
@@ -461,15 +455,18 @@ 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 {
+
+	.poup-content {
 		overflow: hidden;
-}
+	}
-.poup-body {
+
+	.poup-body {
 		height: 60vh;
 		box-sizing: border-box;
-}
+	}
 </style>

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>
@@ -38,13 +30,13 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
 
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmButton,
@@ -155,22 +147,25 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 24rpx;
+
 		.loading-error {
 			height: 40vh;
 		}
-}
+	}
-.edit-wrap {
+
+	.edit-wrap {
 		box-sizing: border-box;
 		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
-}
+	}
 </style>

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 ">
@@ -153,18 +109,18 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
+	import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
-import tmPickers from '@/tm-vuetify/components/tm-pickers/tm-pickers.vue';
+	import tmPickers from '@/tm-vuetify/components/tm-pickers/tm-pickers.vue';
-import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
 
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmButton,
@@ -217,6 +173,7 @@ export default {
 		},
 		methods: {
 			fnOnTabChange(index) {
+				this.fnResetSetAniWaitIndex();
 				this.fnToTopPage();
 				let _filterData = [];
 				if (index == 0) {
@@ -373,32 +330,38 @@ export default {
 					.catch(err => {});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 24rpx;
+
 		.loading-error {
 			height: 65vh;
 		}
-}
+	}
-.link-card {
+
+	.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,38 +372,44 @@ 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);
 		}
-}
+	}
 
-.poup-content {
+	.poup-content {
 		overflow: hidden;
-}
+	}
-.poup-body {
+
+	.poup-body {
 		height: 71vh;
 		box-sizing: border-box;
 		touch-action: none;
-}
+	}
-.thumbnail {
+
+	.thumbnail {
 		width: 100%;
 		height: 260rpx;
-}
+	}
 
-.update-btn {
+	.update-btn {
 		background-color: rgba(240, 250, 255, 1);
-}
+	}
-.del-btn {
+
+	.del-btn {
 		background-color: rgba(254, 241, 240, 1) !important;
-}
+	}
 </style>

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>
@@ -59,13 +59,13 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmEmpty,
@@ -263,30 +263,35 @@ export default {
 					.catch(err => {});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 24rpx;
-}
+	}
-.page-content {
+
-}
+	.page-content {}
-.content-empty {
+
+	.content-empty {
 		width: 100vw;
 		height: 65vh;
-}
+	}
-.card {
+
+	.card {
 		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
-}
+	}
-.desc-item {
+
+	.desc-item {
 		.desc-label {
 			width: 150rpx;
 			position: relative;
+
 			&::after {
 				content: '：';
 				position: absolute;
@@ -294,10 +299,11 @@ export default {
 				top: 0rpx;
 			}
 		}
+
 		.desc-value {
 			word-wrap: break-word;
 			word-break: break-all;
 			padding-left: 6rpx;
 		}
-}
+	}
 </style>

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>
@@ -181,21 +95,21 @@
 </template>
 
 <script>
-import throttle from '@/utils/throttle.js';
+	import throttle from '@/utils/throttle.js';
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
+	import tmSearch from '@/tm-vuetify/components/tm-search/tm-search.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
+	import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
-import tmPickersDate from '@/tm-vuetify/components/tm-pickersDate/tm-pickersDate.vue';
+	import tmPickersDate from '@/tm-vuetify/components/tm-pickersDate/tm-pickersDate.vue';
-import tmPickers from '@/tm-vuetify/components/tm-pickers/tm-pickers.vue';
+	import tmPickers from '@/tm-vuetify/components/tm-pickers/tm-pickers.vue';
 
-import AttachmentSelect from '@/components/attachment-select/attachment-select.vue';
+	import AttachmentSelect from '@/components/attachment-select/attachment-select.vue';
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmButton,
@@ -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 = [];
@@ -511,43 +427,50 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		padding: 24rpx;
+
 		.loading-error {
 			height: 65vh;
 		}
-}
+	}
-.btn-wrap {
+
+	.btn-wrap {
 		box-sizing: border-box;
 		padding-top: 12rpx;
 		padding-bottom: 12rpx;
 		box-shadow: 0rpx -4rpx 24rpx rgba(0, 0, 0, 0.05);
-}
+	}
-.card {
+
+	.card {
 		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
-}
+	}
-.thumbnail {
+
+	.thumbnail {
 		width: 100%;
+
 		&-img {
 			width: 100%;
 			height: 300rpx;
 		}
-}
+	}
 
-.poup-content {
+	.poup-content {
 		overflow: hidden;
-}
+	}
-.poup-body {
+
+	.poup-body {
 		height: 69vh;
 		box-sizing: border-box;
 		touch-action: none;
-}
+	}
 </style>

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">
 								选择颜色
@@ -108,18 +83,18 @@
 </template>
 
 <script>
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
+	import tmTabs from '@/tm-vuetify/components/tm-tabs/tm-tabs.vue';
-import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
+	import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
-import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
+	import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
-import tColorPicker from '@/components/t-color-picker/t-color-picker.vue';
+	import tColorPicker from '@/components/t-color-picker/t-color-picker.vue';
-import AttachmentSelect from '@/components/attachment-select/attachment-select.vue';
+	import AttachmentSelect from '@/components/attachment-select/attachment-select.vue';
-export default {
+	export default {
 		components: {
 			tmSkeleton,
 			tmButton,
@@ -319,39 +294,45 @@ export default {
 					.catch(err => {});
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
 		width: 100vw;
 		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
+	.loading-wrap {
 		.loading-error {
 			height: 65vh;
 		}
-}
+	}
-.content-empty {
+
+	.content-empty {
 		width: 100%;
 		height: 60vh;
-}
+	}
 
-.poup-content {
+	.poup-content {
 		overflow: hidden;
-}
+	}
-.poup-body {
+
+	.poup-body {
 		height: 58vh;
 		box-sizing: border-box;
-}
+	}
-.thumbnail {
+
+	.thumbnail {
 		width: 100%;
 		height: 260rpx;
-}
+	}
-.tags-card {
+
+	.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,11 +359,13 @@ export default {
 				background-color: #607d8b;
 			}
 		}
+
 		.right {
 			box-sizing: border-box;
+
 			.color {
 				color: #fff;
 			}
 		}
-}
+	}
 </style>

tm-vuetify/tool/function/dayjs/zh-cn.min.js

@@ -4,4 +4,4 @@
  *
  * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
  */
-!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("./dayjs.min")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_zh_cn=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"zh-cn",weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),ordinal:function(e,_){switch(_){case"W":return e+"周";default:return e+"日"}},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah点mm分",LLLL:"YYYY年M月D日ddddAh点mm分",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},relativeTime:{future:"%s后",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},meridiem:function(e,_){var t=100*e+_;return t<600?"凌晨":t<900?"早上":t<1100?"上午":t<1300?"中午":t<1800?"下午":"晚上"}};return t.default.locale(d,null,!0),d}));
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("./dayjs.min.js")):"function"==typeof define&&define.amd?define(require("./dayjs.min.js"),_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_zh_cn=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"zh-cn",weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),ordinal:function(e,_){switch(_){case"W":return e+"周";default:return e+"日"}},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah点mm分",LLLL:"YYYY年M月D日ddddAh点mm分",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},relativeTime:{future:"%s后",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},meridiem:function(e,_){var t=100*e+_;return t<600?"凌晨":t<900?"早上":t<1100?"上午":t<1300?"中午":t<1800?"下午":"晚上"}};return t.default.locale(d,null,!0),d}));

utils/app.js

@@ -35,6 +35,11 @@ export const _DefaultAppSettings = {
 		timeout: 3, // 屏蔽广告时长，时间到后自动恢复展示（单位小时）
 		disabled: false, // 是否屏蔽广告（看广告可以关闭应用内设置的广告）
 	},
+	// 评论弹幕（文章详情）
+	barrage: {
+		use: true, // 是否启用
+		type: 'leftBottom' // 弹幕位置（rightToLeft leftBottom）
+	},
 	gallery: {
 		// 是否使用瀑布流
 		useWaterfull: true
@@ -56,17 +61,19 @@ export const _DefaultAppSettings = {
 	contact: {
 		// 链接是否使用复制的方式，否则直接在内部打开（小程序需要配置对应链接的业务域名）
 		isLinkCopy: true,
-	}
+	},
-}
 
+}
+// 应用设置存储key值
+export const _AppSettingsKey = 'APP_GLOBAL_SETTINGS';
 /**
  * 获取应用设置
  */
 export const getAppSettings = () => {
-	let _appSettings = uni.getStorageSync('APP_GLOBAL_SETTINGS')
+	let _appSettings = uni.getStorageSync(_AppSettingsKey)
 	if (_appSettings) return JSON.parse(_appSettings)
 
-	uni.setStorageSync('APP_GLOBAL_SETTINGS', JSON.stringify(_DefaultAppSettings))
+	uni.setStorageSync(_AppSettingsKey, JSON.stringify(_DefaultAppSettings))
 	return _appSettings;
 }
 
@@ -74,5 +81,5 @@ export const getAppSettings = () => {
  * 保存应用设置
  */
 export const setAppSettings = (appSettings) => {
-	uni.setStorageSync('APP_GLOBAL_SETTINGS', JSON.stringify(appSettings))
+	uni.setStorageSync(_AppSettingsKey, JSON.stringify(appSettings))
 }

utils/index.js

@@ -32,7 +32,10 @@ const utils = {
 	},
 
 	// 检查封面图
-	checkThumbnailUrl: function(thumbnail) {
+	checkThumbnailUrl: function(thumbnail, mustRealUrl = false) {
+		if (!thumbnail && mustRealUrl) {
+			return HaloConfig.defaultStaticThumbnailUrl
+		}
 		if (!HaloConfig.defaultThumbnailUrl) {
 			// logUtils.saveLog(logTypes.config, {
 			// 	path: 'checkThumbnailUrl',
@@ -43,9 +46,9 @@ const utils = {
 		let _url = HaloConfig.defaultThumbnailUrl
 		if (_url) {
 			if (_url.indexOf('?') == -1) {
-				_url += `&next-v=${new Date().getTime()}`
-			} else {
 				_url += `?next-v=${new Date().getTime()}`
+			} else {
+				_url += `&next-v=${new Date().getTime()}`
 			}
 		}
 		if (!thumbnail) return _url;
@@ -58,9 +61,9 @@ const utils = {
 		let _url = HaloConfig.defaultImageUrl
 		if (_url) {
 			if (_url.indexOf('?') == -1) {
-				_url += `&next-v=${new Date().getTime()}`
-			} else {
 				_url += `?next-v=${new Date().getTime()}`
+			} else {
+				_url += `&next-v=${new Date().getTime()}`
 			}
 		}
 		if (!image) return _url;
@@ -75,9 +78,9 @@ const utils = {
 			let _url = HaloConfig.defaultAvatarUrl
 			if (_url) {
 				if (_url.indexOf('?') == -1) {
-					_url += `&next-v=${new Date().getTime()}`
-				} else {
 					_url += `?next-v=${new Date().getTime()}`
+				} else {
+					_url += `&next-v=${new Date().getTime()}`
 				}
 			}
 			return _url;

utils/url.params.js

@@ -0,0 +1,52 @@
+/**
+ * 对象转换为url参数形式
+ * @param {Object} param 将要转换为URL参数的字符串对象
+ * @param {String} key URL 参数字符串的前缀
+ * @param {Boolean} encode 是否进行URL编码，默认为true
+ * @return {String} URL参数字符串
+ */
+export function jsonToUrlParams(param, key, encode) {
+	if (param == null) return '';
+	let paramStr = '';
+	let t = typeof(param);
+	if (t == 'string' || t == 'number' || t == 'boolean') {
+		paramStr += '&' + key + '=' + ((encode == null || encode) ? encodeURIComponent(param) : param);
+	} else {
+		for (var i in param) {
+			var k = key == null ? i : key + (param instanceof Array ? '[' + i + ']' : '.' + i);
+			paramStr += jsonToUrlParams(param[i], k, encode);
+		}
+	}
+	return paramStr;
+}
+
+
+/**
+ * @param {Array} actual
+ * @returns {Array}
+ */
+export function cleanArray(actual) {
+	const newArray = []
+	for (let i = 0; i < actual.length; i++) {
+		if (actual[i]) {
+			newArray.push(actual[i])
+		}
+	}
+	return newArray
+}
+
+
+/**
+ * json对象转Url参数2
+ * @param {Object} json
+ * @returns {Array}
+ */
+export function jsonToUrlParams2(json) {
+	if (!json) return ''
+	return cleanArray(
+		Object.keys(json).map(key => {
+			if (json[key] === undefined) return ''
+			return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
+		})
+	).join('&')
+}

vue.config.js

@@ -12,7 +12,7 @@ module.exports = {
 				changeOrigin: true,
 				secure: true,
 				pathRewrite: {
-					"^/api": ""
+					"^/api": "/api"
 				}
 			}
 		}