From 783e42055373ec8566ad63967509eda812a2aa5f Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 1 Sep 2023 15:32:24 +0800
Subject: [PATCH] up

---
 pages/activity/info.vue  | 12 ++++++++++--
 pages/exhibit/detail.vue |  5 ++++-
 pages/guide/index.vue    | 21 +++++++++++++++++++--
 pages/index/index.vue    |  6 +++++-
 pages/relic/detail.vue   |  5 ++++-
 utils/util.js            |  3 ++-
 6 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 80339f3..1a2dc43 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -354,13 +354,13 @@
 		margin-left: 21rpx;
 	}
 
-	.infoBox-content {
+/* 	.infoBox-content {
 		padding: 37rpx 26rpx;
 		box-sizing: border-box;
 		font-size: 30rpx;
 		color: #828282;
 		margin-bottom: 100rpx;
-	}
+	} */
 
 	.infofooter {
 		position: fixed;
@@ -434,10 +434,18 @@
 	}
 	.infoBox-content{
 		font-size: 28rpx;
+		padding:0 60rpx;
+		background: #fff;
+		padding-top: 30rpx;
+		/* border-radius: 30rpx 30rpx 0 0; */
+		padding-bottom:180rpx;
 	}
 	.infoBox-content img{
 		width:100%;
 		margin:10rpx 0;
 		
+	}
+	.wxParse{
+		line-height: 2.3;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/exhibit/detail.vue b/pages/exhibit/detail.vue
index c31154b..d551822 100644
--- a/pages/exhibit/detail.vue
+++ b/pages/exhibit/detail.vue
@@ -177,7 +177,7 @@
 		background-color: #fbf3ea;
 	}
 	.detail {
-		padding:0 30rpx;
+		padding:0 60rpx;
 		background: #fff;
 		padding-top: 30rpx;
 		border-radius: 30rpx 30rpx 0 0;
@@ -187,5 +187,8 @@
 	.detail img {
 		width: 100%;
 		margin:10rpx 0;
+	}
+	.wxParse{
+		line-height: 2.3;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/guide/index.vue b/pages/guide/index.vue
index f6640e2..ae93591 100644
--- a/pages/guide/index.vue
+++ b/pages/guide/index.vue
@@ -10,7 +10,7 @@
 			<view>
 				<view class='open_info'>
 					<block v-for="(item,key) of openInfoObj">
-						<view v-if="key!='提醒'">
+						<view v-if="key!='提醒' && key!='地址' && key!='咨询电话' && key!='服务时间'">
 							<view>{{item}}</view>
 							<view>{{key}}</view>
 						</view>
@@ -19,6 +19,18 @@
 				<view class='open_text'>
 					<span></span>
 					{{openInfoObj['提醒']?openInfoObj['提醒']:''}}
+				</view>
+				<view class='open_text'>
+					<span></span>
+					地址：{{openInfoObj['地址']?openInfoObj['地址']:''}}
+				</view>
+				<view class='open_text'>
+					<span></span>
+					咨询电话：{{openInfoObj['咨询电话']?openInfoObj['咨询电话']:''}}
+				</view>
+				<view class='open_text'>
+					<span></span>
+					服务时间：{{openInfoObj['服务时间']?openInfoObj['服务时间']:''}}
 				</view>
 			</view>
 
@@ -134,7 +146,12 @@
 								let openStr = str.substring(beforeIndex, afterIndex)
 								let openArr = openStr.split('|')
 								for (let o of openArr) {
-									let oArr = o.split('：')
+									let oArr = o.split('：')
+									
+									if(oArr[1].indexOf('&mdash;')>-1){
+										oArr[1] = oArr[1].replace('&mdash;','—')
+									}
+									console.log(oArr[1])
 									that.openInfoObj[oArr[0]] = oArr[1]
 								}
 							}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b10cb98..00051bb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -10,7 +10,7 @@
 				<!-- <view>我是导航栏标题</view> -->
 			</view>
 		</view>
-		<view class="content" :style="{paddingTop: navBarBoxHeight+10+'rpx'}">
+		<view class="content" :style="{paddingTop: navBarBoxHeight+'rpx'}">
 			<view class="box-top">
 				<image src="../../static/img/index_bg.jpg" class="index_bg"></image>
 			</view>
@@ -617,6 +617,8 @@
 		align-items: center;
 		justify-content: center;
 		padding-bottom:120rpx;
+		min-height:100vh;
+		background-color: #fff;
 		/* padding-top:190rpx; */
 	}
 
@@ -666,6 +668,8 @@
 		padding:50rpx 30rpx; 
 		padding-top:35rpx;
 		width:100%;
+		    /* padding-bottom: 0;
+		    min-height: 41vh; */
 	}
 	.exhibit{
 		
diff --git a/pages/relic/detail.vue b/pages/relic/detail.vue
index c7dc39d..be1d278 100644
--- a/pages/relic/detail.vue
+++ b/pages/relic/detail.vue
@@ -125,7 +125,7 @@
 		background-color: #fbf3ea;
 	}
 	.detail {
-		padding:0 30rpx;
+		padding:0 60rpx;
 		background: #fff;
 		padding-top: 30rpx;
 		/* border-radius: 30rpx 30rpx 0 0; */
@@ -135,5 +135,8 @@
 	.detail img {
 		width: 100%;
 		margin:10rpx 0;
+	}
+	.wxParse{
+		line-height: 2.3;
 	}
 </style>
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index cc5db03..564a6f6 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,7 +1,8 @@
 import md5 from "./md5.min";
 const HOSTARR = {
 	'development':'https://gb-test.ali251.langye.net',
-	'production': 'https://gb-test.ali251.langye.net'
+	'production': 'https://gb-test.ali251.langye.net',
+	// https://gbyuyue.szgmbwg.org.cn/
 }; // 审核状态
 
 const HOST = HOSTARR[process.env