From 21d723d2601094cdb80cbe063b39516ad69f6ea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=8E=AB=E5=94=90=E5=B0=BC?= <1431128779@qq.com>
Date: Thu, 8 Jun 2023 20:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8E=9F=E6=96=87=E9=93=BE=E6=8E=A5=E3=80=81?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=AF=86=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/styles/app.base.scss              |   19 +
 components/cache-image/cache-image.vue   |  321 ++---
 manifest.json                            |  432 +++---
 pages.json                               |    4 +-
 pagesA/article-detail/article-detail.vue | 1636 ++++++++++++----------
 5 files changed, 1273 insertions(+), 1139 deletions(-)

diff --git a/common/styles/app.base.scss b/common/styles/app.base.scss
index 3bc9949..d5567bf 100644
--- a/common/styles/app.base.scss
+++ b/common/styles/app.base.scss
@@ -153,3 +153,22 @@
 		transform: scale(1);
 	}
 }
+
+/* 文本省略样式 开始 */
+.text-sub-one {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+/* 多行文本省略 */
+@for $i from 2 through 30 {
+	.text-sub-more-#{$i} {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: $i;
+		overflow: hidden;
+	}
+}
+
+/* 文本省略样式 结束 */
diff --git a/components/cache-image/cache-image.vue b/components/cache-image/cache-image.vue
index 7ef4429..de7314a 100644
--- a/components/cache-image/cache-image.vue
+++ b/components/cache-image/cache-image.vue
@@ -3,183 +3,192 @@
 		<view v-if="loadStatus == 'loading'" class="img-loading" :style="[imgStyle, loadStyle]">
 			<!-- <text class="img-load-icon iconfont icon-loading"></text>
 			<text class="img-load-text">{{ loadText }}</text> -->
-			<image :src="loadingImgSrc" :style="[imgStyle]" mode="aspectFit"></image>
+			<image :src="loadingImgSrc" :style="[loadingImgStyle]" mode="aspectFit"></image>
 		</view>
 		<view v-if="loadStatus == 'error'" class="img-error" :style="[imgStyle, loadErrStyle]">
-			<text class="img-err-icon iconfont icon-exclamation-circle"></text>
-			<text class="img-load-text">{{ loadErrText }}</text>
+			<!-- <text class="img-err-icon iconfont icon-exclamation-circle"></text>
+			<text class="img-load-text">{{ loadErrText }}</text> -->
+			<image class="img-error-img" :src="loadingErrorImageSrc" mode="scaleToFill"></image>
 		</view>
-		<image
-			v-show="loadStatus == 'success'"
-			:src="src"
-			@load="fnOnLoad"
-			@error="fnOnError"
-			:lazy-load="lazyLoad"
-			:style="[imgStyle]"
-			:mode="mode"
-			@click="$emit('on-click', url)"
-		></image>
+		<image v-show="loadStatus == 'success'" :src="src" @load="fnOnLoad" @error="fnOnError" :lazy-load="lazyLoad" :style="[imgStyle]" :mode="mode" @click="$emit('on-click', url)"></image>
 	</view>
 </template>
 
 <script>
-import imageCache from '@/utils/imageCache.js';
-export default {
-	name: 'cache-image',
-	props: {
-		url: {
-			type: String,
-			default: ''
-		},
-		lazyLoad: {
-			type: Boolean,
-			default: true
-		},
-		loadStyle: {
-			type: Object,
-			default() {
-				return {
-					backgroundColor: '#ffffff',
-					color: '#333'
-				};
+	import imageCache from '@/utils/imageCache.js';
+	export default {
+		name: 'cache-image',
+		props: {
+			url: {
+				type: String,
+				default: ''
+			},
+			lazyLoad: {
+				type: Boolean,
+				default: true
+			},
+			loadStyle: {
+				type: Object,
+				default () {
+					return {
+						backgroundColor: '#ffffff',
+						color: '#333'
+					};
+				}
+			},
+			loadErrStyle: {
+				type: Object,
+				default () {
+					return {
+						color: 'rgba(244, 67, 54,1)'
+						// backgroundColor: 'rgba(244, 67, 54,0.2)'
+					};
+				}
+			},
+			mode: {
+				type: String,
+				default: 'aspectFill'
+			},
+			loadText: {
+				type: String,
+				default: '加载中...'
+			},
+			loadErrText: {
+				type: String,
+				default: '加载失败'
+			},
+			fileMd5: {
+				type: String,
+				default: ''
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			width: {
+				type: String,
+				default: '100%'
+			},
+			height: {
+				type: String,
+				default: '100%'
+			},
+			radius: {
+				type: String,
+				default: ''
 			}
 		},
-		loadErrStyle: {
-			type: Object,
-			default() {
-				return {
-					color: 'rgba(244, 67, 54,1)'
-					// backgroundColor: 'rgba(244, 67, 54,0.2)'
-				};
+		data() {
+			return {
+				imgStyle: {},
+				loadingImgStyle: {
+					width: '120rpx',
+				},
+				src: '', // 图片地址
+				loadStatus: 'loading'
+			};
+		},
+		computed: {
+			loadingImgSrc() {
+				return getApp().globalData.loadingGifUrl;
+			},
+			loadingErrorImageSrc() {
+				return getApp().globalData.loadingErrUrl
 			}
 		},
-		mode: {
-			type: String,
-			default: 'aspectFill'
-		},
-		loadText: {
-			type: String,
-			default: '加载中...'
-		},
-		loadErrText: {
-			type: String,
-			default: '加载失败'
-		},
-		fileMd5: {
-			type: String,
-			default: ''
-		},
-		styles: {
-			type: Object,
-			default() {
-				return {};
+		watch: {
+			// 监听图片md5值的变化
+			fileMd5(val) {
+				// 查找获取图片缓存
+				this.fnGetImageCache();
 			}
 		},
-		width: {
-			type: String,
-			default: '100%'
-		},
-		height: {
-			type: String,
-			default: '100%'
-		},
-		radius: {
-			type: String,
-			default: ''
-		}
-	},
-	data() {
-		return {
-			imgStyle: {},
-			src: '', // 图片地址
-			loadStatus: 'loading'
-		};
-	},
-	computed: {
-		loadingImgSrc() {
-			return getApp().globalData.loadingGifUrl;
-		}
-	},
-	watch: {
-		// 监听图片md5值的变化
-		fileMd5(val) {
+		created() {
+			console.log('cache-image', this.url);
+			this.imgStyle = {
+				width: this.width,
+				height: this.height,
+				borderRadius: this.radius,
+				...this.styles
+			};
+
 			// 查找获取图片缓存
 			this.fnGetImageCache();
-		}
-	},
-	created() {
-		console.log('cache-image', this.url);
-		this.imgStyle = {
-			width: this.width,
-			height: this.height,
-			borderRadius: this.radius,
-			...this.styles
-		};
-
-		// 查找获取图片缓存
-		this.fnGetImageCache();
-	},
-	methods: {
-		// 查找获取图片缓存
-		async fnGetImageCache() {
-			// #ifdef APP-PLUS
-			var result = await imageCache.getImageCache(this.url, this.fileMd5);
-			if (result) {
-				this.src = result;
-			} else {
+		},
+		methods: {
+			// 查找获取图片缓存
+			async fnGetImageCache() {
+				// #ifdef APP-PLUS
+				var result = await imageCache.getImageCache(this.url, this.fileMd5);
+				if (result) {
+					this.src = result;
+				} else {
+					this.src = this.url;
+				}
+				// #endif
+				// #ifndef APP-PLUS
 				this.src = this.url;
+				// #endif
+			},
+			fnOnLoad() {
+				this.loadStatus = 'success';
+			},
+			fnOnError(e) {
+				this.loadStatus = 'error';
 			}
-			// #endif
-			// #ifndef APP-PLUS
-			this.src = this.url;
-			// #endif
-		},
-		fnOnLoad() {
-			this.loadStatus = 'success';
-		},
-		fnOnError() {
-			this.loadStatus = 'error';
 		}
-	}
-};
+	};
 </script>
 
 <style scoped lang="scss">
-.cache-image-wrap {
-	width: 100%;
-	height: 100%;
-}
-.img-loading,
-.img-error {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	box-sizing: border-box;
-	background-color: #f2f2f2;
-}
-.img-load-icon {
-	font-size: 36rpx;
-	animation: xhRote 0.8s infinite linear;
-}
-.img-load-text {
-	font-size: 28rpx;
-	margin-top: 8rpx;
-	color: inherit;
-}
-.img-error {
-	font-size: 28rpx;
-}
-.img-err-icon {
-	font-size: 36rpx;
-}
-@keyframes xhRote {
-	0% {
-		transform: rotate(0deg);
+	.cache-image-wrap {
+		width: 100%;
+		height: 100%;
 	}
 
-	100% {
-		transform: rotate(360deg);
+	.img-loading,
+	.img-error {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		background-color: #f2f2f2;
 	}
-}
-</style>
+
+	.img-load-icon {
+		font-size: 36rpx;
+		animation: xhRote 0.8s infinite linear;
+	}
+
+	.img-load-text {
+		font-size: 28rpx;
+		margin-top: 8rpx;
+		color: inherit;
+	}
+
+	.img-error {
+		font-size: 28rpx;
+
+		&-img {
+			width: 100%;
+			border-radius: 12rpx;
+		}
+	}
+
+	.img-err-icon {
+		font-size: 36rpx;
+	}
+
+	@keyframes xhRote {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 90c689f..21ed9cf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,217 +1,217 @@
 {
-	"name": "uni-halo",
-	"appid": "__UNI__5748B6E",
-	"description": "uni-halo博客：基于halo开源博客系统API开发的多端博客。",
-	"versionName": "1.0.0",
-	"versionCode": 100,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"OAuth": {},
-			"Share": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CAPTURE_VIDEO_OUTPUT\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false,
-				"capabilities": {
-					"entitlements": {
-						"com.apple.developer.associated-domains": ["applinks:static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com"]
-					}
-				}
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"ad": {
-					"gdt": {},
-					"csj": {},
-					"360": {},
-					"ks": {},
-					"sigmob": {},
-					"hw": {},
-					"bd": {}
-				},
-				"oauth": {
-					"weixin": {
-						"appid": "wxd971954762ec4744",
-						"UniversalLinks": "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/"
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wxd971954762ec4744",
-						"UniversalLinks": "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/"
-					}
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		},
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx1bb161867082c72f",
-		"setting": {
-			"urlCheck": false,
-			"minified": true
-		},
-		"usingComponents": true,
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"mp-alipay": {
-		"usingComponents": true,
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"mp-baidu": {
-		"usingComponents": true,
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"mp-toutiao": {
-		"usingComponents": true,
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"uniStatistics": {
-		"enable": true,
-		"version": "2"
-	},
-	"vueVersion": "2",
-	"h5": {
-		"title": "uni-halo",
-		"devServer": {
-			"disableHostCheck": true,
-			"proxy": {
-				"/api": {
-					"target": "https://b.925i.cn",
-					"changeOrigin": true,
-					"secure": false,
-					"pathRewrite": {
-						"^/api": "/api"
-					}
-				}
-			}
-		},
-		"optimization": {
-			"preload": true,
-			"treeShaking": {
-				"enable": true
-			}
-		},
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"_spaceID": "699a26a5-a6cd-4b54-b603-5155b312a5f5",
-	"mp-qq": {
-		"appid": "1112285420",
-		"setting": {
-			"minified": true,
-			"postcss": true,
-			"es6": true
-		},
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"mp-jd": {
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"mp-kuaishou": {
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"mp-lark": {
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"quickapp-webview-huawei": {
-		"uniStatistics": {
-			"enable": true
-		}
-	},
-	"quickapp-webview-union": {
-		"uniStatistics": {
-			"enable": true
-		}
-	}
-}
\ No newline at end of file
+    "name" : "uni-halo",
+    "appid" : "__UNI__5748B6E",
+    "description" : "uni-halo博客：基于halo开源博客系统API开发的多端博客。",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "OAuth" : {},
+            "Share" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CAPTURE_VIDEO_OUTPUT\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com" ]
+                    }
+                }
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {
+                    "gdt" : {},
+                    "csj" : {},
+                    "360" : {},
+                    "ks" : {},
+                    "sigmob" : {},
+                    "hw" : {},
+                    "bd" : {}
+                },
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wxd971954762ec4744",
+                        "UniversalLinks" : "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/"
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxd971954762ec4744",
+                        "UniversalLinks" : "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/"
+                    }
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        },
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx1bb161867082c72f",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true
+        },
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-baidu" : {
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "uniStatistics" : {
+        "enable" : true,
+        "version" : "2"
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "title" : "uni-halo",
+        "devServer" : {
+            "disableHostCheck" : true,
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://b.925i.cn",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/api" : "/api"
+                    }
+                }
+            }
+        },
+        "optimization" : {
+            "preload" : true,
+            "treeShaking" : {
+                "enable" : true
+            }
+        },
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "_spaceID" : "699a26a5-a6cd-4b54-b603-5155b312a5f5",
+    "mp-qq" : {
+        "appid" : "1112285420",
+        "setting" : {
+            "minified" : true,
+            "postcss" : true,
+            "es6" : true
+        },
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-jd" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-kuaishou" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-lark" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-huawei" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-union" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    }
+}
diff --git a/pages.json b/pages.json
index 738a626..a03ed4f 100644
--- a/pages.json
+++ b/pages.json
@@ -550,7 +550,7 @@
 	},
 	"tabBar": {
 		"backgroundColor": "#fff",
-		"borderStyle": "#fff",
+		"borderStyle": "white",
 		"color": "#303133",
 		"selectedColor": "#03a9f4",
 		"list": [{
@@ -582,4 +582,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/pagesA/article-detail/article-detail.vue b/pagesA/article-detail/article-detail.vue
index a288fe4..18825d3 100644
--- a/pagesA/article-detail/article-detail.vue
+++ b/pagesA/article-detail/article-detail.vue
@@ -46,12 +46,7 @@
 					<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)"
-						>
+						<text class="category-tag" v-for="(item, index) in result.categories" :key="index" @click="fnToCate(item)">
 							{{ item.name }}
 						</text>
 					</block>
@@ -60,23 +55,21 @@
 					<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)"
-						>
+						<text class="category-tag" :style="{ backgroundColor: item.color }" v-for="(item, index) in result.tags" :key="index" @click="fnToTag(item)">
 							{{ item.name }}
 						</text>
 					</block>
 				</view>
+				<view v-if="originalURL" class="mt-18 category-type original-url">
+					<view class="original-url_left text-weight-b">原文：</view>
+					<view class="original-url_right text-grey">
+						<text class="original-url_right__link" @click.stop="fnToOriginal(originalURL)">{{ originalURL }}</text>
+						<text class="original-url_right__btn" @click.stop="fnToOriginal(originalURL)">阅读原文<text class="iconfont icon-angle-right ml-5 text-size-s"></text> </text>
+					</view>
+				</view>
 			</view>
 			<!-- 广告区域 -->
-			<view
-				v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)"
-				class="ad-wrap ma-24 mb-0"
-			>
+			<view v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)" class="ad-wrap ma-24 mb-0">
 				<!-- #ifdef MP-WEIXIN -->
 				<ad v-if="haloAdConfig.unitId" :unit-id="haloAdConfig.unitId"></ad>
 				<!-- #endif -->
@@ -87,27 +80,19 @@
 			<!-- 内容区域 -->
 			<view class="content ml-24 mr-24">
 				<!-- markdown渲染 -->
-				<mp-html
-					class="evan-markdown"
-					lazy-load
-					:domain="markdownConfig.domain"
-					:loading-img="markdownConfig.loadingGif"
-					:scroll-table="true"
-					:selectable="true"
-					:tag-style="markdownConfig.tagStyle"
-					:container-style="markdownConfig.containStyle"
-					:content="result.content || result.formatContent"
-					:markdown="true"
-					:showLineNumber="true"
-					:showLanguageName="true"
-					:copyByLongPress="true"
-				/>
-
+				<view class="markdown-wrap">
+					<tm-more :disabled="true" :maxHeight="1500" :isRemovBar="true" :open="showValidVisitMore" @click="fnOnShowValidVisitMore">
+						<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain" :loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true" :tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle" :content="result.content || result.formatContent" :markdown="true" :showLineNumber="true" :showLanguageName="true" :copyByLongPress="true" />
+						<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>
 				<!-- 广告区域：微信/decloud申请 -->
-				<view
-					v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)"
-					class="ad-wrap mt-24 mb-24 "
-				>
+				<view v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)" class="ad-wrap mt-24 mb-24 ">
 					<!-- #ifdef MP-WEIXIN -->
 					<ad v-if="haloAdConfig.unitId" :unit-id="haloAdConfig.unitId"></ad>
 					<!-- #endif -->
@@ -117,21 +102,13 @@
 				</view>
 
 				<!-- 广告区域：自定义广告位 -->
-				<view class="ad-card" v-if="haloAdConfig.articleDetail.custom.use">
+				<view class="ad-card mt-24" v-if="haloAdConfig.articleDetail.custom.use">
 					<text class="ad-card_tip">广告</text>
-					<image
-						class="ad-card_cover"
-						:src="haloAdConfig.articleDetail.custom.cover"
-						mode="scaleToFill"
-					></image>
+					<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 v-if="haloAdConfig.articleDetail.custom.url" class="ad-card_info-link" @click="fnToWebview(haloAdConfig.articleDetail.custom)">
 							立即查看
 						</view>
 					</view>
@@ -140,9 +117,7 @@
 				<!-- 版权声明 -->
 				<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 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>
@@ -157,32 +132,15 @@
 
 				<!-- 评论展示区域 -->
 				<view class="comment-wrap bg-white mt-24 pa-24 round-4">
-					<commentList
-						:disallowComment="result.disallowComment"
-						:postId="result.id"
-						:post="result"
-						@on-comment-detail="fnOnShowCommentDetail"
-						@on-loaded="fnOnCommentLoaded"
-					></commentList>
+					<commentList :disallowComment="result.disallowComment" :postId="result.id" :post="result" @on-comment-detail="fnOnShowCommentDetail" @on-loaded="fnOnCommentLoaded"></commentList>
 				</view>
 			</view>
 
 			<!-- 弹幕效果 -->
 			<barrage ref="barrage" :maxTop="240" :type="globalAppSettings.barrage.type"></barrage>
 			<!-- 返回顶部 -->
-			<tm-flotbutton
-				:offset="[16, 80]"
-				icon="icon-angle-up"
-				color="bg-gradient-light-blue-accent"
-				@click="fnToTopPage()"
-			></tm-flotbutton>
-			<tm-flotbutton
-				:actions="btnOption.actions"
-				actions-pos="left"
-				:show-text="true"
-				color="bg-gradient-orange-accent"
-				@change="fnOnFlotButtonChange"
-			></tm-flotbutton>
+			<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>
 
 		<!-- 评论详情 -->
@@ -190,13 +148,7 @@
 			<view 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"
-						:postId="result.id"
-					></comment-item>
+					<comment-item :useContentBg="false" :useActions="false" :isChild="false" :comment="commentDetail.comment" :postId="result.id"></comment-item>
 				</view>
 
 				<scroll-view :scroll-y="true" class="poup-body">
@@ -207,12 +159,7 @@
 						</view>
 						<view v-else-if="commentDetail.loading == 'error'" class="error">
 							<tm-empty icon="icon-wind-cry" label="加载失败">
-								<tm-button
-									theme="bg-gradient-light-blue-accent"
-									size="m"
-									v-if="!disallowComment"
-									@click="fnGetChildComments()"
-								>
+								<tm-button theme="bg-gradient-light-blue-accent" size="m" v-if="!disallowComment" @click="fnGetChildComments()">
 									刷新试试
 								</tm-button>
 							</tm-empty>
@@ -224,16 +171,7 @@
 						</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"
-								:postId="result.id"
-							></comment-item>
+							<comment-item v-for="(comment, index) in commentDetail.list" :useContentBg="false" :useSolid="false" :useActions="false" :key="index" :isChild="false" :comment="comment" :postId="result.id"></comment-item>
 						</block>
 					</block>
 				</scroll-view>
@@ -263,711 +201,879 @@
 				</block>
 			</view>
 		</tm-poup>
+
+		<!-- 密码访问解密弹窗 -->
+		<tm-dialog :disabled="true" :input-val.sync="validVisitModal.value" title="验证提示" confirmText="立即验证" :showCancel="validVisitModal.useCancel" model="confirm" v-model="validVisitModal.show" content="博主设置了需要密码才能查看该文章内容,请输入文章密码进行验证" theme="split" confirmColor="blue shadow-blue-0" @cancel="fnOnValidVisitCancel" @confirm="fnOnValidVisitConfirm"></tm-dialog>
+
 	</view>
 </template>
 
 <script>
-import MarkdownConfig from '@/common/markdown/markdown.config.js';
+	import MarkdownConfig from '@/common/markdown/markdown.config.js';
 
-import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
-import 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 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,
-		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: {
-				articleId: null
-			},
-			result: {},
-
-			commentDetail: {
-				loading: 'loading',
-				show: false,
-				comment: {},
-				postId: undefined,
-				list: []
-			},
-			poster: {
-				show: false,
-				showCanvas: false,
-				loading: true,
-				res: null
-			}
-		};
-	},
-	computed: {
-		copyright() {
-			return getApp().globalData.copyright;
+	import { haloWxShareMixin } from '@/common/mixins/wxshare.mixin.js';
+	export default {
+		components: {
+			tmSkeleton,
+			tmPoup,
+			tmFlotbutton,
+			tmButton,
+			tmEmpty,
+			tmDialog,
+			tmMore,
+			mpHtml,
+			commentList,
+			commentItem,
+			rCanvas,
+			barrage
 		},
-		calcUrl() {
-			return url => {
-				if (this.$utils.checkIsUrl(url)) {
-					return url;
-				}
-				return getApp().globalData.baseApiUrl + url;
+		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: {
+					articleId: null
+				},
+				result: {},
+
+				commentDetail: {
+					loading: 'loading',
+					show: false,
+					comment: {},
+					postId: undefined,
+					list: []
+				},
+				poster: {
+					show: false,
+					showCanvas: false,
+					loading: true,
+					res: null
+				},
+
+				metas: [], // 自定义元数据
+				// 文章加密（弹窗输入密码解密）
+				validVisitModal: {
+					show: false,
+					useCancel: false,
+					value: undefined
+				},
+				showValidVisitMore: true,
 			};
 		},
-		// 获取博主信息
-		bloggerInfo() {
-			let blogger = this.$tm.vx.getters().getBlogger;
-			blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
-			return blogger;
-		}
-	},
-	onLoad(e) {
-		this.fnSetPageTitle('文章加载中...');
-		this.queryParams.articleId = e.articleId;
-		this.fnGetData();
-	},
-
-	onPullDownRefresh() {
-		this.fnGetData();
-	},
-	methods: {
-		fnGetData() {
-			this.loading = 'loading';
-			uni.showLoading({
-				mask: true,
-				title: '加载中...'
-			});
-			this.$httpApi
-				.getArticleDetail(this.queryParams.articleId)
-				.then(res => {
-					this.result = res.data;
-					this.fnSetPageTitle('文章详情');
-					this.loading = 'success';
-					this.fnSetWxShareConfig({
-						title: this.result.title,
-						desc: this.result.summary,
-						imageUrl: this.$utils.checkThumbnailUrl(this.result.thumbnail),
-						path: `/pagesA/article-detail/article-detail?articleId=${this.queryParams.articleId}`,
-						copyLink: this.$haloConfig.apiUrl,
-						query: {}
-					});
-				})
-				.catch(err => {
-					this.loading = 'error';
-				})
-				.finally(() => {
-					uni.hideLoading();
-					uni.stopPullDownRefresh();
-				});
-		},
-
-		// 浮动按钮点击
-		fnOnFlotButtonChange(index) {
-			switch (index) {
-				case 0:
-					this.fnDoLikes();
-					break;
-				case 1:
-					this.fnToComment();
-					break;
-				case 2:
-					this.fnShowShare();
-					break;
-			}
-		},
-
-		fnToComment() {
-			if (this.result.disallowComment) {
-				return uni.$tm.toast('文章已开启禁止评论！');
-			}
-			this.$Router.push({
-				path: '/pagesA/comment/comment',
-				query: {
-					id: this.result.id,
-					parentId: 0,
-					title: this.result.title,
-					from: 'posts',
-					formPage: 'comment_list',
-					type: 'post'
+		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() {
+				const target = this.metas.find(x => x.key == 'unihalo_originalURL');
+				if (!target) return '';
+				return target.value || '';
+			},
+			// 是否使用文章密码功能，如果值不为空，则优先于 useVisitMore：unihalo_useVisitPwd
+			useVisitPwd() {
+				const target = this.metas.find(x => x.key == 'unihalo_useVisitPwd');
+				if (!target) return false;
+				return target.value || false;
+			},
+			// 是否启用查看完整文章的功能的密码：unihalo_useVisitMorePwd
+			useVisitMorePwd() {
+				const target = this.metas.find(x => x.key == 'unihalo_useVisitMorePwd');
+				if (!target) return false;
+				return target.value || false;
+			},
+			// 当前是使用哪一种类型的密码验证 0=不使用任何 1=默认弹窗密码 2=查看部分内容 
+			useVisitMode() {
+				if (this.useVisitPwd != false) {
+					return 1
 				}
-			});
+				if (this.useVisitMorePwd != false) {
+					return 2
+				}
+				return 0
+			}
+		},
+		watch: {
+			useVisitPwd(val) {
+				if (val) {
+					this.validVisitModal.show = true
+				}
+			},
+			useVisitMode(val) {
+				if (val != 2) {
+					this.showValidVisitMore = true
+				} else {
+					this.showValidVisitMore = false
+				}
+			}
+		},
+		onLoad(e) {
+			this.fnSetPageTitle('文章加载中...');
+			this.queryParams.articleId = e.articleId;
+			this.fnGetData();
 		},
 
-		fnDoLikes() {
-			this.$httpApi
-				.postLikePost(this.result.id)
-				.then(res => {
-					if (res.status == 200) {
-						this.result.likes += 1;
-						uni.$tm.toast('\(^o^)/~点赞成功!');
-					} else {
+		onPullDownRefresh() {
+			this.fnGetData();
+		},
+		methods: {
+			fnGetData() {
+				this.loading = 'loading';
+				uni.showLoading({
+					mask: true,
+					title: '加载中...'
+				});
+				this.$httpApi
+					.getArticleDetail(this.queryParams.articleId)
+					.then(res => {
+						if (res.status == 200) {
+							this.result = res.data;
+							this.metas = res.data.metas;
+							this.fnSetPageTitle('文章详情');
+							this.loading = 'success';
+							this.fnSetWxShareConfig({
+								title: this.result.title,
+								desc: this.result.summary,
+								imageUrl: this.$utils.checkThumbnailUrl(this.result.thumbnail),
+								path: `/pagesA/article-detail/article-detail?articleId=${this.queryParams.articleId}`,
+								copyLink: this.$haloConfig.apiUrl,
+								query: {}
+							});
+						} else {
+							this.loading = 'error';
+						}
+					})
+					.catch(err => {
+						this.loading = 'error';
+					})
+					.finally(() => {
+						uni.hideLoading();
+						uni.stopPullDownRefresh();
+					});
+			},
+
+			// 浮动按钮点击
+			fnOnFlotButtonChange(index) {
+				switch (index) {
+					case 0:
+						this.fnDoLikes();
+						break;
+					case 1:
+						this.fnToComment();
+						break;
+					case 2:
+						this.fnShowShare();
+						break;
+				}
+			},
+
+			fnToComment() {
+				if (this.result.disallowComment) {
+					return uni.$tm.toast('文章已开启禁止评论！');
+				}
+				this.$Router.push({
+					path: '/pagesA/comment/comment',
+					query: {
+						id: this.result.id,
+						parentId: 0,
+						title: this.result.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: 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.thumbnail, 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'
+							title: err.message
 						});
 					});
-				// 博主信息
-				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.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.summary,
-						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.$haloConfig.apiUrl,
-				title: this.result.title,
-				summary: this.result.summary,
-				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 { postId, comment } = data;
-			this.commentDetail.comment = comment;
-			this.commentDetail.postId = postId;
-			this.commentDetail.list = [];
-			this.commentDetail.show = true;
-			this.fnGetChildComments();
-		},
-		fnGetChildComments() {
-			this.commentDetail.loading = 'loading';
-			this.$httpApi
-				.getPostChildrenCommentList(this.commentDetail.postId, this.commentDetail.comment.id, {})
-				.then(res => {
-					if (res.status == 200) {
-						this.commentDetail.loading = 'success';
-						this.commentDetail.list = res.data;
-					} else {
-						this.commentDetail.loading = 'error';
-					}
-					console.log('getPostChildrenCommentList', res);
-				})
-				.catch(err => {
-					this.commentDetail.loading = 'error';
-				});
-		},
-		fnToCate(category) {
-			uni.navigateTo({
-				url: `/pagesA/category-detail/category-detail?slug=${category.slug}&name=${category.name}`
-			});
-		},
-		fnToTag(tag) {
-			uni.navigateTo({
-				url: `/pagesA/tag-detail/tag-detail?id=${tag.id}&slug=${tag.slug}&name=${tag.name}`
-			});
-		},
-		async fnOnCommentLoaded(data) {
-			const _list = [];
-			const _handleData = list => {
-				return new Promise(resolve => {
-					if (list.length == 0) {
-						resolve();
-					} else {
-						list.forEach(item => {
-							_list.push(item);
-							if (item.children && item.children.length != 0) {
-								_handleData(item.children);
-							}
-							resolve();
-						});
-					}
-				});
-			};
-			await _handleData(data);
-			if (this.globalAppSettings.barrage.use) {
-				this.$nextTick(() => {
-					if (_list.length != 0) {
-						_handleAddBarrage();
-					}
-				});
-			}
-			const _handleRemove = () => {
-				this.$refs['barrage'].remove({
-					duration: 5000, // 延迟关闭的时间
-					speed: 600 // 弹幕消失的速度
-				});
-			};
-			let index = 0;
-			const _handleAddBarrage = () => {
+			},
+			fnShowShare() {
+				this.poster.show = true;
 				setTimeout(() => {
-					this.$refs['barrage'].add(_list[index]);
-					index += 1;
-					if (index < _list.length - 1) {
-						_handleAddBarrage();
-					} else {
-						_handleRemove();
+					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.thumbnail, 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.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.summary,
+							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.$haloConfig.apiUrl,
+					title: this.result.title,
+					summary: this.result.summary,
+					imageUrl: this.poster.res.tempFilePath,
+					success: function(res) {
+						console.log('success:' + JSON.stringify(res));
+					},
+					fail: function(err) {
+						console.log('fail:' + JSON.stringify(err));
 					}
-				}, 1000);
-			};
-		},
-		fnToWebview(data) {
-			uni.navigateTo({
-				url:
-					'/pagesC/website/website?data=' +
-					JSON.stringify({
-						title: data.title,
-						url: data.url
+				});
+				// #endif
+			},
+			fnOnShowCommentDetail(data) {
+				const { postId, comment } = data;
+				this.commentDetail.comment = comment;
+				this.commentDetail.postId = postId;
+				this.commentDetail.list = [];
+				this.commentDetail.show = true;
+				this.fnGetChildComments();
+			},
+			fnGetChildComments() {
+				this.commentDetail.loading = 'loading';
+				this.$httpApi
+					.getPostChildrenCommentList(this.commentDetail.postId, this.commentDetail.comment.id, {})
+					.then(res => {
+						if (res.status == 200) {
+							this.commentDetail.loading = 'success';
+							this.commentDetail.list = res.data;
+						} else {
+							this.commentDetail.loading = 'error';
+						}
+						console.log('getPostChildrenCommentList', res);
 					})
-			});
+					.catch(err => {
+						this.commentDetail.loading = 'error';
+					});
+			},
+			fnToCate(category) {
+				uni.navigateTo({
+					url: `/pagesA/category-detail/category-detail?slug=${category.slug}&name=${category.name}`
+				});
+			},
+			fnToTag(tag) {
+				uni.navigateTo({
+					url: `/pagesA/tag-detail/tag-detail?id=${tag.id}&slug=${tag.slug}&name=${tag.name}`
+				});
+			},
+			async fnOnCommentLoaded(data) {
+				const _list = [];
+				const _handleData = list => {
+					return new Promise(resolve => {
+						if (list.length == 0) {
+							resolve();
+						} else {
+							list.forEach(item => {
+								_list.push(item);
+								if (item.children && item.children.length != 0) {
+									_handleData(item.children);
+								}
+								resolve();
+							});
+						}
+					});
+				};
+				await _handleData(data);
+				if (this.globalAppSettings.barrage.use) {
+					this.$nextTick(() => {
+						if (_list.length != 0) {
+							_handleAddBarrage();
+						}
+					});
+				}
+				const _handleRemove = () => {
+					this.$refs['barrage'] && this.$refs['barrage'].remove({
+						duration: 5000, // 延迟关闭的时间
+						speed: 600 // 弹幕消失的速度
+					});
+				};
+				let index = 0;
+				const _handleAddBarrage = () => {
+					setTimeout(() => {
+						this.$refs['barrage'] && this.$refs['barrage'].add(_list[index]);
+						index += 1;
+						if (index < _list.length - 1) {
+							_handleAddBarrage();
+						} else {
+							_handleRemove();
+						}
+					}, 1000);
+				};
+			},
+			fnToWebview(data) {
+				uni.navigateTo({
+					url: '/pagesC/website/website?data=' +
+						JSON.stringify({
+							title: data.title,
+							url: data.url
+						})
+				});
+			},
+			fnToOriginal(originalURL) {
+				this.fnToWebview({ title: this.result.title, url: originalURL });
+			},
+			// 查看密码验证确认
+			fnOnValidVisitConfirm() {
+				if (this.useVisitMode == 1) {
+					if (this.validVisitModal.value === this.useVisitPwd) {
+						this.validVisitModal.show = false;
+						return;
+					}
+				} else if (this.useVisitMode == 2) {
+					if (this.validVisitModal.value === this.useVisitMorePwd) {
+						this.showValidVisitMore = true;
+						this.validVisitModal.show = false;
+						return;
+					}
+				}
+				uni.$tm.toast("验证密码不正确！")
+			},
+			fnOnValidVisitCancel() {
+				this.validVisitModal.show = false;
+				this.validVisitModal.useCancel = true;
+				this.validVisitModal.value = undefined;
+			},
+			// 点击解锁弹出密码输入框
+			fnOnShowValidVisitMore() {
+				this.validVisitModal.useCancel = true;
+				this.validVisitModal.value = undefined;
+				this.validVisitModal.show = true;
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-page {
-	width: 100vw;
-	min-height: 100vh;
-	display: flex;
-	flex-direction: column;
-	box-sizing: border-box;
-	background-color: #fafafd;
-}
-.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: 24rpx;
-	.title {
-		font-size: 36rpx;
-		font-weight: 600;
-		text-align: center;
+	.app-page {
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		background-color: #fafafd;
+		padding-bottom: 24rpx;
 	}
-	.detail {
-		width: 100%;
-		margin-top: 24rpx;
-		font-size: 26rpx;
-		.author {
+
+	.bg-image {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 0;
+	}
+
+	.loading-wrap {
+		padding: 0 24rpx;
+		height: inherit;
+		background-color: #fff;
+	}
+
+	.head {
+		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;
-			font-size: 24rpx;
-			color: #666;
-
-			&-name {
-			}
-			&-time {
-				margin-left: 36rpx;
-			}
 		}
 
-		.cover {
-			margin-top: 24rpx;
+		.detail {
 			width: 100%;
-			height: 280rpx;
-			&-img {
-				width: 100%;
-				height: 100%;
-				border-radius: 12rpx;
-			}
-		}
-		.count {
 			margin-top: 24rpx;
-			display: flex;
-			justify-content: space-between;
-			&.no-thumbnail {
-				border-top: 2rpx solid #f2f2f2;
-				padding-top: 12rpx;
-				.count-item {
-					position: relative;
-					color: #666;
-					&::after {
-						content: '';
-						position: absolute;
-						right: 0;
-						background-color: #eee;
-						width: 2rpx;
-						height: 32rpx;
-					}
-					&:last-child {
+			font-size: 26rpx;
+
+			.author {
+				text-align: center;
+				font-size: 24rpx;
+				color: #666;
+
+				&-name {}
+
+				&-time {
+					margin-left: 36rpx;
+				}
+			}
+
+			.cover {
+				margin-top: 24rpx;
+				width: 100%;
+				height: 280rpx;
+
+				&-img {
+					width: 100%;
+					height: 100%;
+					border-radius: 12rpx;
+				}
+			}
+
+			.count {
+				margin-top: 24rpx;
+				display: flex;
+				justify-content: space-between;
+
+				&.no-thumbnail {
+					border-top: 2rpx solid #f2f2f2;
+					padding-top: 12rpx;
+
+					.count-item {
+						position: relative;
+						color: #666;
+
 						&::after {
-							display: none;
+							content: '';
+							position: absolute;
+							right: 0;
+							background-color: #eee;
+							width: 2rpx;
+							height: 32rpx;
+						}
+
+						&:last-child {
+							&::after {
+								display: none;
+							}
 						}
 					}
 				}
-			}
-			&-item {
-				flex: 1;
-				display: flex;
-				align-items: flex-end;
-				justify-content: center;
-				color: #666;
-				.label {
-					font-size: 24rpx;
-					padding-left: 8rpx;
-				}
-				.value {
-					font-size: 32rpx;
-				}
-			}
-		}
-	}
-}
-.category {
-	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;
-	}
-	&-tag {
-		background-color: #5bb8fa;
-		color: #fff;
-		padding: 6rpx 12rpx;
-		border-radius: 6rpx;
-		font-size: 24rpx;
-		&.is-empty {
-			background-color: #607d8b;
-		}
-	}
-}
-.category-tag + .category-tag {
-	margin-left: 12rpx;
-}
-.content {
-	margin-top: 24rpx;
-}
-.evan-markdown,
-.ad-wrap,
-.copyright-wrap,
-.comment-wrap {
-	box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
-}
-.copyright-title {
-	position: relative;
-	box-sizing: border-box;
-	padding-left: 24rpx;
-	font-size: 30rpx;
-	&:before {
-		content: '';
-		position: absolute;
-		left: 0rpx;
-		top: 8rpx;
-		width: 8rpx;
-		height: 26rpx;
-		background-color: rgb(3, 174, 252);
-		border-radius: 6rpx;
-	}
-}
-.poup-head {
-	border-bottom: 2rpx solid #f5f5f5;
-}
-.poup-body {
-	height: 50vh;
-}
-.poup-empty {
-	width: 100%;
-	height: 40vh;
-}
-.poup-loading-wrap {
-	width: 100%;
-	height: 40vh;
 
-	.e-loading-icon {
-		font-size: 80rpx;
+				&-item {
+					flex: 1;
+					display: flex;
+					align-items: flex-end;
+					justify-content: center;
+					color: #666;
+
+					.label {
+						font-size: 24rpx;
+						padding-left: 8rpx;
+					}
+
+					.value {
+						font-size: 32rpx;
+					}
+				}
+			}
+		}
 	}
-}
-.poster-content {
-	width: 100%;
-	min-height: 60vh;
-	overflow: hidden;
-}
-.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-save {
-	box-sizing: border-box;
-	border-top: 2rpx dashed #eee;
-}
-</style>
+
+	.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;
+		}
+
+		&-tag {
+			background-color: #5bb8fa;
+			color: #fff;
+			padding: 6rpx 12rpx;
+			border-radius: 6rpx;
+			font-size: 24rpx;
+
+			&.is-empty {
+				background-color: #607d8b;
+			}
+		}
+	}
+
+	.category-tag+.category-tag {
+		margin-left: 12rpx;
+	}
+
+	.content {
+		margin-top: 24rpx;
+	}
+
+	.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;
+	}
+
+	.copyright-title {
+		position: relative;
+		box-sizing: border-box;
+		padding-left: 24rpx;
+		font-size: 30rpx;
+
+		&:before {
+			content: '';
+			position: absolute;
+			left: 0rpx;
+			top: 8rpx;
+			width: 8rpx;
+			height: 26rpx;
+			background-color: rgb(3, 174, 252);
+			border-radius: 6rpx;
+		}
+	}
+
+	.poup-head {
+		border-bottom: 2rpx solid #f5f5f5;
+	}
+
+	.poup-body {
+		height: 50vh;
+	}
+
+	.poup-empty {
+		width: 100%;
+		height: 40vh;
+	}
+
+	.poup-loading-wrap {
+		width: 100%;
+		height: 40vh;
+
+		.e-loading-icon {
+			font-size: 80rpx;
+		}
+	}
+
+	.poster-content {
+		width: 100%;
+		min-height: 60vh;
+		overflow: hidden;
+	}
+
+	.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-save {
+		box-sizing: border-box;
+		border-top: 2rpx dashed #eee;
+	}
+
+	.original-url {
+		display: flex;
+
+		&_left {
+			flex-shrink: 0;
+			width: 84rpx;
+		}
+
+		&_right {
+			flex-grow: 1;
+			display: inline-flex;
+			align-items: center;
+
+			&__link {
+				width: 410rpx;
+				display: inline-block;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+
+			&__btn {
+				flex-grow: 1;
+				flex-shrink: 0;
+				display: block;
+				text-align: right;
+			}
+		}
+	}
+</style>
\ No newline at end of file