Переглянути джерело

Merge branch 'feature/v4.8.12_cyl' of qmx/jy into feature/v4.8.12

zhangyuhan 2 роки тому
батько
коміт
260218b2f3

+ 2 - 2
src/web/templates/frontRouter/pc/docs/sess/index.html

@@ -51,7 +51,7 @@
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/named-exports.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/named-register.min.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/use-default.min.js"></script>
-    <script src='/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
     <!-- E-注入  -->
 
     <style>
@@ -108,7 +108,7 @@
     window.addEventListener('single-spa:first-mount', (e) => {
       var childAppRoot = $('#single-spa-app').children('.docs-app')[0]
       if (childAppRoot) {
-        var childApp = root.__vue__
+        var childApp = childAppRoot.__vue__
         var router = childApp.$router
         addNotFindPage(router)
       }

+ 1 - 1
src/web/templates/frontRouter/pc/entpc/sess/index.html

@@ -64,7 +64,7 @@
 <!-- 主应用依赖 -->
 <script src=//cdn-common.jianyu360.com/cdn/lib/url-polyfill/1.1.12/url-polyfill.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/qiankun/2.7.0/index.umd.min.js></script>
-<script src='/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
 <script>
     window.__QIANKUN_ROUTER_BASE = '/entpc'
     qiankun.registerMicroApps(

+ 2 - 2
src/web/templates/frontRouter/pc/integral/sess/index.html

@@ -49,7 +49,7 @@
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/named-exports.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/named-register.min.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/use-default.min.js"></script>
-    <script src='/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
     <!-- E-注入  -->
 
     <style>
@@ -94,7 +94,7 @@
     window.addEventListener('single-spa:first-mount', (e) => {
       var childAppRoot = $('#single-spa-app').children('.home')[0]
       if (childAppRoot) {
-        var childApp = root.__vue__
+        var childApp = childAppRoot.__vue__
         var router = childApp.$router
         addNotFindPage(router)
       }

+ 1 - 1
src/web/templates/frontRouter/pc/page_big_pc/sess/index.html

@@ -66,7 +66,7 @@
 <!-- 主应用依赖 -->
 <script src=//cdn-common.jianyu360.com/cdn/lib/url-polyfill/1.1.12/url-polyfill.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/qiankun/2.7.0/index.umd.min.js></script>
-<script src='/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
 <script>
     window.__QIANKUN_ROUTER_BASE = '/swordfish/page_big_pc'
     qiankun.registerMicroApps(

+ 1 - 1
src/web/templates/frontRouter/pc/page_entbase_pc/sess/index.html

@@ -64,7 +64,7 @@
 <!-- 主应用依赖 -->
 <script src=//cdn-common.jianyu360.com/cdn/lib/url-polyfill/1.1.12/url-polyfill.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/qiankun/2.7.0/index.umd.min.js></script>
-<script src='/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
 <script>
     window.__QIANKUN_ROUTER_BASE = '/orgpc'
     qiankun.registerMicroApps(

+ 1 - 1
src/web/templates/frontRouter/pc/xspc/sess/index.html

@@ -67,7 +67,7 @@
 <!-- 主应用依赖 -->
 <script src=//cdn-common.jianyu360.com/cdn/lib/url-polyfill/1.1.12/url-polyfill.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/qiankun/2.7.0/index.umd.min.js></script>
-<script src='/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
 <script>
   window.__QIANKUN_ROUTER_BASE = '/jyxspc'
   qiankun.registerMicroApps(

+ 1 - 1
src/web/templates/micro/social-pc/index.html

@@ -63,7 +63,7 @@
 <!-- 主应用依赖 -->
 <script src=//cdn-common.jianyu360.com/cdn/lib/url-polyfill/1.1.12/url-polyfill.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/qiankun/2.7.0/index.umd.min.js></script>
-<script src='/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
 
 <!-- 子应用依赖 -->
 <!-- <script src=//cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/build/pdf.min.js></script>

+ 1 - 1
src/web/templates/micro/web-pc/index.html

@@ -61,7 +61,7 @@
 <!-- 主应用依赖 -->
 <script src=//cdn-common.jianyu360.com/cdn/lib/url-polyfill/1.1.12/url-polyfill.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/qiankun/2.7.0/index.umd.min.js></script>
-<script src='/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
 
 <!-- 子应用依赖 -->
 <!-- <script src=//cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/build/pdf.min.js></script>

+ 1 - 1
src/web/templates/site/page/helpCenter/videoDetail.html

@@ -66,7 +66,7 @@
 <!-- 主应用依赖 -->
 <script src=//cdn-common.jianyu360.com/cdn/lib/url-polyfill/1.1.12/url-polyfill.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/qiankun/2.7.0/index.umd.min.js></script>
-<script src='/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/micro/js/qiankun-common-functions.js?v={{Msg "seo" "version"}}'></script>
 <script>
   // 该页面是帮助中心热门操作指南视频详情-页面指向线上课程项目的详情路由
   // 因该页面的顶部顶部导航栏、标题等与线上课程的顶部导航栏不一致,故建两个父应用页面,子应用挂载为同一个(线上课程子应用)