From 0ba28ae2cc4d335278af5a4fe60e037ef13021bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 26 Apr 2023 14:03:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Imglearning/Imglearning.vue     | 34 +++++++++++++++++++++--
 pages/Videolearning/Videolearning.vue |  2 +-
 pages/learning/learning.scss          | 39 +++++++++++++++++++++++----
 pages/learning/learning.vue           |  4 +++
 4 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/pages/Imglearning/Imglearning.vue b/pages/Imglearning/Imglearning.vue
index 5f62fcd..5ad7361 100644
--- a/pages/Imglearning/Imglearning.vue
+++ b/pages/Imglearning/Imglearning.vue
@@ -23,6 +23,10 @@
 			info() {
 				selectNurseAppletPersonTrainingItemDetailsList(this.trainingItemId, this.nurseStationPersonId).then(
 					res => {
+						res.data.trainingItemContent = res.data.trainingItemContent.replace(/\<img/gi,
+							"<br/> <img class='richPic'")
+						res.data.trainingItemContent = res.data.trainingItemContent.replace(/\<p/gi,
+							"<p class='ptext'")
 						this.list = res.data
 					})
 			},
@@ -45,8 +49,34 @@
 		background-color: #fff;
 	}
 
-	.u-content {
+	/deep/ .ptext {
+		margin-top: 20rpx;
+	}
+
+	/deep/ .ptext:nth-child(1) {
+		text-indent: 2em;
+	}
+
+	/deep/ .ql-size-small {
+		font-size: 20rpx;
+	}
+
+	/deep/ .ql-size-large {
+		font-size: 36rpx;
+	}
+
+	/deep/ .ql-size-huge {
+		font-size: 46rpx;
+	}
+
+	/deep/ .richPic {
+		width: 100% !important;
+		height: 100% !important;
+	}
+
+	.u-content {
+		margin: 15rpx auto;
+		width: 96%;
 		text-indent: 2em;
-		margin-top: 15rpx;
 	}
 </style>
diff --git a/pages/Videolearning/Videolearning.vue b/pages/Videolearning/Videolearning.vue
index 3e7a9c3..26ce8c2 100644
--- a/pages/Videolearning/Videolearning.vue
+++ b/pages/Videolearning/Videolearning.vue
@@ -29,7 +29,7 @@
 						开始播放
 					</view>
 					<view class="play" @tap='videoplay(item)'
-						:style="item.itemDirectoryWatchStatus=='WATCHED'?'background-color: #4271B9;color:#3D7DCA':''"
+						:style="item.itemDirectoryWatchStatus=='WATCHED'?'background-color: #E3EAF5;color:#3D7DCA':''"
 						v-if="item.itemDirectoryWatchStatus=='WATCHED'">
 						继续播放
 					</view>
diff --git a/pages/learning/learning.scss b/pages/learning/learning.scss
index db86740..13e073d 100644
--- a/pages/learning/learning.scss
+++ b/pages/learning/learning.scss
@@ -1,4 +1,5 @@
-page {
+
+	page {
 		background-color: #fff;
 	}
 
@@ -6,17 +7,44 @@ page {
 		padding: 0;
 		color: #000000;
 		text-align: justify;
-		
+
 		::v-deep .u-tabs {
 			width: 70% !important;
 		}
 
 		.content {
-			padding: 30rpx 15rpx 200rpx;
-			background-color: #fff;
+			width: 96%;
+			margin: 0 auto;
+			// padding: 30rpx 15rpx 200rpx;
+			// background-color: #fff;
+			// text-indent: 2em;
+		}
+
+		/deep/ .ptext {
+			margin-top: 20rpx;
+		}
+
+		/deep/ .ptext:nth-child(1) {
 			text-indent: 2em;
 		}
 
+		/deep/ .ql-size-small {
+			font-size: 20rpx;
+		}
+
+		/deep/ .ql-size-large {
+			font-size: 36rpx;
+		}
+
+		/deep/ .ql-size-huge {
+			font-size: 46rpx;
+		}
+
+		/deep/ .richPic {
+			width: 100% !important;
+			height: 100% !important;
+		}
+
 		.directory {
 			padding-bottom: 200rpx;
 			background-color: #fff;
@@ -128,6 +156,7 @@ page {
 			background-color: #fff;
 			margin: 0 auto;
 			padding-bottom: 40rpx;
+
 			.toptitle {
 				font-weight: 600;
 				font-size: 38rpx;
@@ -139,7 +168,7 @@ page {
 				font-size: 28rpx;
 				font-weight: 400;
 				color: #666666;
-				margin: 31rpx 56rpx 0 ;
+				margin: 31rpx 56rpx 0;
 			}
 		}
 
diff --git a/pages/learning/learning.vue b/pages/learning/learning.vue
index 45089c4..836cc70 100644
--- a/pages/learning/learning.vue
+++ b/pages/learning/learning.vue
@@ -211,6 +211,10 @@
 			//主信息
 			infos() {
 				selectNurseAppletPersonTrainingParent(this.trainingParentId, this.nurseStationPersonId).then(res => {
+					res.rows[0].trainingItemContent = res.rows[0].trainingItemContent.replace(/\<img/gi,
+						"<br/> <img class='richPic'")
+					res.rows[0].trainingItemContent = res.rows[0].trainingItemContent.replace(/\<p/gi,
+						"<p class='ptext'")
 					this.infoslist = res.rows[0]
 				})
 			},