From 4c74974cfc5497518d35c0c9e81658ddb62ee45c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 18 May 2022 16:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/java110/utils/ImageUtil.js          | 1 +
 pages/activityDetail/activityDetail.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/java110/utils/ImageUtil.js b/lib/java110/utils/ImageUtil.js
index f59df67..118a7a3 100644
--- a/lib/java110/utils/ImageUtil.js
+++ b/lib/java110/utils/ImageUtil.js
@@ -35,6 +35,7 @@ export function replaceImgSrc(_content, _url) {
 	if (isEmpty(_content)) {
 		return _content;
 	}
+	_content = _content.replaceAll("&amp;","&")
 	// a 为富文本的字符串内容，为了测试，只写了img标签
 	let b = /<img [^>]*src=['"]([^'"]+)[^>]*>/g; // img 标签取src里面内容的正则
 	let s = _content.match(b); // 取到所有img标签 放到数组 s里面
diff --git a/pages/activityDetail/activityDetail.vue b/pages/activityDetail/activityDetail.vue
index 6555d5c..b6b0d6d 100644
--- a/pages/activityDetail/activityDetail.vue
+++ b/pages/activityDetail/activityDetail.vue
@@ -77,7 +77,7 @@
 			            let _tmpStartTime = new Date(_startTime);
 
 			            // _item.startTime = _that.java110Util.date.formatDate(_tmpStartTime);
-						      _item.context = replaceImgSrc(_item.context,conf.baseUrl);
+						      _item.context = replaceImgSrc(_item.context,conf.commonBaseUrl);
 			            _that.activity = _item;
 					   
 			          });