'调整'

showPhotos/index.html

@@ -12,8 +12,8 @@
     <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=https://space-api.check.icaremgt.com/ACTIVITY/gitlab-static?url=http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/html2Json.js"></script>
-    <script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/pageJson.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>
+    <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/pageJson.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/modalJson/shareModal.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/modalJson/voteModal.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/removeAttr.js"></script>
@@ -48,19 +48,20 @@
     var pageNumber = "1";
     var baseUrl = "http://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')
+    var gb_player_loaded = false
+    var gb_rank_loaded = false
+    var gb_token = 'admin.725.fbbd4294a56047e7926b7ebab088ade4'
+
     $(function(){
-        // 微信鉴权
-        $('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')
-        var gb_player_loaded = false
-        var gb_rank_loaded = false
-        var gb_token = 'admin.725.fbbd4294a56047e7926b7ebab088ade4'
+        
         btnBindClick();// 绑定点击事件
         getQueryString('');// 根据query参数控制排行榜显示
         removeAttr();
@@ -260,7 +261,7 @@
         }
         $.ajax({
             type: 'GET',
-            url: baseUrl + '/ACTIVITY/sz/search',
+            url: baseUrl + '/ACTIVITY/sz/search/' + activityCode,
             data: params,
             success: function(data) {
                 if(data.status == 200) {
@@ -383,9 +384,10 @@
       var params = {
         userId: id
       }
+      var activityCode = getQueryString('activityCode');
       $.ajax({
         type: 'PUT',
-        url: baseUrl + '/ACTIVITY/sz/vote',
+        url: baseUrl + '/ACTIVITY/sz/vote/' + activityCode,
         data: params,
         success: function(data) {
             if(data.status == 200) {

showPhotos/user.html

@@ -38,14 +38,15 @@
     var activityCode = "hdtbsztest1";
     var pageNumber = "1";
     var baseUrl = "http://space-api.check.icaremgt.com";
-    
+
+    $('body').prepend(json2html(userObj));
+    $('body').prepend(json2html(shareModal));
+    $('body').prepend(json2html(voteModal));
+    $('#html-template-4').addClass('global-none');
+    $('#html-template-8').addClass('global-none');
     
     $(function(){
-        $('body').prepend(json2html(userObj));
-        $('body').prepend(json2html(shareModal));
-        $('body').prepend(json2html(voteModal));
-        $('#html-template-4').addClass('global-none')
-        $('#html-template-8').addClass('global-none')
+        
         btnBindClick();// 绑定点击事件
         userCountDown(10,$('#act31142119991744 span'));  //倒计时
         userTabInfo();