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

修改：修复海报分享因为无图使用随机图在微信小程序下异常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 @@
 
 ---
 
-如果您觉得这个项目对您有帮助，可以帮作者买杯饮料鼓励鼓励!
+如果您觉得这个项目对您有帮助，可以帮作者买杯饮料鼓励鼓励，同时为了项目能够持续发展，可以根据您的喜好支持一下本项目哦，非常感谢您的支持，作者也会更有动力持续维护和更新新的功能哦~
 
-<table rules="none" align="center" border="0">
+|支付宝												|微信												|QQ												|
-	<tr>
+|:--:												|:--:												|:--:											|
-		<td>
+|![支付宝赞赏](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)	|
-			<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/)
+几乎实现PC端后台的全功能，让您在手机端也可以管理您的博客。
 
-- 1、拉取或下载项目<https://gitee.com/ialley-workshop-open/uni-halo>；
+- 用户端：文章列表、文章分类、文章详情、图库、留言板、友链、个人日记等
-- 2、通过hbuilderx 导入项目；
+- 管理端：资料修改、密码修改、日记管理、文章管理、分类管理、标签管理、附件管理、友链管理、评论管理、日志管理等
-- 3、命令行执行 npm i 安装依赖； 
-- 4、配置运行信息，找到项目根目录config目录，将`halo.config.template.js`修改为 `halo.config.js` 并设置相关信息；
-- 5、点击hbuilderx 工具 右上角预览、或者点击工具栏 运行-内置浏览器运行；
-- 6、项目发行：
--    发行小程序：点击工具栏 发行 -> 小程序-微信
--    发行APP：  点击工具栏 发行 -> 原生App-云打包
 
+<br/>
 
-## ⭐️ 功能清单
+#### 💞 特色功能
 
-### 用户部分
+- 恋爱日记：精心为您设计了秀恩爱的模块，秀出关于你们的故事、情侣甜蜜相册、恋爱记录清单，为您的恋爱保驾护航。
-1. - [x] 文章分类
-2. - [x] 文章详情&海报分享
-3. - [x] 文章归档
-4. - [x] 文章列表和搜索
-5. - [x] 数据统计展示
-6. - [x] 图库
-7. - [x] 友链
-8. - [x] 留言板
-9. - [x] 个人日记
 
-### 管理部分
+<br/>
-1. - [x] 个人信息修改
-2. - [x] 个人密码修改
-3. - [x] 日记管理
-4. - [x] 文章管理
-5. - [x] 分类管理
-6. - [x] 标签管理
-7. - [x] 附件管理
-8. - [x] 友链管理
-9. - [x] 图库管理
-10. - [x] 评论管理
-11. - [x] 日志管理
-12. - [ ] 菜单设置
-13. - [ ] 系统设置
 
-## 📃 TODO
+## 😎 文档源码
-1. - [ ] 暗黑模式
-2. - [ ] 国际化
 
+- 作者博客：[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)
   
-## 🌈 在线体验
+  <br/>
 
-- 敬请期待...
+## 😏 在线体验
 
+说明：微信扫码、或搜索【小莫唐尼】即可在线体验已上线小程序！！！
 
-## 🔍 许可证
+![https://img.925i.cn/file/a0c1a95b49b5db7f78248.png](https://img.925i.cn/file/a0c1a95b49b5db7f78248.png)
+
+<br/>
+
+## 😘 界面预览
+
+##### 📱 用户端
+
+说明：以下仅为部分截图
+
+|首页|分类|图库|友链|
+|:--:|:--:|:--:|:--:|
+|![首页](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)|
+
+|我的|归档|详情|留言板|
+|:--:|:--:|:--:|:--:|
+|![我的](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,24 +103,47 @@ export const setInterceptors = (http) => {
 					message: 'API接口服务异常！'
 				})
 			} else if (response.data.status == 401) {
-				delCache('APP_ADMIN_LOGIN_TOKEN');
+				uni.$tm.toast(response.data.message);
-				uni.$eShowModal({
+				// 如果是请求分类之后报401说明密码错误，那么清除该密码，下次点击会报403弹窗再次输入密码
-					title: '提示',
+				if (response.config.url.indexOf('/api/content/categories') >= 0) {
-					content: '您未登录超管账号或登录已过期，是否重新登录？',
+					const category = getCategoryNameByUrl(response.config.url)
-					showCancel: true,
+					delCache('APP_CATEGORY_PWD_' + category);
-					cancelText: '否',
+					uni.showToast({
-					cancelColor: '#999999',
+						title: '提示：密码不正确',
-					confirmText: '是',
+						icon: 'none',
-					confirmColor: '#03a9f4'
+						success: () => {
-				}).then(res => {
+							setTimeout(() => {
-					uni.navigateTo({
+								showCategoryInputPasswordModal(response, category);
-						url: '/pagesB/login/login'
+							}, 800)
+						}
 					})
-				}).catch(err => {
+				} else {
-					uni.switchTab({
+					// 其他情况维持原来的逻辑
-						url: '/pages/tabbar/about/about'
+					delCache('APP_ADMIN_LOGIN_TOKEN');
+					uni.$eShowModal({
+						title: '提示',
+						content: '您未登录超管账号或登录已过期，是否重新登录？',
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					}).then(res => {
+						uni.navigateTo({
+							url: '/pagesB/login/login'
+						})
+					}).catch(err => {
+						uni.switchTab({
+							url: '/pages/tabbar/about/about'
+						})
 					})
-				})
+				}
+			} 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,15 +18,31 @@ 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
 				this._isWechat = true;
@@ -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,273 +27,327 @@
 </template>
 
 <script>
-export default {
+	import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
-	name: 'article-card',
+	export default {
-	props: {
+		name: 'article-card',
-		from: {
+		components: { tmTags },
-			type: String,
+		props: {
-			default: ''
+			from: {
-		},
+				type: String,
-		article: {
+				default: ''
-			type: Object,
+			},
-			default: () => {}
+			article: {
-		}
+				type: Object,
-	},
+				default: () => {}
-	computed: {
+			}
-		cardType() {
+		},
-			// tb_image_text=上图下文
+		computed: {
-			// tb_text_image=上文下图
+			cardType() {
-			if (this.from == 'home' && this.globalAppSettings.layout.home == 'h_row_col2') {
+				// tb_image_text=上图下文
-				if (!['tb_image_text', 'tb_text_image', 'only_text'].some(x => x == this.globalAppSettings.layout.cardType)) {
+				// tb_text_image=上文下图
-					return [this.from, this.globalAppSettings.layout.home, 'tb_image_text'];
+				if (this.from == 'home' && this.globalAppSettings.layout.home == 'h_row_col2') {
-				}
+					if (!['tb_image_text', 'tb_text_image', 'only_text'].some(x => x == this.globalAppSettings.layout.cardType)) {
-				return [this.from, this.globalAppSettings.layout.home, this.globalAppSettings.layout.cardType];
+						return [this.from, this.globalAppSettings.layout.home, 'tb_image_text'];
+					}
+					return [this.from, this.globalAppSettings.layout.home, this.globalAppSettings.layout.cardType];
+				}
+				return [this.globalAppSettings.layout.home, this.globalAppSettings.layout.cardType];
+			}
+		},
+		methods: {
+			fnClickEvent() {
+				this.$emit('on-click', this.article);
 			}
-			return [this.globalAppSettings.layout.home, this.globalAppSettings.layout.cardType];
 		}
-	},
+	};
-	methods: {
-		fnClickEvent() {
-			this.$emit('on-click', this.article);
-		}
-	}
-};
 </script>
 
 <style scoped lang="scss">
-.article-card {
+	.article-card {
-	display: flex;
+		display: flex;
-	box-sizing: border-box;
+		box-sizing: border-box;
-	margin: 0 24rpx;
+		margin: 0 24rpx;
-	padding: 32rpx;
+		padding: 24rpx;
-	border-radius: 12rpx;
+		border-radius: 12rpx;
-	background-color: #ffff;
+		background-color: #ffff;
-	box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
-	overflow: hidden;
+		overflow: hidden;
-	margin-bottom: 24rpx;
+		margin-bottom: 24rpx;
-	&.home {
+
-		&.h_row_col2 {
+		&.h_row_col1 {
-			margin: 12rpx;
+			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;
+							line-height: 36rpx;
+							vertical-align: 4rpx;
+							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 {
+								border-radius: 6rpx !important;
+							}
+						}
+					}
+				}
+
+				&.only_text {
+					padding: 24rpx;
+
+					.right .foot {
+						.create-time {
+							.time-label {
+								display: none;
+							}
+						}
+
+						.visits {
+							font-size: 24rpx;
+						}
+					}
+				}
+			}
+		}
+
+		&.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: 200rpx;
+				height: 340rpx;
+
 				.thumbnail {
 					::v-deep uni-image {
 						border-radius: 6rpx 6rpx 0 0 !important;
 					}
 				}
 			}
+
 			.right {
-				.title {
+				padding-left: 0;
-					display: flex;
+				padding: 24rpx 0;
-					align-items: center;
+				padding-bottom: 0;
-					font-size: 26rpx;
+				width: 100%;
-					font-weight: bold;
+
-					.is-top {
-						height: 36rpx;
-						margin-right: 10rpx;
-						line-height: 36rpx;
-						vertical-align: 4rpx;
-						transform: scale(0.9);
-					}
-				}
 				.foot {
-					justify-content: space-between;
+					justify-content: flex-start;
-					.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 {
-							border-radius: 6rpx !important;
-						}
-					}
-				}
-			}
-			&.only_text {
-				padding: 24rpx;
-				.right .foot {
-					.create-time {
-						.time-label {
-							display: none;
-						}
-					}
-					.visits {
-						font-size: 24rpx;
-					}
-				}
-			}
-		}
-	}
-	&.lr_image_text {
-	}
 
-	&.lr_text_image {
+					.create-time {
-		.left {
+						.time-label {
-			order: 2;
+							display: inline-block;
-			padding-left: 30rpx;
+						}
+					}
+
+					.visits {
+						margin-left: 24rpx;
+					}
+				}
+			}
 		}
-		.right {
+
-			order: 1;
+		&.tb_text_image {
-			padding-left: 0;
+			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;
+					}
+				}
+			}
 		}
-	}
+
-	&.tb_image_text {
+		&.only_text {
-		flex-direction: column;
+			padding: 36rpx;
-		padding: 24rpx;
+
+			.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;
+					}
+				}
+			}
+		}
+
 		.left {
-			width: 100%;
+			width: 240rpx;
-			height: 340rpx;
+			height: 180rpx;
+
 			.thumbnail {
-				::v-deep uni-image {
+				width: 100%;
-					border-radius: 6rpx 6rpx 0 0 !important;
+				height: 100%;
-				}
+				border-radius: 12rpx;
 			}
 		}
+
 		.right {
-			padding-left: 0;
+			width: 0;
-			padding: 24rpx 0;
+			flex-grow: 1;
-			padding-bottom: 0;
+			display: flex;
-			width: 100%;
+			flex-direction: column;
-			.foot {
+			padding-left: 30rpx;
-				justify-content: flex-start;
+			box-sizing: border-box;
-				.create-time {
+
-					.time-label {
+			.title {
-						display: inline-block;
+				display: flex;
-					}
+				align-items: center;
+				font-size: 30rpx;
+				color: var(--main-text-color);
+
+				.is-top {
+					height: 40rpx;
+					padding: 0 12rpx;
+					margin-right: 10rpx;
+					line-height: 40rpx;
+					font-size: 24rpx;
+					white-space: nowrap;
+					vertical-align: 4rpx;
+					color: #fff;
+					// background-image: -webkit-linear-gradient(0deg, #3ca5f6 0, #a86af9 100%);
+					border-radius: 6rpx 12rpx;
+					box-shadow: none !important;
 				}
-				.visits {
+
-					margin-left: 24rpx;
+				&-text {
+					color: #303133;
 				}
 			}
-		}
+
-	}
-	&.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;
+				display: -webkit-box;
+				font-size: 26rpx;
+				color: #909399;
+				height: 80rpx;
+				margin-top: 14rpx;
+				line-height: 42rpx;
 			}
+
 			.foot {
-				justify-content: flex-start;
+				display: flex;
-				margin-top: 24rpx;
+				font-size: 24rpx;
+				justify-content: space-between;
+				align-items: center;
+				color: #909399;
+				margin-top: 18rpx;
+
 				.create-time {
+					font-size: 26rpx;
+
 					.time-label {
-						display: inline-block;
+						display: none;
 					}
 				}
+
 				.visits {
-					margin-left: 24rpx;
+					.number {
+						padding: 0 6rpx;
+						font-size: 26rpx;
+					}
 				}
 			}
 		}
 	}
-
-	.left {
-		width: 240rpx;
-		height: 180rpx;
-		.thumbnail {
-			width: 100%;
-			height: 100%;
-			border-radius: 12rpx;
-		}
-	}
-	.right {
-		width: 0;
-		flex-grow: 1;
-		display: flex;
-		flex-direction: column;
-		padding-left: 30rpx;
-		box-sizing: border-box;
-		.title {
-			display: flex;
-			font-size: 30rpx;
-			color: var(--main-text-color);
-			.is-top {
-				height: 40rpx;
-				padding: 0 12rpx;
-				margin-right: 10rpx;
-				line-height: 40rpx;
-				font-size: 24rpx;
-				white-space: nowrap;
-				vertical-align: 4rpx;
-				color: #fff;
-				background-image: -webkit-linear-gradient(0deg, #3ca5f6 0, #a86af9 100%);
-				border-radius: 4rpx 12rpx;
-			}
-			&-text {
-				color: #303133;
-			}
-		}
-		.content {
-			display: -webkit-box;
-			font-size: 26rpx;
-			color: #909399;
-			height: 80rpx;
-			margin-top: 14rpx;
-			line-height: 42rpx;
-		}
-		.foot {
-			display: flex;
-			font-size: 24rpx;
-			justify-content: space-between;
-			align-items: center;
-			color: #909399;
-			margin-top: 18rpx;
-
-			.create-time {
-				font-size: 26rpx;
-				.time-label {
-					display: none;
-				}
-			}
-			.visits {
-				.number {
-					padding: 0 6rpx;
-					font-size: 26rpx;
-				}
-			}
-		}
-	}
-}
 </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,168 +24,197 @@
 </template>
 
 <script>
-export default {
+	export default {
-	name: 'article-min-card',
+		name: 'article-min-card',
-	props: {
+		props: {
-		article: {
+			article: {
-			type: Object,
+				type: Object,
-			default: () => {}
+				default: () => {}
+			}
+		},
+		methods: {
+			fnClickEvent() {
+				this.$emit('on-click', this.article);
+			}
 		}
-	},
+	};
-	methods: {
-		fnClickEvent() {
-			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;
-	background-color: #ffff;
-	overflow: hidden;
-	margin: 12rpx 24rpx;
-	margin-bottom: 24rpx;
-	padding: 16rpx;
-	box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
-	&.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;
-				}
-			}
-		}
-	}
-
-	.left {
-		width: 180rpx;
-		height: 130rpx;
-		.thumbnail {
-			width: 100%;
-			height: 100%;
-			border-radius: 12rpx;
-		}
-	}
-	.right {
-		width: 0;
-		flex-grow: 1;
 		display: flex;
-		flex-direction: column;
+		box-sizing: border-box;
-		padding-left: 24rpx;
+		border-radius: 12rpx;
-		.title {
+		background-color: #ffff;
-			font-size: 28rpx;
+		overflow: hidden;
-			font-weight: 600;
+		margin: 12rpx 24rpx;
-			color: var(--main-text-color);
+		margin-bottom: 24rpx;
+		padding: 16rpx;
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+
+		&.lr_image_text {}
+
+		&.lr_text_image {
+			.left {
+				order: 2;
+				padding-left: 30rpx;
+			}
+
+			.right {
+				order: 1;
+				padding-left: 0;
+			}
 		}
-		.content {
+
-			font-size: 26rpx;
+		&.tb_image_text {
-			color: #909399;
+			flex-direction: column;
-			margin-top: 14rpx;
+
-		}
+			.left {
-		.foot {
+				width: 100%;
-			display: flex;
+				height: 220rpx;
-			font-size: 24rpx;
+			}
-			justify-content: space-between;
+
-			align-items: center;
+			.right {
-			color: #909399;
+				padding-left: 0;
-			margin-top: 14rpx;
+				width: 100%;
-			.create-time {
+
-				font-size: 24rpx;
+				.title {
-				.time-label {
+					margin-top: 24rpx;
-					display: none;
 				}
-				.icon {
+
-					font-size: 24rpx;
+				.foot {
-					padding-right: 4rpx;
+					justify-content: flex-start;
+
+					.create-time {
+						.time-label {
+							display: inline-block;
+						}
+					}
+
+					.visits {
+						margin-left: 24rpx;
+					}
 				}
 			}
-			.visits {
+		}
-				.icon {
+
-					font-size: 28rpx;
+		&.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;
+					}
 				}
-				.number {
+			}
-					padding: 0 6rpx;
+		}
+
+		&.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;
+					}
+				}
+			}
+		}
+
+		.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: 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;
+				justify-content: space-between;
+				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;
+					}
 				}
 			}
 		}
 	}
-}
 </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;
-					display: flex;
+				align-items: center;
-
+				justify-content: center;
-					image {
+				.avatar {
-						width: 58rpx;
+					width: 42rpx;
-						height: 58rpx;
+					height: 42rpx;
-						background: rgba(55, 55, 55, 1);
+					background: rgba(55, 55, 55, 1);
-						border-radius: 50%;
+					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,183 +3,191 @@
 		<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',
+		name: 'cache-image',
-	props: {
+		props: {
-		url: {
+			url: {
-			type: String,
+				type: String,
-			default: ''
+				default: ''
-		},
+			},
-		lazyLoad: {
+			lazyLoad: {
-			type: Boolean,
+				type: Boolean,
-			default: true
+				default: true
-		},
+			},
-		loadStyle: {
+			loadStyle: {
-			type: Object,
+				type: Object,
-			default() {
+				default () {
-				return {
+					return {
-					backgroundColor: '#ffffff',
+						backgroundColor: '#ffffff',
-					color: '#333'
+						color: '#333'
-				};
+					};
+				}
+			},
+			loadErrStyle: {
+				type: Object,
+				default () {
+					return {
+						color: 'rgba(244, 67, 54,1)'
+						// backgroundColor: 'rgba(244, 67, 54,0.2)'
+					};
+				}
+			},
+			mode: {
+				type: String,
+				default: 'aspectFill'
+			},
+			loadText: {
+				type: String,
+				default: '加载中...'
+			},
+			loadErrText: {
+				type: String,
+				default: '加载失败'
+			},
+			fileMd5: {
+				type: String,
+				default: ''
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			width: {
+				type: String,
+				default: '100%'
+			},
+			height: {
+				type: String,
+				default: '100%'
+			},
+			radius: {
+				type: String,
+				default: ''
 			}
 		},
-		loadErrStyle: {
+		data() {
-			type: Object,
+			return {
-			default() {
+				imgStyle: {},
-				return {
+				loadingImgStyle: {
-					color: 'rgba(244, 67, 54,1)'
+					width: '120rpx',
-					// backgroundColor: 'rgba(244, 67, 54,0.2)'
+				},
-				};
+				src: '', // 图片地址
+				loadStatus: 'loading'
+			};
+		},
+		computed: {
+			loadingImgSrc() {
+				return getApp().globalData.loadingGifUrl;
+			},
+			loadingErrorImageSrc() {
+				return getApp().globalData.loadingErrUrl
 			}
 		},
-		mode: {
+		watch: {
-			type: String,
+			// 监听图片md5值的变化
-			default: 'aspectFill'
+			fileMd5(val) {
-		},
+				// 查找获取图片缓存
-		loadText: {
+				this.fnGetImageCache();
-			type: String,
-			default: '加载中...'
-		},
-		loadErrText: {
-			type: String,
-			default: '加载失败'
-		},
-		fileMd5: {
-			type: String,
-			default: ''
-		},
-		styles: {
-			type: Object,
-			default() {
-				return {};
 			}
 		},
-		width: {
+		created() {
-			type: String,
+			this.imgStyle = {
-			default: '100%'
+				width: this.width,
-		},
+				height: this.height,
-		height: {
+				borderRadius: this.radius,
-			type: String,
+				...this.styles
-			default: '100%'
+			};
-		},
+
-		radius: {
-			type: String,
-			default: ''
-		}
-	},
-	data() {
-		return {
-			imgStyle: {},
-			src: '', // 图片地址
-			loadStatus: 'loading'
-		};
-	},
-	computed: {
-		loadingImgSrc() {
-			return getApp().globalData.loadingGifUrl;
-		}
-	},
-	watch: {
-		// 监听图片md5值的变化
-		fileMd5(val) {
 			// 查找获取图片缓存
 			this.fnGetImageCache();
-		}
+		},
-	},
+		methods: {
-	created() {
+			// 查找获取图片缓存
-		console.log('cache-image', this.url);
+			async fnGetImageCache() {
-		this.imgStyle = {
+				// #ifdef APP-PLUS
-			width: this.width,
+				var result = await imageCache.getImageCache(this.url, this.fileMd5);
-			height: this.height,
+				if (result) {
-			borderRadius: this.radius,
+					this.src = result;
-			...this.styles
+				} else {
-		};
+					this.src = this.url;
-
+				}
-		// 查找获取图片缓存
+				// #endif
-		this.fnGetImageCache();
+				// #ifndef APP-PLUS
-	},
-	methods: {
-		// 查找获取图片缓存
-		async fnGetImageCache() {
-			// #ifdef APP-PLUS
-			var result = await imageCache.getImageCache(this.url, this.fileMd5);
-			if (result) {
-				this.src = result;
-			} else {
 				this.src = this.url;
+				// #endif
+			},
+			fnOnLoad() {
+				this.loadStatus = 'success';
+			},
+			fnOnError(e) {
+				this.loadStatus = 'error';
 			}
-			// #endif
-			// #ifndef APP-PLUS
-			this.src = this.url;
-			// #endif
-		},
-		fnOnLoad() {
-			this.loadStatus = 'success';
-		},
-		fnOnError() {
-			this.loadStatus = 'error';
 		}
-	}
+	};
-};
 </script>
 
 <style scoped lang="scss">
-.cache-image-wrap {
+	.cache-image-wrap {
-	width: 100%;
+		width: 100%;
-	height: 100%;
+		height: 100%;
-}
-.img-loading,
-.img-error {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	box-sizing: border-box;
-	background-color: #f2f2f2;
-}
-.img-load-icon {
-	font-size: 36rpx;
-	animation: xhRote 0.8s infinite linear;
-}
-.img-load-text {
-	font-size: 28rpx;
-	margin-top: 8rpx;
-	color: inherit;
-}
-.img-error {
-	font-size: 28rpx;
-}
-.img-err-icon {
-	font-size: 36rpx;
-}
-@keyframes xhRote {
-	0% {
-		transform: rotate(0deg);
 	}
 
-	100% {
+	.img-loading,
-		transform: rotate(360deg);
+	.img-error {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		background-color: #f2f2f2;
+	}
+
+	.img-load-icon {
+		font-size: 36rpx;
+		animation: xhRote 0.8s infinite linear;
+	}
+
+	.img-load-text {
+		font-size: 28rpx;
+		margin-top: 8rpx;
+		color: inherit;
+	}
+
+	.img-error {
+		font-size: 28rpx;
+
+		&-img {
+			width: 100%;
+			border-radius: 12rpx;
+		}
+	}
+
+	.img-err-icon {
+		font-size: 36rpx;
+	}
+
+	@keyframes xhRote {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		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,194 +34,201 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmEmpty,
+			tmEmpty,
-		tmFlowLayout,
+			tmFlowLayout,
-		tmSliderNav,
+			tmSliderNav,
-		ArticleMinCard
+			ArticleMinCard
-	},
+		},
-	data() {
+		data() {
-		return {
+			return {
-			loading: 'loading',
+				loading: 'loading',
-			queryParams: {
+				queryParams: {
-				size: 10,
+					size: 10,
-				page: 0,
+					page: 0,
-				slug: ''
+					slug: ''
-			},
+				},
-			categoryList: [],
+				categoryList: [],
-			result: null,
+				result: null,
-			dataList: [],
+				dataList: [],
-			isLoadMore: false,
+				isLoadMore: false,
-			loadMoreText: '',
+				loadMoreText: '',
-			scrollTop: 0,
+				scrollTop: 0,
-			tempScrollTop: 0,
+				tempScrollTop: 0,
-			scrollTimeout: null,
+				scrollTimeout: null,
-			triggered: false
+				triggered: false
-		};
+			};
-	},
+		},
 
-	onLoad() {
+		onLoad() {
-		this.fnSetPageTitle('文章分类');
+			this.fnSetPageTitle('文章分类');
-		this.fnGetAllCategory();
+			this.fnGetAllCategory();
-	},
+		},
-	onPullDownRefresh() {
+		onPullDownRefresh() {
-		this.queryParams.page = 0;
+			this.queryParams.page = 0;
-		this.isLoadMore = false;
+			this.isLoadMore = false;
-		this.fnGetData();
-	},
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
-			this.fnGetData(false);
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		fnOnCategoryChange(e) {
-			this.queryParams.slug = this.categoryList[e].slug;
-			this.fnToTopScroll();
-			this.dataList = [];
 			this.fnGetData();
 		},
-
+		onReachBottom(e) {
-		fnGetAllCategory() {
+			if (this.result.hasNext) {
-			this.loading = 'loading';
+				this.queryParams.page += 1;
-			uni.showLoading({
+				this.isLoadMore = true;
-				mask: true,
+				this.fnGetData(false);
-				title: '加载中...'
-			});
-			this.$httpApi
-				.getCategoryList({ more: true })
-				.then(res => {
-					this.categoryList = res.data;
-					if (res.data.length != 0) {
-						this.queryParams.slug = res.data[0].slug;
-						this.triggered = false;
-						this.loading = 'success';
-						this.fnGetData(true, false);
-					}
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-				})
-				.finally(() => {
-					uni.hideLoading();
-					uni.stopPullDownRefresh();
-				});
-		},
-		fnGetData(isPulldownRefresh = true, triggered = true) {
-			if (!isPulldownRefresh) {
-				if (this.result.hasNext) {
-					this.queryParams.page += 1;
-				} else {
-					return uni.showToast({
-						icon: 'none',
-						title: '没有更多数据了'
-					});
-				}
 			} else {
-				this.queryParams.page = 0;
+				uni.showToast({
-				if (triggered) {
+					icon: 'none',
-					this.triggered = true;
+					title: '没有更多数据了'
-				}
-			}
-
-			this.$httpApi
-				.getCategoryPostList(this.queryParams.slug, this.queryParams)
-				.then(res => {
-					this.result = res.data;
-
-					if (!isPulldownRefresh) {
-						this.dataList = this.dataList.concat(res.data.content);
-					} else {
-						this.dataList = res.data.content;
-					}
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-				})
-				.catch(err => {
-					this.loadMoreText = '加载失败！';
-				})
-				.finally(() => {
-					this.triggered = false;
 				});
+			}
 		},
-		//跳转文章详情
+		methods: {
-		fnToArticleDetail(article) {
+			fnOnCategoryChange(e) {
-			uni.navigateTo({
+				this.fnResetSetAniWaitIndex();
-				url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+				this.queryParams.slug = this.categoryList[e].slug;
-				animationType: 'slide-in-right'
+				this.fnToTopScroll();
-			});
+				this.dataList = [];
-		},
+				this.fnGetData();
-		fnOnScroll(e) {
+			},
-			this.tempScrollTop = e.detail.scrollTop;
+
-		},
+			fnGetAllCategory() {
-		fnToTopScroll() {
+				this.loading = 'loading';
-			uni.pageScrollTo({
+				// uni.showLoading({
-				scrollTop: 0,
+				// 	mask: true,
-				duration: 500
+				// 	title: '加载中...'
-			});
+				// });
-			this.scrollTop = 0;
+				this.$httpApi
-			this.tempScrollTop = 0;
+					.getCategoryList({ more: true })
-		},
+					.then(res => {
-		fnOnTouchStart() {
+						this.categoryList = res.data;
-			clearTimeout(this.scrollTimeout);
+						if (res.data.length != 0) {
-		},
+							this.queryParams.slug = res.data[0].slug;
-		fnOnTouchEnd() {
+							this.triggered = false;
-			this.scrollTimeout = setTimeout(() => {
+							this.loading = 'success';
-				this.scrollTop = this.tempScrollTop;
+							this.fnGetData(true, false);
-			}, 500);
+						}
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+					})
+					.finally(() => {
+						uni.hideLoading();
+						uni.stopPullDownRefresh();
+					});
+			},
+			fnGetData(isPulldownRefresh = true, triggered = true) {
+				if (!isPulldownRefresh) {
+					if (this.result.hasNext) {
+						this.queryParams.page += 1;
+					} else {
+						return uni.showToast({
+							icon: 'none',
+							title: '没有更多数据了'
+						});
+					}
+				} else {
+					this.queryParams.page = 0;
+					if (triggered) {
+						this.triggered = true;
+					}
+				}
+
+				this.$httpApi
+					.getCategoryPostList(this.queryParams.slug, this.queryParams)
+					.then(res => {
+						this.result = res.data;
+
+						if (!isPulldownRefresh) {
+							this.dataList = this.dataList.concat(res.data.content);
+						} else {
+							this.dataList = res.data.content;
+						}
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+					})
+					.catch(err => {
+						this.loadMoreText = '加载失败！';
+					})
+					.finally(() => {
+						this.triggered = false;
+					});
+			},
+			//跳转文章详情
+			fnToArticleDetail(article) {
+				uni.navigateTo({
+					url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					animationType: 'slide-in-right'
+				});
+			},
+			fnOnScroll(e) {
+				this.tempScrollTop = e.detail.scrollTop;
+			},
+			fnToTopScroll() {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 500
+				});
+				this.scrollTop = 0;
+				this.tempScrollTop = 0;
+			},
+			fnOnTouchStart() {
+				clearTimeout(this.scrollTimeout);
+			},
+			fnOnTouchEnd() {
+				this.scrollTimeout = setTimeout(() => {
+					this.scrollTop = this.tempScrollTop;
+				}, 500);
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	display: flex;
+		display: flex;
-	flex-direction: column;
+		flex-direction: column;
-	background-color: #fff;
+		background-color: #fff;
-}
+	}
-.content {
+
-	height: 100vh;
+	.content {
-	background-color: #fafafa;
+		height: 100vh;
-}
+		background-color: #fafafa;
-.category-empty {
+	}
-	width: 100%;
+
-	height: 70vh;
+	.category-empty {
-}
+		width: 100%;
-.article-empty {
+		height: 70vh;
-	width: 100%;
+	}
-	height: 70vh;
+
-}
+	.article-empty {
-.right-content {
+		width: 100%;
-	// width: calc(100vw - 144rpx);
+		height: 70vh;
-	width: calc(100vw - 190rpx);
+	}
-	height: 100vh;
+
-	background-color: #fff;
+	.right-content {
-	white-space: nowrap;
+		// width: calc(100vw - 144rpx);
-}
+		width: calc(100vw - 190rpx);
-.loading-wrap {
+		height: 100vh;
-	padding: 24rpx;
+		background-color: #fff;
-}
+		white-space: nowrap;
+		background-color: #fafafa;
+	}
+
+	.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,218 +107,225 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmTags,
+			tmTags,
-		tmEmpty,
+			tmEmpty,
-		tmIcons,
+			tmIcons,
-		tmImages,
+			tmImages,
-		tmFlowLayout,
+			tmFlowLayout,
-		tmTabs
+			tmTabs
-	},
+		},
-	data() {
+		data() {
-		return {
+			return {
-			isBlackTheme: false,
+				isBlackTheme: false,
-			loading: 'loading',
+				loading: 'loading',
-			category: {
+				category: {
-				activeIndex: 0,
+					activeIndex: 0,
-				activeValue: '',
+					activeValue: '',
-				list: []
+					list: []
-			},
+				},
-			queryParams: {
+				queryParams: {
-				size: 10,
+					size: 10,
-				page: 0,
+					page: 0,
-				team: null,
+					team: null,
-				keyword: ''
+					keyword: ''
-			},
+				},
-			cache: {
+				cache: {
-				dataList: [],
+					dataList: [],
-				total: 0
+					total: 0
-			},
+				},
-			isLoadMore: false,
+				isLoadMore: false,
-			loadMoreText: '',
+				loadMoreText: '',
-			result: {},
+				result: {},
-			dataList: []
+				dataList: []
-		};
+			};
-	},
+		},
-	filters: {
+		filters: {
-		filterTakeTime(val) {
+			filterTakeTime(val) {
-			return uni.$tm.dayjs(val).format('DD/MM/YYYY');
+				return uni.$tm.dayjs(val).format('DD/MM/YYYY');
-		}
-	},
-	watch: {
-		globalAppSettings: {
-			deep: true,
-			handler() {
-				// this.isLoadMore = false;
-				// this.queryParams.page = 0;
-				// this.dataList = [];
-				// this.cache.list = [];
-				// this.cache.total = 0;
 			}
-		}
+		},
-	},
+		watch: {
-	onLoad() {
+			globalAppSettings: {
-		this.fnSetPageTitle('个人图库');
+				deep: true,
-		this.fnGetCategory();
+				handler() {
-	},
+					// this.isLoadMore = false;
-	created() {
+					// this.queryParams.page = 0;
-		this.fnGetData();
+					// this.dataList = [];
-	},
+					// this.cache.list = [];
-	onPullDownRefresh() {
+					// this.cache.total = 0;
-		this.isLoadMore = false;
+				}
-		this.queryParams.page = 0;
+			}
-		this.fnGetData();
+		},
-	},
+		onLoad() {
-	onReachBottom(e) {
+			this.fnSetPageTitle('个人图库');
-		if (this.result.hasNext) {
+			this.fnGetCategory();
-			this.queryParams.page += 1;
+		},
-			this.isLoadMore = true;
+		created() {
 			this.fnGetData();
-		} else {
+		},
-			uni.showToast({
+		onPullDownRefresh() {
-				icon: 'none',
+			this.isLoadMore = false;
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		fnOnCategoryChange(index) {
-			this.dataList = [];
-			if (index == 0) {
-				this.queryParams.team = null;
-			} else {
-				this.queryParams.team = this.category.list[index];
-			}
 			this.queryParams.page = 0;
-			this.fnToTopPage();
 			this.fnGetData();
 		},
-		fnGetCategory() {
+		onReachBottom(e) {
-			this.$httpApi.getPhotoTeams().then(res => {
+			if (this.result.hasNext) {
-				this.category.list = ['全部', ...res.data];
+				this.queryParams.page += 1;
-			});
+				this.isLoadMore = true;
-		},
+				this.fnGetData();
-		fnGetData() {
+			} else {
-			uni.showLoading({
+				uni.showToast({
-				mask: true,
+					icon: 'none',
-				title: '加载中...'
+					title: '没有更多数据了'
-			});
+				});
-			// 设置状态为加载中
-			if (!this.isLoadMore) {
-				this.loading = 'loading';
 			}
-			this.loadMoreText = '';
+		},
-			this.$httpApi
+		methods: {
-				.getPhotoListByPage(this.queryParams)
+			fnOnCategoryChange(index) {
-				.then(res => {
+				this.fnResetSetAniWaitIndex();
-					if (res.status == 200) {
+				this.dataList = [];
-						this.loading = 'success';
+				if (index == 0) {
-						this.result = res.data;
+					this.queryParams.team = null;
-						if (res.data.content.length != 0) {
+				} else {
-							const _list = res.data.content.map((item, index) => {
+					this.queryParams.team = this.category.list[index];
-								item['image'] = this.$utils.checkImageUrl(item.thumbnail);
+				}
-								item['model'] = 'text';
+				this.queryParams.page = 0;
-								item['takeTime'] = this.$tm.dayjs(item['takeTime']).format('DD/MM/YYYY');
+				this.fnToTopPage();
-								return item;
+				this.fnGetData();
-							});
+			},
-							this.fnCacheDataList(_list);
+			fnGetCategory() {
-							if (this.globalAppSettings.gallery.useWaterfull) {
+				this.$httpApi.getPhotoTeams().then(res => {
-								this.dataList = _list;
+					this.category.list = ['全部', ...res.data];
-								this.$nextTick(() => {
+				});
-									this.$refs.wafll.pushData(_list);
+			},
+			fnGetData() {
+				// uni.showLoading({
+				// 	mask: true,
+				// 	title: '加载中...'
+				// });
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '';
+				this.$httpApi
+					.getPhotoListByPage(this.queryParams)
+					.then(res => {
+						if (res.status == 200) {
+							this.loading = 'success';
+							this.result = res.data;
+							if (res.data.content.length != 0) {
+								const _list = res.data.content.map((item, index) => {
+									item['image'] = this.$utils.checkImageUrl(item.thumbnail);
+									item['model'] = 'text';
+									item['takeTime'] = this.$tm.dayjs(item['takeTime']).format('DD/MM/YYYY');
+									return item;
 								});
-							} else {
+								this.fnCacheDataList(_list);
-								this.dataList = this.dataList.concat(_list);
+								if (this.globalAppSettings.gallery.useWaterfull) {
+									this.dataList = _list;
+									this.$nextTick(() => {
+										this.$refs.wafll.pushData(_list);
+									});
+								} else {
+									this.dataList = this.dataList.concat(_list);
+								}
 							}
+							this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						} else {
+							this.loading = 'error';
+							this.waterfall.loading = 'finish';
+							this.loadMoreText = '';
 						}
-						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+					})
-					} else {
+					.catch(err => {
+						console.error(err);
 						this.loading = 'error';
 						this.waterfall.loading = 'finish';
-						this.loadMoreText = '';
+						this.loadMoreText = '加载失败，请下拉刷新！';
-					}
+					})
-				})
+					.finally(() => {
-				.catch(err => {
+						setTimeout(() => {
-					console.error(err);
+							uni.hideLoading();
-					this.loading = 'error';
+							uni.stopPullDownRefresh();
-					this.waterfall.loading = 'finish';
+						}, 500);
-					this.loadMoreText = '加载失败，请下拉刷新！';
+					});
-				})
+			},
-				.finally(() => {
+			// 缓存数据
-					setTimeout(() => {
+			fnCacheDataList(dataList) {
-						uni.hideLoading();
+				if (this.queryParams.page == 0) {
-						uni.stopPullDownRefresh();
+					this.cache.dataList = dataList;
-					}, 500);
+				} else {
-				});
+					this.cache.dataList = [...this.cache.dataList, ...dataList];
-		},
+				}
-		// 缓存数据
+			},
-		fnCacheDataList(dataList) {
-			if (this.queryParams.page == 0) {
-				this.cache.dataList = dataList;
-			} else {
-				this.cache.dataList = [...this.cache.dataList, ...dataList];
-			}
-		},
 
-		// 瀑布流组件点击事件
+			// 瀑布流组件点击事件
-		fnOnClick(data) {
+			fnOnClick(data) {
-			console.log('点击数据', data);
+				console.log('点击数据', data);
-		},
+			},
-		// 预览
+			// 预览
-		fnPreview(item) {
+			fnPreview(item) {
-			const index = this.cache.dataList.findIndex(x => x.id == item.id);
+				const index = this.cache.dataList.findIndex(x => x.id == item.id);
-			uni.previewImage({
+				uni.previewImage({
-				current: index,
+					current: index,
-				urls: this.cache.dataList.map(x => x.image),
+					urls: this.cache.dataList.map(x => x.image),
-				indicator: 'number',
+					indicator: 'number',
-				loop: true
+					loop: true
-			});
+				});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	display: flex;
-	flex-direction: column;
-	padding-bottom: 24rpx;
-	background-color: #fafafd;
-
-	&.is-balck {
-		background-color: #212121;
-	}
-}
-.content {
-	box-sizing: border-box;
-	padding: 0 24rpx;
-	padding-top: 24rpx;
-
-	.content-empty {
-		height: 60vh;
 		display: flex;
-		align-items: center;
+		flex-direction: column;
-		justify-content: center;
+		padding-bottom: 24rpx;
+		background-color: #fafafa;
+
+		&.is-balck {
+			background-color: #212121;
+		}
+	}
+
+	.content {
+		box-sizing: border-box;
+		padding: 0 24rpx;
+		padding-top: 24rpx;
+
+		.content-empty {
+			height: 60vh;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+
+	.loading-wrap {
+		box-sizing: border-box;
+		padding: 24rpx;
+	}
+
+	.card {
+		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
 	}
-}
-.loading-wrap {
-	box-sizing: border-box;
-	padding: 24rpx;
-}
 </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,367 +90,380 @@
 </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: {
+		components: {
-		tmMenubars,
+			tmMenubars,
-		tmSkeleton,
+			tmSkeleton,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmIcons,
+			tmIcons,
-		tmEmpty,
+			tmEmpty,
-		eSwiper
+			eSwiper
-	},
-	data() {
-		return {
-			loading: 'loading',
-			queryParams: {
-				size: 10,
-				page: 0
-			},
-			result: {},
-			isLoadMore: false,
-			loadMoreText: '加载中...',
-			bannerCurrent: 0,
-			bannerList: [],
-			noticeList: [],
-			articleList: [],
-			categoryList: [],
-			useQuickNav: false,
-			quickNavList: []
-		};
-	},
-
-	computed: {
-		bloggerInfo() {
-			let blogger = this.$tm.vx.getters().getBlogger;
-			blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
-			return blogger;
-		}
-	},
-	onLoad() {
-		this.fnSetPageTitle();
-		this.useQuickNav = this.$haloConfig.quickNav.use;
-	},
-
-	created() {
-		this.fnQuery();
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnQuery();
-	},
-
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
-			this.fnGetArticleList();
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		fnQuery() {
-			this.fnGetBanner();
-			this.fnGetArticleList();
-			this.fnGetCategoryList();
-			this.fnGetQuickNavList();
 		},
-		fnGetQuickNavList() {
+		data() {
-			this.useQuickNav = this.$haloConfig.quickNav.use;
+			return {
-			if (!this.$haloConfig.quickNav.use) return;
+				loading: 'loading',
-			const _quickNavList = this.$haloConfig.quickNav.list;
+				queryParams: {
-			this.quickNavList = _quickNavList.map(item => {
+					size: 10,
-				return item;
+					page: 0
-			});
+				},
-		},
+				result: {},
-		fnGetCategoryList() {
+				isLoadMore: false,
-			this.$httpApi
+				loadMoreText: '加载中...',
-				.getCategoryList({ more: true })
+				bannerCurrent: 0,
-				.then(res => {
+				bannerList: [],
-					this.categoryList = res.data.sort((a, b) => {
+				noticeList: [],
-						return b.postCount - a.postCount;
+				articleList: [],
-					});
+				categoryList: [],
-
+				useQuickNav: false,
-					setTimeout(() => {
+				quickNavList: []
-						this.loading = 'success';
-					}, 500);
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 500);
-				});
-		},
-		// 获取轮播图
-		fnGetBanner() {
-			const _this = this;
-			const _format = function(list, type) {
-				return list.map((item, index) => {
-					switch (type) {
-						case 'list':
-							return {
-								id: index,
-								nickname: _this.bloggerInfo.nickname,
-								avatar: _this.bloggerInfo.avatar,
-								address: item.href || '',
-								title: item.title,
-								image: _this.$utils.checkImageUrl(item.thumbnail)
-							};
-						case 'article':
-							return {
-								mp4: '',
-								id: item.id,
-								nickname: _this.bloggerInfo.nickname,
-								avatar: _this.bloggerInfo.avatar,
-								address: '',
-								createTime: uni.$tm.dayjs(item.createTime).fromNow(),
-								title: item.title,
-								src: _this.$utils.checkImageUrl(item.thumbnail),
-								image: _this.$utils.checkImageUrl(item.thumbnail)
-							};
-						case 'banner':
-							return {
-								id: '',
-								src: item
-							};
-					}
-				});
 			};
-			switch (this.$haloConfig.banner.type) {
+		},
-				case 'list': // 手动配置的banner
+
-					this.bannerList = _format(this.$haloConfig.banner.list, 'list');
+		computed: {
-					break;
+			bloggerInfo() {
-				case 'article': // 来自热门文章的封面
+				let blogger = this.$tm.vx.getters().getBlogger;
-					this.$httpApi.getPostList({ page: 0, size: 6, sort: 'topPriority,visits,desc' }).then(res => {
+				blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
-						this.bannerList = _format(res.data.content, 'article');
+				return blogger;
-						if (this.bannerList.length == 0) {
+			},
-							this.bannerList = _format(this.$haloConfig.banner.list, 'list');
+
+		},
+		onLoad() {
+			this.fnSetPageTitle();
+			this.useQuickNav = this.$haloConfig.quickNav.use;
+		},
+
+		created() {
+			this.fnQuery();
+		},
+		onPullDownRefresh() {
+			this.isLoadMore = false;
+			this.queryParams.page = 0;
+			this.fnQuery();
+		},
+
+		onReachBottom(e) {
+			if (this.result.hasNext) {
+				this.queryParams.page += 1;
+				this.isLoadMore = true;
+				this.fnGetArticleList();
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+			}
+		},
+		methods: {
+			fnQuery() {
+				this.fnGetBanner();
+				this.fnGetArticleList();
+				this.fnGetCategoryList();
+				this.fnGetQuickNavList();
+			},
+			fnGetQuickNavList() {
+				this.useQuickNav = this.$haloConfig.quickNav.use;
+				if (!this.$haloConfig.quickNav.use) return;
+				const _quickNavList = this.$haloConfig.quickNav.list;
+				this.quickNavList = _quickNavList.map(item => {
+					return item;
+				});
+			},
+			fnGetCategoryList() {
+				this.$httpApi
+					.getCategoryList({ more: true })
+					.then(res => {
+						this.categoryList = res.data.sort((a, b) => {
+							return b.postCount - a.postCount;
+						});
+
+						setTimeout(() => {
+							this.loading = 'success';
+						}, 500);
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
+					});
+			},
+			// 获取轮播图
+			fnGetBanner() {
+				const _this = this;
+				const _format = function(list, type) {
+					return list.map((item, index) => {
+						switch (type) {
+							case 'list':
+								return {
+									id: index,
+										nickname: _this.bloggerInfo.nickname,
+										avatar: _this.bloggerInfo.avatar,
+										address: item.href || '',
+										title: item.title,
+										image: _this.$utils.checkImageUrl(item.thumbnail)
+								};
+							case 'article':
+								return {
+									mp4: '',
+										id: item.id,
+										nickname: _this.bloggerInfo.nickname,
+										avatar: _this.bloggerInfo.avatar,
+										address: '',
+										createTime: uni.$tm.dayjs(item.createTime).fromNow(),
+										title: item.title,
+										src: _this.$utils.checkImageUrl(item.thumbnail),
+										image: _this.$utils.checkImageUrl(item.thumbnail)
+								};
+							case 'banner':
+								return {
+									id: '',
+										src: item
+								};
 						}
 					});
-					break;
+				};
-				case 'banner': // 来自后台配置的banner（暂未开放）
+				switch (this.$haloConfig.banner.type) {
-					this.bannerList = _format([], 'banner');
+					case 'list': // 手动配置的banner
-					break;
+						this.bannerList = _format(this.$haloConfig.banner.list, 'list');
-			}
+						break;
-		},
+					case 'article': // 来自热门文章的封面
-		fnOnBannerChange(e) {
+						this.$httpApi.getPostList({ page: 0, size: 6, sort: 'topPriority,visits,desc' }).then(res => {
-			this.bannerCurrent = e.current;
+							this.bannerList = _format(res.data.content, 'article');
-		},
+							if (this.bannerList.length == 0) {
-		fnOnBannerClick(item) {
+								this.bannerList = _format(this.$haloConfig.banner.list, 'list');
-			if (item.id == '') return;
+							}
-			this.fnToArticleDetail(item);
+						});
-		},
+						break;
-		// 文章列表
+					case 'banner': // 来自后台配置的banner（暂未开放）
-		fnGetArticleList() {
+						this.bannerList = _format([], 'banner');
-			uni.showLoading({
+						break;
-				mask: true,
+				}
-				title: '加载中...'
+			},
-			});
+			fnOnBannerChange(e) {
-			// 设置状态为加载中
+				this.bannerCurrent = e.current;
-			if (!this.isLoadMore) {
+			},
-				this.loading = 'loading';
+			fnOnBannerClick(item) {
-			}
+				if (item.id == '') return;
-			this.loadMoreText = '加载中...';
+				this.fnToArticleDetail(item);
-			this.$httpApi
+			},
-				.getPostList(this.queryParams)
+			// 文章列表
-				.then(res => {
+			fnGetArticleList() {
-					this.loading = 'success';
+				// uni.showLoading({
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+				// 	mask: true,
-					this.result = res.data;
+				// 	title: '加载中...'
-					if (this.isLoadMore) {
+				// });
-						this.articleList = this.articleList.concat(res.data.content);
+				// 设置状态为加载中
-					} else {
+				if (!this.isLoadMore) {
-						this.articleList = res.data.content;
+					this.loading = 'loading';
-					}
+				}
-					this.loading = 'success';
+				this.loadMoreText = '加载中...';
-				})
+				this.$httpApi
-				.catch(err => {
+					.getPostList(this.queryParams)
-					this.loading = 'error';
+					.then(res => {
-					this.loadMoreText = '加载失败，请下拉刷新！';
+						this.loading = 'success';
-					uni.$tm.toast(err.message || '数据加载失败！');
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-				})
+						this.result = res.data;
-				.finally(() => {
+						if (this.isLoadMore) {
-					uni.hideLoading();
+							this.articleList = this.articleList.concat(res.data.content);
-					uni.stopPullDownRefresh();
+						} else {
+							this.articleList = res.data.content;
+						}
+						this.loading = 'success';
+					})
+					.catch(err => {
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+						uni.$tm.toast(err.message || '数据加载失败！');
+					})
+					.finally(() => {
+						uni.hideLoading();
+						uni.stopPullDownRefresh();
+					});
+			},
+
+			//跳转文章详情
+			fnToArticleDetail(article) {
+				uni.navigateTo({
+					url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					animationType: 'slide-in-right'
 				});
-		},
+			},
+			// 快捷导航页面跳转
+			fnToNavPage(item) {
+				switch (item.type) {
+					case 'tabbar':
+						uni.switchTab({
+							url: item.path
+						});
+						break;
+					case 'page':
+						uni.navigateTo({
+							url: item.path
+						});
+						break;
+				}
+			},
+			// 分类页面
+			fnToCategoryPage() {
+				uni.switchTab({
+					url: '/pages/tabbar/category/category'
+				});
+			},
+			// 所有的文章列表页面
+			fnToArticlesPage() {
+				uni.navigateTo({
+					url: '/pagesA/articles/articles'
+				});
+			},
 
-		//跳转文章详情
+			// 根据slug查询分类下的文章
-		fnToArticleDetail(article) {
+			fnToCategoryBy(category) {
-			uni.navigateTo({
+				uni.navigateTo({
-				url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					url: `/pagesA/category-detail/category-detail?slug=${category.slug}&name=${category.name}`
-				animationType: 'slide-in-right'
+				});
-			});
+			},
-		},
+
-		// 快捷导航页面跳转
+			fnChangeMode() {
-		fnToNavPage(item) {
+				const isBlackTheme = this.$tm.vx.state().tmVuetify.black;
-			switch (item.type) {
+				this.$tm.theme.setBlack(!isBlackTheme);
-				case 'tabbar':
+				uni.setNavigationBarColor({
-					uni.switchTab({
+					backgroundColor: !isBlackTheme ? '#0a0a0a' : '#ffffff',
-						url: item.path
+					frontColor: !isBlackTheme ? '#ffffff' : '#0a0a0a'
-					});
+				});
-					break;
+			},
-				case 'page':
+
-					uni.navigateTo({
+			fnToSearch() {
-						url: item.path
+				uni.navigateTo({
-					});
+					url: '/pagesA/articles/articles'
-					break;
+				});
 			}
-		},
-		// 分类页面
-		fnToCategoryPage() {
-			uni.switchTab({
-				url: '/pages/tabbar/category/category'
-			});
-		},
-		// 所有的文章列表页面
-		fnToArticlesPage() {
-			uni.navigateTo({
-				url: '/pagesA/articles/articles'
-			});
-		},
-
-		// 根据slug查询分类下的文章
-		fnToCategoryBy(category) {
-			uni.navigateTo({
-				url: `/pagesA/category-detail/category-detail?slug=${category.slug}&name=${category.name}`
-			});
-		},
-
-		fnChangeMode() {
-			const isBlackTheme = this.$tm.vx.state().tmVuetify.black;
-			this.$tm.theme.setBlack(!isBlackTheme);
-			uni.setNavigationBarColor({
-				backgroundColor: !isBlackTheme ? '#0a0a0a' : '#ffffff',
-				frontColor: !isBlackTheme ? '#ffffff' : '#0a0a0a'
-			});
-		},
-
-		fnToSearch() {
-			uni.navigateTo({
-				url: '/pagesA/articles/articles'
-			});
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	display: flex;
+		display: flex;
-	flex-direction: column;
+		flex-direction: column;
-	// background-color: #ffffff;
+		// background-color: #ffffff;
 
-	.logo {
+		.logo {
-		width: 60rpx;
+			width: 60rpx;
-		height: 60rpx;
+			height: 60rpx;
+			box-sizing: border-box;
+		}
+
+		::v-deep {
+			.tm-menubars .body .body_wk .left {
+				min-width: initial;
+			}
+		}
+	}
+
+	.loading-wrap {
+		padding: 24rpx;
+	}
+
+	.search-input {
+		background-color: #f5f5f5;
+		align-items: center;
+		/* #ifdef MP-WEIXIN */
+		margin-right: 24rpx;
+
+		/* #endif */
+		&_icon {}
+
+		&_text {}
+	}
+
+	.show-more {
+		width: 42rpx;
+		height: 42rpx;
 		box-sizing: border-box;
+		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
 	}
 
-	::v-deep {
+	.banner {
-		.tm-menubars .body .body_wk .left {
+		overflow: hidden;
-			min-width: initial;
-		}
 	}
-}
-.loading-wrap {
-	padding: 24rpx;
-}
-.search-input {
-	background-color: #f5f5f5;
-	align-items: center;
-	/* #ifdef MP-WEIXIN */
-	margin-right: 24rpx;
-	/* #endif */
-	&_icon {
-	}
-	&_text {
-	}
-}
-.show-more {
-	width: 42rpx;
-	height: 42rpx;
-	box-sizing: border-box;
-	box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
-}
-.banner {
-	overflow: hidden;
-}
-.quick-nav {
-	background-color: #fff;
-	box-sizing: border-box;
-	// box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
-	.name {
-		color: var(--main-text-color);
-	}
-}
-.category {
-	width: 94vw;
-	display: flex;
-	height: 200rpx;
-	white-space: nowrap;
-	margin: 0 24rpx;
-	.content {
-		display: inline-block;
-		padding-left: 24rpx;
-		&:first-child {
-			padding-left: 0;
-		}
-	}
-	.cate-empty {
-		height: inherit;
-	}
-}
 
-.page-item {
+	.quick-nav {
-	&_title {
+		background-color: #fff;
-		position: relative;
+		box-sizing: border-box;
-		padding-left: 24rpx;
+
-		font-size: 32rpx;
+		// box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
-		z-index: 1;
+		.name {
-		color: var(--main-text-color);
+			color: var(--main-text-color);
-		&:before {
-			content: '';
-			position: absolute;
-			left: 0rpx;
-			top: 8rpx;
-			width: 8rpx;
-			height: 30rpx;
-			background-color: rgba(33, 150, 243, 1);
-			border-radius: 6rpx;
-			z-index: 0;
 		}
 	}
-}
 
-.h_row_col2 {
+	.category {
-	display: flex;
+		width: 94vw;
-	flex-wrap: wrap;
+		display: flex;
-	box-sizing: border-box;
+		height: 200rpx;
-	padding: 0 12rpx;
+		white-space: nowrap;
-	.ani-item {
+		margin: 0 24rpx;
-		width: 50%;
+
+		.content {
+			display: inline-block;
+			padding-left: 24rpx;
+
+			&:first-child {
+				padding-left: 0;
+			}
+		}
+
+		.cate-empty {
+			height: inherit;
+		}
+	}
+
+	.page-item {
+		&_title {
+			position: relative;
+			padding-left: 24rpx;
+			font-size: 32rpx;
+			z-index: 1;
+			color: var(--main-text-color);
+
+			&:before {
+				content: '';
+				position: absolute;
+				left: 0rpx;
+				top: 8rpx;
+				width: 8rpx;
+				height: 30rpx;
+				background-color: rgba(33, 150, 243, 1);
+				border-radius: 6rpx;
+				z-index: 0;
+			}
+		}
+	}
+
+	.h_row_col2 {
+		display: flex;
+		flex-wrap: wrap;
+		box-sizing: border-box;
+		padding: 0 12rpx;
+
+		.ani-item {
+			width: 50%;
+		}
 	}
-}
 </style>

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,243 +147,259 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmTags,
+			tmTags,
-		tmEmpty,
+			tmEmpty,
-		tmImages,
+			tmImages,
-		tmPoup
+			tmPoup
-	},
-	data() {
-		return {
-			loading: 'loading',
-			queryParams: {
-				size: 10,
-				page: 0,
-				sort: ''
-			},
-			result: [],
-			detail: {
-				show: false,
-				data: {}
-			},
-			linkTotal: 0
-		};
-	},
-	computed: {
-		caclSiteThumbnail(val) {
-			return val => {
-				if (!val) return '';
-				if (val.charAt(val.length - 1) != '/') {
-					val = val + '/';
-				}
-				return 'https://image.thum.io/get/width/1000/crop/800/' + val;
-			};
-		}
-	},
-	onLoad() {
-		this.fnSetPageTitle('朋友圈');
-	},
-	created() {
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.fnGetData();
-	},
-	methods: {
-		fnRandomColor() {
-			const _r = GetRandomNumberByRange(0, this.$haloConfig.colors.length - 1);
-			return this.$haloConfig.colors[_r];
 		},
-		fnGetData() {
+		data() {
-			this.linkTotal = 0;
+			return {
-			this.loading = 'loading';
+				loading: 'loading',
-			uni.showLoading({
+				queryParams: {
-				mask: true,
+					size: 10,
-				title: '加载中...'
+					page: 0,
-			});
+					sort: ''
-			this.$httpApi
-				.getLinkListByTeam()
-				.then(res => {
-					if (res.status == 200) {
-						console.log('请求结果：');
-						console.log(res);
-						// 处理数据
-						const _result = res.data.map(item => {
-							const _team = item.team || '未分组';
-							const _links = item.links.map(link => {
-								this.linkTotal += 1;
-								link.logo = this.$utils.checkAvatarUrl(link.logo);
-								return link;
-							});
-							return {
-								title: _team,
-								children: _links
-							};
-						});
-
-						this.result = _result.reverse();
-						setTimeout(() => {
-							this.loading = 'success';
-						}, 500);
-					} else {
-						this.loading = 'error';
-					}
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 500);
-				});
-		},
-
-		fnOnLinkEvent(link) {
-			this.detail.data = link;
-			this.detail.show = true;
-		},
-
-		fnCopyLink(link) {
-			uni.setClipboardData({
-				data: `${link.name}:${link.url}`,
-				showToast: false,
-				success: () => {
-					uni.showToast({
-						icon: 'none',
-						title: '链接复制成功！'
-					});
 				},
-				fail: () => {
+				result: [],
-					uni.showToast({
+				detail: {
-						icon: 'none',
+					show: false,
-						title: '复制失败！'
+					data: {}
+				},
+				linkTotal: 0
+			};
+		},
+		computed: {
+			caclSiteThumbnail(val) {
+				return val => {
+					if (!val) return '';
+					if (val.charAt(val.length - 1) != '/') {
+						val = val + '/';
+					}
+					return 'https://image.thum.io/get/width/1000/crop/800/' + val;
+				};
+			}
+		},
+		onLoad() {
+			this.fnSetPageTitle('朋友圈');
+		},
+		created() {
+			this.fnGetData();
+		},
+		onPullDownRefresh() {
+			this.fnGetData();
+		},
+		methods: {
+			fnRandomColor() {
+				const _r = GetRandomNumberByRange(0, this.$haloConfig.colors.length - 1);
+				return this.$haloConfig.colors[_r];
+			},
+			fnGetData() {
+				this.linkTotal = 0;
+				this.loading = 'loading';
+				// uni.showLoading({
+				// 	mask: true,
+				// 	title: '加载中...'
+				// });
+				this.$httpApi
+					.getLinkListByTeam()
+					.then(res => {
+						if (res.status == 200) {
+							console.log('请求结果：');
+							console.log(res);
+							// 处理数据
+							const _result = res.data.map(item => {
+								const _team = item.team || '未分组';
+								const _links = item.links.map(link => {
+									this.linkTotal += 1;
+									link.logo = this.$utils.checkAvatarUrl(link.logo);
+									return link;
+								});
+								return {
+									title: _team,
+									children: _links
+								};
+							});
+
+							this.result = _result.reverse();
+							setTimeout(() => {
+								this.loading = 'success';
+							}, 500);
+						} else {
+							this.loading = 'error';
+						}
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
 					});
-				}
+			},
-			});
+
+			fnOnLinkEvent(link) {
+				this.detail.data = link;
+				this.detail.show = true;
+			},
+
+			fnCopyLink(link) {
+				uni.setClipboardData({
+					data: `${link.name}:${link.url}`,
+					showToast: false,
+					success: () => {
+						uni.showToast({
+							icon: 'none',
+							title: '链接复制成功！'
+						});
+					},
+					fail: () => {
+						uni.showToast({
+							icon: 'none',
+							title: '复制失败！'
+						});
+					}
+				});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	display: flex;
-	flex-direction: column;
-	background-color: #fafafd;
-}
-.loading-wrap {
-	padding: 24rpx;
-	min-height: 100vh;
-}
-
-.content {
-	padding: 0 24rpx;
-	padding-top: 24rpx;
-
-	.content-empty {
-		height: 60vh;
 		display: flex;
-		align-items: center;
+		flex-direction: column;
-		justify-content: center;
+		background-color: #fafafd;
 	}
-}
+
-.link-card {
+	.loading-wrap {
-	border-bottom: 2rpx solid #f5f5f5;
+		padding: 24rpx;
-	background-color: #ffffff;
+		min-height: 100vh;
-	&.one {
+	}
-		border: 0;
+
-		box-shadow: 0rpx 2rpx 24rpx 0rpx rgba(0, 0, 0, 0.03);
+	.content {
-		.logo {
+		padding: 0 24rpx;
-			box-shadow: 0rpx 2rpx 12rpx rgba(0, 0, 0, 0.1);
+		padding-top: 24rpx;
+
+		.content-empty {
+			height: 60vh;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 		}
 	}
-	.logo {
+
-		// width: 126rpx;
+	.link-card {
-		// height: 126rpx;
+		border-bottom: 2rpx solid #f5f5f5;
-		width: 80rpx;
+		background-color: #ffffff;
-		height: 80rpx;
+
-		border-radius: 12rpx;
+		&.one {
-		border: 6rpx solid #ffffff;
+			border: 0;
-		box-shadow: none;
+			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;
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 12rpx;
+			border: 6rpx solid #ffffff;
+			box-shadow: none;
+		}
+
+		.info {
+			width: 0;
+			flex-grow: 1;
+
+			.name {
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				color: #303133;
+				font-size: 30rpx;
+				font-weight: bold;
+			}
+
+			.desc {
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				color: #303133;
+				font-size: 28rpx;
+			}
+		}
 	}
 
-	.info {
+	.link-card_name {
+		// color: #303133;
+		// color: #0080fe;
+	}
+
+	.link-card_desc {
+		font-size: 24rpx;
+		line-height: 1.6;
+		color: #303133;
+	}
+
+	.link-logo {
+		width: 140rpx;
+		height: 140rpx;
+
+		&_img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.poup-logo {
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: 50%;
+
+		&_img {
+			width: 100%;
+			height: 100%;
+			border-radius: 50%;
+		}
+	}
+
+	.info-detail {
 		width: 0;
 		flex-grow: 1;
-		.name {
+		justify-content: center;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			color: #303133;
-			font-size: 30rpx;
-			font-weight: bold;
-		}
-		.desc {
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			color: #303133;
-			font-size: 28rpx;
-		}
 	}
-}
+
-.link-card_name {
+	.poup-desc {
-	// color: #303133;
+		font-size: 28rpx;
-	// color: #0080fe;
+		line-height: 1.6;
-}
+		color: #555 !important;
-.link-card_desc {
+	}
-	font-size: 24rpx;
+
-	line-height: 1.6;
+	.preview-site {
-	color: #303133;
-}
-.link-logo {
-	width: 140rpx;
-	height: 140rpx;
-	&_img {
 		width: 100%;
-		height: 100%;
+		height: 300rpx;
 	}
-}
-.poup-logo {
-	width: 140rpx;
-	height: 140rpx;
-	border-radius: 50%;
-	&_img {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
-}
-.info-detail {
-	width: 0;
-	flex-grow: 1;
-	justify-content: center;
-}
-.poup-desc {
-	font-size: 28rpx;
-	line-height: 1.6;
-	color: #555 !important;
-}
-.preview-site {
-	width: 100%;
-	height: 300rpx;
-}
 </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,274 +59,309 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmTabs,
+			tmTabs,
-		tmEmpty
+			tmEmpty
-	},
-	data() {
-		return {
-			loading: 'loading',
-			tab: {
-				activeIndex: 0,
-				list: ['按月份查看', '按年份查看']
-			},
-			queryParams: {
-				size: 10,
-				page: 0
-			},
-			result: null,
-			dataList: [],
-			api: 'getMonthArchives'
-		};
-	},
-	computed: {
-		black_tmeme: function() {
-			return this.$tm.vx.state().tmVuetify.black;
 		},
-		color_tmeme: function() {
+		data() {
-			return this.$tm.vx.state().tmVuetify.color;
+			return {
-		}
+				loading: 'loading',
-	},
+				tab: {
-	created() {
+					activeIndex: 0,
-		this.fnGetData();
+					list: ['按月份查看', '按年份查看']
-	},
+				},
-	onPullDownRefresh() {
+				queryParams: {
-		this.fnGetData();
+					size: 10,
-		this.queryParams.page = 0;
+					page: 0
-	},
+				},
-
+				result: null,
-	methods: {
+				dataList: [],
-		fnOnTabChange(index) {
+				api: 'getMonthArchives'
-			// todo:
+			};
-			const _api = ['getMonthArchives', 'getYearArchives'];
+		},
-			this.api = _api[index];
+		computed: {
-			this.queryParams.page = 0;
+			black_tmeme: function() {
+				return this.$tm.vx.state().tmVuetify.black;
+			},
+			color_tmeme: function() {
+				return this.$tm.vx.state().tmVuetify.color;
+			}
+		},
+		created() {
 			this.fnGetData();
 		},
-		fnGetData() {
+		onPullDownRefresh() {
-			this.loading = 'loading';
+			this.fnGetData();
-			uni.showLoading({
+			this.queryParams.page = 0;
-				mask: true,
-				title: '加载中...'
-			});
-			this.$httpApi[this.api](this.queryParams)
-				.then(res => {
-					this.result = res.data;
-					this.dataList = res.data;
-					setTimeout(() => {
-						this.loading = 'success';
-					}, 500);
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 500);
-				});
 		},
-		//跳转文章详情
+
-		fnToArticleDetail(article) {
+		methods: {
-			uni.navigateTo({
+			fnOnTabChange(index) {
-				url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+				this.fnResetSetAniWaitIndex();
-				animationType: 'slide-in-right'
+				const _api = ['getMonthArchives', 'getYearArchives'];
-			});
+				this.api = _api[index];
+				this.queryParams.page = 0;
+				this.fnGetData();
+			},
+			fnGetData() {
+				this.loading = 'loading';
+				// uni.showLoading({
+				// 	mask: true,
+				// 	title: '加载中...'
+				// });
+				this.$httpApi[this.api](this.queryParams)
+					.then(res => {
+						this.result = res.data;
+						this.dataList = res.data;
+						setTimeout(() => {
+							this.loading = 'success';
+						}, 500);
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
+					});
+			},
+			//跳转文章详情
+			fnToArticleDetail(article) {
+				uni.navigateTo({
+					url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					animationType: 'slide-in-right'
+				});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	display: flex;
+		display: flex;
-	flex-direction: column;
+		flex-direction: column;
-	background-color: #fafafd;
+		background-color: #fafafd;
-}
+	}
-.loading-wrap {
+
-	padding: 24rpx;
+	.loading-wrap {
-}
+		padding: 24rpx;
-.list-empty {
+	}
-	width: 100vw;
+
-	height: 100vh;
+	.list-empty {
-}
+		width: 100vw;
-.statistics {
+		height: 100vh;
-	background-color: #ffffff;
+	}
-}
+
-.e-timeline {
+	.statistics {
-	::v-deep {
+		background-color: #ffffff;
-		.tm-timeline-item > view:first-child {
+	}
-			width: 110rpx !important;
+
-		}
+	.e-timeline {
-		.tm-timeline-item-left {
+		::v-deep {
-			max-width: 580rpx !important;
+			.tm-timeline-item>view:first-child {
-			width: 100% !important;
+				width: 110rpx !important;
+			}
+
+			.tm-timeline-item-left {
+				max-width: 580rpx !important;
+				width: 100% !important;
+			}
 		}
 	}
-}
 
-.tm-timeline {
+	.tm-timeline {
-	.tm-timeline-item {
+		.tm-timeline-item {
-		.tm-timeline-item-left,
-		.tm-timeline-item-right {
-			width: 200rpx;
-			flex-shrink: 0;
-		}
 
-		.tm-timeline-item-content {
-			display: flex;
-			justify-content: center;
-			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;
+				width: 200rpx;
-				max-width: 400rpx;
+				flex-shrink: 0;
-			}
-			.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;
+				justify-content: center;
 				align-items: flex-start;
 				align-content: flex-start;
 			}
-		}
-	}
-}
 
-.post {
+			.tm-timeline-jidian {
-	width: 560rpx;
+				margin: auto;
-	border-radius: 12rpx;
+			}
-	background-color: #fff;
+
-	&.lr_image_text {
+			&.tm-timeline-item--leftDir {
-	}
+				display: flex;
-	&.lr_text_image {
+				flex-flow: row;
-		.post-thumbnail {
+
-			order: 2;
+				&.endright {
-		}
+					justify-content: flex-end;
-		.post-info {
+				}
-			order: 1;
+
-			padding-left: 0;
+				.tm-timeline-item-left,
-			padding-right: 24rpx;
+				.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;
+					align-items: flex-start;
+					align-content: flex-start;
+				}
+			}
 		}
 	}
-	&.tb_image_text {
+
-		flex-direction: column;
+	.post {
-		.post-thumbnail {
+		width: 560rpx;
-			width: 100%;
+		border-radius: 12rpx;
-			height: 220rpx;
+		background-color: #fff;
+
+		&.lr_image_text {}
+
+		&.lr_text_image {
+			.post-thumbnail {
+				order: 2;
+			}
+
+			.post-info {
+				order: 1;
+				padding-left: 0;
+				padding-right: 24rpx;
+			}
 		}
-		.post-info {
+
-			width: 100%;
+		&.tb_image_text {
-			padding-left: 0;
+			flex-direction: column;
-			&_title {
+
+			.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;
 			}
-			&_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%;
-			padding-left: 0;
 
-			&_time {
+			.post-info {
-				.iconfont {
+				order: 1;
-					display: none;
+				width: 100%;
-				}
+				padding-left: 0;
-				.time-label {
+
-					display: inline-block;
+				&_time {
+					.iconfont {
+						display: none;
+					}
+
+					.time-label {
+						display: inline-block;
+					}
 				}
 			}
 		}
-	}
+
-	&.only_text {
+		&.only_text {
-		.post-info {
+			.post-info {
-			padding: 6rpx;
+				padding: 6rpx;
-			&_time {
+
-				margin-top: 20rpx;
+				&_time {
-				.iconfont {
+					margin-top: 20rpx;
-					display: none;
+
-				}
+					.iconfont {
-				.time-label {
+						display: none;
-					display: inline-block;
+					}
+
+					.time-label {
+						display: inline-block;
+					}
 				}
 			}
-		}
+
-		.post-thumbnail {
+			.post-thumbnail {
-			display: none;
+				display: none;
+			}
 		}
 	}
-}
+
-.post-thumbnail {
+	.post-thumbnail {
-	border-radius: 6rpx;
+		border-radius: 6rpx;
-	width: 200rpx;
+		width: 200rpx;
-	height: 170rpx;
+		height: 170rpx;
-}
-.post-info {
-	width: 0;
-	flex-grow: 1;
-	&_title {
-		color: #303133;
-		font-size: 28rpx;
-		font-weight: bold;
 	}
-	&_summary {
+
-		display: -webkit-box;
+	.post-info {
-		line-height: 1.6;
+		width: 0;
-	}
+		flex-grow: 1;
-	&_time {
+
-		.time-label {
+		&_title {
-			display: none;
+			color: #303133;
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+
+		&_summary {
+			display: -webkit-box;
+			line-height: 1.6;
+		}
+
+		&_time {
+			.time-label {
+				display: none;
+			}
 		}
 	}
-}
 </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,159 +45,162 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmSearch,
+			tmSearch,
-		tmTranslate,
+			tmTranslate,
-		tmTabs,
+			tmTabs,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmEmpty
+			tmEmpty
-	},
+		},
-	data() {
+		data() {
-		return {
+			return {
-			isBlackTheme: false,
+				isBlackTheme: false,
-			loading: 'loading',
+				loading: 'loading',
-			tab: {
+				tab: {
-				activeIndex: 0,
+					activeIndex: 0,
-				list: ['全部', '最新文章', '热门文章', '最近更新', '最多点赞']
+					list: ['全部', '最新文章', '热门文章', '最近更新', '最多点赞']
-			},
+				},
-			queryParams: {
+				queryParams: {
-				size: 10,
+					size: 10,
-				page: 0,
+					page: 0,
-				sort: 'topPriority,createTime,desc',
+					sort: 'topPriority,createTime,desc',
-				keyword: ''
+					keyword: ''
-			},
+				},
-			cache: {
+				cache: {
-				dataList: [],
+					dataList: [],
-				total: 0
+					total: 0
-			},
+				},
-			isLoadMore: false,
+				isLoadMore: false,
-			loadMoreText: '加载中...',
+				loadMoreText: '加载中...',
-			result: {},
+				result: {},
-			dataList: []
+				dataList: []
-		};
-	},
-	onLoad() {
-		this.fnSetPageTitle('文章列表');
-	},
-	created() {
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnGetData();
-	},
-
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
-			this.fnGetData();
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		fnOnTabChange(index) {
-			this.dataList = [];
-			const _sorts = {
-				0: '',
-				1: 'topPriority,createTime,desc',
-				2: 'topPriority,visits,desc',
-				3: 'topPriority,updateTime,desc',
-				4: 'topPriority,likes,desc'
 			};
-			this.queryParams.sort = _sorts[index];
+		},
-			this.queryParams.page = 0;
+		onLoad() {
-			this.dataList = [];
+			this.fnSetPageTitle('文章列表');
-			this.fnToTopPage();
+		},
+		created() {
 			this.fnGetData();
 		},
-		fnOnSearch() {
+		onPullDownRefresh() {
-			this.queryParams.page = 0;
 			this.isLoadMore = false;
+			this.queryParams.page = 0;
 			this.fnGetData();
 		},
-		fnGetData() {
-			uni.showLoading({
-				mask: true,
-				title: '加载中...'
-			});
-			// 设置状态为加载中
-			if (!this.isLoadMore) {
-				this.loading = 'loading';
-			}
-			this.loadMoreText = '加载中...';
-			this.$httpApi
-				.getPostList(this.queryParams)
-				.then(res => {
-					console.log('请求结果：');
-					console.log(res);
 
-					this.loading = 'success';
+		onReachBottom(e) {
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+			if (this.result.hasNext) {
-					// 处理数据
+				this.queryParams.page += 1;
-					this.result = res.data;
+				this.isLoadMore = true;
-					if (this.isLoadMore) {
+				this.fnGetData();
-						this.dataList = this.dataList.concat(res.data.content);
+			} else {
-					} else {
+				uni.showToast({
-						this.dataList = res.data.content;
+					icon: 'none',
-					}
+					title: '没有更多数据了'
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 800);
 				});
+			}
 		},
+		methods: {
+			fnOnTabChange(index) {
+				this.fnResetSetAniWaitIndex();
+				this.dataList = [];
+				const _sorts = {
+					0: '',
+					1: 'topPriority,createTime,desc',
+					2: 'topPriority,visits,desc',
+					3: 'topPriority,updateTime,desc',
+					4: 'topPriority,likes,desc'
+				};
+				this.queryParams.sort = _sorts[index];
+				this.queryParams.page = 0;
+				this.dataList = [];
+				this.fnToTopPage();
+				this.fnGetData();
+			},
+			fnOnSearch() {
+				this.fnResetSetAniWaitIndex();
+				this.queryParams.page = 0;
+				this.isLoadMore = false;
+				this.fnGetData();
+			},
+			fnGetData() {
+				// uni.showLoading({
+				// 	mask: true,
+				// 	title: '加载中...'
+				// });
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi
+					.getPostList(this.queryParams)
+					.then(res => {
+						console.log('请求结果：');
+						console.log(res);
 
-		//跳转文章详情
+						this.loading = 'success';
-		fnToArticleDetail(article) {
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-			uni.navigateTo({
+						// 处理数据
-				url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+						this.result = res.data;
-				animationType: 'slide-in-right'
+						if (this.isLoadMore) {
-			});
+							this.dataList = this.dataList.concat(res.data.content);
+						} else {
+							this.dataList = res.data.content;
+						}
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 800);
+					});
+			},
+
+			//跳转文章详情
+			fnToArticleDetail(article) {
+				uni.navigateTo({
+					url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					animationType: 'slide-in-right'
+				});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	display: flex;
+		display: flex;
-	flex-direction: column;
+		flex-direction: column;
-	padding-bottom: 24rpx;
+		padding-bottom: 24rpx;
-	background-color: #fafafd;
+		background-color: #fafafd;
 
-	&.is-balck {
+		&.is-balck {
-		background-color: #212121;
+			background-color: #212121;
+		}
 	}
-}
-.content {
-	padding-top: 24rpx;
 
-	.content-empty {
+	.content {
-		height: 60vh;
+		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,123 +22,125 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmEmpty,
+			tmEmpty,
-		ArticleCard
+			ArticleCard
-	},
-	data() {
-		return {
-			loading: 'loading',
-			queryParams: {
-				size: 10,
-				page: 0
-			},
-			slug: '',
-			pageTitle: '加载中...',
-			result: null,
-			dataList: [],
-			isLoadMore: false,
-			loadMoreText: ''
-		};
-	},
-
-	onLoad(e) {
-		this.slug = e.slug;
-		this.pageTitle = e.name;
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnGetData();
-	},
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
-			this.fnGetData();
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		fnGetData() {
-			uni.showLoading({
-				mask: true,
-				title: '加载中...'
-			});
-			// 设置状态为加载中
-			if (!this.isLoadMore) {
-				this.loading = 'loading';
-			}
-			this.loadMoreText = '加载中...';
-			this.$httpApi
-				.getCategoryPostList(this.slug, this.queryParams)
-				.then(res => {
-					this.fnSetPageTitle(`分类：${this.pageTitle} （共${res.data.total}篇）`);
-					this.result = res.data;
-					if (this.isLoadMore) {
-						this.dataList = this.dataList.concat(res.data.content);
-					} else {
-						this.dataList = res.data.content;
-					}
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-					setTimeout(() => {
-						this.loading = 'success';
-					}, 500);
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 500);
-				});
 		},
-		//跳转文章详情
+		data() {
-		fnToArticleDetail(article) {
+			return {
-			uni.navigateTo({
+				loading: 'loading',
-				url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+				queryParams: {
-				animationType: 'slide-in-right'
+					size: 10,
-			});
+					page: 0
+				},
+				slug: '',
+				pageTitle: '加载中...',
+				result: null,
+				dataList: [],
+				isLoadMore: false,
+				loadMoreText: ''
+			};
+		},
+
+		onLoad(e) {
+			this.slug = e.slug;
+			this.pageTitle = e.name;
+			this.fnGetData();
+		},
+		onPullDownRefresh() {
+			this.isLoadMore = false;
+			this.queryParams.page = 0;
+			this.fnGetData();
+		},
+		onReachBottom(e) {
+			if (this.result.hasNext) {
+				this.queryParams.page += 1;
+				this.isLoadMore = true;
+				this.fnGetData();
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+			}
+		},
+		methods: {
+			fnGetData() {
+				// uni.showLoading({
+				// 	mask: true,
+				// 	title: '加载中...'
+				// });
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi
+					.getCategoryPostList(this.slug, this.queryParams)
+					.then(res => {
+						this.fnSetPageTitle(`分类：${this.pageTitle} （共${res.data.total}篇）`);
+						this.result = res.data;
+						if (this.isLoadMore) {
+							this.dataList = this.dataList.concat(res.data.content);
+						} else {
+							this.dataList = res.data.content;
+						}
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						setTimeout(() => {
+							this.loading = 'success';
+						}, 500);
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
+					});
+			},
+			//跳转文章详情
+			fnToArticleDetail(article) {
+				uni.navigateTo({
+					url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					animationType: 'slide-in-right'
+				});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss">
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	display: flex;
+		display: flex;
-	flex-direction: column;
+		flex-direction: column;
-	padding: 24rpx 0;
+		padding: 24rpx 0;
-	background-color: #fafafd;
+		background-color: #fafafd;
-}
+	}
-.loading-wrap {
+
-	padding: 0 24rpx;
+	.loading-wrap {
-	min-height: 100vh;
+		padding: 0 24rpx;
-}
+		min-height: 100vh;
-.empty {
+	}
-	height: 60vh;
+
-	display: flex;
+	.empty {
-	align-items: center;
+		height: 60vh;
-	justify-content: center;
+		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,134 +18,136 @@
 </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: {
+		components: {
-		tmForm,
+			tmForm,
-		tmInput,
+			tmInput,
-		tmSwitch,
+			tmSwitch,
-		tmButton
+			tmButton
-	},
-	data() {
-		return {
-			params: {
-				postId: '',
-				parentId: '',
-				title: '', // 被回复的标题 type=user =用户名  否则为文章标题
-				form: '',
-				formPage: '', // 来自哪个页面
-				type: 'post' // 来源文章/页面 还是用户  user=用户
-			},
-			form: {
-				allowNotification: true,
-				author: '', // 作者
-				avatar: '',
-				authorUrl: '', // 作者主页
-				content: '', // 评论内容
-				email: '', // 邮件
-				parentId: 0,
-				postId: 0
-			}
-		};
-	},
-	computed: {
-		// 评论游客信息
-		wxLoginVisitorUser() {
-			return uni.$tm.vx.getters().getWxLoginInfo;
-		}
-	},
-	onLoad() {
-		this.params = this.$Route.query;
-		this.form.postId = this.params.id;
-		if (this.params.type == 'user') {
-			this.form.parentId = this.params.parentId;
-			this.fnSetPageTitle('回复用户：' + this.params.title);
-		} else {
-			this.form.parentId = 0;
-			this.fnSetPageTitle(this.params.title);
-		}
-		this.form.author = this.wxLoginVisitorUser.nickName;
-		this.form.avatar = this.wxLoginVisitorUser.avatarUrl;
-		this.form.email = this.wxLoginVisitorUser.email;
-		this.form.authorUrl = this.wxLoginVisitorUser.url;
-	},
-	methods: {
-		fnOnSubmit(e) {
-			if (e === false) {
-				return uni.$tm.toast('请检查所有的必填项是否填写完整！');
-			}
-			if (this.form.allowNotification && !this.form.email) {
-				return uni.$tm.toast('未填写邮箱地址，将无法接收提醒！');
-			}
-			if (this.form.email && !uni.$tm.test.email(this.form.email)) {
-				return uni.$tm.toast('请填写正确的邮箱地址！');
-			}
-			if (this.form.authorUrl && !uni.$tm.test.url(this.form.authorUrl)) {
-				return uni.$tm.toast('请输入正确的Url地址！');
-			}
-			this.fnHandle();
 		},
-
+		data() {
-		fnHandle() {
+			return {
-			uni.showLoading({
+				params: {
-				title: '正在提交...'
+					postId: '',
-			});
+					parentId: '',
-			const _api = {
+					title: '', // 被回复的标题 type=user =用户名  否则为文章标题
-				sheets: this.$httpApi.postSheetsComments,
+					form: '',
-				posts: this.$httpApi.postCommentPost
+					formPage: '', // 来自哪个页面
+					type: 'post' // 来源文章/页面 还是用户  user=用户
+				},
+				form: {
+					allowNotification: true,
+					author: '', // 作者
+					avatar: '',
+					authorUrl: '', // 作者主页
+					content: '', // 评论内容
+					email: '', // 邮件
+					parentId: 0,
+					postId: 0
+				}
 			};
-			_api[this.params.from](this.form)
+		},
-				.then(res => {
+		computed: {
-					if (res.status == 200) {
+			// 评论游客信息
-						uni.$tm.toast('提交成功，待博主审核通过后即可展示！');
+			wxLoginVisitorUser() {
-						// 更新评论者信息
+				return uni.$tm.vx.getters().getWxLoginInfo;
-						uni.$tm.vx.commit('user/setWxLoginInfo', {
+			}
-							avatarUrl: this.wxLoginVisitorUser.avatarUrl,
+		},
-							nickName: this.form.author,
+		onLoad() {
-							email: this.form.email,
+			this.params = this.$Route.query;
-							url: this.form.authorUrl
+			this.form.postId = this.params.id;
-						});
+			if (this.params.type == 'user') {
-						// 清空评论内容
+				this.form.parentId = this.params.parentId;
-						this.form.content = '';
+				this.fnSetPageTitle('回复用户：' + this.params.title);
-						// 触发刷新评论（可能需要评论审核不会有改变）
+			} else {
-						// uni.$emit(this.params.formPage + '_refresh');
+				this.form.parentId = 0;
-					} else {
+				this.fnSetPageTitle(this.params.title);
-						uni.$tm.toast('操作失败，请重试！');
+			}
-					}
+			this.form.author = this.wxLoginVisitorUser.nickName;
-				})
+			this.form.avatar = this.wxLoginVisitorUser.avatarUrl;
-				.catch(err => {
+			this.form.email = this.wxLoginVisitorUser.email;
-					uni.$tm.toast(err.message);
+			this.form.authorUrl = this.wxLoginVisitorUser.url;
+		},
+		methods: {
+			fnOnSubmit(e) {
+				console.log('提交评论');
+				if (e === false) {
+					return uni.$tm.toast('请检查所有的必填项是否填写完整！');
+				}
+				if (this.form.allowNotification && !this.form.email) {
+					return uni.$tm.toast('未填写邮箱地址，将无法接收提醒！');
+				}
+				if (this.form.email && !uni.$tm.test.email(this.form.email)) {
+					return uni.$tm.toast('请填写正确的邮箱地址！');
+				}
+				if (this.form.authorUrl && !uni.$tm.test.url(this.form.authorUrl)) {
+					return uni.$tm.toast('请输入正确的Url地址！');
+				}
+				this.fnHandle();
+			},
+
+			fnHandle() {
+				uni.showLoading({
+					title: '正在提交...'
 				});
+				const _api = {
+					sheets: this.$httpApi.postSheetsComments,
+					posts: this.$httpApi.postCommentPost
+				};
+				_api[this.params.from](this.form)
+					.then(res => {
+						if (res.status == 200) {
+							uni.$tm.toast('提交成功，待博主审核通过后即可展示！');
+							// 更新评论者信息
+							uni.$tm.vx.commit('user/setWxLoginInfo', {
+								avatarUrl: this.wxLoginVisitorUser.avatarUrl,
+								nickName: this.form.author,
+								email: this.form.email,
+								url: this.form.authorUrl
+							});
+							// 清空评论内容
+							this.form.content = '';
+							// 触发刷新评论（可能需要评论审核不会有改变）
+							// uni.$emit(this.params.formPage + '_refresh');
+						} else {
+							uni.$tm.toast('操作失败，请重试！');
+						}
+					})
+					.catch(err => {
+						uni.$tm.toast(err.message);
+					});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style scoped lang="scss">
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	box-sizing: border-box;
+		box-sizing: border-box;
-	// background-color: #fafafd;
+		// background-color: #fafafd;
-	background-color: #ffffff;
+		background-color: #ffffff;
 
-	.content {
+		.content {
-		overflow: hidden;
+			overflow: hidden;
-		background-color: #fff;
+			background-color: #fff;
-		// box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
+			// box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
-	}
+		}
-}
+	}
-.poup-content {
+
-	width: 500rpx;
+	.poup-content {
-
+		width: 500rpx;
-	::v-deep {
+
-		.slider_id {
+		::v-deep {
-			width: 100% !important;
+			.slider_id {
+				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,107 +27,108 @@
 </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 },
+		components: { mpHtml, tmSkeleton, tmEmpty, tmTranslate, tmFlotbutton, journalCard },
-	data() {
+		data() {
-		return {
+			return {
-			loading: 'loading',
+				loading: 'loading',
-			markdownConfig: MarkdownConfig,
+				markdownConfig: MarkdownConfig,
-			queryParams: {
+				queryParams: {
-				size: 10,
+					size: 10,
-				page: 0
+					page: 0
-			},
+				},
-			result: null,
+				result: null,
-			dataList: [],
+				dataList: [],
-			isLoadMore: false,
+				isLoadMore: false,
-			loadMoreText: '加载中...'
+				loadMoreText: '加载中...'
-		};
+			};
-	},
+		},
 
-	onLoad() {
+		onLoad() {
-		this.fnSetPageTitle('个人日记');
+			this.fnSetPageTitle('个人日记');
-	},
+		},
-	created() {
+		created() {
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnGetData();
-	},
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
 			this.fnGetData();
-		} else {
+		},
-			uni.showToast({
+		onPullDownRefresh() {
-				icon: 'none',
+			this.isLoadMore = false;
-				title: '没有更多数据了'
+			this.queryParams.page = 0;
-			});
+			this.fnGetData();
-		}
+		},
-	},
+		onReachBottom(e) {
-	methods: {
+			if (this.result.hasNext) {
-		fnGetData() {
+				this.queryParams.page += 1;
-			uni.showLoading({
+				this.isLoadMore = true;
-				mask: true,
+				this.fnGetData();
-				title: '加载中...'
+			} else {
-			});
+				uni.showToast({
-			// 设置状态为加载中
+					icon: 'none',
-			if (!this.isLoadMore) {
+					title: '没有更多数据了'
-				this.loading = 'loading';
-			}
-			this.loadMoreText = '加载中...';
-			this.$httpApi
-				.getJournals(this.queryParams)
-				.then(res => {
-					this.loading = 'success';
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-					// 处理数据
-					this.result = res.data;
-					if (this.isLoadMore) {
-						this.dataList = this.dataList.concat(res.data.content);
-					} else {
-						this.dataList = res.data.content;
-					}
-					this.loading = 'success';
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 500);
 				});
+			}
+		},
+		methods: {
+			fnGetData() {
+				// uni.showLoading({
+				// 	mask: true,
+				// 	title: '加载中...'
+				// });
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi
+					.getJournals(this.queryParams)
+					.then(res => {
+						this.loading = 'success';
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						// 处理数据
+						this.result = res.data;
+						if (this.isLoadMore) {
+							this.dataList = this.dataList.concat(res.data.content);
+						} else {
+							this.dataList = res.data.content;
+						}
+						this.loading = 'success';
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
+					});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	display: flex;
+		display: flex;
-	flex-direction: column;
+		flex-direction: column;
-}
+	}
-.loading-wrap {
+
-}
+	.loading-wrap {}
-.app-page-content {
+
-}
+	.app-page-content {}
-.content-empty {
+
-	height: 60vh;
+	.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,194 +61,197 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmTranslate,
+			tmTranslate,
-		tmEmpty,
+			tmEmpty,
-		tmPoup,
+			tmPoup,
-		tmButton,
+			tmButton,
-		commentItem
+			commentItem
-	},
+		},
-	data() {
+		data() {
-		return {
+			return {
-			loading: 'loading',
-			queryParams: {
-				size: 10,
-				page: 0
-			},
-			result: null,
-			dataList: [],
-			isLoadMore: false,
-			loadMoreText: '加载中...',
-			sheetId: SheetConfig[AppKeys.SHEET_LEAVING],
-			commentDetail: {
 				loading: 'loading',
-				show: false,
+				queryParams: {
-				comment: {},
+					size: 10,
-				postId: undefined,
+					page: 0
-				list: []
+				},
-			}
+				result: null,
-		};
+				dataList: [],
-	},
+				isLoadMore: false,
+				loadMoreText: '加载中...',
+				sheetId: SheetConfig[AppKeys.SHEET_LEAVING],
+				commentDetail: {
+					loading: 'loading',
+					show: false,
+					comment: {},
+					postId: undefined,
+					list: []
+				}
+			};
+		},
 
-	onLoad() {
+		onLoad() {
-		this.fnSetPageTitle('留言板');
+			this.fnSetPageTitle('留言板');
-	},
+		},
-	created() {
+		created() {
-		this.fnGetData();
-		uni.$on('leaving_refresh', () => {
 			this.fnGetData();
-		});
+			uni.$on('leaving_refresh', () => {
-	},
+				this.fnGetData();
-	onPullDownRefresh() {
+			});
-		this.isLoadMore = false;
+		},
-		this.queryParams.page = 0;
+		onPullDownRefresh() {
-		this.fnGetData();
+			this.isLoadMore = false;
-	},
+			this.queryParams.page = 0;
-
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
 			this.fnGetData();
-		} else {
+		},
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
 
-	methods: {
+		onReachBottom(e) {
-		fnGetData() {
+			if (this.result.hasNext) {
-			uni.showLoading({
+				this.queryParams.page += 1;
-				mask: true,
+				this.isLoadMore = true;
-				title: '加载中...'
+				this.fnGetData();
-			});
+			} else {
-			// 设置状态为加载中
+				uni.showToast({
-			if (!this.isLoadMore) {
+					icon: 'none',
-				this.loading = 'loading';
+					title: '没有更多数据了'
+				});
 			}
-			this.loadMoreText = '加载中...';
+		},
-			this.$httpApi
+
-				.getSheetsCommentsTreeBySheetId(this.sheetId, this.queryParams)
+		methods: {
-				.then(res => {
+			fnGetData() {
-					if (res.status == 200) {
+				// uni.showLoading({
-						this.loading = 'success';
+				// 	mask: true,
-						// return;
+				// 	title: '加载中...'
-						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+				// });
-						// 处理数据
+				// 设置状态为加载中
-						this.result = res.data;
+				if (!this.isLoadMore) {
-						if (this.isLoadMore) {
+					this.loading = 'loading';
-							this.dataList = this.dataList.concat(res.data.content);
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi
+					.getSheetsCommentsTreeBySheetId(this.sheetId, this.queryParams)
+					.then(res => {
+						if (res.status == 200) {
+							this.loading = 'success';
+							// return;
+							this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+							// 处理数据
+							this.result = res.data;
+							if (this.isLoadMore) {
+								this.dataList = this.dataList.concat(res.data.content);
+							} else {
+								this.dataList = res.data.content;
+							}
 						} else {
-							this.dataList = res.data.content;
+							this.loading = 'error';
+							this.loadMoreText = '加载失败，请下拉刷新！';
 						}
-					} else {
+					})
+					.catch(err => {
+						console.error(err);
 						this.loading = 'error';
 						this.loadMoreText = '加载失败，请下拉刷新！';
-					}
+					})
-				})
+					.finally(() => {
-				.catch(err => {
+						setTimeout(() => {
-					console.error(err);
+							uni.hideLoading();
-					this.loading = 'error';
+							uni.stopPullDownRefresh();
-					this.loadMoreText = '加载失败，请下拉刷新！';
+						}, 500);
-				})
+					});
-				.finally(() => {
+			},
-					setTimeout(() => {
+			fnToComment(data) {
-						uni.hideLoading();
+				let _comment = {};
-						uni.stopPullDownRefresh();
+				if (data) {
-					}, 500);
+					_comment = {
-				});
+						id: this.sheetId,
-		},
+						parentId: data.comment.id,
-		fnToComment(data) {
+						title: data.comment.author,
-			let _comment = {};
+						from: 'sheets',
-			if (data) {
+						formPage: 'leaving',
-				_comment = {
+						type: 'user'
-					id: this.sheetId,
+					};
-					parentId: data.comment.id,
+				} else {
-					title: data.comment.author,
+					_comment = {
-					from: 'sheets',
+						id: this.sheetId,
-					formPage: 'leaving',
+						parentId: 0,
-					type: 'user'
+						title: '留言板留言',
-				};
+						from: 'sheets',
-			} else {
+						formPage: 'leaving',
-				_comment = {
+						type: 'post'
-					id: this.sheetId,
+					};
-					parentId: 0,
+				}
-					title: '留言板留言',
-					from: 'sheets',
-					formPage: 'leaving',
-					type: 'post'
-				};
-			}
 
-			uni.$tm.vx.commit('comment/setCommentInfo', _comment);
+				uni.$tm.vx.commit('comment/setCommentInfo', _comment);
-			this.$Router.push({
+				this.$Router.push({
-				path: '/pagesA/comment/comment',
+					path: '/pagesA/comment/comment',
-				query: _comment
+					query: _comment
-			});
-		},
-		fnCopyContent(content) {
-			uni.$tm.u.setClipboardData(content);
-			uni.$tm.toast('内容已复制成功！');
-		},
-		fnOnShowCommentDetail(comment) {
-			this.commentDetail.comment = comment;
-			this.commentDetail.list = [];
-			this.commentDetail.show = true;
-			this.fnGetChildComments();
-		},
-		fnGetChildComments() {
-			this.commentDetail.loading = 'loading';
-			this.$httpApi
-				.getSheetsChildrenCommentList(this.sheetId, this.commentDetail.comment.id, {})
-				.then(res => {
-					if (res.status == 200) {
-						this.commentDetail.loading = 'success';
-						this.commentDetail.list = res.data;
-					} else {
-						this.commentDetail.loading = 'error';
-					}
-				})
-				.catch(err => {
-					this.commentDetail.loading = 'error';
 				});
+			},
+			fnCopyContent(content) {
+				uni.$tm.u.setClipboardData(content);
+				uni.$tm.toast('内容已复制成功！');
+			},
+			fnOnShowCommentDetail(comment) {
+				this.commentDetail.comment = comment;
+				this.commentDetail.list = [];
+				this.commentDetail.show = true;
+				this.fnGetChildComments();
+			},
+			fnGetChildComments() {
+				this.commentDetail.loading = 'loading';
+				this.$httpApi
+					.getSheetsChildrenCommentList(this.sheetId, this.commentDetail.comment.id, {})
+					.then(res => {
+						if (res.status == 200) {
+							this.commentDetail.loading = 'success';
+							this.commentDetail.list = res.data;
+						} else {
+							this.commentDetail.loading = 'error';
+						}
+					})
+					.catch(err => {
+						this.commentDetail.loading = 'error';
+					});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	display: flex;
+		display: flex;
-	flex-direction: column;
+		flex-direction: column;
-	background-color: #fafafd;
+		background-color: #fafafd;
-}
+	}
-.app-page-content {
+
-	box-sizing: border-box;
+	.app-page-content {
-	// box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
+		box-sizing: border-box;
-}
+		// box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
-.content-empty {
+	}
-	width: 100%;
+
-	height: 60vh;
+	.content-empty {
-}
+		width: 100%;
-.loading-wrap {
+		height: 60vh;
-	box-sizing: border-box;
+	}
-	padding: 24rpx;
+
-}
+	.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);
-	animation: loveCardAni 3s ease-in-out infinite;
+	&.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,123 +22,125 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmEmpty,
+			tmEmpty,
-		ArticleCard
+			ArticleCard
-	},
-	data() {
-		return {
-			loading: 'loading',
-			queryParams: {
-				size: 10,
-				page: 0
-			},
-			slug: '',
-			pageTitle: '加载中...',
-			result: null,
-			dataList: [],
-			isLoadMore: false,
-			loadMoreText: ''
-		};
-	},
-
-	onLoad(e) {
-		this.slug = e.slug;
-		this.pageTitle = e.name;
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnGetData();
-	},
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
-			this.fnGetData();
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		fnGetData() {
-			uni.showLoading({
-				mask: true,
-				title: '加载中...'
-			});
-			// 设置状态为加载中
-			if (!this.isLoadMore) {
-				this.loading = 'loading';
-			}
-			this.loadMoreText = '加载中...';
-			this.$httpApi
-				.getTagPostsList(this.slug, this.queryParams)
-				.then(res => {
-					this.fnSetPageTitle(`标签：${this.pageTitle} （共${res.data.total}篇）`);
-					this.result = res.data;
-					if (this.isLoadMore) {
-						this.dataList = this.dataList.concat(res.data.content);
-					} else {
-						this.dataList = res.data.content;
-					}
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-					setTimeout(() => {
-						this.loading = 'success';
-					}, 500);
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 500);
-				});
 		},
-		//跳转文章详情
+		data() {
-		fnToArticleDetail(article) {
+			return {
-			uni.navigateTo({
+				loading: 'loading',
-				url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+				queryParams: {
-				animationType: 'slide-in-right'
+					size: 10,
-			});
+					page: 0
+				},
+				slug: '',
+				pageTitle: '加载中...',
+				result: null,
+				dataList: [],
+				isLoadMore: false,
+				loadMoreText: ''
+			};
+		},
+
+		onLoad(e) {
+			this.slug = e.slug;
+			this.pageTitle = e.name;
+			this.fnGetData();
+		},
+		onPullDownRefresh() {
+			this.isLoadMore = false;
+			this.queryParams.page = 0;
+			this.fnGetData();
+		},
+		onReachBottom(e) {
+			if (this.result.hasNext) {
+				this.queryParams.page += 1;
+				this.isLoadMore = true;
+				this.fnGetData();
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
+				});
+			}
+		},
+		methods: {
+			fnGetData() {
+				// uni.showLoading({
+				// 	mask: true,
+				// 	title: '加载中...'
+				// });
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi
+					.getTagPostsList(this.slug, this.queryParams)
+					.then(res => {
+						this.fnSetPageTitle(`标签：${this.pageTitle} （共${res.data.total}篇）`);
+						this.result = res.data;
+						if (this.isLoadMore) {
+							this.dataList = this.dataList.concat(res.data.content);
+						} else {
+							this.dataList = res.data.content;
+						}
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						setTimeout(() => {
+							this.loading = 'success';
+						}, 500);
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
+					});
+			},
+			//跳转文章详情
+			fnToArticleDetail(article) {
+				uni.navigateTo({
+					url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					animationType: 'slide-in-right'
+				});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss">
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	display: flex;
+		display: flex;
-	flex-direction: column;
+		flex-direction: column;
-	padding: 24rpx 0;
+		padding: 24rpx 0;
-	background-color: #fafafd;
+		background-color: #fafafd;
-}
+	}
-.loading-wrap {
+
-	padding: 0 24rpx;
+	.loading-wrap {
-	min-height: 100vh;
+		padding: 0 24rpx;
-}
+		min-height: 100vh;
-.empty {
+	}
-	height: 60vh;
+
-	display: flex;
+	.empty {
-	align-items: center;
+		height: 60vh;
-	justify-content: center;
+		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,295 +110,305 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmSearch,
+			tmSearch,
-		tmTranslate,
+			tmTranslate,
-		tmTabs,
+			tmTabs,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmEmpty,
+			tmEmpty,
-		tmTags,
+			tmTags,
-		tmButton,
+			tmButton,
-		tmPickers
+			tmPickers
-	},
+		},
-	data() {
+		data() {
-		return {
+			return {
-			isBlackTheme: false,
+				isBlackTheme: false,
-			loading: 'loading',
-			tab: {
-				activeIndex: 0,
-				list: ['全部', '已发布', '私密', '草稿', '回收站']
-			},
-			queryParams: {
-				size: 10,
-				page: 0,
-				status: '',
-				keyword: '',
-				categoryId: undefined
-			},
-			cache: {
-				dataList: [],
-				total: 0
-			},
-			isLoadMore: false,
-			loadMoreText: '加载中...',
-			result: {},
-			dataList: [],
-			category: {
 				loading: 'loading',
-				show: false,
+				tab: {
-				list: [],
+					activeIndex: 0,
-				selected: [0]
+					list: ['全部', '已发布', '私密', '草稿', '回收站']
-			}
+				},
-		};
+				queryParams: {
-	},
+					size: 10,
-	onLoad() {
+					page: 0,
-		this.fnSetPageTitle('文章管理');
+					status: '',
-		this.fnGetCategoryList();
+					keyword: '',
-	},
+					categoryId: undefined
-	created() {
+				},
-		this.fnGetData();
+				cache: {
-		uni.$on('refresh-article-list', () => {
+					dataList: [],
-			this.isLoadMore = false;
+					total: 0
-			this.queryParams.page = 0;
+				},
-			this.fnGetData();
+				isLoadMore: false,
-		});
+				loadMoreText: '加载中...',
-	},
+				result: {},
-	onPullDownRefresh() {
+				dataList: [],
-		this.isLoadMore = false;
+				category: {
-		this.queryParams.page = 0;
+					loading: 'loading',
-		this.fnGetData();
+					show: false,
-	},
+					list: [],
-
+					selected: [0]
-	onReachBottom(e) {
+				}
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
-			this.fnGetData();
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		fnOnTabChange(index) {
-			this.dataList = [];
-			const _status = {
-				0: '',
-				1: 'PUBLISHED',
-				2: 'INTIMATE',
-				3: 'DRAFT',
-				4: 'RECYCLE'
 			};
-			this.queryParams.status = _status[index];
+		},
-			this.queryParams.page = 0;
+		onLoad() {
-			this.fnToTopPage();
+			this.fnSetPageTitle('文章管理');
+			this.fnGetCategoryList();
+		},
+		created() {
 			this.fnGetData();
+			uni.$on('refresh-article-list', () => {
+				this.isLoadMore = false;
+				this.queryParams.page = 0;
+				this.fnGetData();
+			});
 		},
-		// 获取分类列表
+		onPullDownRefresh() {
-		fnGetCategoryList() {
-			this.category.loading = 'loading';
-			this.$httpApi.admin
-				.getCategoryList()
-				.then(res => {
-					if (res.status == 200) {
-						let _list = res.data;
-						_list.unshift({ id: undefined, name: '全部' });
-						this.category.list = _list;
-						this.category.loading = 'success';
-					} else {
-						this.category.loading = 'error';
-					}
-				})
-				.catch(err => {
-					this.category.loading = 'error';
-				});
-		},
-		// 显示分类选择
-		fnOnCategoryConfirm(e) {
-			this.category.selected = [e[0].index];
-			this.queryParams.categoryId = e[0].data.id;
-		},
-		fnOnSearch() {
-			this.queryParams.page = 0;
 			this.isLoadMore = false;
-			this.fnToTopPage();
+			this.queryParams.page = 0;
 			this.fnGetData();
 		},
-		fnGetData() {
-			uni.showLoading({
-				mask: true,
-				title: '加载中...'
-			});
-			// 设置状态为加载中
-			if (!this.isLoadMore) {
-				this.loading = 'loading';
-			}
-			this.loadMoreText = '加载中...';
-			this.$httpApi.admin
-				.getPostsByPage(this.queryParams)
-				.then(res => {
-					console.log('请求结果：');
-					console.log(res);
-					if (res.status == 200) {
-						// 处理数据
-						this.result = res.data;
-						const _dataList = res.data.content.map(item => {
-							item.hasThumbnail = item.thumbnail != '';
-							if (item.thumbnail) {
-								item.thumbnail = this.$utils.checkThumbnailUrl(item.thumbnail);
-							}
-							return item;
-						});
-						if (this.isLoadMore) {
-							this.dataList = this.dataList.concat(_dataList);
-						} else {
-							this.dataList = _dataList;
-						}
 
-						this.loading = 'success';
+		onReachBottom(e) {
-						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+			if (this.result.hasNext) {
-					} else {
+				this.queryParams.page += 1;
-						this.loading = 'error';
+				this.isLoadMore = true;
-						this.loadMoreText = '呜呜，加载失败了~';
+				this.fnGetData();
-					}
+			} else {
-				})
+				uni.showToast({
-				.catch(err => {
+					icon: 'none',
-					console.error(err);
+					title: '没有更多数据了'
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 800);
 				});
+			}
 		},
-
+		methods: {
-		// 跳转文章详情（预览）
+			fnOnTabChange(index) {
-		fnToArticleDetail(article) {
+				this.dataList = [];
-			uni.navigateTo({
+				const _status = {
-				url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					0: '',
-				animationType: 'slide-in-right'
+					1: 'PUBLISHED',
-			});
+					2: 'INTIMATE',
-		},
+					3: 'DRAFT',
-		// 新增
+					4: 'RECYCLE'
-		fnOnAddArticle() {
+				};
-			this.$Router.push({ path: '/pagesB/articles/article-edit', query: {} });
+				this.queryParams.status = _status[index];
-		},
+				this.queryParams.page = 0;
-		// 文章编辑
+				this.fnToTopPage();
-		fnOnEditArticle(article) {
+				this.fnGetData();
-			this.$Router.push({ path: '/pagesB/articles/article-edit', query: { postsId: article.id } });
+			},
-		},
+			// 获取分类列表
-		// 设置文章信息
+			fnGetCategoryList() {
-		fnOnSetArticle(article, index) {
+				this.category.loading = 'loading';
-			this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: article.id, postTitle: article.title, isEdit: 1, from: 'list' } });
+				this.$httpApi.admin
-		},
+					.getCategoryList()
-		// 删除文章
+					.then(res => {
-		fnOnDelArticle(article, index) {
+						if (res.status == 200) {
-			uni.$eShowModal({
+							let _list = res.data;
-				title: '提示',
+							_list.unshift({ id: undefined, name: '全部' });
-				content: '是否确定要删除该文章？',
+							this.category.list = _list;
-				showCancel: true,
+							this.category.loading = 'success';
-				cancelText: '否',
+						} else {
-				cancelColor: '#999999',
+							this.category.loading = 'error';
-				confirmText: '是',
+						}
-				confirmColor: '#03a9f4'
+					})
-			})
+					.catch(err => {
-				.then(res => {
+						this.category.loading = 'error';
-					uni.showLoading({
-						mask: true,
-						title: '删除中...'
 					});
-					this.$httpApi.admin
+			},
-						.deletePostsByIds([article.id])
+			// 显示分类选择
-						.then(res => {
+			fnOnCategoryConfirm(e) {
-							if (res.status == 200) {
+				this.fnResetSetAniWaitIndex();
-								uni.$tm.toast('文章已删除成功！');
+				this.category.selected = [e[0].index];
-								this.dataList.splice(index, 1);
+				this.queryParams.categoryId = e[0].data.id;
+			},
+			fnOnSearch() {
+				this.fnResetSetAniWaitIndex();
+				this.queryParams.page = 0;
+				this.isLoadMore = false;
+				this.fnToTopPage();
+				this.fnGetData();
+			},
+			fnGetData() {
+				uni.showLoading({
+					mask: true,
+					title: '加载中...'
+				});
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi.admin
+					.getPostsByPage(this.queryParams)
+					.then(res => {
+						console.log('请求结果：');
+						console.log(res);
+						if (res.status == 200) {
+							// 处理数据
+							this.result = res.data;
+							const _dataList = res.data.content.map(item => {
+								item.hasThumbnail = item.thumbnail != '';
+								if (item.thumbnail) {
+									item.thumbnail = this.$utils.checkThumbnailUrl(item.thumbnail);
+								}
+								return item;
+							});
+							if (this.isLoadMore) {
+								this.dataList = this.dataList.concat(_dataList);
 							} else {
-								uni.$tm.toast('操作失败，请重试！');
+								this.dataList = _dataList;
 							}
-						})
+
-						.catch(err => {
+							this.loading = 'success';
-							uni.$tm.toast('操作失败，请重试！');
+							this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						} else {
+							this.loading = 'error';
+							this.loadMoreText = '呜呜，加载失败了~';
+						}
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 800);
+					});
+			},
+
+			// 跳转文章详情（预览）
+			fnToArticleDetail(article) {
+				uni.navigateTo({
+					url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
+					animationType: 'slide-in-right'
+				});
+			},
+			// 新增
+			fnOnAddArticle() {
+				this.$Router.push({ path: '/pagesB/articles/article-edit', query: {} });
+			},
+			// 文章编辑
+			fnOnEditArticle(article) {
+				this.$Router.push({ path: '/pagesB/articles/article-edit', query: { postsId: article.id } });
+			},
+			// 设置文章信息
+			fnOnSetArticle(article, index) {
+				this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: article.id, postTitle: article.title, isEdit: 1, from: 'list' } });
+			},
+			// 删除文章
+			fnOnDelArticle(article, index) {
+				uni.$eShowModal({
+						title: '提示',
+						content: '是否确定要删除该文章？',
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						uni.showLoading({
+							mask: true,
+							title: '删除中...'
 						});
-				})
+						this.$httpApi.admin
-				.catch(err => {});
+							.deletePostsByIds([article.id])
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast('文章已删除成功！');
+									this.dataList.splice(index, 1);
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
+								uni.$tm.toast('操作失败，请重试！');
+							});
+					})
+					.catch(err => {});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-	display: flex;
+		display: flex;
-	flex-direction: column;
+		flex-direction: column;
-	padding-bottom: 24rpx;
+		padding-bottom: 24rpx;
-	background-color: #fafafd;
+		background-color: #fafafd;
 
-	&.is-balck {
+		&.is-balck {
-		background-color: #212121;
+			background-color: #212121;
-	}
-}
-.app-page-content {
-	box-sizing: border-box;
-	.content-empty {
-		height: 60vh;
-	}
-}
-
-.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;
+	.app-page-content {
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		word-wrap: break-word;
-		word-break: break-all;
-	}
-	.summary {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 3;
-		overflow: hidden;
-		word-wrap: break-word;
-		word-break: break-all;
-	}
-	.foot {
 		box-sizing: border-box;
-		border-top: 2rpx solid rgba(0, 0, 0, 0.03);
+
+		.content-empty {
+			height: 60vh;
+		}
+	}
+
+	.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;
+			text-overflow: ellipsis;
+			word-wrap: break-word;
+			word-break: break-all;
+		}
+
+		.summary {
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 3;
+			overflow: hidden;
+			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/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,207 +86,163 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmButton,
+			tmButton,
-		tmEmpty,
+			tmEmpty,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmPoup,
+			tmPoup,
-		tmInput,
+			tmInput,
-		AttachmentSelect
+			AttachmentSelect
-	},
-	data() {
-		return {
-			loading: 'loading',
-			queryParams: {
-				size: 10,
-				page: 0,
-				more: true
-			},
-			dataList: [],
-			poupShow: false,
-			attachmentsSelectShow: false,
-			form: {
-				description: undefined,
-				password: undefined,
-				createTime: undefined,
-				fullPath: undefined,
-				id: undefined,
-				name: '',
-				slug: undefined,
-				thumbnail: undefined,
-				showThumbnail: undefined
-			}
-		};
-	},
-
-	onLoad() {
-		this.fnSetPageTitle('分类管理');
-	},
-	created() {
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnGetData();
-	},
-
-	methods: {
-		fnGetData() {
-			uni.showLoading({
-				mask: true,
-				title: '加载中...'
-			});
-			// 设置状态为加载中
-			if (!this.isLoadMore) {
-				this.loading = 'loading';
-			}
-			this.loadMoreText = '加载中...';
-			this.$httpApi.admin
-				.getCategoryList(this.queryParams)
-				.then(res => {
-					console.log('getCategoryList：');
-					console.log(res);
-					if (res.status == 200) {
-						this.loading = 'success';
-						this.dataList = res.data.map(item => {
-							if (item.thumbnail) {
-								item['showThumbnail'] = this.$utils.checkThumbnailUrl(item.thumbnail);
-							} else {
-								item['showThumbnail'] = '';
-							}
-							return item;
-						});
-					} else {
-						this.loading = 'error';
-					}
-
-					console.log(this.dataList);
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 800);
-				});
 		},
-
+		data() {
-		fnSelectColor() {
+			return {
-			this.$refs.colorPicker.open();
+				loading: 'loading',
-		},
+				queryParams: {
-
+					size: 10,
-		fnOnConfirmSelectColor(e) {
+					page: 0,
-			this.selectColor = e.rgba;
+					more: true
-			this.$set(this.form, 'color', e.hex);
+				},
-		},
+				dataList: [],
-		fnOnAttachmentsSelectClose() {
+				poupShow: false,
-			this.attachmentsSelectShow = false;
+				attachmentsSelectShow: false,
-		},
+				form: {
-		fnOnPoupChange(e) {
+					description: undefined,
-			if (!e) {
+					password: undefined,
-				this.fnResetForm();
+					createTime: undefined,
-			}
+					fullPath: undefined,
-		},
+					id: undefined,
-		// 监听附件选择
+					name: '',
-		fnOnAttachmentsSelect(file) {
+					slug: undefined,
-			this.form.thumbnail = file.path;
+					thumbnail: undefined,
-			this.form.showThumbnail = this.$utils.checkThumbnailUrl(file.path);
+					showThumbnail: undefined
-			this.attachmentsSelectShow = false;
-		},
-		fnShowFormModal(category) {
-			if (category) {
-				this.form = Object.assign({}, {}, category);
-				if (category.thumbnail) {
-					this.form.showThumbnail = this.$utils.checkThumbnailUrl(category.thumbnail);
 				}
-			} else {
-				this.fnResetForm();
-			}
-			this.poupShow = true;
-		},
-		fnResetForm() {
-			this.form = {
-				color: undefined,
-				createTime: undefined,
-				fullPath: undefined,
-				id: undefined,
-				name: '',
-				slug: undefined,
-				thumbnail: undefined,
-				showThumbnail: undefined
 			};
 		},
-		fnSubmit() {
+
-			if (this.form.name.trim() == '') {
+		onLoad() {
-				return uni.$tm.toast('分类名称未填写！');
+			this.fnSetPageTitle('分类管理');
-			}
-			if (this.form.id == undefined) {
-				this.$httpApi.admin
-					.createCategory(this.form)
-					.then(res => {
-						if (res.status == 200) {
-							uni.$tm.toast(`保存成功！`);
-							uni.startPullDownRefresh();
-						} else {
-							uni.$tm.toast('操作失败，请重试！');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast('操作失败，请重试！');
-					});
-			} else {
-				this.$httpApi.admin
-					.updateCategoryById(this.form.id, this.form)
-					.then(res => {
-						if (res.status == 200) {
-							uni.$tm.toast(`保存成功！`);
-							let updateIndex = this.dataList.findIndex(x => x.id == this.form.id);
-							this.$set(this.dataList, updateIndex, this.form);
-						} else {
-							uni.$tm.toast('操作失败，请重试！');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast('操作失败，请重试！');
-					});
-			}
 		},
-		// 删除
+		created() {
-		fnDelete(category) {
+			this.fnGetData();
-			const _category = category || this.form;
+		},
-			uni.$eShowModal({
+		onPullDownRefresh() {
-				title: '提示',
+			this.isLoadMore = false;
-				content: `您是否要将 ${_category.name} 的分类删除？`,
+			this.queryParams.page = 0;
-				showCancel: true,
+			this.fnGetData();
-				cancelText: '否',
+		},
-				cancelColor: '#999999',
+
-				confirmText: '是',
+		methods: {
-				confirmColor: '#03a9f4'
+			fnGetData() {
-			})
+				uni.showLoading({
-				.then(res => {
+					mask: true,
+					title: '加载中...'
+				});
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi.admin
+					.getCategoryList(this.queryParams)
+					.then(res => {
+						console.log('getCategoryList：');
+						console.log(res);
+						if (res.status == 200) {
+							this.loading = 'success';
+							this.dataList = res.data.map(item => {
+								if (item.thumbnail) {
+									item['showThumbnail'] = this.$utils.checkThumbnailUrl(item.thumbnail);
+								} else {
+									item['showThumbnail'] = '';
+								}
+								return item;
+							});
+						} else {
+							this.loading = 'error';
+						}
+
+						console.log(this.dataList);
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 800);
+					});
+			},
+
+			fnSelectColor() {
+				this.$refs.colorPicker.open();
+			},
+
+			fnOnConfirmSelectColor(e) {
+				this.selectColor = e.rgba;
+				this.$set(this.form, 'color', e.hex);
+			},
+			fnOnAttachmentsSelectClose() {
+				this.attachmentsSelectShow = false;
+			},
+			fnOnPoupChange(e) {
+				if (!e) {
+					this.fnResetForm();
+				}
+			},
+			// 监听附件选择
+			fnOnAttachmentsSelect(file) {
+				this.form.thumbnail = file.path;
+				this.form.showThumbnail = this.$utils.checkThumbnailUrl(file.path);
+				this.attachmentsSelectShow = false;
+			},
+			fnShowFormModal(category) {
+				if (category) {
+					this.form = Object.assign({}, {}, category);
+					if (category.thumbnail) {
+						this.form.showThumbnail = this.$utils.checkThumbnailUrl(category.thumbnail);
+					}
+				} else {
+					this.fnResetForm();
+				}
+				this.poupShow = true;
+			},
+			fnResetForm() {
+				this.form = {
+					color: undefined,
+					createTime: undefined,
+					fullPath: undefined,
+					id: undefined,
+					name: '',
+					slug: undefined,
+					thumbnail: undefined,
+					showThumbnail: undefined
+				};
+			},
+			fnSubmit() {
+				if (this.form.name.trim() == '') {
+					return uni.$tm.toast('分类名称未填写！');
+				}
+				if (this.form.id == undefined) {
 					this.$httpApi.admin
-						.deleteCategoryById(_category.id)
+						.createCategory(this.form)
 						.then(res => {
 							if (res.status == 200) {
-								uni.$tm.toast(`${_category.name} 分类已删除！`);
+								uni.$tm.toast(`保存成功！`);
-								const delIndex = this.dataList.findIndex(x => x.id == _category.id);
+								uni.startPullDownRefresh();
-								this.dataList.splice(delIndex, 1);
 							} else {
 								uni.$tm.toast('操作失败，请重试！');
 							}
@@ -330,91 +250,146 @@ export default {
 						.catch(err => {
 							uni.$tm.toast('操作失败，请重试！');
 						});
-				})
+				} else {
-				.catch(err => {});
+					this.$httpApi.admin
+						.updateCategoryById(this.form.id, this.form)
+						.then(res => {
+							if (res.status == 200) {
+								uni.$tm.toast(`保存成功！`);
+								let updateIndex = this.dataList.findIndex(x => x.id == this.form.id);
+								this.$set(this.dataList, updateIndex, this.form);
+							} else {
+								uni.$tm.toast('操作失败，请重试！');
+							}
+						})
+						.catch(err => {
+							uni.$tm.toast('操作失败，请重试！');
+						});
+				}
+			},
+			// 删除
+			fnDelete(category) {
+				const _category = category || this.form;
+				uni.$eShowModal({
+						title: '提示',
+						content: `您是否要将 ${_category.name} 的分类删除？`,
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						this.$httpApi.admin
+							.deleteCategoryById(_category.id)
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast(`${_category.name} 分类已删除！`);
+									const delIndex = this.dataList.findIndex(x => x.id == _category.id);
+									this.dataList.splice(delIndex, 1);
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
+								uni.$tm.toast('操作失败，请重试！');
+							});
+					})
+					.catch(err => {});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-}
-.loading-wrap {
-	.loading-error {
-		height: 65vh;
 	}
-}
-.content-empty {
-	width: 100%;
-	height: 60vh;
-}
 
-.poup-content {
+	.loading-wrap {
-	overflow: hidden;
+		.loading-error {
-}
+			height: 65vh;
-.poup-body {
-	height: 71vh;
-	box-sizing: border-box;
-	touch-action: none;
-}
-.thumbnail {
-	width: 100%;
-	height: 260rpx;
-}
-.category-card {
-	position: relative;
-	box-sizing: border-box;
-	box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
-	.del-icon {
-		width: 46rpx;
-		height: 46rpx;
-		position: absolute;
-		right: 24rpx;
-		top: 24rpx;
-		border-radius: 50%;
-		box-sizing: border-box;
-		border: 4rpx solid #fff;
-		background-color: #ff8177;
-		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
-		font-size: 32rpx;
-		color: #fff;
-	}
-	.left {
-		width: 200rpx;
-		height: 190rpx;
-
-		.cover {
-			width: 100%;
-			height: inherit;
-			background-color: #607d8b;
 		}
 	}
-	.right {
+
-		width: 0;
+	.content-empty {
-		flex-grow: 1;
+		width: 100%;
+		height: 60vh;
+	}
+
+	.poup-content {
+		overflow: hidden;
+	}
+
+	.poup-body {
+		height: 71vh;
 		box-sizing: border-box;
-		.color {
+		touch-action: none;
+	}
+
+	.thumbnail {
+		width: 100%;
+		height: 260rpx;
+	}
+
+	.category-card {
+		position: relative;
+		box-sizing: border-box;
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+
+		.del-icon {
+			width: 46rpx;
+			height: 46rpx;
+			position: absolute;
+			right: 24rpx;
+			top: 24rpx;
+			border-radius: 50%;
+			box-sizing: border-box;
+			border: 4rpx solid #fff;
+			background-color: #ff8177;
+			box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
+			font-size: 32rpx;
 			color: #fff;
 		}
-	}
-}
 
-.desc-box {
+		.left {
-	box-sizing: border-box;
+			width: 200rpx;
-	.label {
+			height: 190rpx;
-		width: 86rpx;
+
+			.cover {
+				width: 100%;
+				height: inherit;
+				background-color: #607d8b;
+			}
+		}
+
+		.right {
+			width: 0;
+			flex-grow: 1;
+			box-sizing: border-box;
+
+			.color {
+				color: #fff;
+			}
+		}
 	}
-	.value {
+
-		width: 0;
+	.desc-box {
-		flex-grow: 1;
+		box-sizing: border-box;
-		white-space: nowrap;
+
-		overflow: hidden;
+		.label {
-		text-overflow: ellipsis;
+			width: 86rpx;
-		word-wrap: break-word;
+		}
-		word-break: break-all;
+
+		.value {
+			width: 0;
+			flex-grow: 1;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			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,347 +119,354 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmButton,
+			tmButton,
-		tmEmpty,
+			tmEmpty,
-		tmTabs,
+			tmTabs,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmTags,
+			tmTags,
-		tmPoup,
+			tmPoup,
-		tmInput
+			tmInput
-	},
-	data() {
-		return {
-			loading: 'loading',
-			tab: {
-				adtiveIndex: 0,
-				list: ['文章评论', '页面评论', '日记评论']
-			},
-			queryParams: {
-				size: 10,
-				page: 0
-			},
-			result: {},
-			dataList: [],
-			queryType: 'Posts',
-			isLoadMore: false,
-			loadMoreText: '加载中...',
-			reply: {
-				show: false,
-				data: {},
-				form: {
-					allowNotification: true,
-					author: '',
-					authorUrl: '',
-					content: '',
-					email: '',
-					parentId: 0,
-					postId: 0
-				}
-			}
-		};
-	},
-	computed: {
-		// 获取博主信息
-		bloggerInfo() {
-			return this.$tm.vx.getters().getBlogger;
-		}
-	},
-	onLoad() {
-		this.fnSetPageTitle('评论管理');
-	},
-	created() {
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnGetData();
-	},
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
-			this.fnGetData();
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		fnOnTabChange(index) {
-			this.fnResetReply();
-			this.dataList = [];
-			this.queryType = ['Posts', 'Sheets', 'Journals'][index];
-			this.fnToTopPage();
-			this.fnGetData();
 		},
-
+		data() {
-		fnGetData() {
+			return {
-			uni.showLoading({
+				loading: 'loading',
-				mask: true,
+				tab: {
-				title: '加载中...'
+					adtiveIndex: 0,
-			});
+					list: ['文章评论', '页面评论', '日记评论']
-			// 设置状态为加载中
+				},
-			if (!this.isLoadMore) {
+				queryParams: {
-				this.loading = 'loading';
+					size: 10,
-			}
+					page: 0
-			this.loadMoreText = '加载中...';
+				},
-			this.$httpApi.admin[`get${this.queryType}Comments`](this.queryParams)
+				result: {},
-				.then(res => {
+				dataList: [],
-					console.log('请求结果：');
+				queryType: 'Posts',
-					console.log(res);
+				isLoadMore: false,
-
+				loadMoreText: '加载中...',
-					this.loading = 'success';
+				reply: {
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+					show: false,
-					const _list = res.data.content.map(x => {
+					data: {},
-						x.avatar = this.$utils.checkAvatarUrl(x.avatar, x.isAdmin);
+					form: {
-						return x;
+						allowNotification: true,
-					});
+						author: '',
-					// 处理数据
+						authorUrl: '',
-					this.result = res.data;
+						content: '',
-					if (this.isLoadMore) {
+						email: '',
-						this.dataList = this.dataList.concat(_list);
+						parentId: 0,
-					} else {
+						postId: 0
-						this.dataList = _list;
 					}
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 800);
-				});
-		},
-		fnShowReplyModal(comment) {
-			this.reply.data = comment;
-			this.reply.form.parentId = comment.id;
-			switch (this.queryType) {
-				case 'Posts':
-					this.reply.form.postId = comment.post.id;
-					break;
-				case 'Sheets':
-					this.reply.form.postId = comment.sheet.id;
-					break;
-				case 'Journals':
-					this.reply.form.postId = comment.journal.id;
-					break;
-			}
-			this.reply.show = true;
-		},
-		fnResetReply() {
-			this.reply = {
-				show: false,
-				data: {},
-				form: {
-					allowNotification: true,
-					author: '',
-					authorUrl: '',
-					content: '',
-					email: '',
-					parentId: 0,
-					postId: 0
 				}
 			};
 		},
-		// 审核通过
+		computed: {
-		fnReplyPass(comment) {
+			// 获取博主信息
-			uni.$eShowModal({
+			bloggerInfo() {
-				title: '提示',
+				return this.$tm.vx.getters().getBlogger;
-				content: `您是否要通过 ${comment.author} 的评论？`,
+			}
-				showCancel: true,
-				cancelText: '否',
-				cancelColor: '#999999',
-				confirmText: '是',
-				confirmColor: '#03a9f4'
-			})
-				.then(res => {
-					this.$httpApi.admin[`update${this.queryType}CommentsStatus`](comment.id, 'PUBLISHED')
-						.then(res => {
-							if (res.status == 200) {
-								uni.$tm.toast(`操作成功！`);
-								comment.status = 'PUBLISHED';
-								// uni.startPullDownRefresh();
-							} else {
-								uni.$tm.toast('操作失败，请重试！');
-							}
-						})
-						.catch(err => {
-							uni.$tm.toast('操作失败，请重试！');
-						});
-				})
-				.catch(err => {});
 		},
-		// 回复评论
+		onLoad() {
-		fnReplySubmit() {
+			this.fnSetPageTitle('评论管理');
-			this.reply.form.author = this.bloggerInfo.nickname;
+		},
-			this.reply.form.authorUrl = this.$haloConfig.social.blog || this.$haloConfig.apiUrl;
+		created() {
-			this.reply.form.email = this.bloggerInfo.email;
+			this.fnGetData();
-
+		},
-			uni.showLoading({
+		onPullDownRefresh() {
-				title: '正在回复中...'
+			this.isLoadMore = false;
-			});
+			this.queryParams.page = 0;
-			this.$httpApi.admin[`post${this.queryType}Comments`](this.reply.form)
+			this.fnGetData();
-				.then(res => {
+		},
-					if (res.status == 200) {
+		onReachBottom(e) {
-						uni.$tm.toast('回复成功');
+			if (this.result.hasNext) {
-						this.fnResetReply();
+				this.queryParams.page += 1;
-						this.fnToTopPage();
+				this.isLoadMore = true;
-						uni.startPullDownRefresh();
+				this.fnGetData();
-					} else {
+			} else {
-						uni.$tm.toast('回复失败，请重试！');
+				uni.showToast({
-					}
+					icon: 'none',
-				})
+					title: '没有更多数据了'
-				.catch(err => {
-					uni.$tm.toast('回复失败，请重试！');
 				});
+			}
 		},
-		// 还原
+		methods: {
-		fnRestore(comment) {
+			fnOnTabChange(index) {
-			uni.$eShowModal({
+				this.fnResetSetAniWaitIndex();
-				title: '提示',
+				this.fnResetReply();
-				content: `您是否要将 ${comment.author} 的评论还原？`,
+				this.dataList = [];
-				showCancel: true,
+				this.queryType = ['Posts', 'Sheets', 'Journals'][index];
-				cancelText: '否',
+				this.fnToTopPage();
-				cancelColor: '#999999',
+				this.fnGetData();
-				confirmText: '是',
+			},
-				confirmColor: '#03a9f4'
+
-			})
+			fnGetData() {
-				.then(res => {
+				uni.showLoading({
-					this.$httpApi.admin[`update${this.queryType}CommentsStatus`](comment.id, 'PUBLISHED')
+					mask: true,
-						.then(res => {
+					title: '加载中...'
-							if (res.status == 200) {
+				});
-								uni.$tm.toast(`已将 ${comment.author} 的评论还原！`);
+				// 设置状态为加载中
-								// uni.startPullDownRefresh();
+				if (!this.isLoadMore) {
-								comment.status = 'PUBLISHED';
+					this.loading = 'loading';
-							} else {
+				}
-								uni.$tm.toast('操作失败，请重试！');
+				this.loadMoreText = '加载中...';
-							}
+				this.$httpApi.admin[`get${this.queryType}Comments`](this.queryParams)
-						})
+					.then(res => {
-						.catch(err => {
+						console.log('请求结果：');
-							uni.$tm.toast('操作失败，请重试！');
+						console.log(res);
+
+						this.loading = 'success';
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						const _list = res.data.content.map(x => {
+							x.avatar = this.$utils.checkAvatarUrl(x.avatar, x.isAdmin);
+							return x;
 						});
-				})
+						// 处理数据
-				.catch(err => {});
+						this.result = res.data;
-		},
+						if (this.isLoadMore) {
-		// 移到回收站
+							this.dataList = this.dataList.concat(_list);
-		fnRecycle(comment) {
+						} else {
-			uni.$eShowModal({
+							this.dataList = _list;
-				title: '提示',
+						}
-				content: `您是否要将 ${comment.author} 的评论移到回收站？`,
+					})
-				showCancel: true,
+					.catch(err => {
-				cancelText: '否',
+						console.error(err);
-				cancelColor: '#999999',
+						this.loading = 'error';
-				confirmText: '是',
+						this.loadMoreText = '加载失败，请下拉刷新！';
-				confirmColor: '#03a9f4'
+					})
-			})
+					.finally(() => {
-				.then(res => {
+						setTimeout(() => {
-					this.$httpApi.admin[`update${this.queryType}CommentsStatus`](comment.id, 'RECYCLE')
+							uni.hideLoading();
-						.then(res => {
+							uni.stopPullDownRefresh();
-							if (res.status == 200) {
+						}, 800);
-								uni.$tm.toast(`已将 ${comment.author} 的评论移到回收站！`);
+					});
-								comment.status = 'RECYCLE';
+			},
-								// uni.startPullDownRefresh();
+			fnShowReplyModal(comment) {
-							} else {
+				this.reply.data = comment;
+				this.reply.form.parentId = comment.id;
+				switch (this.queryType) {
+					case 'Posts':
+						this.reply.form.postId = comment.post.id;
+						break;
+					case 'Sheets':
+						this.reply.form.postId = comment.sheet.id;
+						break;
+					case 'Journals':
+						this.reply.form.postId = comment.journal.id;
+						break;
+				}
+				this.reply.show = true;
+			},
+			fnResetReply() {
+				this.reply = {
+					show: false,
+					data: {},
+					form: {
+						allowNotification: true,
+						author: '',
+						authorUrl: '',
+						content: '',
+						email: '',
+						parentId: 0,
+						postId: 0
+					}
+				};
+			},
+			// 审核通过
+			fnReplyPass(comment) {
+				uni.$eShowModal({
+						title: '提示',
+						content: `您是否要通过 ${comment.author} 的评论？`,
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						this.$httpApi.admin[`update${this.queryType}CommentsStatus`](comment.id, 'PUBLISHED')
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast(`操作成功！`);
+									comment.status = 'PUBLISHED';
+									// uni.startPullDownRefresh();
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
 								uni.$tm.toast('操作失败，请重试！');
-							}
+							});
-						})
+					})
-						.catch(err => {
+					.catch(err => {});
-							uni.$tm.toast('操作失败，请重试！');
+			},
-						});
+			// 回复评论
-				})
+			fnReplySubmit() {
-				.catch(err => {});
+				this.reply.form.author = this.bloggerInfo.nickname;
-		},
+				this.reply.form.authorUrl = this.$haloConfig.social.blog || this.$haloConfig.apiUrl;
-		// 删除评论（永久删除）
+				this.reply.form.email = this.bloggerInfo.email;
-		fnDelete(comment) {
+
-			uni.$eShowModal({
+				uni.showLoading({
-				title: '提示',
+					title: '正在回复中...'
-				content: `您是否要将 ${comment.author} 的评论删除？`,
+				});
-				showCancel: true,
+				this.$httpApi.admin[`post${this.queryType}Comments`](this.reply.form)
-				cancelText: '否',
+					.then(res => {
-				cancelColor: '#999999',
+						if (res.status == 200) {
-				confirmText: '是',
+							uni.$tm.toast('回复成功');
-				confirmColor: '#03a9f4'
+							this.fnResetReply();
-			})
+							this.fnToTopPage();
-				.then(res => {
+							uni.startPullDownRefresh();
-					this.$httpApi.admin[`delete${this.queryType}CommentsById`](comment.id)
+						} else {
-						.then(res => {
+							uni.$tm.toast('回复失败，请重试！');
-							if (res.status == 200) {
+						}
-								uni.$tm.toast(`${comment.author} 的评论已删除！`);
+					})
-								const delIndex = this.dataList.findIndex(x => x.id == comment.id);
+					.catch(err => {
-								this.dataList.splice(delIndex, 1);
+						uni.$tm.toast('回复失败，请重试！');
-								// uni.startPullDownRefresh();
+					});
-							} else {
+			},
+			// 还原
+			fnRestore(comment) {
+				uni.$eShowModal({
+						title: '提示',
+						content: `您是否要将 ${comment.author} 的评论还原？`,
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						this.$httpApi.admin[`update${this.queryType}CommentsStatus`](comment.id, 'PUBLISHED')
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast(`已将 ${comment.author} 的评论还原！`);
+									// uni.startPullDownRefresh();
+									comment.status = 'PUBLISHED';
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
 								uni.$tm.toast('操作失败，请重试！');
-							}
+							});
-						})
+					})
-						.catch(err => {
+					.catch(err => {});
-							uni.$tm.toast('操作失败，请重试！');
+			},
-						});
+			// 移到回收站
-				})
+			fnRecycle(comment) {
-				.catch(err => {});
+				uni.$eShowModal({
+						title: '提示',
+						content: `您是否要将 ${comment.author} 的评论移到回收站？`,
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						this.$httpApi.admin[`update${this.queryType}CommentsStatus`](comment.id, 'RECYCLE')
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast(`已将 ${comment.author} 的评论移到回收站！`);
+									comment.status = 'RECYCLE';
+									// uni.startPullDownRefresh();
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
+								uni.$tm.toast('操作失败，请重试！');
+							});
+					})
+					.catch(err => {});
+			},
+			// 删除评论（永久删除）
+			fnDelete(comment) {
+				uni.$eShowModal({
+						title: '提示',
+						content: `您是否要将 ${comment.author} 的评论删除？`,
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						this.$httpApi.admin[`delete${this.queryType}CommentsById`](comment.id)
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast(`${comment.author} 的评论已删除！`);
+									const delIndex = this.dataList.findIndex(x => x.id == comment.id);
+									this.dataList.splice(delIndex, 1);
+									// uni.startPullDownRefresh();
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
+								uni.$tm.toast('操作失败，请重试！');
+							});
+					})
+					.catch(err => {});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-}
-.loading-wrap {
-	padding: 24rpx;
-	.loading-error {
-		height: 65vh;
 	}
-}
-.content-empty {
-	width: 100%;
-	height: 60vh;
-}
 
-.comment-card {
+	.loading-wrap {
-	box-sizing: border-box;
+		padding: 24rpx;
-	box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
-	margin-bottom: 24rpx;
 
-	.avatar {
+		.loading-error {
-		width: 56rpx;
+			height: 65vh;
-		height: 56rpx;
+		}
+	}
+
+	.content-empty {
+		width: 100%;
+		height: 60vh;
+	}
+
+	.comment-card {
 		box-sizing: border-box;
-		border: 4rpx solid #fff;
+		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
-		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.15);
+		margin-bottom: 24rpx;
+
+		.avatar {
+			width: 56rpx;
+			height: 56rpx;
+			box-sizing: border-box;
+			border: 4rpx solid #fff;
+			box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.15);
+		}
+
+		.comment-content {
+			line-height: 1.6;
+		}
 	}
-	.comment-content {
+
-		line-height: 1.6;
+	.poup-content {
+		overflow: hidden;
+	}
+
+	.poup-body {
+		height: 60vh;
+		box-sizing: border-box;
 	}
-}
-.poup-content {
-	overflow: hidden;
-}
-.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,139 +30,142 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmButton,
+			tmButton,
-		tmEmpty,
+			tmEmpty,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton
+			tmFlotbutton
-	},
+		},
-	data() {
+		data() {
-		return {
+			return {
-			loading: 'loading',
+				loading: 'loading',
-			queryParams: {
+				queryParams: {
-				size: 10,
+					size: 10,
-				page: 0
+					page: 0
-			},
+				},
-			form: {
+				form: {
-				status: true,
+					status: true,
-				content: '',
+					content: '',
-				keepRaw: true,
+					keepRaw: true,
-				sourceContent: '',
+					sourceContent: '',
-				type: 'PUBLIC'
+					type: 'PUBLIC'
-			},
+				},
-			result: {},
+				result: {},
-			dataList: [],
+				dataList: [],
-			isLoadMore: false,
+				isLoadMore: false,
-			loadMoreText: '加载中...'
+				loadMoreText: '加载中...'
-		};
+			};
-	},
+		},
 
-	onLoad() {
+		onLoad() {
-		this.fnSetPageTitle('日记管理');
+			this.fnSetPageTitle('日记管理');
-	},
+		},
-	created() {
+		created() {
-		this.fnGetData();
+			this.fnGetData();
-		uni.$on('journals_refresh', () => {
+			uni.$on('journals_refresh', () => {
+				this.isLoadMore = false;
+				this.queryParams.page = 0;
+				this.fnGetData(false);
+			});
+		},
+		onPullDownRefresh() {
 			this.isLoadMore = false;
 			this.queryParams.page = 0;
-			this.fnGetData(false);
-		});
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnGetData();
-	},
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
 			this.fnGetData();
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		// 调用编辑操作
-		fnOnToolBarEdit(e) {
-			this.$refs.article[e.currentTarget.dataset.method]();
 		},
-		fnGetData(useTip = true) {
+		onReachBottom(e) {
-			if (useTip) {
+			if (this.result.hasNext) {
-				uni.showLoading({
+				this.queryParams.page += 1;
-					mask: true,
+				this.isLoadMore = true;
-					title: '加载中...'
+				this.fnGetData();
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: '没有更多数据了'
 				});
 			}
-			// 设置状态为加载中
+		},
-			if (!this.isLoadMore) {
+		methods: {
-				this.loading = 'loading';
+			// 调用编辑操作
-			}
+			fnOnToolBarEdit(e) {
-			this.loadMoreText = '加载中...';
+				this.$refs.article[e.currentTarget.dataset.method]();
-			this.$httpApi
+			},
-				.getJournals(this.queryParams)
+			fnGetData(useTip = true) {
-				.then(res => {
+				if (useTip) {
-					this.loading = 'success';
+					uni.showLoading({
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						mask: true,
-					// 处理数据
+						title: '加载中...'
-					this.result = res.data;
+					});
-					if (this.isLoadMore) {
+				}
-						this.dataList = this.dataList.concat(res.data.content);
+				// 设置状态为加载中
-					} else {
+				if (!this.isLoadMore) {
-						this.dataList = res.data.content;
+					this.loading = 'loading';
-					}
+				}
-					this.loading = 'success';
+				this.loadMoreText = '加载中...';
-				})
+				this.$httpApi
-				.catch(err => {
+					.getJournals(this.queryParams)
-					console.error(err);
+					.then(res => {
-					this.loading = 'error';
+						this.loading = 'success';
-					this.loadMoreText = '加载失败，请下拉刷新！';
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-				})
+						// 处理数据
-				.finally(() => {
+						this.result = res.data;
-					setTimeout(() => {
+						if (this.isLoadMore) {
-						uni.hideLoading();
+							this.dataList = this.dataList.concat(res.data.content);
-						uni.stopPullDownRefresh();
+						} else {
-					}, 500);
+							this.dataList = res.data.content;
+						}
+						this.loading = 'success';
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 500);
+					});
+			},
+			fnOnJournalDel(journal) {
+				this.dataList.splice(this.dataList.findIndex(x => x.id == journal.id), 1);
+			},
+			fnOnJournalEdit(data) {
+				uni.$tm.vx.commit('journal/setJournalInfo', data);
+				this.$Router.push({
+					path: '/pagesB/journal/journal-edit',
+					query: data
 				});
-		},
+			}
-		fnOnJournalDel(journal) {
-			this.dataList.splice(this.dataList.findIndex(x => x.id == journal.id), 1);
-		},
-		fnOnJournalEdit(data) {
-			uni.$tm.vx.commit('journal/setJournalInfo', data);
-			this.$Router.push({
-				path: '/pagesB/journal/journal-edit',
-				query: data
-			});
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
-	padding: 24rpx;
+	.loading-wrap {
-	.loading-error {
+		padding: 24rpx;
-		height: 40vh;
+
+		.loading-error {
+			height: 40vh;
+		}
+	}
+
+	.edit-wrap {
+		box-sizing: border-box;
+		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
 	}
-}
-.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,215 +109,172 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmButton,
+			tmButton,
-		tmEmpty,
+			tmEmpty,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmPoup,
+			tmPoup,
-		tmInput,
+			tmInput,
-		tmPickers,
+			tmPickers,
-		tmTags,
+			tmTags,
-		tmTabs,
+			tmTabs,
-		tmTranslate
+			tmTranslate
-	},
-	data() {
-		return {
-			loading: 'loading',
-			queryParams: {
-				size: 10,
-				page: 0
-			},
-			dataList: [],
-			filterList: [],
-			poupShow: false,
-			form: {
-				id: undefined,
-				description: '',
-				logo: '',
-				name: '',
-				team: '',
-				url: '',
-				priority: 0
-			},
-			tab: {
-				activeIndex: 0,
-				list: []
-			},
-			selectTeam: [],
-			teamList: []
-		};
-	},
-
-	onLoad() {
-		this.fnSetPageTitle('友链管理');
-		this.fnGetTeamData();
-	},
-	created() {
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.fnGetData();
-	},
-	methods: {
-		fnOnTabChange(index) {
-			this.fnToTopPage();
-			let _filterData = [];
-			if (index == 0) {
-				_filterData = this.dataList;
-			} else {
-				_filterData = this.dataList.filter(x => x.team == this.teamList[index - 1]);
-			}
-			this.filterList = JSON.parse(JSON.stringify(_filterData));
 		},
-		fnGetTeamData() {
+		data() {
-			this.$httpApi.admin
+			return {
-				.getLinkTeamList()
+				loading: 'loading',
-				.then(res => {
+				queryParams: {
-					if (res.status == 200) {
+					size: 10,
-						this.tab.list = ['全部', ...res.data];
+					page: 0
-						this.teamList = res.data;
+				},
-					} else {
+				dataList: [],
-						uni.$tm.toast('友链分组数据加载失败！');
+				filterList: [],
-					}
+				poupShow: false,
-				})
+				form: {
-				.catch(err => {
+					id: undefined,
-					uni.$tm.toast('友链分组数据加载失败！');
+					description: '',
-				});
+					logo: '',
-		},
+					name: '',
-		fnGetData() {
+					team: '',
-			this.loading = 'loading';
+					url: '',
-			uni.showLoading({
+					priority: 0
-				mask: true,
+				},
-				title: '加载中...'
+				tab: {
-			});
+					activeIndex: 0,
-			this.tab.activeIndex = 0;
+					list: []
-			this.$httpApi.admin
+				},
-				.getLinkList(this.queryParams)
+				selectTeam: [],
-				.then(res => {
+				teamList: []
-					if (res.status == 200) {
-						const _dataList = res.data.map(item => {
-							item.logo = this.$utils.checkUrl(item.logo);
-							return item;
-						});
-						this.dataList = _dataList;
-						this.filterList = _dataList;
-						this.loading = 'success';
-					} else {
-						this.loading = 'error';
-						uni.$tm.toast('加载失败，请重试！');
-					}
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-					uni.$tm.toast('加载失败，请重试！');
-				})
-				.finally(() => {
-					uni.hideLoading();
-					uni.stopPullDownRefresh();
-				});
-		},
-		fnOnPoupChange(e) {
-			if (!e) {
-				this.fnResetForm();
-			}
-		},
-		fnShowFormModal(link) {
-			if (link) {
-				this.form = Object.assign({}, {}, link);
-				if (link.team) {
-					this.selectTeam = [link.team];
-				}
-			} else {
-				this.fnResetForm();
-			}
-			this.poupShow = true;
-		},
-		fnOnSelectTeam(e) {
-			this.form.team = e[0].data;
-			this.selectTeam = [e[0].data];
-		},
-		fnResetForm() {
-			this.form = {
-				id: undefined,
-				description: '',
-				logo: '',
-				name: '',
-				team: '',
-				url: '',
-				priority: 0
 			};
 		},
-		fnSubmit() {
+
-			if (this.form.name.trim() == '') {
+		onLoad() {
-				return uni.$tm.toast('友链名称未填写！');
+			this.fnSetPageTitle('友链管理');
-			}
+			this.fnGetTeamData();
-			if (this.form.id == undefined) {
-				this.$httpApi.admin
-					.addLink(this.form)
-					.then(res => {
-						if (res.status == 200) {
-							uni.$tm.toast(`保存成功！`);
-							setTimeout(() => {
-								uni.startPullDownRefresh();
-							}, 1200);
-						} else {
-							uni.$tm.toast('操作失败，请重试！');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast('操作失败，请重试！');
-					});
-			} else {
-				this.$httpApi.admin
-					.updateLink(this.form.id, this.form)
-					.then(res => {
-						if (res.status == 200) {
-							uni.$tm.toast(`保存成功！`);
-							let updateIndex = this.dataList.findIndex(x => x.id == this.form.id);
-							this.$set(this.dataList, updateIndex, this.form);
-						} else {
-							uni.$tm.toast('操作失败，请重试！');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast('操作失败，请重试！');
-					});
-			}
 		},
-		// 删除
+		created() {
-		fnDelete(link) {
+			this.fnGetData();
-			const _link = link || this.form;
+		},
-			uni.$eShowModal({
+		onPullDownRefresh() {
-				title: '提示',
+			this.fnGetData();
-				content: `您是否要将 ${_link.name} 删除？`,
+		},
-				showCancel: true,
+		methods: {
-				cancelText: '否',
+			fnOnTabChange(index) {
-				cancelColor: '#999999',
+				this.fnResetSetAniWaitIndex();
-				confirmText: '是',
+				this.fnToTopPage();
-				confirmColor: '#03a9f4'
+				let _filterData = [];
-			})
+				if (index == 0) {
-				.then(res => {
+					_filterData = this.dataList;
+				} else {
+					_filterData = this.dataList.filter(x => x.team == this.teamList[index - 1]);
+				}
+				this.filterList = JSON.parse(JSON.stringify(_filterData));
+			},
+			fnGetTeamData() {
+				this.$httpApi.admin
+					.getLinkTeamList()
+					.then(res => {
+						if (res.status == 200) {
+							this.tab.list = ['全部', ...res.data];
+							this.teamList = res.data;
+						} else {
+							uni.$tm.toast('友链分组数据加载失败！');
+						}
+					})
+					.catch(err => {
+						uni.$tm.toast('友链分组数据加载失败！');
+					});
+			},
+			fnGetData() {
+				this.loading = 'loading';
+				uni.showLoading({
+					mask: true,
+					title: '加载中...'
+				});
+				this.tab.activeIndex = 0;
+				this.$httpApi.admin
+					.getLinkList(this.queryParams)
+					.then(res => {
+						if (res.status == 200) {
+							const _dataList = res.data.map(item => {
+								item.logo = this.$utils.checkUrl(item.logo);
+								return item;
+							});
+							this.dataList = _dataList;
+							this.filterList = _dataList;
+							this.loading = 'success';
+						} else {
+							this.loading = 'error';
+							uni.$tm.toast('加载失败，请重试！');
+						}
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						uni.$tm.toast('加载失败，请重试！');
+					})
+					.finally(() => {
+						uni.hideLoading();
+						uni.stopPullDownRefresh();
+					});
+			},
+			fnOnPoupChange(e) {
+				if (!e) {
+					this.fnResetForm();
+				}
+			},
+			fnShowFormModal(link) {
+				if (link) {
+					this.form = Object.assign({}, {}, link);
+					if (link.team) {
+						this.selectTeam = [link.team];
+					}
+				} else {
+					this.fnResetForm();
+				}
+				this.poupShow = true;
+			},
+			fnOnSelectTeam(e) {
+				this.form.team = e[0].data;
+				this.selectTeam = [e[0].data];
+			},
+			fnResetForm() {
+				this.form = {
+					id: undefined,
+					description: '',
+					logo: '',
+					name: '',
+					team: '',
+					url: '',
+					priority: 0
+				};
+			},
+			fnSubmit() {
+				if (this.form.name.trim() == '') {
+					return uni.$tm.toast('友链名称未填写！');
+				}
+				if (this.form.id == undefined) {
 					this.$httpApi.admin
-						.deleteLink(_link.id)
+						.addLink(this.form)
 						.then(res => {
 							if (res.status == 200) {
-								uni.$tm.toast(`${_link.name} 已删除！`);
+								uni.$tm.toast(`保存成功！`);
-								const delIndex = this.dataList.findIndex(x => x.id == _link.id);
+								setTimeout(() => {
-								this.dataList.splice(delIndex, 1);
+									uni.startPullDownRefresh();
+								}, 1200);
 							} else {
 								uni.$tm.toast('操作失败，请重试！');
 							}
@@ -369,78 +282,134 @@ export default {
 						.catch(err => {
 							uni.$tm.toast('操作失败，请重试！');
 						});
-				})
+				} else {
-				.catch(err => {});
+					this.$httpApi.admin
+						.updateLink(this.form.id, this.form)
+						.then(res => {
+							if (res.status == 200) {
+								uni.$tm.toast(`保存成功！`);
+								let updateIndex = this.dataList.findIndex(x => x.id == this.form.id);
+								this.$set(this.dataList, updateIndex, this.form);
+							} else {
+								uni.$tm.toast('操作失败，请重试！');
+							}
+						})
+						.catch(err => {
+							uni.$tm.toast('操作失败，请重试！');
+						});
+				}
+			},
+			// 删除
+			fnDelete(link) {
+				const _link = link || this.form;
+				uni.$eShowModal({
+						title: '提示',
+						content: `您是否要将 ${_link.name} 删除？`,
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						this.$httpApi.admin
+							.deleteLink(_link.id)
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast(`${_link.name} 已删除！`);
+									const delIndex = this.dataList.findIndex(x => x.id == _link.id);
+									this.dataList.splice(delIndex, 1);
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
+								uni.$tm.toast('操作失败，请重试！');
+							});
+					})
+					.catch(err => {});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-}
-.loading-wrap {
-	padding: 24rpx;
-	.loading-error {
-		height: 65vh;
 	}
-}
-.link-card {
-	box-sizing: border-box;
-	box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
-	.head {
-		.left {
-			width: 166rpx;
-			height: 166rpx;
-			.logo {
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.right {
-			width: 0;
-			flex-grow: 1;
 
-			.name {
+	.loading-wrap {
-				width: 0;
+		padding: 24rpx;
-				flex-grow: 1;
+
-				display: flex;
+		.loading-error {
-				align-items: center;
+			height: 65vh;
-			}
-			.label {
-				width: 84rpx;
-			}
-			.value {
-				width: 0;
-				flex-grow: 1;
-			}
 		}
 	}
-	.foot {
+
+	.link-card {
 		box-sizing: border-box;
-		// border-top: 2rpx solid rgba(0, 0, 0, 0.03);
+		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;
+
+				.name {
+					width: 0;
+					flex-grow: 1;
+					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;
+		overflow: hidden;
-}
+	}
-.poup-body {
-	height: 71vh;
-	box-sizing: border-box;
-	touch-action: none;
-}
-.thumbnail {
-	width: 100%;
-	height: 260rpx;
-}
 
-.update-btn {
+	.poup-body {
-	background-color: rgba(240, 250, 255, 1);
+		height: 71vh;
-}
+		box-sizing: border-box;
-.del-btn {
+		touch-action: none;
-	background-color: rgba(254, 241, 240, 1) !important;
+	}
-}
+
+	.thumbnail {
+		width: 100%;
+		height: 260rpx;
+	}
+
+	.update-btn {
+		background-color: rgba(240, 250, 255, 1);
+	}
+
+	.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,245 +59,251 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmEmpty,
+			tmEmpty,
-		tmButton,
+			tmButton,
-		tmTags,
+			tmTags,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmTranslate
+			tmTranslate
-	},
+		},
-	data() {
+		data() {
-		return {
+			return {
-			loading: 'loading',
+				loading: 'loading',
 
-			queryParams: {
+				queryParams: {
-				size: 8,
+					size: 8,
-				page: 0,
+					page: 0,
-				sort: undefined
+					sort: undefined
-			},
+				},
 
-			result: {},
+				result: {},
-			dataList: [],
+				dataList: [],
-			total: 0,
+				total: 0,
-			isLoadMore: false,
+				isLoadMore: false,
-			loadMoreText: '加载中...'
+				loadMoreText: '加载中...'
-		};
-	},
-	filters: {
-		formatLogType(val) {
-			const logTypes = {
-				BLOG_INITIALIZED: {
-					value: 0,
-					text: '博客初始化'
-				},
-				POST_PUBLISHED: {
-					value: 5,
-					text: '文章发布'
-				},
-				POST_EDITED: {
-					value: 15,
-					text: '文章修改'
-				},
-				POST_DELETED: {
-					value: 20,
-					text: '文章删除'
-				},
-				LOGGED_IN: {
-					value: 25,
-					text: '用户登录'
-				},
-				LOGGED_OUT: {
-					value: 30,
-					text: '注销登录'
-				},
-				LOGIN_FAILED: {
-					value: 35,
-					text: '登录失败'
-				},
-				PASSWORD_UPDATED: {
-					value: 40,
-					text: '修改密码'
-				},
-				PROFILE_UPDATED: {
-					value: 45,
-					text: '资料修改'
-				},
-				SHEET_PUBLISHED: {
-					value: 50,
-					text: '页面发布'
-				},
-				SHEET_EDITED: {
-					value: 55,
-					text: '页面修改'
-				},
-				SHEET_DELETED: {
-					value: 60,
-					text: '页面删除'
-				},
-				MFA_UPDATED: {
-					value: 65,
-					text: '两步验证'
-				},
-				LOGGED_PRE_CHECK: {
-					value: 70,
-					text: '登录验证'
-				}
 			};
-			return logTypes[val].text;
+		},
-		}
+		filters: {
-	},
+			formatLogType(val) {
-
+				const logTypes = {
-	onLoad() {
+					BLOG_INITIALIZED: {
-		this.fnSetPageTitle('日志管理');
+						value: 0,
-	},
+						text: '博客初始化'
-	created() {
+					},
-		this.fnGetData();
+					POST_PUBLISHED: {
-	},
+						value: 5,
-	onPullDownRefresh() {
+						text: '文章发布'
-		this.queryParams.page = 0;
+					},
-		this.dataList = [];
+					POST_EDITED: {
-		this.fnGetData();
+						value: 15,
-	},
+						text: '文章修改'
-	onReachBottom(e) {
+					},
-		if (this.result.hasNext) {
+					POST_DELETED: {
-			this.queryParams.page += 1;
+						value: 20,
-			this.isLoadMore = true;
+						text: '文章删除'
-			this.fnGetData();
+					},
-		} else {
+					LOGGED_IN: {
-			uni.showToast({
+						value: 25,
-				icon: 'none',
+						text: '用户登录'
-				title: '没有更多数据了'
+					},
-			});
+					LOGGED_OUT: {
-		}
+						value: 30,
-	},
+						text: '注销登录'
-	methods: {
+					},
-		fnGetData() {
+					LOGIN_FAILED: {
-			uni.showLoading({
+						value: 35,
-				mask: true,
+						text: '登录失败'
-				title: '加载中...'
+					},
-			});
+					PASSWORD_UPDATED: {
-			// 设置状态为加载中
+						value: 40,
-			if (!this.isLoadMore) {
+						text: '修改密码'
-				this.loading = 'loading';
+					},
-			}
+					PROFILE_UPDATED: {
-			this.loadMoreText = '加载中...';
+						value: 45,
-			this.$httpApi.admin
+						text: '资料修改'
-				.getLogsListByPage(this.queryParams)
+					},
-				.then(res => {
+					SHEET_PUBLISHED: {
-					if (res.status == 200) {
+						value: 50,
-						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+						text: '页面发布'
-						this.result = res.data;
+					},
-						this.total = res.data.total;
+					SHEET_EDITED: {
-						const _tempDataList = res.data.content.map(item => {
+						value: 55,
-							item['time'] = uni.$tm.dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss');
+						text: '页面修改'
-							return item;
+					},
-						});
+					SHEET_DELETED: {
-						if (this.isLoadMore) {
+						value: 60,
-							this.dataList = this.dataList.concat(_tempDataList);
+						text: '页面删除'
-						} else {
+					},
-							this.dataList = _tempDataList;
+					MFA_UPDATED: {
-						}
+						value: 65,
-						this.loading = 'success';
+						text: '两步验证'
-					} else {
+					},
-						uni.$tm.toast('加载失败，请重试！');
+					LOGGED_PRE_CHECK: {
-						thi.loading = 'error';
+						value: 70,
+						text: '登录验证'
 					}
-				})
+				};
-				.catch(err => {
+				return logTypes[val].text;
-					console.error(err);
+			}
-					uni.$tm.toast('加载失败，请重试！');
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 300);
-				});
 		},
 
-		// 删除
+		onLoad() {
-		fnOnClear() {
+			this.fnSetPageTitle('日志管理');
-			uni.$eShowModal({
+		},
-				title: '提示',
+		created() {
-				content: `您确定要清空所有的日志记录吗？`,
+			this.fnGetData();
-				showCancel: true,
+		},
-				cancelText: '否',
+		onPullDownRefresh() {
-				cancelColor: '#999999',
+			this.queryParams.page = 0;
-				confirmText: '是',
+			this.dataList = [];
-				confirmColor: '#03a9f4'
+			this.fnGetData();
-			})
+		},
-				.then(res => {
+		onReachBottom(e) {
-					uni.showLoading({
+			if (this.result.hasNext) {
-						mask: true,
+				this.queryParams.page += 1;
-						title: '正在清空...'
+				this.isLoadMore = true;
-					});
+				this.fnGetData();
-					this.$httpApi.admin
+			} else {
-						.deleteAllLogs()
+				uni.showToast({
-						.then(res => {
+					icon: 'none',
-							if (res.status == 200) {
+					title: '没有更多数据了'
-								uni.$tm.toast('操作成功！');
+				});
-								setTimeout(() => {
+			}
-									this.queryParams.page = 0;
+		},
-									this.dataList = [];
+		methods: {
-									this.fnGetData();
+			fnGetData() {
-								}, 1000);
+				uni.showLoading({
+					mask: true,
+					title: '加载中...'
+				});
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi.admin
+					.getLogsListByPage(this.queryParams)
+					.then(res => {
+						if (res.status == 200) {
+							this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+							this.result = res.data;
+							this.total = res.data.total;
+							const _tempDataList = res.data.content.map(item => {
+								item['time'] = uni.$tm.dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss');
+								return item;
+							});
+							if (this.isLoadMore) {
+								this.dataList = this.dataList.concat(_tempDataList);
 							} else {
-								uni.$tm.toast('操作失败，请重试！');
+								this.dataList = _tempDataList;
 							}
-						})
+							this.loading = 'success';
-						.catch(err => {
+						} else {
-							console.error(err);
+							uni.$tm.toast('加载失败，请重试！');
-							uni.$tm.toast('操作失败，请重试！');
+							thi.loading = 'error';
+						}
+					})
+					.catch(err => {
+						console.error(err);
+						uni.$tm.toast('加载失败，请重试！');
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 300);
+					});
+			},
+
+			// 删除
+			fnOnClear() {
+				uni.$eShowModal({
+						title: '提示',
+						content: `您确定要清空所有的日志记录吗？`,
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						uni.showLoading({
+							mask: true,
+							title: '正在清空...'
 						});
-				})
+						this.$httpApi.admin
-				.catch(err => {});
+							.deleteAllLogs()
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast('操作成功！');
+									setTimeout(() => {
+										this.queryParams.page = 0;
+										this.dataList = [];
+										this.fnGetData();
+									}, 1000);
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
+								console.error(err);
+								uni.$tm.toast('操作失败，请重试！');
+							});
+					})
+					.catch(err => {});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-}
+	}
-.loading-wrap {
+
-	padding: 24rpx;
+	.loading-wrap {
-}
+		padding: 24rpx;
-.page-content {
+	}
-}
+
-.content-empty {
+	.page-content {}
-	width: 100vw;
+
-	height: 65vh;
+	.content-empty {
-}
+		width: 100vw;
-.card {
+		height: 65vh;
-	box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
+	}
-}
+
-.desc-item {
+	.card {
-	.desc-label {
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
-		width: 150rpx;
+	}
-		position: relative;
+
-		&::after {
+	.desc-item {
-			content: '：';
+		.desc-label {
-			position: absolute;
+			width: 150rpx;
-			right: 0px;
+			position: relative;
-			top: 0rpx;
+
+			&::after {
+				content: '：';
+				position: absolute;
+				right: 0px;
+				top: 0rpx;
+			}
+		}
+
+		.desc-value {
+			word-wrap: break-word;
+			word-break: break-all;
+			padding-left: 6rpx;
 		}
 	}
-	.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,316 +95,273 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmButton,
+			tmButton,
-		tmSearch,
+			tmSearch,
-		tmTabs,
+			tmTabs,
-		tmEmpty,
+			tmEmpty,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmTranslate,
+			tmTranslate,
-		tmPoup,
+			tmPoup,
-		tmInput,
+			tmInput,
-		tmPickersDate,
+			tmPickersDate,
-		tmPickers,
+			tmPickers,
-		AttachmentSelect
+			AttachmentSelect
-	},
+		},
-	data() {
+		data() {
-		return {
+			return {
-			loading: 'loading',
+				loading: 'loading',
-			team: {
+				team: {
-				activeIndex: 0,
+					activeIndex: 0,
-				list: [],
+					list: [],
-				selected: [],
+					selected: [],
-				selectList: []
+					selectList: []
-			},
+				},
-			queryParams: {
+				queryParams: {
-				size: 10,
+					size: 10,
-				page: 0,
+					page: 0,
-				sort: 'createTime,desc',
+					sort: 'createTime,desc',
-				sort: 'id,asc'
+					sort: 'id,asc'
-			},
+				},
-			result: null,
+				result: null,
-			dataList: [],
+				dataList: [],
-			total: 0,
+				total: 0,
-			isLoadMore: false,
+				isLoadMore: false,
-			loadMoreText: '加载中...',
+				loadMoreText: '加载中...',
 
-			poupShow: false,
+				poupShow: false,
-			attachmentsSelectShow: false,
+				attachmentsSelectShow: false,
-			selectAttachmentsType: 'url',
+				selectAttachmentsType: 'url',
-			takeTime: undefined,
-			form: {
-				id: undefined,
-				location: undefined,
-				name: undefined,
 				takeTime: undefined,
-				team: undefined,
+				form: {
-				thumbnail: undefined,
+					id: undefined,
-				url: undefined,
+					location: undefined,
-				description: undefined
+					name: undefined,
-			},
+					takeTime: undefined,
-			poupBodyScrollTop: 0
+					team: undefined,
-		};
+					thumbnail: undefined,
-	},
+					url: undefined,
+					description: undefined
+				},
+				poupBodyScrollTop: 0
+			};
+		},
 
-	onLoad() {
+		onLoad() {
-		this.fnSetPageTitle('图库管理');
+			this.fnSetPageTitle('图库管理');
-		this.fnGetTeamList();
+			this.fnGetTeamList();
-	},
-	created() {
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.queryParams.page = 0;
-		this.dataList = [];
-		this.fnGetData();
-	},
-	onReachBottom(e) {
-		if (this.result.hasNext) {
-			this.queryParams.page += 1;
-			this.isLoadMore = true;
-			this.fnGetData();
-		} else {
-			uni.showToast({
-				icon: 'none',
-				title: '没有更多数据了'
-			});
-		}
-	},
-	methods: {
-		// 获取分类列表
-		fnGetTeamList() {
-			this.$httpApi.admin
-				.getPhotosTeams()
-				.then(res => {
-					if (res.status == 200) {
-						let _list = res.data;
-						this.team.selectList = _list.map((item, index) => {
-							return {
-								id: index,
-								name: item,
-								value: item
-							};
-						});
-						if (_list.length > 1) {
-							_list.unshift('全部');
-							this.team.list = _list;
-						}
-					}
-				})
-				.catch(err => {});
 		},
-		fnOnSearch() {
+		created() {
-			this.queryParams.page = 0;
-			this.isLoadMore = false;
-			this.fnToTopPage();
 			this.fnGetData();
 		},
-		fnOnTabChange(index) {
+		onPullDownRefresh() {
-			this.queryParams.team = index == 0 ? undefined : this.team.list[index];
 			this.queryParams.page = 0;
 			this.dataList = [];
-			this.fnToTopPage();
 			this.fnGetData();
 		},
-		fnOnTakeTimeConfirm(e) {
+		onReachBottom(e) {
-			this.takeTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.min}:${e.sec}`;
+			if (this.result.hasNext) {
-			this.form.takeTime = new Date(this.takeTime).getTime();
+				this.queryParams.page += 1;
-		},
+				this.isLoadMore = true;
-		fnOnSelectTeamConfirm(e) {
+				this.fnGetData();
-			const _select = e[0].data;
+			} else {
-			this.form.team = _select.value;
+				uni.showToast({
-		},
+					icon: 'none',
-		fnGetData() {
+					title: '没有更多数据了'
-			uni.showLoading({
+				});
-				mask: true,
-				title: '加载中...'
-			});
-			// 设置状态为加载中
-			if (!this.isLoadMore) {
-				this.loading = 'loading';
 			}
-			this.loadMoreText = '加载中...';
+		},
-			this.$httpApi.admin
+		methods: {
-				.getPhotos(this.queryParams)
+			// 获取分类列表
-				.then(res => {
+			fnGetTeamList() {
-					if (res.status == 200) {
+				this.$httpApi.admin
-						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+					.getPhotosTeams()
-						this.result = res.data;
+					.then(res => {
-						this.total = res.data.total;
+						if (res.status == 200) {
-						let _list = res.data.content.map(item => {
+							let _list = res.data;
-							// 处理显示的图片
+							this.team.selectList = _list.map((item, index) => {
-							item['showThumbnail'] = this.$utils.checkThumbnailUrl(item.thumbnail);
+								return {
-							return item;
+									id: index,
-						});
+									name: item,
-
+									value: item
-						if (this.isLoadMore) {
+								};
-							this.dataList = this.dataList.concat(_list);
+							});
-						} else {
+							if (_list.length > 1) {
-							this.dataList = _list;
+								_list.unshift('全部');
+								this.team.list = _list;
+							}
 						}
-						this.loading = 'success';
+					})
-					} else {
+					.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 = [];
+				this.fnToTopPage();
+				this.fnGetData();
+			},
+			fnOnTakeTimeConfirm(e) {
+				this.takeTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.min}:${e.sec}`;
+				this.form.takeTime = new Date(this.takeTime).getTime();
+			},
+			fnOnSelectTeamConfirm(e) {
+				const _select = e[0].data;
+				this.form.team = _select.value;
+			},
+			fnGetData() {
+				uni.showLoading({
+					mask: true,
+					title: '加载中...'
+				});
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi.admin
+					.getPhotos(this.queryParams)
+					.then(res => {
+						if (res.status == 200) {
+							this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+							this.result = res.data;
+							this.total = res.data.total;
+							let _list = res.data.content.map(item => {
+								// 处理显示的图片
+								item['showThumbnail'] = this.$utils.checkThumbnailUrl(item.thumbnail);
+								return item;
+							});
+
+							if (this.isLoadMore) {
+								this.dataList = this.dataList.concat(_list);
+							} else {
+								this.dataList = _list;
+							}
+							this.loading = 'success';
+						} else {
+							uni.$tm.toast('加载失败，请重试！');
+							this.loading = 'error';
+						}
+					})
+					.catch(err => {
+						console.error(err);
 						uni.$tm.toast('加载失败，请重试！');
 						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 300);
+					});
+			},
+			fnOnAttachmentsSelectClose() {
+				this.attachmentsSelectShow = false;
+			},
+			fnOnPoupBodyScroll(e) {
+				throttle(() => {
+					this.poupBodyScrollTop = e.detail.scrollTop;
+				}, 1000);
+			},
+			fnOnPoupChange(e) {
+				if (!e) {
+					this.fnResetForm();
+				}
+			},
+			fnOnUrlInputChange() {
+				if (this.form.url) {
+					this.$set(this.form, 'showThumbnail', this.$utils.checkThumbnailUrl(this.form.url));
+				}
+			},
+			fnShowAttachmentsSelect(type) {
+				this.selectAttachmentsType = type;
+				this.attachmentsSelectShow = true;
+			},
+			// 监听附件选择
+			fnOnAttachmentsSelect(file) {
+				if (this.selectAttachmentsType == 'url') {
+					this.form.url = file.path;
+					this.form.showThumbnail = this.$utils.checkThumbnailUrl(file.path);
+					if (!this.form.thumbnail) {
+						this.form.thumbnail = file.path;
 					}
-				})
+				} else {
-				.catch(err => {
-					console.error(err);
-					uni.$tm.toast('加载失败，请重试！');
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 300);
-				});
-		},
-		fnOnAttachmentsSelectClose() {
-			this.attachmentsSelectShow = false;
-		},
-		fnOnPoupBodyScroll(e) {
-			throttle(() => {
-				this.poupBodyScrollTop = e.detail.scrollTop;
-			}, 1000);
-		},
-		fnOnPoupChange(e) {
-			if (!e) {
-				this.fnResetForm();
-			}
-		},
-		fnOnUrlInputChange() {
-			if (this.form.url) {
-				this.$set(this.form, 'showThumbnail', this.$utils.checkThumbnailUrl(this.form.url));
-			}
-		},
-		fnShowAttachmentsSelect(type) {
-			this.selectAttachmentsType = type;
-			this.attachmentsSelectShow = true;
-		},
-		// 监听附件选择
-		fnOnAttachmentsSelect(file) {
-			if (this.selectAttachmentsType == 'url') {
-				this.form.url = file.path;
-				this.form.showThumbnail = this.$utils.checkThumbnailUrl(file.path);
-				if (!this.form.thumbnail) {
 					this.form.thumbnail = file.path;
 				}
-			} else {
+				this.attachmentsSelectShow = false;
-				this.form.thumbnail = file.path;
+			},
-			}
+			fnResetForm() {
-			this.attachmentsSelectShow = false;
+				this.form = { id: undefined, location: undefined, name: undefined, takeTime: undefined, team: undefined, thumbnail: undefined, url: undefined, description: undefined };
-		},
+				this.takeTime = uni.$tm.dayjs(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss');
-		fnResetForm() {
+			},
-			this.form = { id: undefined, location: undefined, name: undefined, takeTime: undefined, team: undefined, thumbnail: undefined, url: undefined, description: undefined };
+			fnEdit(item) {
-			this.takeTime = uni.$tm.dayjs(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss');
+				this.poupBodyScrollTop = 0;
-		},
+				if (!item.takeTime) {
-		fnEdit(item) {
+					item.takeTime = new Date().getTime();
-			this.poupBodyScrollTop = 0;
+				}
-			if (!item.takeTime) {
+				this.takeTime = uni.$tm.dayjs(item.takeTime).format('YYYY-MM-DD HH:mm:ss');
-				item.takeTime = new Date().getTime();
+				this.form = item;
-			}
+				if (this.form.team) {
-			this.takeTime = uni.$tm.dayjs(item.takeTime).format('YYYY-MM-DD HH:mm:ss');
+					this.team.selected = [this.team.selectList.findIndex(x => x.name == this.form.team)];
-			this.form = item;
+				} else {
-			if (this.form.team) {
+					this.team.selected = [];
-				this.team.selected = [this.team.selectList.findIndex(x => x.name == this.form.team)];
+				}
-			} else {
+				this.poupShow = true;
-				this.team.selected = [];
+			},
-			}
+			// 新增
-			this.poupShow = true;
+			fnAdd() {
-		},
+				this.fnResetForm();
-		// 新增
+				this.poupBodyScrollTop = 0;
-		fnAdd() {
+				this.poupShow = true;
-			this.fnResetForm();
+			},
-			this.poupBodyScrollTop = 0;
+			// 保存
-			this.poupShow = true;
+			fnSave() {
-		},
+				if (!this.form.name) {
-		// 保存
+					return uni.$tm.toast('请填写图片名称！');
-		fnSave() {
+				}
-			if (!this.form.name) {
+				if (!this.$utils.checkIsUrl(this.form.url)) {
-				return uni.$tm.toast('请填写图片名称！');
+					return uni.$tm.toast('请选择或输入正确的图片地址！');
-			}
+				}
-			if (!this.$utils.checkIsUrl(this.form.url)) {
+				if (!this.$utils.checkIsUrl(this.form.thumbnail)) {
-				return uni.$tm.toast('请选择或输入正确的图片地址！');
+					return uni.$tm.toast('请选择或输入正确的缩略图地址！');
-			}
+				}
-			if (!this.$utils.checkIsUrl(this.form.thumbnail)) {
+				if (this.form.id == undefined) {
-				return uni.$tm.toast('请选择或输入正确的缩略图地址！');
-			}
-			if (this.form.id == undefined) {
-				this.$httpApi.admin
-					.createPhotos(this.form)
-					.then(res => {
-						if (res.status == 200) {
-							uni.$tm.toast(`保存成功！`);
-							this.poupShow = false;
-							setTimeout(() => {
-								this.fnResetForm();
-								this.fnGetTeamList();
-								uni.startPullDownRefresh();
-							}, 1000);
-						} else {
-							uni.$tm.toast('操作失败，请重试！');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast('操作失败，请重试！');
-					});
-			} else {
-				this.$httpApi.admin
-					.updatePhotosById(this.form.id, this.form)
-					.then(res => {
-						if (res.status == 200) {
-							uni.$tm.toast(`保存成功！`);
-							let updateIndex = this.dataList.findIndex(x => x.id == this.form.id);
-							this.$set(this.dataList, updateIndex, this.form);
-							setTimeout(() => {
-								this.fnGetTeamList();
-							}, 500);
-						} else {
-							uni.$tm.toast('操作失败，请重试！');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast('操作失败，请重试！');
-					});
-			}
-		},
-		// 删除
-		fnDelete(item, index) {
-			uni.$eShowModal({
-				title: '提示',
-				content: `您是否删除名为 ${item.name} 的图片？`,
-				showCancel: true,
-				cancelText: '否',
-				cancelColor: '#999999',
-				confirmText: '是',
-				confirmColor: '#03a9f4'
-			})
-				.then(res => {
 					this.$httpApi.admin
-						.deletePhotosById(item.id)
+						.createPhotos(this.form)
 						.then(res => {
 							if (res.status == 200) {
-								uni.$tm.toast(`${item.name} 分类已删除！`);
+								uni.$tm.toast(`保存成功！`);
-								this.dataList.splice(index, 1);
+								this.poupShow = false;
+								setTimeout(() => {
+									this.fnResetForm();
+									this.fnGetTeamList();
+									uni.startPullDownRefresh();
+								}, 1000);
 							} else {
 								uni.$tm.toast('操作失败，请重试！');
 							}
@@ -498,56 +369,108 @@ export default {
 						.catch(err => {
 							uni.$tm.toast('操作失败，请重试！');
 						});
-				})
+				} else {
-				.catch(err => {});
+					this.$httpApi.admin
-		},
+						.updatePhotosById(this.form.id, this.form)
-		// 预览
+						.then(res => {
-		fnPreview(item, index) {
+							if (res.status == 200) {
-			uni.previewImage({
+								uni.$tm.toast(`保存成功！`);
-				current: index,
+								let updateIndex = this.dataList.findIndex(x => x.id == this.form.id);
-				urls: this.dataList.map(x => x.url),
+								this.$set(this.dataList, updateIndex, this.form);
-				indicator: 'number',
+								setTimeout(() => {
-				loop: true
+									this.fnGetTeamList();
-			});
+								}, 500);
+							} else {
+								uni.$tm.toast('操作失败，请重试！');
+							}
+						})
+						.catch(err => {
+							uni.$tm.toast('操作失败，请重试！');
+						});
+				}
+			},
+			// 删除
+			fnDelete(item, index) {
+				uni.$eShowModal({
+						title: '提示',
+						content: `您是否删除名为 ${item.name} 的图片？`,
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						this.$httpApi.admin
+							.deletePhotosById(item.id)
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast(`${item.name} 分类已删除！`);
+									this.dataList.splice(index, 1);
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
+								uni.$tm.toast('操作失败，请重试！');
+							});
+					})
+					.catch(err => {});
+			},
+			// 预览
+			fnPreview(item, index) {
+				uni.previewImage({
+					current: index,
+					urls: this.dataList.map(x => x.url),
+					indicator: 'number',
+					loop: true
+				});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-}
-.loading-wrap {
-	padding: 24rpx;
-	.loading-error {
-		height: 65vh;
 	}
-}
-.btn-wrap {
-	box-sizing: border-box;
-	padding-top: 12rpx;
-	padding-bottom: 12rpx;
-	box-shadow: 0rpx -4rpx 24rpx rgba(0, 0, 0, 0.05);
-}
-.card {
-	box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
-}
-.thumbnail {
-	width: 100%;
-	&-img {
-		width: 100%;
-		height: 300rpx;
-	}
-}
 
-.poup-content {
+	.loading-wrap {
-	overflow: hidden;
+		padding: 24rpx;
-}
+
-.poup-body {
+		.loading-error {
-	height: 69vh;
+			height: 65vh;
-	box-sizing: border-box;
+		}
-	touch-action: none;
+	}
-}
+
+	.btn-wrap {
+		box-sizing: border-box;
+		padding-top: 12rpx;
+		padding-bottom: 12rpx;
+		box-shadow: 0rpx -4rpx 24rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.card {
+		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.thumbnail {
+		width: 100%;
+
+		&-img {
+			width: 100%;
+			height: 300rpx;
+		}
+	}
+
+	.poup-content {
+		overflow: hidden;
+	}
+
+	.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,206 +83,162 @@
 </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: {
+		components: {
-		tmSkeleton,
+			tmSkeleton,
-		tmButton,
+			tmButton,
-		tmEmpty,
+			tmEmpty,
-		tmTabs,
+			tmTabs,
-		tmTranslate,
+			tmTranslate,
-		tmFlotbutton,
+			tmFlotbutton,
-		tmTags,
+			tmTags,
-		tmPoup,
+			tmPoup,
-		tmInput,
+			tmInput,
-		tColorPicker,
+			tColorPicker,
-		AttachmentSelect
+			AttachmentSelect
-	},
-	data() {
-		return {
-			loading: 'loading',
-			queryParams: {
-				size: 10,
-				page: 0,
-				more: true
-			},
-			dataList: [],
-			poupShow: false,
-			selectColor: { r: 255, g: 255, b: 255, a: 1 },
-			attachmentsSelectShow: false,
-			form: {
-				color: undefined,
-				createTime: undefined,
-				fullPath: undefined,
-				id: undefined,
-				name: '',
-				slug: undefined,
-				thumbnail: undefined,
-				showThumbnail: undefined
-			}
-		};
-	},
-
-	onLoad() {
-		this.fnSetPageTitle('标签管理');
-	},
-	created() {
-		this.fnGetData();
-	},
-	onPullDownRefresh() {
-		this.isLoadMore = false;
-		this.queryParams.page = 0;
-		this.fnGetData();
-	},
-
-	methods: {
-		fnGetData() {
-			uni.showLoading({
-				mask: true,
-				title: '加载中...'
-			});
-			// 设置状态为加载中
-			if (!this.isLoadMore) {
-				this.loading = 'loading';
-			}
-			this.loadMoreText = '加载中...';
-			this.$httpApi.admin
-				.getTagsList(this.queryParams)
-				.then(res => {
-					this.loading = 'success';
-					this.dataList = res.data.map(item => {
-						if (item.thumbnail) {
-							item['showThumbnail'] = this.$utils.checkThumbnailUrl(item.thumbnail);
-						} else {
-							item['showThumbnail'] = '';
-						}
-						return item;
-					});
-				})
-				.catch(err => {
-					console.error(err);
-					this.loading = 'error';
-					this.loadMoreText = '加载失败，请下拉刷新！';
-				})
-				.finally(() => {
-					setTimeout(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					}, 800);
-				});
 		},
-
+		data() {
-		fnSelectColor() {
+			return {
-			this.$refs.colorPicker.open();
+				loading: 'loading',
-		},
+				queryParams: {
-
+					size: 10,
-		fnOnConfirmSelectColor(e) {
+					page: 0,
-			this.selectColor = e.rgba;
+					more: true
-			this.$set(this.form, 'color', e.hex);
+				},
-		},
+				dataList: [],
-		fnOnAttachmentsSelectClose() {
+				poupShow: false,
-			this.attachmentsSelectShow = false;
+				selectColor: { r: 255, g: 255, b: 255, a: 1 },
-			console.log('this.attachmentsSelectShow', this.attachmentsSelectShow);
+				attachmentsSelectShow: false,
-		},
+				form: {
-		fnOnPoupChange(e) {
+					color: undefined,
-			if (!e) {
+					createTime: undefined,
-				this.fnResetForm();
+					fullPath: undefined,
-			}
+					id: undefined,
-		},
+					name: '',
-		// 监听附件选择
+					slug: undefined,
-		fnOnAttachmentsSelect(file) {
+					thumbnail: undefined,
-			this.form.thumbnail = file.path;
+					showThumbnail: undefined
-			this.form.showThumbnail = this.$utils.checkThumbnailUrl(file.path);
-			this.attachmentsSelectShow = false;
-		},
-		fnShowFormModal(tag) {
-			if (tag) {
-				this.form = Object.assign({}, {}, tag);
-				if (tag.thumbnail) {
-					this.form.showThumbnail = this.$utils.checkThumbnailUrl(tag.thumbnail);
 				}
-			} else {
-				this.fnResetForm();
-			}
-			this.poupShow = true;
-		},
-		fnResetForm() {
-			this.form = {
-				color: undefined,
-				createTime: undefined,
-				fullPath: undefined,
-				id: undefined,
-				name: '',
-				slug: undefined,
-				thumbnail: undefined,
-				showThumbnail: undefined
 			};
 		},
-		fnSubmit() {
+
-			if (this.form.name.trim() == '') {
+		onLoad() {
-				return uni.$tm.toast('标签名称未填写！');
+			this.fnSetPageTitle('标签管理');
-			}
-			if (this.form.id == undefined) {
-				this.$httpApi.admin
-					.createTags(this.form)
-					.then(res => {
-						if (res.status == 200) {
-							uni.$tm.toast(`保存成功！`);
-							uni.startPullDownRefresh();
-						} else {
-							uni.$tm.toast('操作失败，请重试！');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast('操作失败，请重试！');
-					});
-			} else {
-				this.$httpApi.admin
-					.updateTagsById(this.form.id, this.form)
-					.then(res => {
-						if (res.status == 200) {
-							uni.$tm.toast(`保存成功！`);
-							let updateIndex = this.dataList.findIndex(x => x.id == this.form.id);
-							this.$set(this.dataList, updateIndex, this.form);
-						} else {
-							uni.$tm.toast('操作失败，请重试！');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast('操作失败，请重试！');
-					});
-			}
 		},
-		// 删除
+		created() {
-		fnDelete(tag) {
+			this.fnGetData();
-			const _tag = tag || this.form;
+		},
-			uni.$eShowModal({
+		onPullDownRefresh() {
-				title: '提示',
+			this.isLoadMore = false;
-				content: `您是否要将 ${_tag.name} 的标签删除？`,
+			this.queryParams.page = 0;
-				showCancel: true,
+			this.fnGetData();
-				cancelText: '否',
+		},
-				cancelColor: '#999999',
+
-				confirmText: '是',
+		methods: {
-				confirmColor: '#03a9f4'
+			fnGetData() {
-			})
+				uni.showLoading({
-				.then(res => {
+					mask: true,
+					title: '加载中...'
+				});
+				// 设置状态为加载中
+				if (!this.isLoadMore) {
+					this.loading = 'loading';
+				}
+				this.loadMoreText = '加载中...';
+				this.$httpApi.admin
+					.getTagsList(this.queryParams)
+					.then(res => {
+						this.loading = 'success';
+						this.dataList = res.data.map(item => {
+							if (item.thumbnail) {
+								item['showThumbnail'] = this.$utils.checkThumbnailUrl(item.thumbnail);
+							} else {
+								item['showThumbnail'] = '';
+							}
+							return item;
+						});
+					})
+					.catch(err => {
+						console.error(err);
+						this.loading = 'error';
+						this.loadMoreText = '加载失败，请下拉刷新！';
+					})
+					.finally(() => {
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.stopPullDownRefresh();
+						}, 800);
+					});
+			},
+
+			fnSelectColor() {
+				this.$refs.colorPicker.open();
+			},
+
+			fnOnConfirmSelectColor(e) {
+				this.selectColor = e.rgba;
+				this.$set(this.form, 'color', e.hex);
+			},
+			fnOnAttachmentsSelectClose() {
+				this.attachmentsSelectShow = false;
+				console.log('this.attachmentsSelectShow', this.attachmentsSelectShow);
+			},
+			fnOnPoupChange(e) {
+				if (!e) {
+					this.fnResetForm();
+				}
+			},
+			// 监听附件选择
+			fnOnAttachmentsSelect(file) {
+				this.form.thumbnail = file.path;
+				this.form.showThumbnail = this.$utils.checkThumbnailUrl(file.path);
+				this.attachmentsSelectShow = false;
+			},
+			fnShowFormModal(tag) {
+				if (tag) {
+					this.form = Object.assign({}, {}, tag);
+					if (tag.thumbnail) {
+						this.form.showThumbnail = this.$utils.checkThumbnailUrl(tag.thumbnail);
+					}
+				} else {
+					this.fnResetForm();
+				}
+				this.poupShow = true;
+			},
+			fnResetForm() {
+				this.form = {
+					color: undefined,
+					createTime: undefined,
+					fullPath: undefined,
+					id: undefined,
+					name: '',
+					slug: undefined,
+					thumbnail: undefined,
+					showThumbnail: undefined
+				};
+			},
+			fnSubmit() {
+				if (this.form.name.trim() == '') {
+					return uni.$tm.toast('标签名称未填写！');
+				}
+				if (this.form.id == undefined) {
 					this.$httpApi.admin
-						.deleteTagsById(_tag.id)
+						.createTags(this.form)
 						.then(res => {
 							if (res.status == 200) {
-								uni.$tm.toast(`${_tag.name} 标签已删除！`);
+								uni.$tm.toast(`保存成功！`);
-								const delIndex = this.dataList.findIndex(x => x.id == _tag.id);
+								uni.startPullDownRefresh();
-								this.dataList.splice(delIndex, 1);
 							} else {
 								uni.$tm.toast('操作失败，请重试！');
 							}
@@ -315,73 +246,126 @@ export default {
 						.catch(err => {
 							uni.$tm.toast('操作失败，请重试！');
 						});
-				})
+				} else {
-				.catch(err => {});
+					this.$httpApi.admin
+						.updateTagsById(this.form.id, this.form)
+						.then(res => {
+							if (res.status == 200) {
+								uni.$tm.toast(`保存成功！`);
+								let updateIndex = this.dataList.findIndex(x => x.id == this.form.id);
+								this.$set(this.dataList, updateIndex, this.form);
+							} else {
+								uni.$tm.toast('操作失败，请重试！');
+							}
+						})
+						.catch(err => {
+							uni.$tm.toast('操作失败，请重试！');
+						});
+				}
+			},
+			// 删除
+			fnDelete(tag) {
+				const _tag = tag || this.form;
+				uni.$eShowModal({
+						title: '提示',
+						content: `您是否要将 ${_tag.name} 的标签删除？`,
+						showCancel: true,
+						cancelText: '否',
+						cancelColor: '#999999',
+						confirmText: '是',
+						confirmColor: '#03a9f4'
+					})
+					.then(res => {
+						this.$httpApi.admin
+							.deleteTagsById(_tag.id)
+							.then(res => {
+								if (res.status == 200) {
+									uni.$tm.toast(`${_tag.name} 标签已删除！`);
+									const delIndex = this.dataList.findIndex(x => x.id == _tag.id);
+									this.dataList.splice(delIndex, 1);
+								} else {
+									uni.$tm.toast('操作失败，请重试！');
+								}
+							})
+							.catch(err => {
+								uni.$tm.toast('操作失败，请重试！');
+							});
+					})
+					.catch(err => {});
+			}
 		}
-	}
+	};
-};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
+	.app-page {
-	width: 100vw;
+		width: 100vw;
-	min-height: 100vh;
+		min-height: 100vh;
-}
-.loading-wrap {
-	.loading-error {
-		height: 65vh;
 	}
-}
-.content-empty {
-	width: 100%;
-	height: 60vh;
-}
 
-.poup-content {
+	.loading-wrap {
-	overflow: hidden;
+		.loading-error {
-}
+			height: 65vh;
-.poup-body {
-	height: 58vh;
-	box-sizing: border-box;
-}
-.thumbnail {
-	width: 100%;
-	height: 260rpx;
-}
-.tags-card {
-	position: relative;
-	box-sizing: border-box;
-	box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
-	.del-icon {
-		width: 46rpx;
-		height: 46rpx;
-		position: absolute;
-		right: 24rpx;
-		top: 24rpx;
-		border-radius: 50%;
-		box-sizing: border-box;
-		border: 4rpx solid #fff;
-		background-color: #ff8177;
-		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
-		font-size: 32rpx;
-		color: #fff;
-	}
-	.left {
-		width: 160rpx;
-		height: 140rpx;
-
-		.cover {
-			width: 100%;
-			height: inherit;
-			// background-color: #788ea7;
-			background-color: #607d8b;
 		}
 	}
-	.right {
+
+	.content-empty {
+		width: 100%;
+		height: 60vh;
+	}
+
+	.poup-content {
+		overflow: hidden;
+	}
+
+	.poup-body {
+		height: 58vh;
 		box-sizing: border-box;
-		.color {
+	}
+
+	.thumbnail {
+		width: 100%;
+		height: 260rpx;
+	}
+
+	.tags-card {
+		position: relative;
+		box-sizing: border-box;
+		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
+
+		.del-icon {
+			width: 46rpx;
+			height: 46rpx;
+			position: absolute;
+			right: 24rpx;
+			top: 24rpx;
+			border-radius: 50%;
+			box-sizing: border-box;
+			border: 4rpx solid #fff;
+			background-color: #ff8177;
+			box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
+			font-size: 32rpx;
 			color: #fff;
 		}
+
+		.left {
+			width: 160rpx;
+			height: 140rpx;
+
+			.cover {
+				width: 100%;
+				height: inherit;
+				// background-color: #788ea7;
+				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"
 				}
 			}
 		}