Home Explore Help
Sign In
jianyu
/
page_entbase
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' into feature/v1.1.18

lianbingjie 1 year ago
parent
863e4ba12b bea29793f3
commit
f0ba540b9b
3 changed files with 3 additions and 3 deletions
Unified View Show Diff Stats
  1. 0 1
      entbase-pc/config/cdn.js
  2. 2 1
      entbase-pc/public/index.html
  3. 1 1
      entbase-pc/src/views/ent/inviting.vue

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

@@ -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/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/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/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'
 
     // '//cdn-common.jianyu360.com/cdn/lib/moment/2.29.1/min/moment.min.js'
 
   ]
 
   ]
 
 }
 
 }

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

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

+ 1 - 1
entbase-pc/src/views/ent/inviting.vue
View File 

@@ -182,7 +182,7 @@ export default {
 
       }
 
       }
 
     },
 
     },
 
     toLogin () {
 
     toLogin () {
 
-      // location.href = '/notin/page?backTo=' + encodeURIComponent(location.href)
 
+      location.href = '/notin/page?backTo=' + encodeURIComponent(location.href)
 
     },
 
     },
 
     toBindPhone () {
 
     toBindPhone () {
 
       location.href = '/swordfish/frontPage/userMerge/sess/bind?backTo=' + encodeURIComponent(location.href)
 
       location.href = '/swordfish/frontPage/userMerge/sess/bind?backTo=' + encodeURIComponent(location.href)