Merge branch 'dev4.6.3.2' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.2

src/jfw/modules/app/src/web/templates/active/yearEndReport/result.html

@@ -102,6 +102,9 @@
   <link rel="preload" as="script" href="https://cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js" />
   <!--E-必定需要预加载的资源-->
   <!--S-当前页面的资源-->
+  <script>
+    var domain = '{{Cdns .Host "seo" "cdn"|SafeUrl}}'
+  </script>
   <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/js/rem.js"></script>
   <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>

src/web/staticres/common-module/yearEndReport/js/result.js

@@ -35,21 +35,21 @@ var result = new Vue({
   data: function() {
     return {
       resultList: [
-        {_id: '1', title: '逢标必中的投标达人', label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-1.png', bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-1.png'},
-        {_id: '2', title: '成功触手可及的追梦人', label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-2.png', bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-2.png'},
-        {_id: '3', title: '怀抱热振元气满满的打工人', label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-3.png', bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-3.png'},
-        {_id: '4', title: '日进斗金的大佬', label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-4.png', bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-4.png'},
-        {_id: '5', title: '有钱任性的大BOSS', label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-5.png', bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-5.png'},
-        {_id: '6', title: '开疆拓土的“顶梁柱”', label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-6.png', bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-6.png'},
-        {_id: '7', title: '炉火纯青的盖章无影手', label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-7.png', bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-7.png'},
-        {_id: '8', title: '有钱任性的大BOSS', label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-8.png', bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-5.png'},
-        {_id: '9', title: '有钱任性的大BOSS', label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-9.png', bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-5.png'},
+        {_id: '1', title: '逢标必中的投标达人', label: domain +'/common-module/yearEndReport/images/result/label-1.png', bg: domain + '/common-module/yearEndReport/images/result/item-bg-1.png'},
+        {_id: '2', title: '成功触手可及的追梦人', label: domain + '/common-module/yearEndReport/images/result/label-2.png', bg: domain + '/common-module/yearEndReport/images/result/item-bg-2.png'},
+        {_id: '3', title: '怀抱热振元气满满的打工人', label: domain + '/common-module/yearEndReport/images/result/label-3.png', bg: domain + '/common-module/yearEndReport/images/result/item-bg-3.png'},
+        {_id: '4', title: '日进斗金的大佬', label: domain + '/common-module/yearEndReport/images/result/label-4.png', bg: domain + '/common-module/yearEndReport/images/result/item-bg-4.png'},
+        {_id: '5', title: '有钱任性的大BOSS', label: domain + '/common-module/yearEndReport/images/result/label-5.png', bg: domain + '/common-module/yearEndReport/images/result/item-bg-5.png'},
+        {_id: '6', title: '开疆拓土的“顶梁柱”', label: domain + '/common-module/yearEndReport/images/result/label-6.png', bg: domain + '/common-module/yearEndReport/images/result/item-bg-6.png'},
+        {_id: '7', title: '炉火纯青的盖章无影手', label: domain + '/common-module/yearEndReport/images/result/label-7.png', bg: domain + '/common-module/yearEndReport/images/result/item-bg-7.png'},
+        {_id: '8', title: '有钱任性的大BOSS', label: domain + '/common-module/yearEndReport/images/result/label-8.png', bg: domain + '/common-module/yearEndReport/images/result/item-bg-5.png'},
+        {_id: '9', title: '有钱任性的大BOSS', label: domain + '/common-module/yearEndReport/images/result/label-9.png', bg: domain + '/common-module/yearEndReport/images/result/item-bg-5.png'},
       ],
       curRole: {
         _id: '1',
         title: '逢标必中的投标达人',
-        label: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/label-1.png',
-        bg: '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/item-bg-1.png'
+        label: domain + '/common-module/yearEndReport/images/result/label-1.png',
+        bg: domain + '/common-module/yearEndReport/images/result/item-bg-1.png'
       },
       picImgStatus: false,
       showAction: false,

src/web/templates/active/yearEndReport/result.html

@@ -102,6 +102,9 @@
   <link rel="preload" as="script" href="https://cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js" />
   <!--E-必定需要预加载的资源-->
   <!--S-当前页面的资源-->
+  <script>
+    var domain = '{{Msg "seo" "cdn"}}'
+  </script>
   <script src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/js/rem.js"></script>
   <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>