From 84ad5e0d789aba40ce71c715c07581373f13cbdd Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Thu, 13 Aug 2020 18:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AE=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=89=93=E5=8D=B0=E7=AD=BE=E5=88=B0=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2web/source/x_component_Meeting/Common.js                      | 2 +-
 .../$Main/qrPrint.html => x_desktop/meetingQrPrint.html}        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename o2web/source/{x_component_Meeting/$Main/qrPrint.html => x_desktop/meetingQrPrint.html} (96%)

diff --git a/o2web/source/x_component_Meeting/Common.js b/o2web/source/x_component_Meeting/Common.js
index 682e72f3ee..57a9e3582e 100644
--- a/o2web/source/x_component_Meeting/Common.js
+++ b/o2web/source/x_component_Meeting/Common.js
@@ -946,7 +946,7 @@ MWF.xApplication.Meeting.MeetingForm = new Class({
                 },
                 events : {
                     click : function(){
-                        window.open(o2.filterUrl("../x_component_Meeting/$Main/qrPrint.html?meeting="+this.data.id), "_blank" );
+                        window.open(o2.filterUrl("../x_desktop/meetingQrPrint.html?meeting="+this.data.id), "_blank" );
                     }.bind(this)
                 }
             }).inject( this.qrCodeArea );
diff --git a/o2web/source/x_component_Meeting/$Main/qrPrint.html b/o2web/source/x_desktop/meetingQrPrint.html
similarity index 96%
rename from o2web/source/x_component_Meeting/$Main/qrPrint.html
rename to o2web/source/x_desktop/meetingQrPrint.html
index c93b14b023..a6fae6db2c 100644
--- a/o2web/source/x_component_Meeting/$Main/qrPrint.html
+++ b/o2web/source/x_desktop/meetingQrPrint.html
@@ -7,7 +7,6 @@
     <link rel="stylesheet" href="../x_desktop/css/mBoxTooltip.css" charset="UTF-8" />
 
     <script src="../o2_core/o2.min.js?v=2.1.3"></script>
-    <script src="../o2_core/compatible.min.js?v=2.1.3"></script>
     <script src="../o2_lib/Decimal.js"></script>
     <script src="../x_desktop/js/base.min.js?v=2.1.3"></script>
     <script>
-- 
GitLab