fenzhihebing

README.md

@@ -2,5 +2,8 @@
 微信和pc端功能
 weixin sdk https://github.com/wizjin/weixin
 web用xweb框架
+<<<<<<< HEAD
 v4.6.3.3
 微信公众号迁移(分支2)
+=======
+>>>>>>> release

src/jfw/modules/app/src/web/templates/big-member/meta.html

@@ -19,7 +19,7 @@
   if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
   try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
 </script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>
 <!--E-meta-->
 
 <!--S-必定会使用的资源-->

src/jfw/modules/app/src/web/templates/common/js.html

@@ -9,4 +9,4 @@
       console.log = function () {}
   }
 </script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>

src/web/staticres/common-module/public/head.js

@@ -18,7 +18,7 @@
 try {
   // 剑鱼荟聚Event
   var hm = document.createElement("script");
-  hm.src = '/common-module/track/j-track.min.js?v=1'
+  hm.src = '/common-module/track/j-track.min.js?v=2'
   setTimeout(function(){
     var s = document.getElementsByTagName("script")[0];
     s.parentNode.insertBefore(hm, s);

src/web/templates/big-member/wx/meta.html

@@ -19,7 +19,7 @@
   if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
   try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
 </script>
-<script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>
 <!--E-meta-->
 
 <!--S-必定会使用的资源-->

src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -23,7 +23,7 @@
     if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
     try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
     </script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>
     <script src="/big-member/js/rem.js"></script>
     <!--S-当前页面的css资源-->
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />

src/web/templates/common/pnc.html

@@ -54,7 +54,7 @@
     });
   }
 </script>
-<script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>
 {{Html `<!--[if lt IE 9]><script src="{{Msg "seo" "cdn"}}/js/jquery.js?v={{Msg "seo" "version"}}"><![endif]-->`}}
 <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>

src/web/templates/common/weixin.html

@@ -4,4 +4,4 @@
   if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
   try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
 </script>
-<script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>