From fb2f8c4b2529ecb5ab8d1aeaa94ee462d3b5e4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Fri, 16 Sep 2022 12:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=88=91=E7=9A=84=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=A7=92=E6=A0=87=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=BF=AE=E6=94=B9=E4=B8=BAiframe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue     | 6 ++----
 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue
index cdfc9ef60..3508205d4 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue	
@@ -21,10 +21,8 @@
 	    <!-- @input="setValue('MeetingManagement.Files', $event)" -->
 	  <l-input title="公告内容" disabled style="border-bottom: none;"></l-input>
 	  <view class="padding text-lg" style="background-color: #fff;">
-		  <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse>
-		  <view v-if="ready" v-html="''">
-		  	
-		  </view>
+		  <!-- <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse> -->
+		  <iframe v-if="ready" style="width: 100%;height: 50vh;" :src="CONFIG('webHost')+'/Utility/ListContentView?keyValue='+formData.F_NewsId" frameborder="0"></iframe>
 	  </view>
 	  <l-workflow-action
 	    @audit="audit"
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue
index 268043c77..6037352ca 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue	
@@ -50,7 +50,7 @@
 		  style="position: relative;"
         >
           <l-icon :type="item.icon" color="white" class="text-sl" />
-		  <view v-if="item.F_Name == '我的审批'"  class="CornerMarker">
+		  <view v-if="item.F_Name == '我的审批'&&CornerMarker"  class="CornerMarker">
 		  	{{CornerMarker}}
 		  </view>
         </view>