From 4553d52cc94609e3a49b541e85ac92104b2627fc Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 23 Oct 2023 15:54:49 +0800
Subject: [PATCH] up

---
 pages/activity/book.vue | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 19326d3..8a40959 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -215,19 +215,40 @@
 			keyName="label"></u-picker>
 
 
-		<u-popup :show="showInfo" mode="bottom" @close="closeInfo" :round="10" closeable>
+		<!-- <u-popup :show="showInfo" mode="bottom" @close="closeInfo" :round="10" closeable>
 			<view class="mpopup">
 				<view class="mpopup-title">
 					{{currentNotice.title}}
 				</view>
 				<view class="mpopup-content" style="margin-top: 60rpx;">
 					<rich-text :nodes="currentNotice.content"></rich-text>
-					
-					<view @click="downLoad" style="color:#cf995a ;" v-if="currentNotice.isTemplate">下载模版</view>
+					v-if="currentNotice.isTemplate"
+					<view @click="downLoad" style="color:#cf995a ;" >下载模版</view>
 					<view style="margin-top: 80px;"></view>
 					<u-button type="primary" @click="closeInfo">知道了</u-button>
 				</view>
 			</view>
+		</u-popup> -->
+		
+		<u-popup :show="showInfo" mode="bottom" @close="closeInfo" :round="10" closeable>
+			<view class="mpopup" :style="[{height:maxheight}]">
+		
+				<view class="mpopup-title">
+					{{currentNotice.title}}
+				</view>
+		
+				<view class="mpopup-content" style="margin-top: 60rpx;">
+					<scroll-view scroll-y="true" :style="[{height:scrollheight}]">
+						<!-- <rich-text :nodes="currentNotice.content"></rich-text> -->
+						<view class="htmls" style="line-height: 50rpx;text-indent: 2em;" v-html="currentNotice.content">
+						</view>
+						<view @click="downLoad" style="color:#cf995a ;">下载模版</view>
+					</scroll-view>
+		
+					<view style="margin-top: 40rpx;"></view>
+					<u-button type="primary" @click="closeInfo">知道了</u-button>
+				</view>
+			</view>
 		</u-popup>
 
 		<u-popup :show="showAuthorization" closeable mode="bottom" @close="closePhone" :round="10">
@@ -351,7 +372,6 @@
 			this.form.type = (options.type == 'user' ? 2 : 1);
 			this.form.activity_id = parseInt(options.activity_id);
 			this.form.activity_number_id = parseInt(options.activity_number_id);
-			
 		},
 		onShow(){
 			var that = this;
@@ -402,7 +422,7 @@
 			
 			downLoad() {
 				const downloadTask = uni.downloadFile({
-					url: 'https://leyitest.ali251.langye.net/Template.xlsx', //仅为示例，并非真实的资源
+					url: 'https://gbyuyue.szgmbwg.org.cn/Template.xlsx', //仅为示例，并非真实的资源
 					success: (res) => {
 			        var filePath = res.tempFilePath
 						if (res.statusCode === 200) {