From 7fbf4ce2df0604b908c7d9c95bf2bf4e62fa6ade Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 11 Sep 2023 14:58:41 +0800
Subject: [PATCH] up

---
 pages/guide/index.vue | 70 +++++++++++++++++++++++++++++--------------
 utils/util.js         |  8 ++---
 2 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/pages/guide/index.vue b/pages/guide/index.vue
index b8b9934..1c0ccda 100644
--- a/pages/guide/index.vue
+++ b/pages/guide/index.vue
@@ -15,23 +15,27 @@
 							<view>{{key}}</view>
 						</view>
 					</block>
+				</view>
+				<!-- <uParse></uParse> -->
+				<view class='open_text'>
+					 <u-parse v-if='showContent' :content="openInfoHtml?openInfoHtml:' '"/>
 				</view>
-				<view class='open_text'>
+				<!-- <view class='open_text'>
 					<span></span>
 					{{openInfoObj['提醒']?openInfoObj['提醒']:''}}
 				</view>
 				<view class='open_text'>
 					<span></span>
-					地址：{{openInfoObj['地址']?openInfoObj['地址']:''}}
+					{{openInfoObj['服务时间']?openInfoObj['服务时间']:''}}
 				</view>
 				<view class='open_text'>
 					<span></span>
-					咨询电话：{{openInfoObj['咨询电话']?openInfoObj['咨询电话']:''}}
+					地址：{{openInfoObj['地址']?openInfoObj['地址']:''}}
 				</view>
 				<view class='open_text'>
 					<span></span>
-					服务时间：{{openInfoObj['服务时间']?openInfoObj['服务时间']:''}}
-				</view>
+					咨询电话：{{openInfoObj['咨询电话']?openInfoObj['咨询电话']:''}}
+				</view> -->
 			</view>
 
 		</view>
@@ -83,10 +87,12 @@
 </template>
 
 <script>
-	import tabbar from "../../components/tabbar/tabbar.vue"
+	import tabbar from "../../components/tabbar/tabbar.vue"
+	import uParse from '@/components/gaoyia-parse/parse.vue'
 	export default {
 		components: {
-			tabbar
+			tabbar,
+			uParse
 		},
 		data() {
 			return {
@@ -96,7 +102,9 @@
 					mobile: "",
 					content: ""
 				},
-				openInfoObj: {},
+				openInfoObj: {},
+				openInfoHtml:'',
+				showContent:false,
 				show: {
 					shownotice: false,
 					showask: false,
@@ -147,13 +155,17 @@
 								let openArr = openStr.split('|')
 								for (let o of openArr) {
 									let oArr = o.split('：')
-									
 									if(oArr[1].indexOf('&mdash;')>-1){
-										oArr[1] = oArr[1].replace('&mdash;','—')
-									}
-									console.log(oArr[1])
+										oArr[1] = oArr[1].replace(/&mdash;/g,'—')
+									}
 									that.openInfoObj[oArr[0]] = oArr[1]
-								}
+								}
+								
+								let libeforeIndex = str.indexOf("<ul>") + 4
+								let liafterIndex = str.indexOf("</ul>")
+								that.openInfoHtml = str.substring(libeforeIndex, liafterIndex)
+								that.showContent = true
+								
 							}
 						}
 						that.noticeList = res.data
@@ -227,7 +239,8 @@
 	}
 </script>
 
-<style>
+<style>
+		@import url("/components/gaoyia-parse/parse.css");
 	page {
 		background: #f7f6f4;
 	}
@@ -292,15 +305,28 @@
 		font-size: 28rpx;
 		line-height: 2.3;
 	}
-
+	.open_text .li{
+		line-height: 2.3;
+	}
+	 .open_text .li::before{
+		content:'';
+		width: 8rpx;
+		height: 8rpx;
+		border-radius: 8rpx;
+		background-color: #BFBFBF;
+		display: inline-block;
+		vertical-align: middle;
+		margin: 0 10rpx;
+		margin-top: -6rpx;
+	}
 	.open_text span {
-		width: 8rpx;
-		height: 8rpx;
-		border-radius: 8rpx;
-		background-color: #BFBFBF;
-		display: inline-block;
-		vertical-align: middle;
-		margin: 0 16rpx;
+		width: 8rpx;
+		height: 8rpx;
+		border-radius: 8rpx;
+		background-color: #BFBFBF;
+		display: inline-block;
+		vertical-align: middle;
+		margin: 0 16rpx;
 		margin-top: -6rpx;
 
 	}
diff --git a/utils/util.js b/utils/util.js
index 6bd199f..e2d9299 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,9 +1,9 @@
 import md5 from "./md5.min";
 const HOSTARR = {
-	// 'development':'https://gb-test.ali251.langye.net',
-	// 'production': 'https://gb-test.ali251.langye.net',
-	'development':'https://gbyuyue.szgmbwg.org.cn',
-	'production': 'https://gbyuyue.szgmbwg.org.cn',
+	'development':'https://gb-test.ali251.langye.net',
+	'production': 'https://gb-test.ali251.langye.net',
+	// 'development':'https://gbyuyue.szgmbwg.org.cn',
+	// 'production': 'https://gbyuyue.szgmbwg.org.cn',
 	// https://gbyuyue.szgmbwg.org.cn/
 }; // 审核状态