Commit f8a8a8d0f608732851251fd36a8477b5c8b1fc6c

Authored by liwei2917
1 parent 5e3cfb54

增加直播申请审核的邮件通知状态和详情页里的审核信息

src/main/resources/templates/common/frame.html
... ... @@ -90,7 +90,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser.
90 90 <ul class="treeview-menu">
91 91 <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
92 92 <li><a href="/sites/page" id="/sites/page"> SP白名单管理</a></li>
93   - <li><a href="/usersFree/page" id="/usersFree/page"> 用户白名单管理</a></li>
  93 + <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
94 94 <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
95 95 </ul>
96 96 </li>
... ...
src/main/resources/templates/page/liveApply.html
... ... @@ -216,6 +216,11 @@
216 216 <div class="th-inner ">审核类型</div>
217 217 <div class="fht-cell"></div>
218 218 </th>
  219 + <th style="text-align: center; width: 5%; " data-field="state_name"
  220 + tabindex="0">
  221 + <div class="th-inner ">邮件通知</div>
  222 + <div class="fht-cell"></div>
  223 + </th>
219 224 <th style="text-align: center; width: 10%; " data-field="upload_time"
220 225 tabindex="0">
221 226 <div class="th-inner ">直播申请时间</div>
... ... @@ -259,6 +264,11 @@
259 264 <span th:if="${liveApply.shenhe_type==2}">机审</span>
260 265 <span th:if="${liveApply.shenhe_type==3}">人工审</span>
261 266 </td>
  267 + <td style="text-align: center; width: 5%;">
  268 + <span class="btn btn-sm btn-warning" th:if="${liveApply.email_notice_state==1}">未通知</span>
  269 + <span class="btn btn-sm btn-success" th:if="${liveApply.email_notice_state==2}">已通知</span>
  270 + <span class="btn btn-sm btn-danger" th:if="${liveApply.email_notice_state==3}">通知失败</span>
  271 + </td>
262 272 <td style="text-align: center; width: 10%;"
263 273 th:text="${#dates.format(liveApply.created_at, 'yyyy-MM-dd HH:mm:ss')}">
264 274 2018-03-07 16:56:20
... ...
src/main/resources/templates/page/liveApplyDetail.html
... ... @@ -135,8 +135,22 @@
135 135 </table>
136 136  
137 137 <hr>
138   - </div>
139   -
  138 + <div class="form-group">
  139 + <label for="msg" class="control-label col-sm-2">审核信息:</label>
  140 + <div class="col-sm-9">
  141 + <textarea class="form-control" name="msg" cols="50" rows="4"
  142 + id="msg" th:text="${shyLiveapply.shenhe_msg}">审核信息</textarea>
  143 + </div>
  144 + </div>
  145 + <div class="form-group">
  146 + <label for="msg" class="control-label col-sm-2">邮件通知信息:</label>
  147 + <div class="col-sm-9">
  148 + <textarea class="form-control" name="msg" cols="50" rows="4"
  149 + id="msg" th:text="${shyLiveapply.email_notice_msg}">审核信息</textarea>
  150 + </div>
  151 + </div>
  152 + </div>
  153 + <hr>
140 154 <div class="form-group">
141 155 <input type="text" hidden="hidden" id="shyLiveapply_id" th:value="${shyLiveapply.id}">
142 156 </div>
... ...