Merge branch 'develop' of http://gitlab.icaremgt.com/tanxinyu/h5_activity into develop

showPhotos/index.html

@@ -20,9 +20,7 @@
     <script type="text/javascript" src="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/removeAttr.js"></script>
     <script type="text/javascript" src="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/autoFontsize.min.js"></script>
     <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
-    <script type="text/javascript" th:inline="javascript">
-        // var data = [[${test}]];
-    </script>
+    <script type="text/javascript" src="./index_data.js"></script>
     <script type="text/javascript">
         wx.config({
 		    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
@@ -47,16 +45,13 @@
     var xtoken = "123123";
     var activityCode = "hdtbsztest1";
     var pageNumber = "1";
-    var baseUrl = "http://space-api.check.icaremgt.com";
+    var baseUrl = "https://space-api.check.icaremgt.com";
 
     // 微信鉴权
-    $('body').prepend(json2html(indexObj));
-    $('body').prepend(json2html(shareModal));
-    $('body').prepend(json2html(voteModal));
-    // $('body').prepend(json2html(voteEmptyModal));
-    $('#html-template-4').addClass('global-none')
-    $('#html-template-5').addClass('global-none')
-    $('#html-template-8').addClass('global-none')
+    wxpermission();
+    // 加载html结构
+    loadHtmlJson();
+    
     var gb_player_loaded = false
     var gb_rank_loaded = false
     var gb_token = 'admin.725.fbbd4294a56047e7926b7ebab088ade4'
@@ -67,21 +62,22 @@
         getQueryString('');// 根据query参数控制排行榜显示
         removeAttr();
         getAjaxListSearch('player',1,function(playerListData){
-            getPlayerList(playerListData)
-        })  // 参赛选手列表
+            getPlayerList(playerListData);
+        });  // 参赛选手列表
         getAjaxListSearch('rank',1,function(rankListData){
-            getRangeList(rankListData)
-        })  // 排行榜列表
+            getRangeList(rankListData);
+        }); // 排行榜列表
     });
 
     // 微信鉴权
     function wxpermission() {
+        var settings = rules.settings;
         wx.ready(function(){
             var shareData = {
-                title: "",
-                imgUrl: "",
-                desc: "",
-                link: ""
+                title: settings.szText.shareTitile,
+                imgUrl: settings.szText.shareIcon,
+                desc: settings.szText.shareSubtitle,
+                link: window.location.href
             }
             /**
              *分享给朋友
@@ -190,12 +186,13 @@
         })
         // 我要拉票
         $('#act2172989331265,#act5161551593534').off('click').on('click',function(){
-            $('#html-template-8').fadeIn()
+            $("#html-template-4").hide();
+            $('#html-template-8').fadeIn();
         })
 
         // 查看排行
         $('#act5161526928645').off('click').on('click',function(){
-            $('#html-template-5').fadeOut()
+            $('#html-template-5').fadeOut();
             $("#user-list").hide();
             $("#range-list").show();  
         })
@@ -429,6 +426,23 @@
         return null;
     }
 
+    // 加载HTML结构
+    function loadHtmlJson() {
+
+        // 页面结构注入
+        $('body').prepend(json2html(JSON.parse(data.htmlJson)));
+
+        var _relationship = data.relationship.childs;
+        var htmlJson = "";
+        // 依赖组件注入
+        for(var i = 0 ;i < _relationship.length ;i++){
+           var _page = _relationship[i].page;
+           $('body').prepend(json2html(JSON.parse(data[_page].htmlJson)));
+           // 隐藏添加元素
+           $('#html-template-'+ _relationship[i].pageNumber).addClass('global-none');
+        }
+    }
+
     // 页面跳转
     function transPage(_pageNumber,_activityCode, _token, _urlParam){
         var url = ''

showPhotos/index_data.js

@@ -75,20 +75,45 @@ var rules = {
       "qrCodeMessage": "",
       "kgAcActivityTypeId": "1"
   },
-  "acActivityOrgs": [],
+  "acActivityOrgs": [
+      {
+          "id": "1",
+          "kgAcActivityId": "5",
+          "orgId": "967",
+          "qrCodeUrl": "http://qnfile.icareyou.net/jpg119_4_11_18_22_43_1557570163811zSy.jpg",
+          "createTime": "2019-07-10 15:27:51",
+          "updateTime": "2019-07-10 15:27:51"
+      },
+      {
+          "id": "2",
+          "kgAcActivityId": "5",
+          "orgId": "1108",
+          "qrCodeUrl": "http://qnfile.icareyou.net/jpg119_4_11_18_22_43_1557570163811zSy.jpg",
+          "createTime": "2019-07-10 15:27:51",
+          "updateTime": "2019-07-10 15:27:51"
+      },
+      {
+          "id": "3",
+          "kgAcActivityId": "5",
+          "orgId": "1103",
+          "qrCodeUrl": "http://qnfile.icareyou.net/jpg119_4_11_18_22_43_1557570163811zSy.jpg",
+          "createTime": "2019-07-10 15:27:51",
+          "updateTime": "2019-07-10 15:27:51"
+      }
+  ],
   "acActivityRegistrationAudit": "",
   "settings": {
       "szText": {
           "id": "7",
           "kgAcActivityId": "5",
-          "shareTitile": "share title",
-          "shareSubtitle": "share cotentn",
-          "shareIcon": "",
-          "pullTitile": "sha",
-          "pullSubtitle": "hhhh",
+          "shareTitile": "分享晒照活动标题",
+          "shareSubtitle": "分享晒照活动......",
+          "shareIcon": "http://qnfile.icareyou.net/4082d7c2d61940b58fcdbeb45225da831562748231795.jpg",
+          "pullTitile": "请为我拉票",
+          "pullSubtitle": "我是xxx请为我拉票",
           "h5Title": "",
           "createTime": "2019-06-23 03:04:27",
-          "updateTime": "2019-07-05 16:29:38"
+          "updateTime": "2019-07-10 16:45:46"
       },
       "szRule": {
           "id": "9",
@@ -100,7 +125,7 @@ var rules = {
           "voteNumDay": 50,
           "voteNumPeople": 9999,
           "createTime": "2019-06-23 03:04:21",
-          "updateTime": "2019-07-06 03:25:17"
+          "updateTime": "2019-07-10 16:45:46"
       }
   }
 }