周伟鹏 / cnlive_shenhe · Commits

Commit 855de82402935206b45a98327c01bb4aec68d166

Authored by 徐近程
1 parent 376e394c

点播审核状态修改详情排版修改

Inline Side-by-side
Showing 2 changed files with 71 additions and 61 deletions
src/main/java/com/cnlive/shenhe/api/AudioControllerApi.java
  View file @855de82
... ... @@ -87,7 +87,8 @@ public class AudioControllerApi {
87 87 shyAudio.setCreateTime(new Date());
88 88 shyAudio.setState(0);
89 89 //获取审核类型
90   - audioService.getShenheType(shyAudio);
  90 + //audioService.getShenheType(shyAudio);
  91 + shyAudio.setShenhe_type(3);
91 92 shyAudio.setReceive(0);
92 93 audioService.importAudioMsg(shyAudio);
93 94 }
... ...
src/main/resources/templates/page/audioDetail.html
  View file @855de82
... ... @@ -51,45 +51,6 @@
51 51 <div id="tabContents" class="tab-content">
52 52 <div id="tabHome" class="tab-pane fade in active padding-t-15">
53 53 <div class="col-sm-5">
54   - <div class="form-group">
55   - <div>
56   - <label for="video_cover_img" class="control-label col-sm-4"
57   - style="margin-left: -3%">封面图:</label>
58   - </div>
59   - <div style="height:110px; margin-left: 17%;">
60   - <div class="col-sm-4 popover-options " th:style="${imgsStat.index==0}? 'float:left;margin-right: 43px;margin-left: -18px;':''" th:if="${imgsStat.index<2}"
61   - th:each="imgs :${images}">
62   - <a href="#">
63   - <img th:src="@{${imgs.value}}" height="100px" alt="封面图">
64   - </a>
65   - <b th:text="${imgs.key}"></b>
66   - </div>
67   - </div>
68   - <div style="height: 110px;margin-top: 15px;">
69   - <label for="" class="control-label col-sm-4"
70   - style="width: 26.3%;"></label>
71   - <div class="col-sm-4 popover-options " th:style="${imgsStat.index==2}?'float:left;margin-right: 15px;':'float:left;'"
72   - th:if="${imgsStat.index>=2&&imgsStat.index<4}"
73   - th:each="imgs :${images}">
74   - <a href="#">
75   - <img th:src="@{${imgs.value}}" height="100px" alt="封面图">
76   - </a>
77   - <b th:text="${imgs.key}"></b>
78   - </div>
79   - </div>
80   - <div style="height: 110px;margin-top: 15px;">
81   - <label for="" class="control-label col-sm-4"
82   - style="width: 26.3%;"></label>
83   - <div class="col-sm-4 popover-options" th:style="${imgsStat.index==4}?'float:left;margin-right: 15px;':'float:left;'"
84   - th:if="${imgsStat.index>=4}"
85   - th:each="imgs :${images}">
86   - <a href="#">
87   - <img th:src="@{${imgs.value}}" height="100px" alt="封面图">
88   - </a>
89   - <b th:text="${imgs.key}"></b>
90   - </div>
91   - </div>
92   - </div>
93 54 <div class="form-group" style="margin-bottom: 6px;">
94 55 <label for="audioTitle" class="control-label col-sm-4">音频标题:</label>
95 56 <div class="col-sm-8">
... ... @@ -120,28 +81,7 @@
120 81 </div>
121 82 <hr>
122 83  
123   - <div class="form-group">
124   - <div class="col-sm-12">
125   - <div class="modal-body" id="videoBox" style="height:450px">
126   - <script type="text/javascript"
127   - src="//resweb.cnliveimg.com/sites/common/cnlive_video.min.js"></script>
128   - <script th:inline="javascript">
129   - var audioUrl = [[${audio.audioUrl}]];
130   - cnliveVideo.init({
131   - "eleId": "videoBox",
132   - "width": 800,//指定放入指定ID元素内
133   - "height": 450,
134   - "model": 3,
135   - "autoplay": 1,
136   - "currRate": 3,
137   - "cover": "http://sxzg.ys1.cnliveimg.com/82/img/2018/0426/82_20180426164129.png",
138   - "videoUrl_3": audioUrl
139   - });
140   - </script>
141 84  
142   - </div>
143   - </div>
144   - </div>
145 85 <br>
146 86 <hr>
147 87  
... ... @@ -200,6 +140,75 @@
200 140 th:text="${audio.msg}"></textarea>
201 141 </div>
202 142 </div>
  143 +
  144 +
  145 +
  146 + </div>
  147 +
  148 + <div class="form-group col-sm-7" style="padding-left:200px">
  149 + <!--<div class="col-sm-12">-->
  150 + <div class="modal-body" id="videoBox" style="height:450px">
  151 + <script type="text/javascript"
  152 + src="//resweb.cnliveimg.com/sites/common/cnlive_video.min.js"></script>
  153 + <script th:inline="javascript">
  154 + var audioUrl = [[${audio.audioUrl}]];
  155 + cnliveVideo.init({
  156 + "eleId": "videoBox",
  157 + "width": 600,//指定放入指定ID元素内
  158 + "height": 450,
  159 + "model": 3,
  160 + "autoplay": 1,
  161 + "currRate": 3,
  162 + "cover": "http://sxzg.ys1.cnliveimg.com/82/img/2018/0426/82_20180426164129.png",
  163 + "videoUrl_3": audioUrl
  164 + });
  165 + </script>
  166 +
  167 + </div>
  168 + <!--</div>-->
  169 + </div>
  170 +
  171 +
  172 + <div class="form-group col-sm-7">
  173 + <br/>
  174 + <br/>
  175 + <div>
  176 + <label for="video_cover_img" class="control-label col-sm-4"
  177 + style="margin-left: -3%">封面图:</label>
  178 + </div>
  179 + <div style="height:110px; margin-left: 17%;">
  180 + <div class="col-sm-4 popover-options " th:style="${imgsStat.index==0}? 'float:left;margin-right: 43px;margin-left: -18px;':''" th:if="${imgsStat.index<2}"
  181 + th:each="imgs :${images}">
  182 + <a href="#">
  183 + <img th:src="@{${imgs.value}}" height="100px" alt="封面图">
  184 + </a>
  185 + <b th:text="${imgs.key}"></b>
  186 + </div>
  187 + </div>
  188 + <div style="height: 110px;margin-top: 15px;">
  189 + <label for="" class="control-label col-sm-4"
  190 + style="width: 26.3%;"></label>
  191 + <div class="col-sm-4 popover-options " th:style="${imgsStat.index==2}?'float:left;margin-right: 15px;':'float:left;'"
  192 + th:if="${imgsStat.index>=2&&imgsStat.index<4}"
  193 + th:each="imgs :${images}">
  194 + <a href="#">
  195 + <img th:src="@{${imgs.value}}" height="100px" alt="封面图">
  196 + </a>
  197 + <b th:text="${imgs.key}"></b>
  198 + </div>
  199 + </div>
  200 + <div style="height: 110px;margin-top: 15px;">
  201 + <label for="" class="control-label col-sm-4"
  202 + style="width: 26.3%;"></label>
  203 + <div class="col-sm-4 popover-options" th:style="${imgsStat.index==4}?'float:left;margin-right: 15px;':'float:left;'"
  204 + th:if="${imgsStat.index>=4}"
  205 + th:each="imgs :${images}">
  206 + <a href="#">
  207 + <img th:src="@{${imgs.value}}" height="100px" alt="封面图">
  208 + </a>
  209 + <b th:text="${imgs.key}"></b>
  210 + </div>
  211 + </div>
203 212 </div>
204 213 </div>
205 214  
... ...