Commit b8ef8f4a4defeba810378f4778c844e10d01ba35
1 parent
172a15a1
去掉视频列表封面图;微调详情页通过按钮功能;设置默认显示待审核的视频
Showing
4 changed files
with
25 additions
and
22 deletions
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://test.shen.cnlive.com/videos/page"; | 56 | + return "redirect:http://test.shen.cnlive.com/videos/page?state=0"; |
| 57 | } | 57 | } |
| 58 | } | 58 | } |
| 59 | return "page/error.html"; | 59 | return "page/error.html"; |
src/main/resources/templates/common/frame.html
| @@ -60,7 +60,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser. | @@ -60,7 +60,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser. | ||
| 60 | <span class="menu-item-top">审核云</span> | 60 | <span class="menu-item-top">审核云</span> |
| 61 | </a> | 61 | </a> |
| 62 | <ul class="treeview-menu"> | 62 | <ul class="treeview-menu"> |
| 63 | - <li class="active"><a href="/videos/page"></i> 点播审核</a></li> | 63 | + <li class="active"><a href="/videos/page?state=0"></i> 点播审核</a></li> |
| 64 | <li><a href="/comments/page"> 评论审核</a></li> | 64 | <li><a href="/comments/page"> 评论审核</a></li> |
| 65 | </ul> | 65 | </ul> |
| 66 | </li> | 66 | </li> |
src/main/resources/templates/page/video.html
| @@ -99,7 +99,7 @@ | @@ -99,7 +99,7 @@ | ||
| 99 | <!--</th>--> | 99 | <!--</th>--> |
| 100 | <th style="text-align: center; width: 6%; " data-field="sp_id_brief" tabindex="0"><div class="th-inner ">spid</div><div class="fht-cell"></div></th> | 100 | <th style="text-align: center; width: 6%; " data-field="sp_id_brief" tabindex="0"><div class="th-inner ">spid</div><div class="fht-cell"></div></th> |
| 101 | <th style="text-align: center; width: 20%; " data-field="video_title" tabindex="0"><div class="th-inner ">标题</div><div class="fht-cell"></div></th> | 101 | <th style="text-align: center; width: 20%; " data-field="video_title" tabindex="0"><div class="th-inner ">标题</div><div class="fht-cell"></div></th> |
| 102 | - <th style="text-align: center; width: 10%; " data-field="video_cover_img" tabindex="0"><div class="th-inner ">点播封面图</div><div class="fht-cell"></div></th> | 102 | + <!--<th style="text-align: center; width: 10%; " data-field="video_cover_img" tabindex="0"><div class="th-inner ">点播封面图</div><div class="fht-cell"></div></th>--> |
| 103 | <th style="text-align: center; width: 6%; " data-field="auditor" tabindex="0"><div class="th-inner ">审核员</div><div class="fht-cell"></div></th> | 103 | <th style="text-align: center; width: 6%; " data-field="auditor" tabindex="0"><div class="th-inner ">审核员</div><div class="fht-cell"></div></th> |
| 104 | <th style="text-align: center; width: 3%; " data-field="is_hot_name" tabindex="0"><div class="th-inner ">热点</div><div class="fht-cell"></div></th> | 104 | <th style="text-align: center; width: 3%; " data-field="is_hot_name" tabindex="0"><div class="th-inner ">热点</div><div class="fht-cell"></div></th> |
| 105 | <th style="text-align: center; width: 3%; " data-field="state_name" tabindex="0"><div class="th-inner ">审核状态</div><div class="fht-cell"></div></th> | 105 | <th style="text-align: center; width: 3%; " data-field="state_name" tabindex="0"><div class="th-inner ">审核状态</div><div class="fht-cell"></div></th> |
| @@ -112,9 +112,9 @@ | @@ -112,9 +112,9 @@ | ||
| 112 | <!--<td class="bs-checkbox "><input data-index="0" name="btSelectItem" type="checkbox"></td>--> | 112 | <!--<td class="bs-checkbox "><input data-index="0" name="btSelectItem" type="checkbox"></td>--> |
| 113 | <td style="text-align: center; width: 6%;" th:text="${video.spid}"></td> | 113 | <td style="text-align: center; width: 6%;" th:text="${video.spid}"></td> |
| 114 | <td style="text-align: center; width: 20%;" th:text="${video.video_title}">邓建国正面PK冯小刚 </td> | 114 | <td style="text-align: center; width: 20%;" th:text="${video.video_title}">邓建国正面PK冯小刚 </td> |
| 115 | - <td style="text-align: center; width: 10%;"> | ||
| 116 | - <div width="160px" height="90px"><img th:src="@{${video.video_poster}}" width="160px" alt="封面图"></div> | ||
| 117 | - </td> | 115 | + <!--<td style="text-align: center; width: 10%;">--> |
| 116 | + <!--<div width="160px" height="90px"><img th:src="@{${video.video_poster}}" width="160px" alt="封面图"></div>--> | ||
| 117 | + <!--</td>--> | ||
| 118 | <td style="text-align: center; width: 6%;" th:text="${video.auditor}">审核员</td> | 118 | <td style="text-align: center; width: 6%;" th:text="${video.auditor}">审核员</td> |
| 119 | <td style="text-align: center; width: 3%;" th:text="${video.video_priority=='1'?'是':'否'}">是</td> | 119 | <td style="text-align: center; width: 3%;" th:text="${video.video_priority=='1'?'是':'否'}">是</td> |
| 120 | <td style="text-align: center; width: 3%;"> | 120 | <td style="text-align: center; width: 3%;"> |
src/main/resources/templates/page/videoDetail.html
| @@ -310,22 +310,25 @@ | @@ -310,22 +310,25 @@ | ||
| 310 | if (typeof(activity_id) == "undefined") { | 310 | if (typeof(activity_id) == "undefined") { |
| 311 | return false; | 311 | return false; |
| 312 | } | 312 | } |
| 313 | - $.post("/videos/shenheVideo", { | ||
| 314 | - id: id, | ||
| 315 | - activity_id: activity_id, | ||
| 316 | - state: state, | ||
| 317 | - attr_tags: msg, | ||
| 318 | - msg: msg, | ||
| 319 | - callback: callback | ||
| 320 | - }, | ||
| 321 | - function (data) { | ||
| 322 | - if (data.errorCode == 0) { | ||
| 323 | - alert(data.errorMessage); | ||
| 324 | - self.location=document.referrer; | ||
| 325 | - } else { | ||
| 326 | - alert(data.errorMessage); | ||
| 327 | - } | ||
| 328 | - }) | 313 | + if(confirm("您确认通过此条点播吗?")) |
| 314 | + { | ||
| 315 | + $.post("/videos/shenheVideo", { | ||
| 316 | + id: id, | ||
| 317 | + activity_id: activity_id, | ||
| 318 | + state: state, | ||
| 319 | + attr_tags: msg, | ||
| 320 | + msg: msg, | ||
| 321 | + callback: callback | ||
| 322 | + }, | ||
| 323 | + function (data) { | ||
| 324 | + if (data.errorCode == 0) { | ||
| 325 | + alert(data.errorMessage); | ||
| 326 | + self.location=document.referrer; | ||
| 327 | + } else { | ||
| 328 | + alert(data.errorMessage); | ||
| 329 | + } | ||
| 330 | + }); | ||
| 331 | + } | ||
| 329 | }); | 332 | }); |
| 330 | 333 | ||
| 331 | /*返回列表 */ | 334 | /*返回列表 */ |