周伟鹏 / cnlive_shenhe · Commits

Commit 1dc01dcebfd1ab1dad06e10ba241efdcbbf7807f

Authored by 王言钊
2 parents 2f7f3c86 e717e271

Merge branch 'test' into dev

Inline Side-by-side
Showing 3 changed files with 3 additions and 3 deletions
src/main/resources/templates/page/audio.html
  View file @1dc01dc
@@ -442,9 +442,9 @@ @@ -442,9 +442,9 @@
442 state = $("#state").val(); 442 state = $("#state").val();
443 sp_Id = $("#sp_Id").val(); 443 sp_Id = $("#sp_Id").val();
444 var spId = [[${session.sessionUser.spid}]]; 444 var spId = [[${session.sessionUser.spid}]];
  445 + count = $("#pageSize").val();
445 if (spId == 0) { 446 if (spId == 0) {
446 sp_desc = $("#sp_desc").val(); 447 sp_desc = $("#sp_desc").val();
447 - count = $("#pageSize").val();  
448 } 448 }
449 } 449 }
450 450
src/main/resources/templates/page/content.html
  View file @1dc01dc
@@ -488,9 +488,9 @@ @@ -488,9 +488,9 @@
488 start_date = $("#start_date").val(); 488 start_date = $("#start_date").val();
489 end_date = $("#end_date").val(); 489 end_date = $("#end_date").val();
490 var spId = [[${session.sessionUser.spid}]]; 490 var spId = [[${session.sessionUser.spid}]];
  491 + count = $("#pageSize").val();
491 if (spId == 0) { 492 if (spId == 0) {
492 sp_desc = $("#sp_desc").val(); 493 sp_desc = $("#sp_desc").val();
493 - count = $("#pageSize").val();  
494 contentId = $("#contentId").val(); 494 contentId = $("#contentId").val();
495 content_tag = $("#content_tag").val(); 495 content_tag = $("#content_tag").val();
496 } 496 }
src/main/resources/templates/page/video.html
  View file @1dc01dc
@@ -488,9 +488,9 @@ @@ -488,9 +488,9 @@
488 sp_Id = $("#sp_Id").val(); 488 sp_Id = $("#sp_Id").val();
489 source = $("#source").val(); 489 source = $("#source").val();
490 var spId = [[${session.sessionUser.spid}]]; 490 var spId = [[${session.sessionUser.spid}]];
  491 + count = $("#pageSize").val();
491 if (spId == 0) { 492 if (spId == 0) {
492 sp_desc = $("#sp_desc").val(); 493 sp_desc = $("#sp_desc").val();
493 - count = $("#pageSize").val();  
494 video_user_id = $("#video_user_id").val(); 494 video_user_id = $("#video_user_id").val();
495 shen_auditor_id = $("#shen_auditor_id").val(); 495 shen_auditor_id = $("#shen_auditor_id").val();
496 contentId = $("#contentId").val(); 496 contentId = $("#contentId").val();