Commit eb1806aa8397ea3370ecd77ebd5db9b40cc29ad4

Authored by 陈浩
1 parent cb4a123c

更新点播审核在 <全部待领 >状态下不显示' 查看' 按钮

src/main/java/com/cnlive/shenhe/controller/UsersController.java
@@ -53,7 +53,7 @@ public class UsersController { @@ -53,7 +53,7 @@ public class UsersController {
53 sessionUser.setLogo(user.getUser_logo()); 53 sessionUser.setLogo(user.getUser_logo());
54 sessionUser.setMaster(user.getMaster()); 54 sessionUser.setMaster(user.getMaster());
55 request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser); 55 request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser);
56 - return "redirect:http://shen.cnlive.com/videos/page?state=0&receive=false"; 56 + return "redirect:http://shen.cnlive.com/videos/page?video_title=&start_date=&end_date=&state=0&receive=false&video_priority=";
57 } 57 }
58 } 58 }
59 return "page/error.html"; 59 return "page/error.html";
src/main/resources/templates/page/video.html
@@ -203,7 +203,8 @@ @@ -203,7 +203,8 @@
203 <td style="text-align: center; width: 17%;"> 203 <td style="text-align: center; width: 17%;">
204 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}"> 204 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
205 <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"--> 205 <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"-->
206 - <button class="btn btn-info btn-sm">查看</button> 206 + <button th:if="${param.state[0] eq ''}" class="btn btn-info btn-sm">查看</button>
  207 + <button th:if="${param.state[0] ne ''}" class="btn btn-info btn-sm" th:style="${param.state[0] eq '0' && param.receive[0] eq 'false'} ? 'display: none ' : ' '">查看</button>
207 </a> 208 </a>
208 <span th:if="${video.state==0 and !video.receive}"> &nbsp;</span> 209 <span th:if="${video.state==0 and !video.receive}"> &nbsp;</span>
209 <a th:href="@{'javascript:applyReceive('+${video.id}+')'}" 210 <a th:href="@{'javascript:applyReceive('+${video.id}+')'}"
@@ -312,7 +313,7 @@ @@ -312,7 +313,7 @@
312 313
313 //全部 314 //全部
314 function quanbu() { 315 function quanbu() {
315 - window.location.href = "page"; 316 + window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority=";
316 } 317 }
317 318
318 //全部待领 319 //全部待领