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

showPhotos/index.html

@@ -7,9 +7,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
     <meta name="format-detection" content="telephone=no">
     <title>宝贝，因“喂”爱你</title>
-    
-    <link rel="stylesheet" href="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/activity.css">
-    <link rel="stylesheet" href="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/toast.css">
+    <link rel="stylesheet" href="css/activity.css">
+    <link rel="stylesheet" href="css/toast.css">
+    <!-- <link rel="stylesheet" href="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/activity.css">
+    <link rel="stylesheet" href="https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/toast.css"> -->
     <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/jquery-3.4.1.min.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/toast.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/html2Json.js"></script>
@@ -250,6 +251,7 @@
             }
         }
         var params = {
+            reviewStatus:1,  // 审核状态
             descs:descs,  // 降序排列
             curPage:page?page:1,
             pageSize:10,
@@ -280,6 +282,13 @@
                         gb_rank_loaded = false
                     }
                 }
+            },
+            error: function() {
+                if(type == 'player' || type == 'search') {
+                    gb_player_loaded = false
+                }else if(type == 'rank') {
+                    gb_rank_loaded = false
+                }
             }
         })
     }
@@ -295,13 +304,13 @@
         if(playerListData.records.length) {
             for(;i < playerListData.records.length; i++){
                 // 序号替换
-                $('.number-icon',item).text(i+1);
+                $('.number-icon',item).text(playerListData.records[i].userNumber);
                 // 图片url替换
                 $('img',item).attr('src',playerListData.records[i].imageUrl);
                 // 名称替换
                 $('.user-name',item).text(playerListData.records[i].name);
                 // 机构名称替换
-                $('.vote-struct',item).text('贵阳市乌当区新天社区卫生服务中心测试');
+                $('.vote-struct',item).text(playerListData.records[i].orgName);
                 // 票数替换
                 $('.vote-num',item).text(playerListData.records[i].voteNum+'票');
                 
@@ -345,6 +354,7 @@
             // 替换名字,图片
             $('.table-info img',tr).attr('src',rankListData.records[i].imageUrl);
             $('.cell-info h4', tr).text(rankListData.records[i].name);
+            // $('.cell-info small', tr).text(rankListData.records[i].userNumber);
             // 票数
             $('.ticket-total .text-red', tr).text(rankListData.records[i].voteNum);
 
@@ -402,7 +412,7 @@
     // 选手主页
     function playPageFn() {
       var id = $(this).attr('id');
-      var urlParam = '?id='+id;
+      var urlParam = '?UserId='+id;
       transPage('3',activityCode,xtoken,urlParam);
     }