From 57abbc3fc7b04d904b4c196908508537d8cb2a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Tue, 6 Sep 2022 17:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=87=E7=AB=A0=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E8=A1=A8=E6=A0=BC=E9=97=AE=E9=A2=98=E9=87=87=E7=94=A8?=
 =?UTF-8?q?iframe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/pages/home/notice.vue          | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue
index 7bd17e8f3..fe151502c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue	
@@ -1,7 +1,8 @@
 <template>
   <view id="notice" class="page">
     <view class="padding text-lg">
-      <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse>
+      <u-parse v-if="ready&&contentType == 1" :imageProp="{ domain: apiRoot }" :content="content"></u-parse>
+	  <iframe v-if="ready&&contentType == 2" style="width: 100%;height: calc(100vh - 150px);" :src="CONFIG('webHost')+'/Utility/ListContentView?keyValue='+keyValue" frameborder="0"></iframe>
     </view>
     <view class="padding-sm text-grey notice-info">
       <view class="text-right">本页内容发布于 {{ time }}</view>
@@ -19,7 +20,9 @@ export default {
       ready: false,
       content: '',
       time: '',
-      date: ''
+      date: '',
+	  contentType:'',
+	  keyValue:'',
     }
   },
 
@@ -31,6 +34,13 @@ export default {
     async init() {
       this.LOADING('加载中…')
       const noticeItem = this.GET_PARAM()
+	  this.keyValue = noticeItem.f_id
+	  if(noticeItem.f_category){
+		  this.contentType = 2
+	  }else{
+		  this.contentType = 1
+	  }
+	  console.log(noticeItem)
       this.content = this.CONVERT_HTML(noticeItem.f_content)
       this.time = moment(noticeItem.f_time).format('HH : mm')
       this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日')