Merge branch 'fix/o2_fix' into 'wrdp'

增加polyfill-Promise

See merge request o2oa/o2oa!2184

(cherry picked from commit 7a07b6d4a51254f4e26497e511699fcc24987111)

6a481357 增加polyfill-Promise

o2web/source/x_desktop/appMobile.html

@@ -5,15 +5,6 @@
         <link rel="stylesheet" type="text/css" href="css/style.css" charset="UTF-8" />
         <link rel="stylesheet" href="css/mBoxNotice.css" charset="UTF-8" />
         <link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
-
-        <script src="../o2_core/o2.min.js"></script>
-        <script src="../o2_lib/Decimal.js"></script>
-        <script src="js/base.min.js"></script>
-        <script src="js/o2m.api.js"></script>
-        <script src="js/app.min.js"></script>
-
-        <script>layout.mobile = true;</script>
-
         <title></title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
@@ -26,5 +17,12 @@
             <div id="loaddingArea" style="overflow: hidden;width:0px; height:2px; background-color:#4e82bd; position: absolute; top: 0; z-index: 100"></div>
         </div>
         <div id="appContentMask" style="overflow: hidden; height:100%; position: relative; top: -100%; background-image:url('../x_desktop/img/launch_background.png'); background-size: cover"></div>
+
+        <script src="../o2_core/o2.min.js"></script>
+        <script src="../o2_lib/Decimal.js"></script>
+        <script src="js/base.min.js"></script>
+        <script src="js/o2m.api.js"></script>
+        <script src="js/app.min.js"></script>
+        <script>layout.mobile = true;</script>
     </body>
 </html>

o2web/source/x_desktop/index.html

@@ -66,7 +66,6 @@
         }
     </script>
 
-    <script src="../o2_lib/polyfill/polyfill.js"></script>
     <script src="../o2_core/o2.min.js"></script>
     <script src="js/base.min.js"></script>
     <script src="js/x.min.js"></script>