周伟鹏 / cnlive_shenhe · Commits

Commit 0e415b4677dffeb87a31e072e80836f70a891690

Authored by 王言钊
1 parent ea173668

修改条件查询的按钮昵称，活动昵称的显示

Inline Side-by-side
Showing 11 changed files with 25 additions and 25 deletions
src/main/resources/templates/page/activity.html
  View file @0e415b4
@@ -118,9 +118,9 @@ @@ -118,9 +118,9 @@
118 <div class="col-sm-7" style="padding: 0;"> 118 <div class="col-sm-7" style="padding: 0;">
119 <select class="form-control" id="exempt_from_trial_query" 119 <select class="form-control" id="exempt_from_trial_query"
120 name="exempt_from_trial"> 120 name="exempt_from_trial">
121 - <option value="">--全部审免类型--</option>  
122 - <option value="0" name="未审核" th:selected="${exempt_from_trial ==0}" >未审免</option>  
123 - <option value="1" name="已经审核" th:selected="${exempt_from_trial ==1}" >已经审免</option> 121 + <option value="">--全部免审类型--</option>
  122 + <option value="0" name="非免审" th:selected="${exempt_from_trial ==0}" >非免审</option>
  123 + <option value="1" name="免审" th:selected="${exempt_from_trial ==1}" >免审</option>
124 </select> 124 </select>
125 </div> 125 </div>
126 </div> 126 </div>
@@ -189,7 +189,7 @@ @@ -189,7 +189,7 @@
189 </td> 189 </td>
190 190
191 <td style="text-align: center; width: 12%;" 191 <td style="text-align: center; width: 12%;"
192 - th:text="${ShyActivity.exempt_from_trial} == 1 ? 已经免审 : 未免审"> 192 + th:text="${ShyActivity.exempt_from_trial} == 1 ? 免审 : 非免审">
193 2016-08-03 193 2016-08-03
194 14:27:17 194 14:27:17
195 </td> 195 </td>
@@ -306,8 +306,8 @@ @@ -306,8 +306,8 @@
306 306
307 <select class="" id="exempt_from_trial" name="exempt_from_trial"> 307 <select class="" id="exempt_from_trial" name="exempt_from_trial">
308 <option value="" name="-选择审核类型-">-选择审核类型-</option> 308 <option value="" name="-选择审核类型-">-选择审核类型-</option>
309 - <option value="0" name="未审核">未审免</option>  
310 - <option value="1" name="已经审核">已经审免</option> 309 + <option value="0" name="非免审">非免审</option>
  310 + <option value="1" name="免审">免审</option>
311 </select> 311 </select>
312 </div> 312 </div>
313 </div> 313 </div>
src/main/resources/templates/page/audio.html
  View file @0e415b4
@@ -71,8 +71,8 @@ @@ -71,8 +71,8 @@
71 th:onclick="'javascript:yishen()'" value="1">我的已审 71 th:onclick="'javascript:yishen()'" value="1">我的已审
72 </button> 72 </button>
73 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query" 73 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
74 - onclick="openOrClose(&#39;forms&#39;)">查询  
75 - <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 74 + onclick="openOrClose(&#39;forms&#39;)">
  75 + <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
76 </button> 76 </button>
77 </div> 77 </div>
78 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;"> 78 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
src/main/resources/templates/page/channel.html
  View file @0e415b4
@@ -78,8 +78,8 @@ @@ -78,8 +78,8 @@
78 </button> 78 </button>
79 </div> 79 </div>
80 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query" 80 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
81 - onclick="openOrClose(&#39;forms&#39;)">高级查询  
82 - <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 81 + onclick="openOrClose(&#39;forms&#39;)">
  82 + <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
83 </button> 83 </button>
84 </div> 84 </div>
85 </div> 85 </div>
src/main/resources/templates/page/comment.html
  View file @0e415b4
@@ -81,8 +81,8 @@ @@ -81,8 +81,8 @@
81 </button> 81 </button>
82 </div> 82 </div>
83 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query" 83 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
84 - onclick="openOrClose(&#39;forms&#39;)">高级查询  
85 - <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 84 + onclick="openOrClose(&#39;forms&#39;)">
  85 + <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
86 </button> 86 </button>
87 </div> 87 </div>
88 </div> 88 </div>
src/main/resources/templates/page/comment2.html
  View file @0e415b4
@@ -78,8 +78,8 @@ @@ -78,8 +78,8 @@
78 </button> 78 </button>
79 </div> 79 </div>
80 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query" 80 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
81 - onclick="openOrClose(&#39;forms&#39;)">高级查询  
82 - <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 81 + onclick="openOrClose(&#39;forms&#39;)">
  82 + <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
83 </button> 83 </button>
84 </div> 84 </div>
85 </div> 85 </div>
src/main/resources/templates/page/content.html
  View file @0e415b4
@@ -71,8 +71,8 @@ @@ -71,8 +71,8 @@
71 th:onclick="'javascript:yishen()'" value="1">我的已审 71 th:onclick="'javascript:yishen()'" value="1">我的已审
72 </button> 72 </button>
73 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query" 73 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
74 - onclick="openOrClose(&#39;forms&#39;)">查询  
75 - <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 74 + onclick="openOrClose(&#39;forms&#39;)">
  75 + <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
76 </button> 76 </button>
77 </div> 77 </div>
78 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;"> 78 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
src/main/resources/templates/page/live.html
  View file @0e415b4
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 <button type="button" 71 <button type="button"
72 class="btn btn-primary btn-sm margin-r-5" id="query" 72 class="btn btn-primary btn-sm margin-r-5" id="query"
73 onclick="openOrClose('forms')"> 73 onclick="openOrClose('forms')">
74 - 查询 <span id="a_up">▼</span><span id="a_down">▲</span> 74 + <span id="a_up">展开▼</span><span id="a_down">收起▲</span>
75 </button> 75 </button>
76 </div> 76 </div>
77 77
src/main/resources/templates/page/liveApply.html
  View file @0e415b4
@@ -70,8 +70,8 @@ @@ -70,8 +70,8 @@
70 th:onclick="'javascript:yishen()'" value="1">我的已审 70 th:onclick="'javascript:yishen()'" value="1">我的已审
71 </button> 71 </button>
72 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query" 72 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
73 - onclick="openOrClose(&#39;forms&#39;)">查询  
74 - <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 73 + onclick="openOrClose(&#39;forms&#39;)">
  74 + <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
75 </button> 75 </button>
76 </div> 76 </div>
77 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;"> 77 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
src/main/resources/templates/page/notspeak.html
  View file @0e415b4
@@ -107,8 +107,8 @@ input:checked + .slider:before { @@ -107,8 +107,8 @@ input:checked + .slider:before {
107 <!-- </button> --> 107 <!-- </button> -->
108 </div> 108 </div>
109 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query" 109 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
110 - onclick="openOrClose(&#39;forms&#39;)">高级查询  
111 - <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 110 + onclick="openOrClose(&#39;forms&#39;)">
  111 + <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
112 </button> 112 </button>
113 </div> 113 </div>
114 </div> 114 </div>
src/main/resources/templates/page/topic.html
  View file @0e415b4
@@ -78,8 +78,8 @@ @@ -78,8 +78,8 @@
78 </button> 78 </button>
79 </div> 79 </div>
80 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query" 80 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
81 - onclick="openOrClose(&#39;forms&#39;)">高级查询  
82 - <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 81 + onclick="openOrClose(&#39;forms&#39;)">
  82 + <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
83 </button> 83 </button>
84 </div> 84 </div>
85 </div> 85 </div>
src/main/resources/templates/page/video.html
  View file @0e415b4
@@ -71,8 +71,8 @@ @@ -71,8 +71,8 @@
71 th:onclick="'javascript:yishen()'" value="1">我的已审 71 th:onclick="'javascript:yishen()'" value="1">我的已审
72 </button> 72 </button>
73 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query" 73 <button type="button" class="btn btn-primary btn-sm margin-r-5" id="query"
74 - onclick="openOrClose(&#39;forms&#39;)">查询  
75 - <span id="a_up">▼</span><span id="a_down" style="display: none;">▲</span> 74 + onclick="openOrClose(&#39;forms&#39;)">
  75 + <span id="a_up">展开▼</span><span id="a_down" style="display: none;">收起▲</span>
76 </button> 76 </button>
77 </div> 77 </div>
78 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;"> 78 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">