diff --git a/api/v2/all.api.js b/api/v2/all.api.js
index 2d5890a..9106582 100644
--- a/api/v2/all.api.js
+++ b/api/v2/all.api.js
@@ -4,169 +4,170 @@
 import HaloTokenConfig from '@/config/token.config.js'
 import HttpHandler from '@/common/http/request.js'
 import {
-	getCache
+    getCache
 } from '@/utils/storage.js'
+
 export default {
-	/**
-	 * 获取文章列表
-	 * @param {Object} params 参数 
-	 */
-	getPostList: (params) => {
-		return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/posts`, params)
-	},
+    /**
+     * 获取文章列表
+     * @param {Object} params 参数
+     */
+    getPostList: (params) => {
+        return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/posts`, params)
+    },
 
-	/**
-	 * 根据名称获取文章
-	 * @param {String} name 分类名称
-	 */
-	getPostByName: (name) => {
-		return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/posts/${name}`, {}, {
-			header: {
-				'Wechat-Session-Id': uni.getStorageSync('openid'),
-			}
-		})
-	},
+    /**
+     * 根据名称获取文章
+     * @param {String} name 分类名称
+     */
+    getPostByName: (name) => {
+        return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/posts/${name}`, {}, {
+            header: {
+                'Wechat-Session-Id': uni.getStorageSync('openid'),
+            }
+        })
+    },
 
-	/**
-	 * 搜索文章
-	 * @param {Object} params 数据 
-	 */
-	getPostListByKeyword: (params) => {
-		return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/indices/post`, params)
-	},
+    /**
+     * 搜索文章
+     * @param {Object} params 数据
+     */
+    getPostListByKeyword: (params) => {
+        return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/indices/post`, params)
+    },
 
-	/**
-	 * 查询分类列表
-	 * @param {Object} params  查询参数 
-	 */
-	getCategoryList: (params) => {
-		return HttpHandler.Get('/apis/api.content.halo.run/v1alpha1/categories', params)
-	},
-	/**
-	 * 查询分类下的文章
-	 * @param {String} name  分类名称
-	 * @param {Object} params  查询参数 
-	 */
-	getCategoryPostList: (name, params) => {
-		return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/categories/${name}/posts`, params)
-	},
+    /**
+     * 查询分类列表
+     * @param {Object} params  查询参数
+     */
+    getCategoryList: (params) => {
+        return HttpHandler.Get('/apis/api.content.halo.run/v1alpha1/categories', params)
+    },
+    /**
+     * 查询分类下的文章
+     * @param {String} name  分类名称
+     * @param {Object} params  查询参数
+     */
+    getCategoryPostList: (name, params) => {
+        return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/categories/${name}/posts`, params)
+    },
 
 
-	/**
-	 * 获取评论列表接口（列表数据） 
-	 * @param {Object} params  查询参数
-	 */
-	getPostCommentList: (params) => {
-		return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/comments`, params)
-	},
+    /**
+     * 获取评论列表接口（列表数据）
+     * @param {Object} params  查询参数
+     */
+    getPostCommentList: (params) => {
+        return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/comments`, params)
+    },
 
-	/**
-	 * 获取回复列表
-	 * @param {String} commentName  名称
-	 * @param {Object} params  查询参数
-	 */
-	getPostCommentReplyList: (commentName, params) => {
-		return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/comments/${commentName}/reply`, params)
-	},
+    /**
+     * 获取回复列表
+     * @param {String} commentName  名称
+     * @param {Object} params  查询参数
+     */
+    getPostCommentReplyList: (commentName, params) => {
+        return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/comments/${commentName}/reply`, params)
+    },
 
-	// 提交评论
-	addPostComment: (data) => {
-		return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/comments`, data)
-	},
-	// 提交回复
-	addPostCommentReply: (commentName, data) => {
-		return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/comments/${commentName}/replay`, data)
-	},
+    // 提交评论
+    addPostComment: (data) => {
+        return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/comments`, data)
+    },
+    // 提交回复
+    addPostCommentReply: (commentName, data) => {
+        return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/comments/${commentName}/replay`, data)
+    },
 
-	/**
-	 * 获取标签列表
-	 * @param {Object} params  查询参数
-	 */
-	getTagList: (params) => {
-		return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/tags`, params)
-	},
+    /**
+     * 获取标签列表
+     * @param {Object} params  查询参数
+     */
+    getTagList: (params) => {
+        return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/tags`, params)
+    },
 
-	/**
-	 * 根据标签获取文章列表 
-	 * @param {String} tagName  参数
-	 * @param {Object} params  查询参数
-	 */
-	getPostByTagName: (tagName, params) => {
-		return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/tags/${tagName}/posts`, params)
-	},
+    /**
+     * 根据标签获取文章列表
+     * @param {String} tagName  参数
+     * @param {Object} params  查询参数
+     */
+    getPostByTagName: (tagName, params) => {
+        return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/tags/${tagName}/posts`, params)
+    },
 
-	/**
-	 * 获取瞬间列表
-	 */
-	getMomentList: (params) => {
-		return HttpHandler.Get(`/apis/moment.halo.run/v1alpha1/moments`, params, {
-			custom: {
-				systemToken: HaloTokenConfig.systemToken
-			}
-		})
-	},
+    /**
+     * 获取瞬间列表
+     */
+    getMomentList: (params) => {
+        return HttpHandler.Get(`/apis/moment.halo.run/v1alpha1/moments`, params, {
+            custom: {
+                systemToken: HaloTokenConfig.systemToken
+            }
+        })
+    },
 
-	/**
-	 * 查询站点统计信息
-	 */
-	getBlogStatistics: () => {
-		return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/stats/-`, {})
-	},
+    /**
+     * 查询站点统计信息
+     */
+    getBlogStatistics: () => {
+        return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/stats/-`, {})
+    },
 
 
-	/**
-	 * 获取相册分组
-	 */
-	getPhotoGroupList: (params) => {
-		return HttpHandler.Get(`/apis/core.halo.run/v1alpha1/photogroups`, params, {
-			custom: {
-				systemToken: HaloTokenConfig.systemToken
-			}
-		})
-	},
+    /**
+     * 获取相册分组
+     */
+    getPhotoGroupList: (params) => {
+        return HttpHandler.Get(`/apis/core.halo.run/v1alpha1/photogroups`, params, {
+            custom: {
+                systemToken: HaloTokenConfig.systemToken
+            }
+        })
+    },
 
 
-	/**
-	 * 根据分组获取相册
-	 */
-	getPhotoListByGroupName: (params) => {
-		return HttpHandler.Get(`/apis/console.api.photo.halo.run/v1alpha1/photos`, params, {
-			custom: {
-				systemToken: HaloTokenConfig.systemToken
-			}
-		})
-	},
+    /**
+     * 根据分组获取相册
+     */
+    getPhotoListByGroupName: (params) => {
+        return HttpHandler.Get(`/apis/console.api.photo.halo.run/v1alpha1/photos`, params, {
+            custom: {
+                systemToken: HaloTokenConfig.systemToken
+            }
+        })
+    },
 
 
-	/**
-	 * 获取友链
-	 */
-	getFriendLinkList: (params) => {
-		return HttpHandler.Get(`/apis/api.plugin.halo.run/v1alpha1/plugins/PluginLinks/links`, params)
-	},
+    /**
+     * 获取友链
+     */
+    getFriendLinkList: (params) => {
+        return HttpHandler.Get(`/apis/api.plugin.halo.run/v1alpha1/plugins/PluginLinks/links`, params)
+    },
 
 
-	/**
-	 * 校验文章访问密码
-	 */
-	checkPostVerifyCode: (verifyCode, postId) => {
-		return HttpHandler.Get(`/tools/verificationCode/check?code=${verifyCode}`, null, {
-			header: {
-				'Authorization': 'Tools工具箱插件设置的认证token',
-				'Wechat-Session-Id': uni.getStorageSync('openid'),
-				'Post-Id': postId
-			}
-		})
-	},
+    /**
+     * 校验文章访问密码
+     */
+    checkPostVerifyCode: (verifyCode, postId) => {
+        return HttpHandler.Get(`/tools/verificationCode/check?code=${verifyCode}`, null, {
+            header: {
+                'Authorization': 'Tools工具箱插件设置的认证token',
+                'Wechat-Session-Id': uni.getStorageSync('openid'),
+                'Post-Id': postId
+            }
+        })
+    },
 
-	/**
-	 * 获取文章验证码
-	 */
-	getPostVerifyCode: () => {
-		return HttpHandler.Get(`/tools/verificationCode/create`, null, {
-			header: {
-				'Authorization': 'Tools工具箱插件设置的认证token'
-			}
-		})
-	},
-}
\ No newline at end of file
+    /**
+     * 获取文章验证码
+     */
+    getPostVerifyCode: () => {
+        return HttpHandler.Get(`/tools/verificationCode/create`, null, {
+            header: {
+                'Authorization': 'Tools工具箱插件设置的认证token'
+            }
+        })
+    },
+}
diff --git a/pages.json b/pages.json
index 7afa52f..e6e5736 100644
--- a/pages.json
+++ b/pages.json
@@ -1,598 +1,647 @@
 {
-	"pages": [{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "uni-halo",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/tabbar/home/home",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom",
-				"app-plus": {
-					"pullToRefresh": {
-						"color": "#03a9f4",
-						"style": "circle"
-					}
-				}
-			}
-		}, {
-			"path": "pages/tabbar/category/category",
-			"style": {
-				"navigationBarTitleText": "分类",
-				"enablePullDownRefresh": true,
-				"app-plus": {
-					"pullToRefresh": {
-						"color": "#03a9f4",
-						"style": "circle"
-					}
-				}
-			}
-		}, {
-			"path": "pages/tabbar/gallery/gallery",
-			"style": {
-				"navigationBarTitleText": "图库",
-				"enablePullDownRefresh": true,
-				"app-plus": {
-					"pullToRefresh": {
-						"color": "#03a9f4",
-						"style": "circle"
-					}
-				}
-			}
-		}, {
-			"path": "pages/tabbar/moments/moments",
-			"style": {
-				"navigationBarTitleText": "瞬间",
-				"enablePullDownRefresh": true,
-				"app-plus": {
-					"pullToRefresh": {
-						"color": "#03a9f4",
-						"style": "circle"
-					}
-				}
-			}
-		}, {
-			"path": "pages/tabbar/about/about",
-			"style": {
-				"navigationBarTitleText": "关于",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true,
-				"app-plus": {
-					"pullToRefresh": {
-						"color": "#03a9f4",
-						"style": "circle"
-					}
-				}
-			}
-		}, {
-			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
-			"style": {
-				"disableScroll": true,
-				"app-plus": {
-					"backgroundColorTop": "transparent",
-					"background": "transparent",
-					"titleNView": false,
-					"scrollIndicator": false,
-					"popGesture": "none",
-					"animationType": "fade-in",
-					"animationDuration": 200
-				}
-			}
-		}
-	],
-	//此配置为小程序的分包加载机制。在5+App里始终为整包。
-	"subPackages": [{
-			"root": "pagesA",
-			"pages": [{
-				"path": "start/start",
-				"style": {
-					"navigationBarTitleText": "uni-halo",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
-			}, {
-				"path": "article-detail/article-detail",
-				"style": {
-					"navigationBarTitleText": "文章详情",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				}
-			}, {
-				"path": "love/love",
-				"style": {
-					"navigationBarTitleText": "恋爱日记",
-					"navigationStyle": "custom",
-					"enablePullDownRefresh": false,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				}
-			}, {
-				"path": "love/list",
-				"style": {
-					"navigationBarTitleText": "恋爱清单",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
-
-			}, {
-				"path": "love/album",
-				"style": {
-					"navigationBarTitleText": "恋爱相册",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				}
-			}, {
-				"path": "love/journey",
-				"style": {
-					"navigationBarTitleText": "我们的故事",
-					"navigationStyle": "custom",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "archives/archives",
-				"style": {
-					"navigationBarTitleText": "文章归档",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				}
-
-			}, {
-				"path": "friend-links/friend-links",
-				"style": {
-					"navigationBarTitleText": "友情链接",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				}
-			}, {
-				"path": "journal/journal",
-				"style": {
-					"navigationBarTitleText": "个人日记",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				}
-			}, {
-				"path": "articles/articles",
-				"style": {
-					"navigationBarTitleText": "文章列表",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				}
-			}, {
-				"path": "category-detail/category-detail",
-				"style": {
-					"navigationBarTitleText": "分类详情",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				}
-			}, {
-				"path": "comment/comment",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				},
-				"meta": {
-					"auth": "login"
-				}
-			}, {
-				"path": "disclaimers/disclaimers",
-				"style": {
-					"navigationBarTitleText": "免责声明",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "contact/contact",
-				"style": {
-					"navigationBarTitleText": "联系博主",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "about/about",
-				"style": {
-					"navigationBarTitleText": "关于博客",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "setting/setting",
-				"style": {
-					"navigationBarTitleText": "设置",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "tags/tags",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "tag-detail/tag-detail",
-				"style": {
-					"navigationBarTitleText": "标签详情",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				}
-			},
-			{
-				"path" : "test-page/test-page",
-				"style" : 
-				{
-					"navigationBarTitleText" : ""
-				}
-			},
-			{
-				"path": "advertise/advertise",
-				"style": {
-					"navigationBarTitleText": "广告页面",
-					"enablePullDownRefresh": false
-				}
-			}]
-		},
-		{
-			"root": "pagesB",
-			"pages": [{
-				"path": "login/login",
-				"style": {
-					"navigationBarTitleText": "登录",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
-			}, {
-				"path": "admin/admin",
-				"style": {
-					"navigationBarTitleText": "工作台",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "settings/settings",
-				"style": {
-					"navigationBarTitleText": "系统设置",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "journal/journal",
-				"style": {
-					"navigationBarTitleText": "日记管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "journal/journal-edit",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "articles/articles",
-				"style": {
-					"navigationBarTitleText": "文章管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "articles/article-edit",
-				"style": {
-					"navigationBarTitleText": "写文章",
-					"enablePullDownRefresh": false
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "articles/article-setting",
-				"style": {
-					"navigationBarTitleText": "文章设置",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "category/category",
-				"style": {
-					"navigationBarTitleText": "分类管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "tags/tags",
-				"style": {
-					"navigationBarTitleText": "标签管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "attachment/attachment",
-				"style": {
-					"navigationBarTitleText": "附件管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "links/links",
-				"style": {
-					"navigationBarTitleText": "友链管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "photos/photos",
-				"style": {
-					"navigationBarTitleText": "图库管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "photos/photos-edit",
-				"style": {
-					"navigationBarTitleText": "新增/编辑图片",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "comments/comments",
-				"style": {
-					"navigationBarTitleText": "评论管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "menus/menus",
-				"style": {
-					"navigationBarTitleText": "菜单管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "password/password",
-				"style": {
-					"navigationBarTitleText": "修改密码",
-					"enablePullDownRefresh": false
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "profile/profile",
-				"style": {
-					"navigationBarTitleText": "个人信息",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}, {
-				"path": "logs/logs",
-				"style": {
-					"navigationBarTitleText": "日志管理",
-					"enablePullDownRefresh": true,
-					"app-plus": {
-						"pullToRefresh": {
-							"color": "#03a9f4",
-							"style": "circle"
-						}
-					}
-				},
-				"meta": {
-					"auth": "admin"
-				}
-			}]
-		}, {
-			"root": "pagesC",
-			"pages": [{
-				"path": "website/website",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			}]
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-halo",
-		"navigationBarBackgroundColor": "#ffffff",
-		"backgroundColor": "#F8F8F8"
-	},
-	"tabBar": {
-		"backgroundColor": "#fff",
-		"borderStyle": "white",
-		"color": "#303133",
-		"selectedColor": "#03a9f4",
-		"list": [{
-				"iconPath": "static/tabbar/select_home.png",
-				"selectedIconPath": "static/tabbar/select_home_active.png",
-				"pagePath": "pages/tabbar/home/home",
-				"text": "首页"
-			},
-			{
-				"iconPath": "static/tabbar/select_category.png",
-				"selectedIconPath": "static/tabbar/select_category_active.png",
-				"pagePath": "pages/tabbar/category/category",
-				"text": "分类"
-			}, {
-				"iconPath": "static/tabbar/select_gallery.png",
-				"selectedIconPath": "static/tabbar/select_gallery_active.png",
-				"pagePath": "pages/tabbar/gallery/gallery",
-				"text": "图库"
-			}, {
-				"iconPath": "static/tabbar/select_links.png",
-				"selectedIconPath": "static/tabbar/select_links_active.png",
-				"pagePath": "pages/tabbar/moments/moments",
-				"text": "瞬间"
-			}, {
-				"iconPath": "static/tabbar/select_mine.png",
-				"selectedIconPath": "static/tabbar/select_mine_active.png",
-				"pagePath": "pages/tabbar/about/about",
-				"text": "关于"
-			}
-		]
-	}
-}
\ No newline at end of file
+  "pages": [
+    {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "uni-halo",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/tabbar/home/home",
+      "style": {
+        "navigationBarTitleText": "首页",
+        "enablePullDownRefresh": true,
+        "navigationStyle": "custom",
+        "app-plus": {
+          "pullToRefresh": {
+            "color": "#03a9f4",
+            "style": "circle"
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabbar/category/category",
+      "style": {
+        "navigationBarTitleText": "分类",
+        "enablePullDownRefresh": true,
+        "app-plus": {
+          "pullToRefresh": {
+            "color": "#03a9f4",
+            "style": "circle"
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabbar/gallery/gallery",
+      "style": {
+        "navigationBarTitleText": "图库",
+        "enablePullDownRefresh": true,
+        "app-plus": {
+          "pullToRefresh": {
+            "color": "#03a9f4",
+            "style": "circle"
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabbar/moments/moments",
+      "style": {
+        "navigationBarTitleText": "瞬间",
+        "enablePullDownRefresh": true,
+        "app-plus": {
+          "pullToRefresh": {
+            "color": "#03a9f4",
+            "style": "circle"
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabbar/about/about",
+      "style": {
+        "navigationBarTitleText": "关于",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": true,
+        "app-plus": {
+          "pullToRefresh": {
+            "color": "#03a9f4",
+            "style": "circle"
+          }
+        }
+      }
+    },
+    {
+      "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
+      "style": {
+        "disableScroll": true,
+        "app-plus": {
+          "backgroundColorTop": "transparent",
+          "background": "transparent",
+          "titleNView": false,
+          "scrollIndicator": false,
+          "popGesture": "none",
+          "animationType": "fade-in",
+          "animationDuration": 200
+        }
+      }
+    }
+  ],
+  //此配置为小程序的分包加载机制。在5+App里始终为整包。
+  "subPackages": [
+    {
+      "root": "pagesA",
+      "pages": [
+        {
+          "path": "start/start",
+          "style": {
+            "navigationBarTitleText": "uni-halo",
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "article-detail/article-detail",
+          "style": {
+            "navigationBarTitleText": "文章详情",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          }
+        },
+        {
+          "path": "love/love",
+          "style": {
+            "navigationBarTitleText": "恋爱日记",
+            "navigationStyle": "custom",
+            "enablePullDownRefresh": false,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          }
+        },
+        {
+          "path": "love/list",
+          "style": {
+            "navigationBarTitleText": "恋爱清单",
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "love/album",
+          "style": {
+            "navigationBarTitleText": "恋爱相册",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          }
+        },
+        {
+          "path": "love/journey",
+          "style": {
+            "navigationBarTitleText": "我们的故事",
+            "navigationStyle": "custom",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "archives/archives",
+          "style": {
+            "navigationBarTitleText": "文章归档",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          }
+        },
+        {
+          "path": "friend-links/friend-links",
+          "style": {
+            "navigationBarTitleText": "友情链接",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          }
+        },
+        {
+          "path": "journal/journal",
+          "style": {
+            "navigationBarTitleText": "个人日记",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          }
+        },
+        {
+          "path": "articles/articles",
+          "style": {
+            "navigationBarTitleText": "文章列表",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          }
+        },
+        {
+          "path": "category-detail/category-detail",
+          "style": {
+            "navigationBarTitleText": "分类详情",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          }
+        },
+        {
+          "path": "comment/comment",
+          "style": {
+            "navigationBarTitleText": "",
+            "enablePullDownRefresh": false
+          },
+          "meta": {
+            "auth": "login"
+          }
+        },
+        {
+          "path": "disclaimers/disclaimers",
+          "style": {
+            "navigationBarTitleText": "免责声明",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "contact/contact",
+          "style": {
+            "navigationBarTitleText": "联系博主",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "about/about",
+          "style": {
+            "navigationBarTitleText": "关于博客",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "setting/setting",
+          "style": {
+            "navigationBarTitleText": "设置",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "tags/tags",
+          "style": {
+            "navigationBarTitleText": "",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "tag-detail/tag-detail",
+          "style": {
+            "navigationBarTitleText": "标签详情",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          }
+        },
+        {
+          "path": "test-page/test-page",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "advertise/advertise",
+          "style": {
+            "navigationBarTitleText": "广告页面",
+            "enablePullDownRefresh": false
+          }
+        }
+      ]
+    },
+    {
+      "root": "pagesB",
+      "pages": [
+        {
+          "path": "login/login",
+          "style": {
+            "navigationBarTitleText": "登录",
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "admin/admin",
+          "style": {
+            "navigationBarTitleText": "工作台",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "settings/settings",
+          "style": {
+            "navigationBarTitleText": "系统设置",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "journal/journal",
+          "style": {
+            "navigationBarTitleText": "日记管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "journal/journal-edit",
+          "style": {
+            "navigationBarTitleText": "",
+            "enablePullDownRefresh": false,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "articles/articles",
+          "style": {
+            "navigationBarTitleText": "文章管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "articles/article-edit",
+          "style": {
+            "navigationBarTitleText": "写文章",
+            "enablePullDownRefresh": false
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "articles/article-setting",
+          "style": {
+            "navigationBarTitleText": "文章设置",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "category/category",
+          "style": {
+            "navigationBarTitleText": "分类管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "tags/tags",
+          "style": {
+            "navigationBarTitleText": "标签管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "attachment/attachment",
+          "style": {
+            "navigationBarTitleText": "附件管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "links/links",
+          "style": {
+            "navigationBarTitleText": "友链管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "photos/photos",
+          "style": {
+            "navigationBarTitleText": "图库管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "photos/photos-edit",
+          "style": {
+            "navigationBarTitleText": "新增/编辑图片",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "comments/comments",
+          "style": {
+            "navigationBarTitleText": "评论管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "menus/menus",
+          "style": {
+            "navigationBarTitleText": "菜单管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "password/password",
+          "style": {
+            "navigationBarTitleText": "修改密码",
+            "enablePullDownRefresh": false
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "profile/profile",
+          "style": {
+            "navigationBarTitleText": "个人信息",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        },
+        {
+          "path": "logs/logs",
+          "style": {
+            "navigationBarTitleText": "日志管理",
+            "enablePullDownRefresh": true,
+            "app-plus": {
+              "pullToRefresh": {
+                "color": "#03a9f4",
+                "style": "circle"
+              }
+            }
+          },
+          "meta": {
+            "auth": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pagesC",
+      "pages": [
+        {
+          "path": "website/website",
+          "style": {
+            "navigationBarTitleText": "",
+            "enablePullDownRefresh": false
+          }
+        }
+      ]
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-halo",
+    "navigationBarBackgroundColor": "#ffffff",
+    "backgroundColor": "#F8F8F8"
+  },
+  "tabBar": {
+    "backgroundColor": "#fff",
+    "borderStyle": "white",
+    "color": "#303133",
+    "selectedColor": "#03a9f4",
+    "list": [
+      {
+        "iconPath": "static/tabbar/select_home.png",
+        "selectedIconPath": "static/tabbar/select_home_active.png",
+        "pagePath": "pages/tabbar/home/home",
+        "text": "首页"
+      },
+      {
+        "iconPath": "static/tabbar/select_category.png",
+        "selectedIconPath": "static/tabbar/select_category_active.png",
+        "pagePath": "pages/tabbar/category/category",
+        "text": "分类"
+      },
+      {
+        "iconPath": "static/tabbar/select_gallery.png",
+        "selectedIconPath": "static/tabbar/select_gallery_active.png",
+        "pagePath": "pages/tabbar/gallery/gallery",
+        "text": "图库"
+      },
+      {
+        "iconPath": "static/tabbar/select_links.png",
+        "selectedIconPath": "static/tabbar/select_links_active.png",
+        "pagePath": "pages/tabbar/moments/moments",
+        "text": "瞬间"
+      },
+      {
+        "iconPath": "static/tabbar/select_mine.png",
+        "selectedIconPath": "static/tabbar/select_mine_active.png",
+        "pagePath": "pages/tabbar/about/about",
+        "text": "关于"
+      }
+    ]
+  }
+}
diff --git a/pagesA/advertise/advertise.vue b/pagesA/advertise/advertise.vue
index 6e36446..a2bdafc 100644
--- a/pagesA/advertise/advertise.vue
+++ b/pagesA/advertise/advertise.vue
@@ -1,142 +1,144 @@
 <template>
-	<tm-fullView>
-		<tm-sheet :shadow="24">
-			<tm-alerts label="观看视频即可获取注册码" close></tm-alerts>
-			<tm-divider color="red" model="dashed" :text="codeDataShow?'请复制下方注册码':'请点击“获取注册码”'"></tm-divider>
-			<view class="ma-20" v-show="!codeDataShow">
-				<tm-button theme="bg-gradient-orange-accent" :round="24" block @click="openVideoAd">获取注册码</tm-button>
-			</view>
-			<view class="ma-20" v-show="codeDataShow">
-				<tm-coupon :hdata="codeData" color="orange" @click="fnCopyCode"></tm-coupon>
-			</view>
-		</tm-sheet>
-		<!-- 		<tm-sheet :shadow="24">
-			<tm-images @load="loadimg" src="https://picsum.photos/300?id=7"></tm-images>
-		</tm-sheet> -->
-	</tm-fullView>
+    <tm-fullView>
+        <tm-sheet :shadow="24">
+            <tm-alerts label="观看视频即可获取注册码" close></tm-alerts>
+            <tm-divider color="red" model="dashed" :text="codeDataShow?'请复制下方注册码':'请点击“获取注册码”'"></tm-divider>
+            <view class="ma-20" v-show="!codeDataShow">
+                <tm-button theme="bg-gradient-orange-accent" :round="24" block @click="openVideoAd">获取注册码</tm-button>
+            </view>
+            <view class="ma-20" v-show="codeDataShow">
+                <tm-coupon :hdata="codeData" color="orange" @click="fnCopyCode"></tm-coupon>
+            </view>
+        </tm-sheet>
+        <!-- 		<tm-sheet :shadow="24">
+            <tm-images @load="loadimg" src="https://picsum.photos/300?id=7"></tm-images>
+        </tm-sheet> -->
+    </tm-fullView>
 
 </template>
 
 <script>
-	let videoAd = null;
-	import tmFullView from "@/tm-vuetify/components/tm-fullView/tm-fullView.vue"
-	import tmMenubars from "@/tm-vuetify/components/tm-menubars/tm-menubars.vue"
-	import tmSheet from "@/tm-vuetify/components/tm-sheet/tm-sheet.vue"
-	import tmAlerts from "@/tm-vuetify/components/tm-alerts/tm-alerts.vue"
-	import tmDivider from "@/tm-vuetify/components/tm-divider/tm-divider.vue"
-	import tmCoupon from '@/tm-vuetify/components/tm-coupon/tm-coupon.vue'
-	import tmButton from "@/tm-vuetify/components/tm-button/tm-button.vue"
-	import tmImages from "@/tm-vuetify/components/tm-images/tm-images.vue"
-	export default {
-		components: {
-			tmFullView,
-			tmMenubars,
-			tmSheet,
-			tmAlerts,
-			tmDivider,
-			tmCoupon,
-			tmButton,
-			tmImages
-		},
-		data() {
-			return {
-				adUnitId: '',
-				codeDataShow: false,
-				codeData: {
-					// img: 'https://lywq.muyin.site/logo.png',
-					title: "请获取",
-					btnText: '复制',
-					time: '有效期5分钟',
-					sale: '',
-					saleLable: '注册码',
-					saleSplit: ''
-				}
-			}
-		},
-		onLoad(options) {
-			// #ifdef MP-WEIXIN
-			wx.hideShareMenu();
-			this.adLoad();
-			// #endif 
-			uni.onCopyUrl((result) => {
-				setTimeout(() => {
-					uni.setClipboardData({
-						data: "禁止复制哦",
-					})
-				}, 1000);
-			})
-		},
-		methods: {
-			adLoad() {
-				if (wx.createRewardedVideoAd) {
-					videoAd = wx.createRewardedVideoAd({
-						adUnitId: haloAdConfig.rewardedVideoAd //你的广告key
-					})
-					videoAd.onError(err => {})
-					videoAd.onClose((status) => {
-						if (status && status.isEnded || status === undefined) {
-							//这里写广告播放完成后的事件
-							this.getRegistrationCode();
-						} else {
-							// 广告播放未完成
-						}
-					})
-				}
-			},
-			openVideoAd: function() {
-				if (videoAd && haloAdConfig.rewardedVideoAd != '') {
-					videoAd.show().catch(err => {
-						// 失败重试
-						console.log("广告拉取失败")
-						videoAd.load().then(() => videoAd.show())
-					})
-				} else {
-					this.getRegistrationCode();
-				}
-			},
-			getRegistrationCode() {
-				uni.showLoading({
-					title: '正在获取...'
-				});
-        this.$httpApi.v2.getPostVerifyCode()
-					.then(res => {
-						if (res.code === 200) {
-							uni.$tm.toast('获取成功！');
-							this.codeData.title = res.data;
-							this.codeDataShow = true;
-						} else {
-							uni.$tm.toast('操作失败，请重试！');
-						}
-					})
-					.catch(err => {
-						uni.$tm.toast(err.message);
-					});
-			},
-			fnCopyCode() {
-				uni.setClipboardData({
-					data: this.codeData.title,
-					showToast: false,
-					success: () => {
-						uni.showToast({
-							icon: 'none',
-							title: '复制成功！'
-						});
-						setTimeout(() => {
-              uni.navigateBack()
-						}, 500);
-					},
-					fail: () => {
-						uni.showToast({
-							icon: 'none',
-							title: '复制失败！'
-						});
-					}
-				});
-			}
-		}
-	}
+let videoAd = null;
+import tmFullView from "@/tm-vuetify/components/tm-fullView/tm-fullView.vue"
+import tmMenubars from "@/tm-vuetify/components/tm-menubars/tm-menubars.vue"
+import tmSheet from "@/tm-vuetify/components/tm-sheet/tm-sheet.vue"
+import tmAlerts from "@/tm-vuetify/components/tm-alerts/tm-alerts.vue"
+import tmDivider from "@/tm-vuetify/components/tm-divider/tm-divider.vue"
+import tmCoupon from '@/tm-vuetify/components/tm-coupon/tm-coupon.vue'
+import tmButton from "@/tm-vuetify/components/tm-button/tm-button.vue"
+import tmImages from "@/tm-vuetify/components/tm-images/tm-images.vue"
+
+export default {
+    components: {
+        tmFullView,
+        tmMenubars,
+        tmSheet,
+        tmAlerts,
+        tmDivider,
+        tmCoupon,
+        tmButton,
+        tmImages
+    },
+    data() {
+        return {
+            adUnitId: '',
+            codeDataShow: false,
+            codeData: {
+                // img: 'https://lywq.muyin.site/logo.png',
+                title: "请获取",
+                btnText: '复制',
+                time: '有效期5分钟',
+                sale: '',
+                saleLable: '注册码',
+                saleSplit: ''
+            }
+        }
+    },
+    onLoad(options) {
+        // #ifdef MP-WEIXIN
+        wx.hideShareMenu();
+        this.adLoad();
+        // #endif
+        uni.onCopyUrl((result) => {
+            setTimeout(() => {
+                uni.setClipboardData({
+                    data: "禁止复制哦",
+                })
+            }, 1000);
+        })
+    },
+    methods: {
+        adLoad() {
+            if (wx.createRewardedVideoAd) {
+                videoAd = wx.createRewardedVideoAd({
+                    adUnitId: haloAdConfig.rewardedVideoAd //你的广告key
+                })
+                videoAd.onError(err => {
+                })
+                videoAd.onClose((status) => {
+                    if (status && status.isEnded || status === undefined) {
+                        //这里写广告播放完成后的事件
+                        this.getRegistrationCode();
+                    } else {
+                        // 广告播放未完成
+                    }
+                })
+            }
+        },
+        openVideoAd: function () {
+            if (videoAd && haloAdConfig.rewardedVideoAd != '') {
+                videoAd.show().catch(err => {
+                    // 失败重试
+                    console.log("广告拉取失败")
+                    videoAd.load().then(() => videoAd.show())
+                })
+            } else {
+                this.getRegistrationCode();
+            }
+        },
+        getRegistrationCode() {
+            uni.showLoading({
+                title: '正在获取...'
+            });
+            this.$httpApi.v2.getPostVerifyCode()
+                .then(res => {
+                    if (res.code === 200) {
+                        uni.$tm.toast('获取成功！');
+                        this.codeData.title = res.data;
+                        this.codeDataShow = true;
+                    } else {
+                        uni.$tm.toast('操作失败，请重试！');
+                    }
+                })
+                .catch(err => {
+                    uni.$tm.toast(err.message);
+                });
+        },
+        fnCopyCode() {
+            uni.setClipboardData({
+                data: this.codeData.title,
+                showToast: false,
+                success: () => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '复制成功！'
+                    });
+                    setTimeout(() => {
+                        uni.navigateBack()
+                    }, 500);
+                },
+                fail: () => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '复制失败！'
+                    });
+                }
+            });
+        }
+    }
+}
 </script>
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesA/article-detail/article-detail.vue b/pagesA/article-detail/article-detail.vue
index 4cab8f6..d61b80b 100644
--- a/pagesA/article-detail/article-detail.vue
+++ b/pagesA/article-detail/article-detail.vue
@@ -1,1169 +1,1173 @@
 <template>
-	<view class="app-page">
-		<view v-if="loading != 'success'" class="loading-wrap">
-			<tm-skeleton model="card"></tm-skeleton>
-			<tm-skeleton model="card"></tm-skeleton>
-			<tm-skeleton model="card"></tm-skeleton>
-		</view>
-		<block v-else>
-			<!-- 顶部信息 -->
-			<view class="head ma-24">
-				<view class="title">{{ result.spec.title }}</view>
-				<view class="detail">
-					<view class="author">
-						<text class="author-name">作者：{{ result.owner.displayName }}</text>
-						<text class="author-time">
-							时间：{{ { d: result.spec.publishTime, f: 'yyyy年MM月dd日 星期w' } | formatTime }}
-						</text>
-					</view>
+    <view class="app-page">
+        <view v-if="loading != 'success'" class="loading-wrap">
+            <tm-skeleton model="card"></tm-skeleton>
+            <tm-skeleton model="card"></tm-skeleton>
+            <tm-skeleton model="card"></tm-skeleton>
+        </view>
+        <block v-else>
+            <!-- 顶部信息 -->
+            <view class="head ma-24">
+                <view class="title">{{ result.spec.title }}</view>
+                <view class="detail">
+                    <view class="author">
+                        <text class="author-name">作者：{{ result.owner.displayName }}</text>
+                        <text class="author-time">
+                            时间：{{ {d: result.spec.publishTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
+                        </text>
+                    </view>
 
-					<view class="cover" v-if="result.spec.cover">
-						<image class="cover-img" mode="aspectFill" :src="calcUrl(result.spec.cover)"></image>
-					</view>
-					<view class="count" :class="{ 'no-thumbnail': !result.spec.cover }">
-						<view class="count-item">
-							<text class="value">{{ result.stats.visit }}</text>
-							<text class="label">阅读</text>
-						</view>
-						<view class="count-item">
-							<text class="value">{{ result.stats.upvote }}</text>
-							<text class="label">喜欢</text>
-						</view>
-						<view class="count-item">
-							<text class="value">{{ result.stats.comment }}</text>
-							<text class="label">评论</text>
-						</view>
-						<view class="count-item">
-							<text class="value">{{ result.content.raw.length }}</text>
-							<text class="label">字数</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 分类 -->
-			<view class="category">
-				<view class="category-type">
-					<text class="text-weight-b">分类：</text>
-					<text v-if="result.categories.length == 0" class="category-tag is-empty">未选择分类</text>
-					<block v-else>
-						<text class="category-tag" v-for="(item, index) in result.categories" :key="index"
-							@click="fnToCate(item)">
-							{{ item.spec.displayName }}
-						</text>
-					</block>
-				</view>
-				<view class="mt-18 category-type">
-					<text class="text-weight-b">标签：</text>
-					<text v-if="result.tags.length == 0" class="category-tag is-empty">未选择标签</text>
-					<block v-else>
-						<text class="category-tag" :style="{ backgroundColor: item.color }"
-							v-for="(item, index) in result.tags" :key="index" @click="fnToTag(item)">
-							{{ item.spec.displayName }}
-						</text>
-					</block>
-				</view>
-				<view v-if="originalURL" class="mt-18 category-type original-url">
-					<view class="original-url_left text-weight-b">原文：</view>
-					<view class="original-url_right text-grey">
-						<text class="original-url_right__link"
-							@click.stop="fnToOriginal(originalURL)">{{ originalURL }}</text>
-						<text class="original-url_right__btn" @click.stop="fnToOriginal(originalURL)">阅读原文<text
-								class="iconfont icon-angle-right ml-5 text-size-s"></text> </text>
-					</view>
-				</view>
-			</view>
-			<!-- 内容区域 -->
-			<view class="content ml-24 mr-24">
-				<!-- markdown渲染 -->
-				<view class="markdown-wrap">
-          <mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
-                   :loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
-                   :tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
-                   :content="result.content.raw" :markdown="true" :showLineNumber="true"
-                   :showLanguageName="true" :copyByLongPress="true" />
-					<tm-more v-if="showValidVisitMore" :disabled="true" :maxHeight="1" :isRemovBar="true"
-						@click="showValidVisitMorePop()">
-            <view class="text-size-n pa-24">
-              以下内容已隐藏，请验证后查看完整内容……
+                    <view class="cover" v-if="result.spec.cover">
+                        <image class="cover-img" mode="aspectFill" :src="calcUrl(result.spec.cover)"></image>
+                    </view>
+                    <view class="count" :class="{ 'no-thumbnail': !result.spec.cover }">
+                        <view class="count-item">
+                            <text class="value">{{ result.stats.visit }}</text>
+                            <text class="label">阅读</text>
+                        </view>
+                        <view class="count-item">
+                            <text class="value">{{ result.stats.upvote }}</text>
+                            <text class="label">喜欢</text>
+                        </view>
+                        <view class="count-item">
+                            <text class="value">{{ result.stats.comment }}</text>
+                            <text class="label">评论</text>
+                        </view>
+                        <view class="count-item">
+                            <text class="value">{{ result.content.raw.length }}</text>
+                            <text class="label">字数</text>
+                        </view>
+                    </view>
+                </view>
             </view>
-						<template v-slot:more="{ data }">
-							<view class="">
-								<text class="text-blue text-size-m text-weight-b">文章部分内容已加密点击解锁</text>
-								<text class="text-blue iconfont icon-lock-fill text-size-s ml-5"></text>
-							</view>
-						</template>
-					</tm-more>
-				</view>
-				<!-- 广告区域：自定义广告位 -->
-				<view class="ad-card mt-24" v-if="haloAdConfig.articleDetail.custom">
-					<text class="ad-card_tip">广告</text>
-					<image class="ad-card_cover" :src="haloAdConfig.articleDetail.custom.cover" mode="scaleToFill">
-					</image>
-					<view class="ad-card_info">
-						<view class="ad-card_info-title">{{ haloAdConfig.articleDetail.custom.title }}</view>
-						<view class="ad-card_info-desc">{{ haloAdConfig.articleDetail.custom.content }}</view>
-						<view v-if="haloAdConfig.articleDetail.custom.url" class="ad-card_info-link"
-							@click="fnToWebview(haloAdConfig.articleDetail.custom)">
-							立即查看
-						</view>
-					</view>
-				</view>
+            <!-- 分类 -->
+            <view class="category">
+                <view class="category-type">
+                    <text class="text-weight-b">分类：</text>
+                    <text v-if="result.categories.length == 0" class="category-tag is-empty">未选择分类</text>
+                    <block v-else>
+                        <text class="category-tag" v-for="(item, index) in result.categories" :key="index"
+                              @click="fnToCate(item)">
+                            {{ item.spec.displayName }}
+                        </text>
+                    </block>
+                </view>
+                <view class="mt-18 category-type">
+                    <text class="text-weight-b">标签：</text>
+                    <text v-if="result.tags.length == 0" class="category-tag is-empty">未选择标签</text>
+                    <block v-else>
+                        <text class="category-tag" :style="{ backgroundColor: item.color }"
+                              v-for="(item, index) in result.tags" :key="index" @click="fnToTag(item)">
+                            {{ item.spec.displayName }}
+                        </text>
+                    </block>
+                </view>
+                <view v-if="originalURL" class="mt-18 category-type original-url">
+                    <view class="original-url_left text-weight-b">原文：</view>
+                    <view class="original-url_right text-grey">
+                        <text class="original-url_right__link"
+                              @click.stop="fnToOriginal(originalURL)">{{ originalURL }}
+                        </text>
+                        <text class="original-url_right__btn" @click.stop="fnToOriginal(originalURL)">阅读原文
+                            <text
+                                class="iconfont icon-angle-right ml-5 text-size-s"></text>
+                        </text>
+                    </view>
+                </view>
+            </view>
+            <!-- 内容区域 -->
+            <view class="content ml-24 mr-24">
+                <!-- markdown渲染 -->
+                <view class="markdown-wrap">
+                    <mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
+                             :loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
+                             :tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
+                             :content="result.content.raw" :markdown="true" :showLineNumber="true"
+                             :showLanguageName="true" :copyByLongPress="true"/>
+                    <tm-more v-if="showValidVisitMore" :disabled="true" :maxHeight="1" :isRemovBar="true"
+                             @click="showValidVisitMorePop()">
+                        <view class="text-size-n pa-24">
+                            以下内容已隐藏，请验证后查看完整内容……
+                        </view>
+                        <template v-slot:more="{ data }">
+                            <view class="">
+                                <text class="text-blue text-size-m text-weight-b">文章部分内容已加密点击解锁</text>
+                                <text class="text-blue iconfont icon-lock-fill text-size-s ml-5"></text>
+                            </view>
+                        </template>
+                    </tm-more>
+                </view>
+                <!-- 广告区域：自定义广告位 -->
+                <view class="ad-card mt-24" v-if="haloAdConfig.articleDetail.use">
+                    <text class="ad-card_tip">广告</text>
+                    <image class="ad-card_cover" :src="haloAdConfig.articleDetail.cover" mode="scaleToFill">
+                    </image>
+                    <view class="ad-card_info">
+                        <view class="ad-card_info-title">{{ haloAdConfig.articleDetail.title }}</view>
+                        <view class="ad-card_info-desc">{{ haloAdConfig.articleDetail.content }}</view>
+                        <view v-if="haloAdConfig.articleDetail.url" class="ad-card_info-link"
+                              @click="fnToWebview(haloAdConfig.articleDetail)">
+                            立即查看
+                        </view>
+                    </view>
+                </view>
 
-				<!-- 版权声明 -->
-				<view v-if="copyright.use" class="copyright-wrap bg-white mt-24 pa-24 round-4">
-					<view class="copyright-title text-weight-b">版权声明</view>
-					<view
-						class="copyright-content mt-12  grey-lighten-5 text-grey-darken-2 round-4 pt-12 pb-12 pl-24 pr-24 ">
-						<view v-if="copyright.author" class="copyright-text text-size-s ">
-							版权归属：{{ copyright.author }}
-						</view>
-						<view v-if="copyright.description" class="copyright-text text-size-s mt-12">
-							版权说明：{{ copyright.description }}
-						</view>
-						<view v-if="copyright.violation" class="copyright-text text-size-s mt-12 text-red">
-							侵权处理：{{ copyright.violation }}
-						</view>
-					</view>
-				</view>
+                <!-- 版权声明 -->
+                <view v-if="copyright.use" class="copyright-wrap bg-white mt-24 pa-24 round-4">
+                    <view class="copyright-title text-weight-b">版权声明</view>
+                    <view
+                        class="copyright-content mt-12  grey-lighten-5 text-grey-darken-2 round-4 pt-12 pb-12 pl-24 pr-24 ">
+                        <view v-if="copyright.author" class="copyright-text text-size-s ">
+                            版权归属：{{ copyright.author }}
+                        </view>
+                        <view v-if="copyright.description" class="copyright-text text-size-s mt-12">
+                            版权说明：{{ copyright.description }}
+                        </view>
+                        <view v-if="copyright.violation" class="copyright-text text-size-s mt-12 text-red">
+                            侵权处理：{{ copyright.violation }}
+                        </view>
+                    </view>
+                </view>
 
-				<!-- 评论展示区域 -->
-				<view v-if="result" class="comment-wrap bg-white mt-24 pa-24 round-4">
-					<commentList :disallowComment="!result.spec.allowComment" :postName="result.metadata.name"
-						:post="result" @on-comment-detail="fnOnShowCommentDetail" @on-loaded="fnOnCommentLoaded">
-					</commentList>
-				</view>
-			</view>
+                <!-- 评论展示区域 -->
+                <view v-if="result" class="comment-wrap bg-white mt-24 pa-24 round-4">
+                    <commentList :disallowComment="!result.spec.allowComment" :postName="result.metadata.name"
+                                 :post="result" @on-comment-detail="fnOnShowCommentDetail" @on-loaded="fnOnCommentLoaded">
+                    </commentList>
+                </view>
+            </view>
 
-			<!-- 弹幕效果 -->
-			<barrage ref="barrage" :maxTop="240" :type="globalAppSettings.barrage.type"></barrage>
-			<!-- 返回顶部 -->
-			<tm-flotbutton :offset="[16, 80]" icon="icon-angle-up" color="bg-gradient-light-blue-accent"
-				@click="fnToTopPage()"></tm-flotbutton>
-			<tm-flotbutton :actions="btnOption.actions" actions-pos="left" :show-text="true"
-				color="bg-gradient-orange-accent" @change="fnOnFlotButtonChange"></tm-flotbutton>
-		</block>
+            <!-- 弹幕效果 -->
+            <barrage ref="barrage" :maxTop="240" :type="globalAppSettings.barrage.type"></barrage>
+            <!-- 返回顶部 -->
+            <tm-flotbutton :offset="[16, 80]" icon="icon-angle-up" color="bg-gradient-light-blue-accent"
+                           @click="fnToTopPage()"></tm-flotbutton>
+            <tm-flotbutton :actions="btnOption.actions" actions-pos="left" :show-text="true"
+                           color="bg-gradient-orange-accent" @change="fnOnFlotButtonChange"></tm-flotbutton>
+        </block>
 
-		<!-- 评论详情 -->
-		<tm-poup v-model="commentDetail.show" height="auto" :round="6" :over-close="true" position="bottom">
-			<view v-if="result" class="pa-24">
-				<view class="poup-head pb-24">
-					<view class="poup-title text-align-center text-size-g text-weight-b mb-32">评论详情</view>
-					<comment-item :useContentBg="false" :useActions="false" :isChild="false"
-						:comment="commentDetail.comment" :postName="result.metadata.name"></comment-item>
-				</view>
+        <!-- 评论详情 -->
+        <tm-poup v-model="commentDetail.show" height="auto" :round="6" :over-close="true" position="bottom">
+            <view v-if="result" class="pa-24">
+                <view class="poup-head pb-24">
+                    <view class="poup-title text-align-center text-size-g text-weight-b mb-32">评论详情</view>
+                    <comment-item :useContentBg="false" :useActions="false" :isChild="false"
+                                  :comment="commentDetail.comment" :postName="result.metadata.name"></comment-item>
+                </view>
 
-				<scroll-view :scroll-y="true" class="poup-body">
-					<view v-if="commentDetail.loading != 'success'" class="poup-loading-wrap flex flex-center">
-						<view v-if="commentDetail.loading == 'loading'" class="loading flex flex-center flex-col">
-							<text class="e-loading-icon iconfont icon-loading text-blue"></text>
-							<view class="text-size-n text-grey-lighten-1 py-12 mt-12">加载中，请稍等...</view>
-						</view>
-						<view v-else-if="commentDetail.loading == 'error'" class="error">
-							<tm-empty icon="icon-wind-cry" label="加载失败">
-								<tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnGetChildComments()">
-									刷新试试
-								</tm-button>
-							</tm-empty>
-						</view>
-					</view>
-					<block v-else>
-						<view v-if="commentDetail.list.length == 0" class="poup-empty flex flex-center">
-							<tm-empty icon="icon-shiliangzhinengduixiang-" label="没有更多评论啦~"></tm-empty>
-						</view>
+                <scroll-view :scroll-y="true" class="poup-body">
+                    <view v-if="commentDetail.loading != 'success'" class="poup-loading-wrap flex flex-center">
+                        <view v-if="commentDetail.loading == 'loading'" class="loading flex flex-center flex-col">
+                            <text class="e-loading-icon iconfont icon-loading text-blue"></text>
+                            <view class="text-size-n text-grey-lighten-1 py-12 mt-12">加载中，请稍等...</view>
+                        </view>
+                        <view v-else-if="commentDetail.loading == 'error'" class="error">
+                            <tm-empty icon="icon-wind-cry" label="加载失败">
+                                <tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnGetChildComments()">
+                                    刷新试试
+                                </tm-button>
+                            </tm-empty>
+                        </view>
+                    </view>
+                    <block v-else>
+                        <view v-if="commentDetail.list.length == 0" class="poup-empty flex flex-center">
+                            <tm-empty icon="icon-shiliangzhinengduixiang-" label="没有更多评论啦~"></tm-empty>
+                        </view>
 
-						<block v-else>
-							<comment-item v-for="(comment, index) in commentDetail.list" :useContentBg="false"
-								:useSolid="false" :useActions="false" :key="index" :isChild="false" :comment="comment"
-								:postName="result.metadata.name"></comment-item>
-						</block>
-					</block>
-				</scroll-view>
-			</view>
-		</tm-poup>
+                        <block v-else>
+                            <comment-item v-for="(comment, index) in commentDetail.list" :useContentBg="false"
+                                          :useSolid="false" :useActions="false" :key="index" :isChild="false" :comment="comment"
+                                          :postName="result.metadata.name"></comment-item>
+                        </block>
+                    </block>
+                </scroll-view>
+            </view>
+        </tm-poup>
 
-		<!-- 海报 -->
-		<tm-poup v-model="poster.show" width="90vw" height="auto" :round="6" :over-close="true" position="center">
-			<view class="poster-content pt-12 bg-white">
-				<view v-if="poster.loading" class="poster-loading flex flex-center text-grey-darken-1">
-					<text class="e-loading-icon iconfont icon-loading"></text>
-					<text class="ml-6">海报正在生成...</text>
-				</view>
-				<block v-if="poster.showCanvas">
-					<r-canvas ref="rCanvas"></r-canvas>
-					<view class="poster-save ma-24 mt-0 pt-20 flex flex-center">
-						<tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnSavePoster()">
-							保存到相册
-						</tm-button>
-						<tm-button v-if="false" theme="bg-gradient-orange-accent" size="m" @click="fnShareTo()">
-							分享给好友
-						</tm-button>
-						<tm-button theme="bg-gradient-blue-grey-accent" size="m" @click="fnOnPosterClose()">
-							关 闭
-						</tm-button>
-					</view>
-				</block>
-			</view>
-		</tm-poup>
+        <!-- 海报 -->
+        <tm-poup v-model="poster.show" width="90vw" height="auto" :round="6" :over-close="true" position="center">
+            <view class="poster-content pt-12 bg-white">
+                <view v-if="poster.loading" class="poster-loading flex flex-center text-grey-darken-1">
+                    <text class="e-loading-icon iconfont icon-loading"></text>
+                    <text class="ml-6">海报正在生成...</text>
+                </view>
+                <block v-if="poster.showCanvas">
+                    <r-canvas ref="rCanvas"></r-canvas>
+                    <view class="poster-save ma-24 mt-0 pt-20 flex flex-center">
+                        <tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnSavePoster()">
+                            保存到相册
+                        </tm-button>
+                        <tm-button v-if="false" theme="bg-gradient-orange-accent" size="m" @click="fnShareTo()">
+                            分享给好友
+                        </tm-button>
+                        <tm-button theme="bg-gradient-blue-grey-accent" size="m" @click="fnOnPosterClose()">
+                            关 闭
+                        </tm-button>
+                    </view>
+                </block>
+            </view>
+        </tm-poup>
 
-		<!-- 密码访问解密弹窗 -->
-		<tm-dialog :disabled="true" :input-val.sync="validVisitModal.value" title="验证提示" confirmText="立即验证"
-               :showCancel="validVisitModal.useCancel" model="confirm" v-model="validVisitModal.show"
-               content="博主设置了需要密码才能查看该文章内容,请输入文章密码进行验证" theme="split" confirmColor="blue shadow-blue-0"
-               @cancel="closeValidVisitPop" @confirm="fnValidVisitPwd"></tm-dialog>
-    <!-- 是否前往获取验证码 -->
-    <tm-dialog v-model="showGetPassword" title="免费获取验证码" content="是否前往获取验证码？" @confirm="toAdvertise" @cancel="closeAllPop"></tm-dialog>
+        <!-- 密码访问解密弹窗 -->
+        <tm-dialog :disabled="true" :input-val.sync="validVisitModal.value" title="验证提示" confirmText="立即验证"
+                   :showCancel="validVisitModal.useCancel" model="confirm" v-model="validVisitModal.show"
+                   content="博主设置了需要密码才能查看该文章内容,请输入文章密码进行验证" theme="split" confirmColor="blue shadow-blue-0"
+                   @cancel="closeValidVisitPop" @confirm="fnValidVisitPwd"></tm-dialog>
+        <!-- 是否前往获取验证码 -->
+        <tm-dialog v-model="showGetPassword" title="免费获取验证码" content="是否前往获取验证码？" @confirm="toAdvertise"
+                   @cancel="closeAllPop"></tm-dialog>
 
-  </view>
+    </view>
 </template>
 
 <script>
-	import MarkdownConfig from '@/common/markdown/markdown.config.js';
+import MarkdownConfig from '@/common/markdown/markdown.config.js';
 
-	import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-	import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
-	import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
-	import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
-	import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
-	import tmDialog from '@/tm-vuetify/components/tm-dialog/tm-dialog.vue';
-	import tmMore from '@/tm-vuetify/components/tm-more/tm-more.vue';
+import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
+import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
+import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
+import tmDialog from '@/tm-vuetify/components/tm-dialog/tm-dialog.vue';
+import tmMore from '@/tm-vuetify/components/tm-more/tm-more.vue';
 
-	import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
-	import commentList from '@/components/comment-list/comment-list.vue';
-	import commentItem from '@/components/comment-item/comment-item.vue';
+import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
+import commentList from '@/components/comment-list/comment-list.vue';
+import commentItem from '@/components/comment-item/comment-item.vue';
 
-	import rCanvas from '@/components/r-canvas/r-canvas.vue';
-	import barrage from '@/components/barrage/barrage.vue';
+import rCanvas from '@/components/r-canvas/r-canvas.vue';
+import barrage from '@/components/barrage/barrage.vue';
 
-	import {
-		haloWxShareMixin
-	} from '@/common/mixins/wxshare.mixin.js';
-	export default {
-		components: {
-			tmSkeleton,
-			tmPoup,
-			tmFlotbutton,
-			tmButton,
-			tmEmpty,
-			tmDialog,
-			tmMore,
-			mpHtml,
-			commentList,
-			commentItem,
-			rCanvas,
-			barrage
-		},
-		mixins: [haloWxShareMixin],
-		data() {
-			return {
-				loading: 'loading',
-				markdownConfig: MarkdownConfig,
-				btnOption: {
-					actions: [
-						// {
-						// 	icon: 'icon-like',
-						// 	color: 'bg-gradient-orange-accent'
-						// },
-						{
-							icon: 'icon-commentdots-fill',
-							color: 'bg-gradient-green-accent'
-						},
-						{
-							icon: 'icon-share1',
-							color: 'bg-gradient-blue-accent'
-						}
-					]
-				},
-				queryParams: {
-					name: null
-				},
-				result: null,
+import {
+    haloWxShareMixin
+} from '@/common/mixins/wxshare.mixin.js';
 
-				commentDetail: {
-					loading: 'loading',
-					show: false,
-					comment: {},
-					postName: undefined,
-					list: []
-				},
-				poster: {
-					show: false,
-					showCanvas: false,
-					loading: true,
-					res: null
-				},
+export default {
+    components: {
+        tmSkeleton,
+        tmPoup,
+        tmFlotbutton,
+        tmButton,
+        tmEmpty,
+        tmDialog,
+        tmMore,
+        mpHtml,
+        commentList,
+        commentItem,
+        rCanvas,
+        barrage
+    },
+    mixins: [haloWxShareMixin],
+    data() {
+        return {
+            loading: 'loading',
+            markdownConfig: MarkdownConfig,
+            btnOption: {
+                actions: [
+                    // {
+                    // 	icon: 'icon-like',
+                    // 	color: 'bg-gradient-orange-accent'
+                    // },
+                    {
+                        icon: 'icon-commentdots-fill',
+                        color: 'bg-gradient-green-accent'
+                    },
+                    {
+                        icon: 'icon-share1',
+                        color: 'bg-gradient-blue-accent'
+                    }
+                ]
+            },
+            queryParams: {
+                name: null
+            },
+            result: null,
 
-				metas: [], // 自定义元数据
-				// 文章加密（弹窗输入密码解密）
-				validVisitModal: {
-					show: false,
-					useCancel: false,
-					value: undefined
-				},
-        visitType: 0, // 0 未加密 1 后端部分隐藏 2 前端部分隐藏 3 全部隐藏
-        visitPwd: undefined,
-				showValidVisitMore: true,
-        showGetPassword: false
-			};
-		},
-		computed: {
-			copyright() {
-				return getApp().globalData.copyright;
-			},
-			calcUrl() {
-				return url => {
-					if (this.$utils.checkIsUrl(url)) {
-						return url;
-					}
-					return getApp().globalData.baseApiUrl + url;
-				};
-			},
-			// 获取博主信息
-			bloggerInfo() {
-				let blogger = this.$tm.vx.getters().getBlogger;
-				blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
-				return blogger;
-			},
-			// 原文链接：个人资质=可以打开公众号文章；非个人：任意链接地址（需在小程序后台配置）
-			originalURL() {
-        if ('unihalo_originalURL' in this.result?.metadata?.annotations) {
-          return this.result?.metadata?.annotations?.unihalo_originalURL;
-        } else {
-          return '';
-        }
-			},
-		},
-		watch: {
+            commentDetail: {
+                loading: 'loading',
+                show: false,
+                comment: {},
+                postName: undefined,
+                list: []
+            },
+            poster: {
+                show: false,
+                showCanvas: false,
+                loading: true,
+                res: null
+            },
 
-		},
-		onLoad(e) {
-			this.fnSetPageTitle('文章加载中...');
-			this.queryParams.name = e.name;
-			this.fnGetData();
-		},
-
-		onPullDownRefresh() {
-			this.fnGetData();
-		},
-		methods: {
-			fnGetData() {
-				this.loading = 'loading';
-				this.$httpApi.v2
-					.getPostByName(this.queryParams.name)
-					.then(res => {
-						console.log('详情', res);
-						this.result = res;
-
-            const openid = uni.getStorageSync('openid');
-            if (openid == '' || openid == null) {
-              this.fnGetOpenid();
-            }
-            const visitFlag = uni.getStorageSync('visit_' + this.result?.metadata?.name);
-
-            if (!visitFlag) {
-              const annotationsMap = res?.metadata?.annotations;
-              if (('restrictReadEnable' in annotationsMap) && annotationsMap.restrictReadEnable === 'true') {
-                this.visitType = 1;
-                this.showValidVisitMorePop();
-              } else if ('unihalo_useVisitMorePwd' in annotationsMap) {
-                this.visitType = 2;
-                this.visitPwd = annotationsMap.unihalo_useVisitMorePwd;
-                this.showValidVisitMorePop();
-              } else if ('unihalo_useVisitPwd' in annotationsMap) {
-                this.visitType = 3;
-                this.visitPwd = annotationsMap.unihalo_useVisitPwd;
-                this.showValidVisitPop();
-              } else {
-                this.visitType = 0;
-                this.showValidVisitMore = false;
-              }
-              this.fnHideContent();
+            metas: [], // 自定义元数据
+            // 文章加密（弹窗输入密码解密）
+            validVisitModal: {
+                show: false,
+                useCancel: false,
+                value: undefined
+            },
+            visitType: 0, // 0 未加密 1 后端部分隐藏 2 前端部分隐藏 3 全部隐藏
+            visitPwd: undefined,
+            showValidVisitMore: true,
+            showGetPassword: false
+        };
+    },
+    computed: {
+        copyright() {
+            return getApp().globalData.copyright;
+        },
+        calcUrl() {
+            return url => {
+                if (this.$utils.checkIsUrl(url)) {
+                    return url;
+                }
+                return getApp().globalData.baseApiUrl + url;
+            };
+        },
+        // 获取博主信息
+        bloggerInfo() {
+            let blogger = this.$tm.vx.getters().getBlogger;
+            blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
+            return blogger;
+        },
+        // 原文链接：个人资质=可以打开公众号文章；非个人：任意链接地址（需在小程序后台配置）
+        originalURL() {
+            if ('unihalo_originalURL' in this.result?.metadata?.annotations) {
+                return this.result?.metadata?.annotations?.unihalo_originalURL;
             } else {
-              this.showValidVisitMore = false;
+                return '';
             }
+        },
+    },
+    watch: {},
+    onLoad(e) {
+        this.fnSetPageTitle('文章加载中...');
+        this.queryParams.name = e.name;
+        this.fnGetData();
+    },
 
-						this.fnSetPageTitle('文章详情');
-						this.loading = 'success';
-						this.fnSetWxShareConfig({
-							title: this.result.spec.title,
-							desc: this.result.content.raw,
-							imageUrl: this.$utils.checkThumbnailUrl(this.result.spec.cover),
-							path: `/pagesA/article-detail/article-detail?name=${this.result.metadata.name}`,
-							copyLink: this.$baseApiUrl,
-							query: {}
-						});
+    onPullDownRefresh() {
+        this.fnGetData();
+    },
+    methods: {
+        fnGetData() {
+            this.loading = 'loading';
+            this.$httpApi.v2
+                .getPostByName(this.queryParams.name)
+                .then(res => {
+                    console.log('详情', res);
+                    this.result = res;
 
-					})
-					.catch(err => {
-						console.log("错误", err)
-						this.loading = 'error';
-					})
-					.finally(() => {
-						uni.hideLoading();
-						uni.stopPullDownRefresh();
-					});
-			},
+                    const openid = uni.getStorageSync('openid');
+                    if (openid == '' || openid == null) {
+                        this.fnGetOpenid();
+                    }
+                    const visitFlag = uni.getStorageSync('visit_' + this.result?.metadata?.name);
 
-			// 浮动按钮点击
-			fnOnFlotButtonChange(index) {
-				switch (index) {
-					// case 0:
-					// 	this.fnDoLikes();
-					// 	break;
-					case 0:
-						this.fnToComment();
-						break;
-					case 1:
-						this.fnShowShare();
-						break;
-				}
-			},
+                    if (!visitFlag) {
+                        const annotationsMap = res?.metadata?.annotations;
+                        if (('restrictReadEnable' in annotationsMap) && annotationsMap.restrictReadEnable === 'true') {
+                            this.visitType = 1;
+                            this.showValidVisitMorePop();
+                        } else if ('unihalo_useVisitMorePwd' in annotationsMap) {
+                            this.visitType = 2;
+                            this.visitPwd = annotationsMap.unihalo_useVisitMorePwd;
+                            this.showValidVisitMorePop();
+                        } else if ('unihalo_useVisitPwd' in annotationsMap) {
+                            this.visitType = 3;
+                            this.visitPwd = annotationsMap.unihalo_useVisitPwd;
+                            this.showValidVisitPop();
+                        } else {
+                            this.visitType = 0;
+                            this.showValidVisitMore = false;
+                        }
+                        this.fnHideContent();
+                    } else {
+                        this.showValidVisitMore = false;
+                    }
 
-			fnToComment() {
-				if (!this.result.spec.allowComment) {
-					return uni.$tm.toast('文章已开启禁止评论！');
-				}
-				this.$Router.push({
-					path: '/pagesA/comment/comment',
-					query: {
-						isComment: true,
-						postName: this.result.metadata.name,
-						title: this.result.spec.title,
-						from: 'posts',
-						formPage: 'comment_list',
-						type: 'post'
-					}
-				});
-			},
+                    this.fnSetPageTitle('文章详情');
+                    this.loading = 'success';
+                    this.fnSetWxShareConfig({
+                        title: this.result.spec.title,
+                        desc: this.result.content.raw,
+                        imageUrl: this.$utils.checkThumbnailUrl(this.result.spec.cover),
+                        path: `/pagesA/article-detail/article-detail?name=${this.result.metadata.name}`,
+                        copyLink: this.$baseApiUrl,
+                        query: {}
+                    });
 
-			fnDoLikes() {
-				this.$httpApi
-					.postLikePost(this.result.id)
-					.then(res => {
-						if (res.status == 200) {
-							this.result.likes += 1;
-							uni.$tm.toast('\(^o^)/~点赞成功!');
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: res.message
-							});
-						}
-					})
-					.catch(err => {
-						uni.showToast({
-							icon: 'none',
-							title: err.message
-						});
-					});
-			},
-			fnShowShare() {
-				this.poster.show = true;
-				setTimeout(() => {
-					this.poster.showCanvas = true;
-					this.fnCreatePoster(res => {
-						this.poster.res = res;
-					});
-				}, 500);
-			},
-			// 绘制虚线：https://blog.csdn.net/a460550542/article/details/124821248
-			drawDashedLine(ctx, x, y, w, h, pattern, color) {
-				ctx.lineWidth = h;
-				ctx.strokeStyle = color;
-				ctx.beginPath();
-				ctx.setLineDash(pattern);
-				ctx.moveTo(x, y);
-				ctx.lineTo(w, y);
-				ctx.stroke();
-				y += 20;
-			},
-			fnCreatePoster(callback) {
-				this.$nextTick(async () => {
-					const systemInfo = await uni.getSystemInfoSync();
-					const _bloggerAvatar = this.$utils.checkAvatarUrl(this.bloggerInfo.avatar, true);
-					const _articleCover = this.$utils.checkThumbnailUrl(this.result.spec.cover, true);
-					// 初始化
-					await this.$refs.rCanvas.init({
-						canvas_id: 'rCanvas',
-						// canvas_width: systemInfo.windowWidth - uni.upx2px(76),
-						canvas_width: 337,
-						canvas_height: 460,
-						background_color: 'rgba(255,255,255,0)'
-					});
-					// 画圆角背景
-					await this.$refs.rCanvas
-						.fillRoundRect({
-							x: 0,
-							y: 0,
-							w: 337,
-							h: 460,
-							radius: 12,
-							fill_color: '#fff'
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-					// 博主信息
-					await this.$refs.rCanvas
-						.drawImage({
-							url: _bloggerAvatar,
-							x: 12,
-							y: 12,
-							w: 48,
-							h: 48,
-							border_radius: 24
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-
-					await this.$refs.rCanvas
-						.drawText({
-							text: this.bloggerInfo.nickname,
-							max_width: 0,
-							x: 70,
-							y: 30,
-							font_color: '#000',
-							font_size: 15
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-					await this.$refs.rCanvas
-						.drawText({
-							text: this.bloggerInfo.description,
-							max_width: 0,
-							x: 70,
-							y: 52,
-							font_color: '#666',
-							font_size: 12
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-					// 文章封面图
-					await this.$refs.rCanvas
-						.drawImage({
-							url: _articleCover,
-							x: 12,
-							y: 75,
-							w: 312,
-							h: 180,
-							border_radius: 6
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-
-					// 文章标题
-					await this.$refs.rCanvas
-						.drawText({
-							text: this.result.spec.title,
-							max_width: 312,
-							line_clamp: 1,
-							x: 12,
-							y: 285,
-							font_weight: 'bold',
-							font_color: '#333',
-							font_size: 14
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-					await this.$refs.rCanvas
-						.drawText({
-							text: this.result.content.raw,
-							max_width: 312,
-							line_clamp: 2,
-							x: 12,
-							y: 310,
-							font_color: '#333',
-							font_size: 13,
-							line_height: 20
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-
-					this.drawDashedLine(this.$refs.rCanvas.ctx, 14, 356, 332, 0.5, [8, 5, 5, 5], '#999');
-					// 小程序信息
-					await this.$refs.rCanvas
-						.drawImage({
-							url: this.$haloConfig.miniCodeImageUrl,
-							x: 20,
-							y: 360,
-							w: 80,
-							h: 80
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-
-					await this.$refs.rCanvas
-						.drawText({
-							text: '长按识别小程序',
-							x: 150,
-							y: 390,
-							font_color: '#333',
-							font_size: 15,
-							font_weight: 'bold',
-							line_height: 22
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-					await this.$refs.rCanvas
-						.drawText({
-							text: '关注我，给你分享更多有趣的知识',
-							x: 115,
-							y: 425,
-							font_color: '#333',
-							font_size: 12,
-							line_height: 22
-						})
-						.catch(err_msg => {
-							uni.showToast({
-								title: err_msg,
-								icon: 'none'
-							});
-						});
-					// 生成海报
-					await this.$refs.rCanvas.draw(res => {
-						//res.tempFilePath：生成成功，返回base64图片
-						// 保存图片
-						this.poster.loading = false;
-						callback(res);
-					});
-				});
-			},
-			fnOnPosterClose() {
-				this.poster.show = false;
-				this.poster.showCanvas = false;
-				this.poster.loading = true;
-			},
-			fnSavePoster() {
-				this.$refs.rCanvas.saveImage(this.poster.res.tempFilePath);
-				uni.$tm.toast('保存成功');
-			},
-			fnShareTo() {
-				// #ifdef MP-WEIXIN
-				uni.$tm.toast('点击右上角分享给好友！');
-				// #endif
-				// #ifdef APP-PLUS
-				uni.share({
-					provider: 'weixin',
-					scene: 'WXSceneSession',
-					type: 0,
-					href: this.$baseApiUrl,
-					title: this.result.spec.title,
-					summary: this.result.content.raw,
-					imageUrl: this.poster.res.tempFilePath,
-					success: function(res) {
-						console.log('success:' + JSON.stringify(res));
-					},
-					fail: function(err) {
-						console.log('fail:' + JSON.stringify(err));
-					}
-				});
-				// #endif
-			},
-			fnOnShowCommentDetail(data) {
-				const {
-					postName,
-					comment
-				} = data;
-				this.commentDetail.comment = comment;
-				this.commentDetail.postName = postName;
-				this.commentDetail.list = [];
-				this.commentDetail.show = true;
-				this.fnGetChildComments();
-			},
-			fnGetChildComments() {
-				this.commentDetail.loading = 'loading';
-				this.$httpApi.v2
-					.getPostCommentReplyList(this.commentDetail.postName, {
-						page: 1,
-						size: 100
-					})
-					.then(res => {
-						console.log('getPostChildrenCommentList res', res);
-						this.commentDetail.loading = 'success';
-						this.commentDetail.list = res.items;
-					})
-					.catch(err => {
-						console.log('getPostChildrenCommentList err', error);
-						this.commentDetail.loading = 'error';
-					});
-			},
-			fnToCate(category) {
-				uni.navigateTo({
-					url: `/pagesA/category-detail/category-detail?name=${category.metadata.name}&title=${category.spec.displayName}`
-				});
-			},
-			fnToTag(tag) {
-				uni.navigateTo({
-					url: `/pagesA/tag-detail/tag-detail?name=${tag.metadata.name}&title=${tag.spec.displayName}`
-				});
-			},
-			async fnOnCommentLoaded(data) {
-				console.log("data", data)
-				const _list = [];
-				const _handleData = list => {
-					return new Promise(resolve => {
-						if (list.length == 0) {
-							resolve();
-						} else {
-							list.forEach(item => {
-								_list.push(item);
-								if (item.replies && item.replies.length != 0) {
-									_handleData(item.replies.items);
-								}
-								resolve();
-							});
-						}
-					});
-				};
-				await _handleData(data);
-				// if (this.globalAppSettings.barrage.use) {
-				// 	this.$nextTick(() => {
-				// 		if (_list.length != 0) {
-				// 			_handleAddBarrage();
-				// 		}
-				// 	});
-				// }
-				// const _handleRemove = () => {
-				// 	this.$refs['barrage'] && this.$refs['barrage'].remove({
-				// 		duration: 5000, // 延迟关闭的时间
-				// 		speed: 600 // 弹幕消失的速度
-				// 	});
-				// };
-				// let index = 0;
-				// const _handleAddBarrage = () => {
-				// 	setTimeout(() => {
-				// 		this.$refs['barrage'] && this.$refs['barrage'].add(_list[index]);
-				// 		index += 1;
-				// 		if (index < _list.length - 1) {
-				// 			_handleAddBarrage();
-				// 		} else {
-				// 			_handleRemove();
-				// 		}
-				// 	}, 1000);
-				// };
-			},
-			fnToWebview(data) {
-				uni.navigateTo({
-					url: '/pagesC/website/website?data=' +
-						JSON.stringify({
-							title: data.title,
-							url: data.url
-						})
-				});
-			},
-			fnToOriginal(originalURL) {
-				this.fnToWebview({
-					title: this.result.title,
-					url: originalURL
-				});
-			},
-      showValidVisitPop() {
-        this.showValidVisitMore = true;
-        this.validVisitModal.value = undefined;
-        this.validVisitModal.show = true;
-        this.validVisitModal.useCancel = false;
-      },
-      showValidVisitMorePop() {
-        this.showValidVisitMore = true;
-        this.validVisitModal.value = undefined;
-        this.validVisitModal.show = true;
-        this.validVisitModal.useCancel = true;
-      },
-      closeValidVisitPop() {
-        this.validVisitModal.show = false;
-        this.validVisitModal.useCancel = true;
-        this.validVisitModal.value = undefined;
-        if (this.visitType === 1) {
-          // 显示是否前往获取验证弹窗
-          this.validVisitModal.show = true;
-          this.showGetPassword = true;
-        }
-      },
-      closeAllPop() {
-        this.validVisitModal.show = false;
-        this.validVisitModal.useCancel = true;
-        this.validVisitModal.value = undefined;
-        this.showGetPassword = false;
-      },
-      toAdvertise() {
-        this.showGetPassword = false;
-        uni.navigateTo({
-          url: '/pagesA/advertise/advertise'
-        });
-      },
-    //   获取openid
-      fnGetOpenid() {
-        uni.login({
-          provider: 'weixin',
-          success: function (loginRes) {
-            try {
-              // todo 因为没有获取openid，所以先使用code代替
-              uni.setStorageSync('openid', loginRes.code)
-            } catch (error) {
-              console.log(error)
-            }
-          }
-        })
-      },
-    //   隐藏内容
-      fnHideContent() {
-        switch (this.visitType) {
-          case 1:
-            const restrictReadRaw = this.result?.content?.raw.split('<!-- restrictRead start -->')[0];
-            this.result.content.raw = restrictReadRaw;
-            return;
-          case 2:
-          case 3:
-            const length = this.result?.content?.raw?.length;
-            const first30PercentLength = Math.floor(length * 0.3);
-            const first30PercentRaw = this.result?.content?.raw?.substring(0, first30PercentLength);
-            this.result.content.raw = first30PercentRaw;
-            return;
-          default:
-            return;
-        }
-      },
-    //   校验密码
-      fnValidVisitPwd() {
-        switch (this.visitType) {
-          case 0:
-            return;
-          case 1:
-            this.$httpApi.v2.checkPostVerifyCode(this.validVisitModal.value, this.result?.metadata?.name).then(res => {
-              if (res.code === 200) {
-                uni.setStorageSync('visit_' + this.result?.metadata?.name, true)
-                this.closeAllPop();
-                this.fnGetData();
-              } else {
-                uni.showToast({
-                  title: '密码错误',
-                  icon: 'none'
+                })
+                .catch(err => {
+                    console.log("错误", err)
+                    this.loading = 'error';
+                })
+                .finally(() => {
+                    uni.hideLoading();
+                    uni.stopPullDownRefresh();
                 });
-              }
-            }).catch(err => {
-              console.log(err);
-            });
-            return;
-          case 2:
-          case 3:
-            if (this.visitPwd === this.validVisitModal.value) {
-              uni.setStorageSync('visit_' + this.result?.metadata?.name, true)
-              this.closeValidVisitPop();
-              this.fnGetData();
-            } else {
-              uni.showToast({
-                title: '密码错误',
-                icon: 'none'
-              });
+        },
+
+        // 浮动按钮点击
+        fnOnFlotButtonChange(index) {
+            switch (index) {
+                // case 0:
+                // 	this.fnDoLikes();
+                // 	break;
+                case 0:
+                    this.fnToComment();
+                    break;
+                case 1:
+                    this.fnShowShare();
+                    break;
             }
-            return;
-          default:
-            return;
-        }
-      },
-		}
-	};
+        },
+
+        fnToComment() {
+            if (!this.result.spec.allowComment) {
+                return uni.$tm.toast('文章已开启禁止评论！');
+            }
+            this.$Router.push({
+                path: '/pagesA/comment/comment',
+                query: {
+                    isComment: true,
+                    postName: this.result.metadata.name,
+                    title: this.result.spec.title,
+                    from: 'posts',
+                    formPage: 'comment_list',
+                    type: 'post'
+                }
+            });
+        },
+
+        fnDoLikes() {
+            this.$httpApi
+                .postLikePost(this.result.id)
+                .then(res => {
+                    if (res.status == 200) {
+                        this.result.likes += 1;
+                        uni.$tm.toast('\(^o^)/~点赞成功!');
+                    } else {
+                        uni.showToast({
+                            icon: 'none',
+                            title: res.message
+                        });
+                    }
+                })
+                .catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
+                    });
+                });
+        },
+        fnShowShare() {
+            this.poster.show = true;
+            setTimeout(() => {
+                this.poster.showCanvas = true;
+                this.fnCreatePoster(res => {
+                    this.poster.res = res;
+                });
+            }, 500);
+        },
+        // 绘制虚线：https://blog.csdn.net/a460550542/article/details/124821248
+        drawDashedLine(ctx, x, y, w, h, pattern, color) {
+            ctx.lineWidth = h;
+            ctx.strokeStyle = color;
+            ctx.beginPath();
+            ctx.setLineDash(pattern);
+            ctx.moveTo(x, y);
+            ctx.lineTo(w, y);
+            ctx.stroke();
+            y += 20;
+        },
+        fnCreatePoster(callback) {
+            this.$nextTick(async () => {
+                const systemInfo = await uni.getSystemInfoSync();
+                const _bloggerAvatar = this.$utils.checkAvatarUrl(this.bloggerInfo.avatar, true);
+                const _articleCover = this.$utils.checkThumbnailUrl(this.result.spec.cover, true);
+                // 初始化
+                await this.$refs.rCanvas.init({
+                    canvas_id: 'rCanvas',
+                    // canvas_width: systemInfo.windowWidth - uni.upx2px(76),
+                    canvas_width: 337,
+                    canvas_height: 460,
+                    background_color: 'rgba(255,255,255,0)'
+                });
+                // 画圆角背景
+                await this.$refs.rCanvas
+                    .fillRoundRect({
+                        x: 0,
+                        y: 0,
+                        w: 337,
+                        h: 460,
+                        radius: 12,
+                        fill_color: '#fff'
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+                // 博主信息
+                await this.$refs.rCanvas
+                    .drawImage({
+                        url: _bloggerAvatar,
+                        x: 12,
+                        y: 12,
+                        w: 48,
+                        h: 48,
+                        border_radius: 24
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+
+                await this.$refs.rCanvas
+                    .drawText({
+                        text: this.bloggerInfo.nickname,
+                        max_width: 0,
+                        x: 70,
+                        y: 30,
+                        font_color: '#000',
+                        font_size: 15
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+                await this.$refs.rCanvas
+                    .drawText({
+                        text: this.bloggerInfo.description,
+                        max_width: 0,
+                        x: 70,
+                        y: 52,
+                        font_color: '#666',
+                        font_size: 12
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+                // 文章封面图
+                await this.$refs.rCanvas
+                    .drawImage({
+                        url: _articleCover,
+                        x: 12,
+                        y: 75,
+                        w: 312,
+                        h: 180,
+                        border_radius: 6
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+
+                // 文章标题
+                await this.$refs.rCanvas
+                    .drawText({
+                        text: this.result.spec.title,
+                        max_width: 312,
+                        line_clamp: 1,
+                        x: 12,
+                        y: 285,
+                        font_weight: 'bold',
+                        font_color: '#333',
+                        font_size: 14
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+                await this.$refs.rCanvas
+                    .drawText({
+                        text: this.result.content.raw,
+                        max_width: 312,
+                        line_clamp: 2,
+                        x: 12,
+                        y: 310,
+                        font_color: '#333',
+                        font_size: 13,
+                        line_height: 20
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+
+                this.drawDashedLine(this.$refs.rCanvas.ctx, 14, 356, 332, 0.5, [8, 5, 5, 5], '#999');
+                // 小程序信息
+                await this.$refs.rCanvas
+                    .drawImage({
+                        url: this.$haloConfig.miniCodeImageUrl,
+                        x: 20,
+                        y: 360,
+                        w: 80,
+                        h: 80
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+
+                await this.$refs.rCanvas
+                    .drawText({
+                        text: '长按识别小程序',
+                        x: 150,
+                        y: 390,
+                        font_color: '#333',
+                        font_size: 15,
+                        font_weight: 'bold',
+                        line_height: 22
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+                await this.$refs.rCanvas
+                    .drawText({
+                        text: '关注我，给你分享更多有趣的知识',
+                        x: 115,
+                        y: 425,
+                        font_color: '#333',
+                        font_size: 12,
+                        line_height: 22
+                    })
+                    .catch(err_msg => {
+                        uni.showToast({
+                            title: err_msg,
+                            icon: 'none'
+                        });
+                    });
+                // 生成海报
+                await this.$refs.rCanvas.draw(res => {
+                    //res.tempFilePath：生成成功，返回base64图片
+                    // 保存图片
+                    this.poster.loading = false;
+                    callback(res);
+                });
+            });
+        },
+        fnOnPosterClose() {
+            this.poster.show = false;
+            this.poster.showCanvas = false;
+            this.poster.loading = true;
+        },
+        fnSavePoster() {
+            this.$refs.rCanvas.saveImage(this.poster.res.tempFilePath);
+            uni.$tm.toast('保存成功');
+        },
+        fnShareTo() {
+            // #ifdef MP-WEIXIN
+            uni.$tm.toast('点击右上角分享给好友！');
+            // #endif
+            // #ifdef APP-PLUS
+            uni.share({
+                provider: 'weixin',
+                scene: 'WXSceneSession',
+                type: 0,
+                href: this.$baseApiUrl,
+                title: this.result.spec.title,
+                summary: this.result.content.raw,
+                imageUrl: this.poster.res.tempFilePath,
+                success: function (res) {
+                    console.log('success:' + JSON.stringify(res));
+                },
+                fail: function (err) {
+                    console.log('fail:' + JSON.stringify(err));
+                }
+            });
+            // #endif
+        },
+        fnOnShowCommentDetail(data) {
+            const {
+                postName,
+                comment
+            } = data;
+            this.commentDetail.comment = comment;
+            this.commentDetail.postName = postName;
+            this.commentDetail.list = [];
+            this.commentDetail.show = true;
+            this.fnGetChildComments();
+        },
+        fnGetChildComments() {
+            this.commentDetail.loading = 'loading';
+            this.$httpApi.v2
+                .getPostCommentReplyList(this.commentDetail.postName, {
+                    page: 1,
+                    size: 100
+                })
+                .then(res => {
+                    console.log('getPostChildrenCommentList res', res);
+                    this.commentDetail.loading = 'success';
+                    this.commentDetail.list = res.items;
+                })
+                .catch(err => {
+                    console.log('getPostChildrenCommentList err', error);
+                    this.commentDetail.loading = 'error';
+                });
+        },
+        fnToCate(category) {
+            uni.navigateTo({
+                url: `/pagesA/category-detail/category-detail?name=${category.metadata.name}&title=${category.spec.displayName}`
+            });
+        },
+        fnToTag(tag) {
+            uni.navigateTo({
+                url: `/pagesA/tag-detail/tag-detail?name=${tag.metadata.name}&title=${tag.spec.displayName}`
+            });
+        },
+        async fnOnCommentLoaded(data) {
+            console.log("data", data)
+            const _list = [];
+            const _handleData = list => {
+                return new Promise(resolve => {
+                    if (list.length == 0) {
+                        resolve();
+                    } else {
+                        list.forEach(item => {
+                            _list.push(item);
+                            if (item.replies && item.replies.length != 0) {
+                                _handleData(item.replies.items);
+                            }
+                            resolve();
+                        });
+                    }
+                });
+            };
+            await _handleData(data);
+            // if (this.globalAppSettings.barrage.use) {
+            // 	this.$nextTick(() => {
+            // 		if (_list.length != 0) {
+            // 			_handleAddBarrage();
+            // 		}
+            // 	});
+            // }
+            // const _handleRemove = () => {
+            // 	this.$refs['barrage'] && this.$refs['barrage'].remove({
+            // 		duration: 5000, // 延迟关闭的时间
+            // 		speed: 600 // 弹幕消失的速度
+            // 	});
+            // };
+            // let index = 0;
+            // const _handleAddBarrage = () => {
+            // 	setTimeout(() => {
+            // 		this.$refs['barrage'] && this.$refs['barrage'].add(_list[index]);
+            // 		index += 1;
+            // 		if (index < _list.length - 1) {
+            // 			_handleAddBarrage();
+            // 		} else {
+            // 			_handleRemove();
+            // 		}
+            // 	}, 1000);
+            // };
+        },
+        fnToWebview(data) {
+            uni.navigateTo({
+                url: '/pagesC/website/website?data=' +
+                    JSON.stringify({
+                        title: data.title,
+                        url: data.url
+                    })
+            });
+        },
+        fnToOriginal(originalURL) {
+            this.fnToWebview({
+                title: this.result.title,
+                url: originalURL
+            });
+        },
+        showValidVisitPop() {
+            this.showValidVisitMore = true;
+            this.validVisitModal.value = undefined;
+            this.validVisitModal.show = true;
+            this.validVisitModal.useCancel = false;
+        },
+        showValidVisitMorePop() {
+            this.showValidVisitMore = true;
+            this.validVisitModal.value = undefined;
+            this.validVisitModal.show = true;
+            this.validVisitModal.useCancel = true;
+        },
+        closeValidVisitPop() {
+            this.validVisitModal.show = false;
+            this.validVisitModal.useCancel = true;
+            this.validVisitModal.value = undefined;
+            if (this.visitType === 1) {
+                // 显示是否前往获取验证弹窗
+                this.validVisitModal.show = true;
+                this.showGetPassword = true;
+            }
+        },
+        closeAllPop() {
+            this.validVisitModal.show = false;
+            this.validVisitModal.useCancel = true;
+            this.validVisitModal.value = undefined;
+            this.showGetPassword = false;
+        },
+        toAdvertise() {
+            this.showGetPassword = false;
+            uni.navigateTo({
+                url: '/pagesA/advertise/advertise'
+            });
+        },
+        //   获取openid
+        fnGetOpenid() {
+            uni.login({
+                provider: 'weixin',
+                success: function (loginRes) {
+                    try {
+                        // todo 因为没有获取openid，所以先使用code代替
+                        uni.setStorageSync('openid', loginRes.code)
+                    } catch (error) {
+                        console.log(error)
+                    }
+                }
+            })
+        },
+        //   隐藏内容
+        fnHideContent() {
+            switch (this.visitType) {
+                case 1:
+                    const restrictReadRaw = this.result?.content?.raw.split('<!-- restrictRead start -->')[0];
+                    this.result.content.raw = restrictReadRaw;
+                    return;
+                case 2:
+                case 3:
+                    const length = this.result?.content?.raw?.length;
+                    const first30PercentLength = Math.floor(length * 0.3);
+                    const first30PercentRaw = this.result?.content?.raw?.substring(0, first30PercentLength);
+                    this.result.content.raw = first30PercentRaw;
+                    return;
+                default:
+                    return;
+            }
+        },
+        //   校验密码
+        fnValidVisitPwd() {
+            switch (this.visitType) {
+                case 0:
+                    return;
+                case 1:
+                    this.$httpApi.v2.checkPostVerifyCode(this.validVisitModal.value, this.result?.metadata?.name).then(res => {
+                        if (res.code === 200) {
+                            uni.setStorageSync('visit_' + this.result?.metadata?.name, true)
+                            this.closeAllPop();
+                            this.fnGetData();
+                        } else {
+                            uni.showToast({
+                                title: '密码错误',
+                                icon: 'none'
+                            });
+                        }
+                    }).catch(err => {
+                        console.log(err);
+                    });
+                    return;
+                case 2:
+                case 3:
+                    if (this.visitPwd === this.validVisitModal.value) {
+                        uni.setStorageSync('visit_' + this.result?.metadata?.name, true)
+                        this.closeValidVisitPop();
+                        this.fnGetData();
+                    } else {
+                        uni.showToast({
+                            title: '密码错误',
+                            icon: 'none'
+                        });
+                    }
+                    return;
+                default:
+                    return;
+            }
+        },
+    }
+};
 </script>
 
 <style lang="scss" scoped>
-	.app-page {
-		width: 100vw;
-		min-height: 100vh;
-		display: flex;
-		flex-direction: column;
-		box-sizing: border-box;
-		background-color: #fafafd;
-		padding-bottom: 24rpx;
-	}
+.app-page {
+    width: 100vw;
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    background-color: #fafafd;
+    padding-bottom: 24rpx;
+}
 
-	.bg-image {
-		position: fixed;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		width: 100vw;
-		height: 100vh;
-		z-index: 0;
-	}
+.bg-image {
+    position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    width: 100vw;
+    height: 100vh;
+    z-index: 0;
+}
 
-	.loading-wrap {
-		padding: 0 24rpx;
-		height: inherit;
-		background-color: #fff;
-	}
+.loading-wrap {
+    padding: 0 24rpx;
+    height: inherit;
+    background-color: #fff;
+}
 
-	.head {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		padding: 36rpx 24rpx;
-		background-color: #ffffff;
-		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
-		// box-shadow: 0rpx 6rpx 30rpx rgba(182, 223, 255, 0.3);
-		border-radius: 12rpx;
+.head {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 36rpx 24rpx;
+    background-color: #ffffff;
+    box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
+    // box-shadow: 0rpx 6rpx 30rpx rgba(182, 223, 255, 0.3);
+    border-radius: 12rpx;
 
-		.title {
-			font-size: 36rpx;
-			font-weight: 600;
-			text-align: center;
-		}
+    .title {
+        font-size: 36rpx;
+        font-weight: 600;
+        text-align: center;
+    }
 
-		.detail {
-			width: 100%;
-			margin-top: 24rpx;
-			font-size: 26rpx;
+    .detail {
+        width: 100%;
+        margin-top: 24rpx;
+        font-size: 26rpx;
 
-			.author {
-				text-align: center;
-				font-size: 24rpx;
-				color: #666;
+        .author {
+            text-align: center;
+            font-size: 24rpx;
+            color: #666;
 
-				&-name {}
+            &-name {
+            }
 
-				&-time {
-					margin-left: 36rpx;
-				}
-			}
+            &-time {
+                margin-left: 36rpx;
+            }
+        }
 
-			.cover {
-				margin-top: 24rpx;
-				width: 100%;
-				height: 280rpx;
+        .cover {
+            margin-top: 24rpx;
+            width: 100%;
+            height: 280rpx;
 
-				&-img {
-					width: 100%;
-					height: 100%;
-					border-radius: 12rpx;
-				}
-			}
+            &-img {
+                width: 100%;
+                height: 100%;
+                border-radius: 12rpx;
+            }
+        }
 
-			.count {
-				margin-top: 24rpx;
-				display: flex;
-				justify-content: space-between;
+        .count {
+            margin-top: 24rpx;
+            display: flex;
+            justify-content: space-between;
 
-				&.no-thumbnail {
-					border-top: 2rpx solid #f2f2f2;
-					padding-top: 12rpx;
+            &.no-thumbnail {
+                border-top: 2rpx solid #f2f2f2;
+                padding-top: 12rpx;
 
-					.count-item {
-						position: relative;
-						color: #666;
+                .count-item {
+                    position: relative;
+                    color: #666;
 
-						&::after {
-							content: '';
-							position: absolute;
-							right: 0;
-							background-color: #eee;
-							width: 2rpx;
-							height: 32rpx;
-						}
+                    &::after {
+                        content: '';
+                        position: absolute;
+                        right: 0;
+                        background-color: #eee;
+                        width: 2rpx;
+                        height: 32rpx;
+                    }
 
-						&:last-child {
-							&::after {
-								display: none;
-							}
-						}
-					}
-				}
+                    &:last-child {
+                        &::after {
+                            display: none;
+                        }
+                    }
+                }
+            }
 
-				&-item {
-					flex: 1;
-					display: flex;
-					align-items: flex-end;
-					justify-content: center;
-					color: #666;
+            &-item {
+                flex: 1;
+                display: flex;
+                align-items: flex-end;
+                justify-content: center;
+                color: #666;
 
-					.label {
-						font-size: 24rpx;
-						padding-left: 8rpx;
-					}
+                .label {
+                    font-size: 24rpx;
+                    padding-left: 8rpx;
+                }
 
-					.value {
-						font-size: 32rpx;
-					}
-				}
-			}
-		}
-	}
+                .value {
+                    font-size: 32rpx;
+                }
+            }
+        }
+    }
+}
 
-	.category {
-		margin: 0 24rpx;
-		padding: 24rpx;
-		background-color: #ffffff;
-		border-radius: 12rpx;
-		// box-shadow: 0rpx 0rpx 24rpx rgba(182, 223, 255, 0.3);
-		box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
-		// border: 2rpx solid #f8f8f8;
-		font-size: 28rpx;
+.category {
+    margin: 0 24rpx;
+    padding: 24rpx;
+    background-color: #ffffff;
+    border-radius: 12rpx;
+    // box-shadow: 0rpx 0rpx 24rpx rgba(182, 223, 255, 0.3);
+    box-shadow: 0rpx 4rpx 24rpx rgba(0, 0, 0, 0.03);
+    // border: 2rpx solid #f8f8f8;
+    font-size: 28rpx;
 
-		&-type {
-			line-height: 55rpx;
-		}
+    &-type {
+        line-height: 55rpx;
+    }
 
-		&-tag {
-			background-color: #5bb8fa;
-			color: #fff;
-			padding: 6rpx 12rpx;
-			border-radius: 6rpx;
-			font-size: 24rpx;
+    &-tag {
+        background-color: #5bb8fa;
+        color: #fff;
+        padding: 6rpx 12rpx;
+        border-radius: 6rpx;
+        font-size: 24rpx;
 
-			&.is-empty {
-				background-color: #607d8b;
-			}
-		}
-	}
+        &.is-empty {
+            background-color: #607d8b;
+        }
+    }
+}
 
-	.category-tag+.category-tag {
-		margin-left: 12rpx;
-	}
+.category-tag + .category-tag {
+    margin-left: 12rpx;
+}
 
-	.content {
-		margin-top: 24rpx;
-	}
+.content {
+    margin-top: 24rpx;
+}
 
-	.markdown-wrap,
-	.evan-markdown,
-	.ad-wrap,
-	.copyright-wrap,
-	.comment-wrap {
-		box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
-	}
+.markdown-wrap,
+.evan-markdown,
+.ad-wrap,
+.copyright-wrap,
+.comment-wrap {
+    box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
+}
 
-	.markdown-wrap {
-		overflow: hidden;
-		border-radius: 12rpx;
-	}
+.markdown-wrap {
+    overflow: hidden;
+    border-radius: 12rpx;
+}
 
-	.copyright-title {
-		position: relative;
-		box-sizing: border-box;
-		padding-left: 24rpx;
-		font-size: 30rpx;
+.copyright-title {
+    position: relative;
+    box-sizing: border-box;
+    padding-left: 24rpx;
+    font-size: 30rpx;
 
-		&:before {
-			content: '';
-			position: absolute;
-			left: 0rpx;
-			top: 8rpx;
-			width: 8rpx;
-			height: 26rpx;
-			background-color: rgb(3, 174, 252);
-			border-radius: 6rpx;
-		}
-	}
+    &:before {
+        content: '';
+        position: absolute;
+        left: 0rpx;
+        top: 8rpx;
+        width: 8rpx;
+        height: 26rpx;
+        background-color: rgb(3, 174, 252);
+        border-radius: 6rpx;
+    }
+}
 
-	.poup-head {
-		border-bottom: 2rpx solid #f5f5f5;
-	}
+.poup-head {
+    border-bottom: 2rpx solid #f5f5f5;
+}
 
-	.poup-body {
-		height: 50vh;
-	}
+.poup-body {
+    height: 50vh;
+}
 
-	.poup-empty {
-		width: 100%;
-		height: 40vh;
-	}
+.poup-empty {
+    width: 100%;
+    height: 40vh;
+}
 
-	.poup-loading-wrap {
-		width: 100%;
-		height: 40vh;
+.poup-loading-wrap {
+    width: 100%;
+    height: 40vh;
 
-		.e-loading-icon {
-			font-size: 80rpx;
-		}
-	}
+    .e-loading-icon {
+        font-size: 80rpx;
+    }
+}
 
-	.poster-content {
-		width: 100%;
-		min-height: 60vh;
-		overflow: hidden;
-	}
+.poster-content {
+    width: 100%;
+    min-height: 60vh;
+    overflow: hidden;
+}
 
-	.copyright-text {
-		line-height: 1.7;
-	}
+.copyright-text {
+    line-height: 1.7;
+}
 
-	.poster-loading {
-		width: 100%;
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		// background-color: rgba(0, 0, 0, 0.1);
-		z-index: 666;
-	}
+.poster-loading {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    // background-color: rgba(0, 0, 0, 0.1);
+    z-index: 666;
+}
 
-	.poster-save {
-		box-sizing: border-box;
-		border-top: 2rpx dashed #eee;
-	}
+.poster-save {
+    box-sizing: border-box;
+    border-top: 2rpx dashed #eee;
+}
 
-	.original-url {
-		display: flex;
+.original-url {
+    display: flex;
 
-		&_left {
-			flex-shrink: 0;
-			width: 84rpx;
-		}
+    &_left {
+        flex-shrink: 0;
+        width: 84rpx;
+    }
 
-		&_right {
-			flex-grow: 1;
-			display: inline-flex;
-			align-items: center;
+    &_right {
+        flex-grow: 1;
+        display: inline-flex;
+        align-items: center;
 
-			&__link {
-				width: 410rpx;
-				display: inline-block;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-			}
+        &__link {
+            width: 410rpx;
+            display: inline-block;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
 
-			&__btn {
-				flex-grow: 1;
-				flex-shrink: 0;
-				display: block;
-				text-align: right;
-			}
-		}
-	}
-</style>
\ No newline at end of file
+        &__btn {
+            flex-grow: 1;
+            flex-shrink: 0;
+            display: block;
+            text-align: right;
+        }
+    }
+}
+</style>