فهرست منبع

Merge branch 'dev/v1.1.17.1' of jianyu/page_entbase into hotfix/v1.1.17.1

cuiyalong 1 سال پیش
والد
کامیت
f89f0cf1ef
2فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 0 1
      entbase-pc/config/cdn.js
  2. 2 1
      entbase-pc/public/index.html

+ 0 - 1
entbase-pc/config/cdn.js

@@ -8,7 +8,6 @@ exports.cdn = {
     '//cdn-common.jianyu360.com/cdn/lib/vuex/3.4.0/vuex.min.js',
     '//cdn-common.jianyu360.com/cdn/lib/axios/0.19.2/axios.min.js',
     '//cdn-common.jianyu360.com/cdn/lib/lodash/4.17.21/lodash.min.js',
-    '//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js'
     // '//cdn-common.jianyu360.com/cdn/lib/moment/2.29.1/min/moment.min.js'
   ]
 }

+ 2 - 1
entbase-pc/public/index.html

@@ -13,6 +13,8 @@
     <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>"/>
     <% } %>
     <!-- 使用CDN的JS文件 -->
+    <!-- jquery使用父应用的 -->
+    <script ignore src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js) { %>
     <script type="text/javascript" src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script>
     <% } %>
@@ -40,7 +42,6 @@
     <!-- <script src="https://www.jianyu360.com/antiRes/js/mainHook.js"></script> -->
     <% } %>
 </head>
-<!-- <script src="https://lib.baomitu.com/jquery/3.6.0/jquery.js"></script> -->
 <body>
 <noscript>
     <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.