周伟鹏 / cnlive_shenhe · Commits

Commit 4baea1b6276dfd2f4510972984f812e88868c596

Authored by liwei2917
1 parent e62fe580

修改字段

Inline Side-by-side
Showing 2 changed files with 19 additions and 19 deletions
src/main/resources/templates/page/comment.html
  View file @4baea1b
... ... @@ -296,15 +296,15 @@
296 296 <button class="btn btn-info btn-sm">查看</button>
297 297 </a>
298 298  
299   - <span th:if="${comment.state==0 and !comment.receive}"> &nbsp;</span>
  299 + <span th:if="${comment.state==0 and comment.receive==0}"> &nbsp;</span>
300 300 <a th:href="@{'javascript:applyReceive('+${comment.id}+')'}"
301   - th:if="${comment.state==0 and !comment.receive}">
  301 + th:if="${comment.state==0 and comment.receive==0}">
302 302 <button class="btn btn-primary btn-sm">认领</button>
303 303 </a>
304 304  
305   - <span th:if="${comment.state==0 and comment.receive and session.sessionUser.userId==comment.receive_user_id}"> &nbsp;</span>
  305 + <span th:if="${comment.state==0 and comment.receive==1 and session.sessionUser.userId==comment.receive_user_id}"> &nbsp;</span>
306 306 <a th:href="@{'javascript:applyRetReceive('+${comment.id}+')'}"
307   - th:if="${comment.state==0 and comment.receive and session.sessionUser.userId==comment.receive_user_id}">
  307 + th:if="${comment.state==0 and comment.receive==1 and session.sessionUser.userId==comment.receive_user_id}">
308 308 <button class="btn btn-warning btn-sm">退领</button>
309 309 </a>
310 310  
... ... @@ -451,11 +451,11 @@
451 451 var receiveIsNull = $.trim(receive) == "";
452 452 if (stateIsNull && receiveIsNull) {
453 453 $("#all_button").addClass("btn-info");
454   - } else if (state == '0' && receive == 'false') {
  454 + } else if (state == '0' && receive == '0') {
455 455 $("#before_button").addClass("btn-warning");
456   - } else if (!stateIsNull && state != '0' && receive == 'true') {
  456 + } else if (!stateIsNull && state != '0' && receive == '1') {
457 457 $("#my_after_button").addClass("btn-success");
458   - } else if (state == '0' && receive == 'true') {
  458 + } else if (state == '0' && receive == '1') {
459 459 $("#my_brfore_button").addClass("btn-danger");
460 460 }
461 461  
... ... @@ -503,8 +503,8 @@
503 503 }
504 504 //去掉领取参数
505 505 if (href.indexOf("receive") >= 0) {
506   - href = href.replace("receive=true", "");
507   - href = href.replace("receive=false", "");
  506 + href = href.replace("receive=1", "");
  507 + href = href.replace("receive=0", "");
508 508 }
509 509 href = href.replace("&&", "&");
510 510 href = href.replace("?&", "?");
... ...
src/main/resources/templates/page/video.html
  View file @4baea1b
... ... @@ -225,14 +225,14 @@
225 225 <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"-->
226 226 <button class="btn btn-info btn-sm" th:style="${state1 eq '0' && receive1 eq 'false'} ? 'display: none ' : ' '">查看</button>
227 227 </a>
228   - <span th:if="${video.state==0 and !video.receive}"> &nbsp;</span>
  228 + <span th:if="${video.state==0 and video.receive==0}"> &nbsp;</span>
229 229 <a th:href="@{'javascript:applyReceive('+${video.id}+')'}"
230   - th:if="${video.state==0 and !video.receive}">
  230 + th:if="${video.state==0 and video.receive==0}">
231 231 <button class="btn btn-primary btn-sm">认领</button>
232 232 </a>
233   - <span th:if="${video.state==0 and video.receive and session.sessionUser.userId==video.receive_user_id}"> &nbsp;</span>
  233 + <span th:if="${video.state==0 and video.receive==1 and session.sessionUser.userId==video.receive_user_id}"> &nbsp;</span>
234 234 <a th:href="@{'javascript:applyRetReceive('+${video.id}+')'}"
235   - th:if="${video.state==0 and video.receive and session.sessionUser.userId==video.receive_user_id}">
  235 + th:if="${video.state==0 and video.receive==1 and session.sessionUser.userId==video.receive_user_id}">
236 236 <button class="btn btn-warning btn-sm">退领</button>
237 237 </a>
238 238 </td>
... ... @@ -300,11 +300,11 @@
300 300 var receiveIsNull = $.trim(receive) == "";
301 301 if (stateIsNull && receiveIsNull) {
302 302 $("#quanbu").addClass("btn-info");
303   - } else if (state == '0' && receive == 'false') {
  303 + } else if (state == '0' && receive == '0') {
304 304 $("#daishen").addClass("btn-warning");
305   - } else if (state == '0' && receive == 'true') {
  305 + } else if (state == '0' && receive == '1') {
306 306 $("#Mydaishen").addClass("btn-success");
307   - } else if (!stateIsNull && state != '0' && receive == 'true') {
  307 + } else if (!stateIsNull && state != '0' && receive == '1') {
308 308 $("#yishen").addClass("btn-danger");
309 309 }
310 310  
... ... @@ -344,7 +344,7 @@
344 344 //全部待领
345 345 $('#daishen').click(function () {
346 346 var state = 0;
347   - var receive = false;
  347 + var receive = 0;
348 348 var video_priority = $("#video_priority").val();
349 349 var video_title = $("#video_titleID").val();
350 350 var start_date = $("#start_date").val();
... ... @@ -354,7 +354,7 @@
354 354 //我的待审核
355 355 $('#Mydaishen').click(function () {
356 356 var state = 0;
357   - var receive = true;
  357 + var receive = 1;
358 358 var video_priority = $("#video_priority").val();
359 359 var video_title = $("#video_titleID").val();
360 360 var start_date = $("#start_date").val();
... ... @@ -364,7 +364,7 @@
364 364 //我的已审核
365 365 $('#yishen').click(function () {
366 366 var state = 1;
367   - var receive = true;
  367 + var receive = 1;
368 368 var video_priority = $("#video_priority").val();
369 369 var video_title = $("#video_titleID").val();
370 370 var start_date = $("#start_date").val();
... ...