diff --git a/application/admin/controller/Appminialipaylist.php b/application/admin/controller/Appminialipaylist.php
index 2fc7cf8c3..029bcc42b 100755
--- a/application/admin/controller/Appminialipaylist.php
+++ b/application/admin/controller/Appminialipaylist.php
@@ -57,7 +57,7 @@ class AppMiniAlipayList extends Common
      */
 	public function Index()
 	{
-		$this->assign('data', AppMiniService::DataList($this->params));
+		$this->assign('data_list', AppMiniService::DataList($this->params));
 		return $this->fetch();
 	}
 
diff --git a/application/admin/controller/Appminiweixinlist.php b/application/admin/controller/Appminiweixinlist.php
index 44a5ee533..50c356d62 100755
--- a/application/admin/controller/Appminiweixinlist.php
+++ b/application/admin/controller/Appminiweixinlist.php
@@ -57,7 +57,7 @@ class AppMiniWeixinList extends Common
      */
 	public function Index()
 	{
-		$this->assign('data', AppMiniService::DataList($this->params));
+		$this->assign('data_list', AppMiniService::DataList($this->params));
 		return $this->fetch();
 	}
 
diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php
index 7a3468202..58a2c9eb1 100755
--- a/application/admin/controller/Goods.php
+++ b/application/admin/controller/Goods.php
@@ -90,7 +90,7 @@ class Goods extends Common
 
 		$this->assign('params', $params);
 		$this->assign('page_html', $page->GetPageHtml());
-		$this->assign('data', $ret['data']);
+		$this->assign('data_list', $ret['data']);
 		return $this->fetch();
 	}
 
diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php
index 5ee0aff68..9f17bba13 100755
--- a/application/admin/controller/Power.php
+++ b/application/admin/controller/Power.php
@@ -117,7 +117,7 @@ class Power extends Common
 		];
 		$data = AdminPowerService::RoleList($data_params);
 
-		$this->assign('data', $data);
+		$this->assign('data_list', $data);
 		return $this->fetch();
 	}
 
diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php
index f44fd2054..f290f1c0c 100755
--- a/application/admin/controller/User.php
+++ b/application/admin/controller/User.php
@@ -89,7 +89,7 @@ class User extends Common
 
 		$this->assign('params', $params);
 		$this->assign('page_html', $page->GetPageHtml());
-		$this->assign('data', $data['data']);
+		$this->assign('data_list', $data['data']);
 		return $this->fetch();
 
 	}
diff --git a/application/admin/view/default/admin/index.html b/application/admin/view/default/admin/index.html
index 6b704a73c..a4b8fe85f 100755
--- a/application/admin/view/default/admin/index.html
+++ b/application/admin/view/default/admin/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/admin/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="用户名" name="username" {{if !empty($params['username'])}} value="{{$params.username}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/admin/index')}}" request-type="form">
+			<div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="用户名" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,23 +21,32 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-					<select name="role_id" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">权限组</option>
-						{{foreach $role as $v}}
-							<option value="{{$v.id}}" {{if isset($params['role_id']) and $params['role_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="gender" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">性别</option>
-						{{foreach $common_gender_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-				</div>
-			</div>
+                </label>
+            </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                	<tr>
+                		<td>
+                			<span>权限：</span>
+							<select name="role_id" class="chosen-select" data-placeholder="权限组...">
+								<option value="-1">权限组...</option>
+								{{foreach $role as $v}}
+									<option value="{{$v.id}}" {{if isset($params['role_id']) and $params['role_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                		<td>
+                			<span>性别：</span>
+							<select name="gender" class="chosen-select" data-placeholder="性别...">
+								<option value="-1">性别...</option>
+								{{foreach $common_gender_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                	</tr>
+                </tbody>
+			</table>
         </form>
         <!-- form end -->
 
@@ -89,11 +102,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="5" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+        {{if empty($data)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- page start -->
diff --git a/application/admin/view/default/answer/index.html b/application/admin/view/default/answer/index.html
index c628302b6..730c4b08e 100755
--- a/application/admin/view/default/answer/index.html
+++ b/application/admin/view/default/answer/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/answer/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="联系人/内容" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/answer/index')}}" request-type="form">
+			<div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="联系人/内容" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,30 +21,50 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-					<select name="is_show" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">是否显示</option>
-						{{foreach $common_is_show_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['is_show']) and $params['is_show'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="is_reply" class="am-radius c-p m-t-10 m-l-5 param-where" data-placeholder="是否回复...">
-                        <option value="-1">是否回复...</option>
-                        {{if !empty($common_is_text_list)}}
-                            {{foreach $common_is_text_list as $v}}
-                                <option value="{{$v.id}}" {{if isset($params['is_reply']) and $params['is_reply'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                            {{/foreach}}
-                        {{/if}}
-                    </select>
-					<div class="param-date param-where m-l-5">
-						<input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-						<span>~</span>
-						<input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-					</div>
-				</div>
-			</div>
+                </label>
+            </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                	<tr>
+                		<td>
+                			<span>显隐：</span>
+							<select name="is_show" class="chosen-select" data-placeholder="是否显示...">
+								<option value="-1">是否显示...</option>
+								{{foreach $common_is_show_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['is_show']) and $params['is_show'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                		<td>
+                			<span>回复：</span>
+							<select name="is_reply" class="chosen-select" data-placeholder="是否回复...">
+		                        <option value="-1">是否回复...</option>
+		                        {{if !empty($common_is_text_list)}}
+		                            {{foreach $common_is_text_list as $v}}
+		                                <option value="{{$v.id}}" {{if isset($params['is_reply']) and $params['is_reply'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+		                            {{/foreach}}
+		                        {{/if}}
+		                    </select>
+                		</td>
+                	</tr>
+                    <tr>
+                        <td class="time">
+							<span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/answer/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+			</table>
         </form>
         <!-- form end -->
 
@@ -209,11 +233,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="20" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- 处理窗口 -->
diff --git a/application/admin/view/default/apphomenav/index.html b/application/admin/view/default/apphomenav/index.html
index 2e9751e52..0f335db06 100755
--- a/application/admin/view/default/apphomenav/index.html
+++ b/application/admin/view/default/apphomenav/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
     <div class="content">
         <!-- form start -->
-        <form class="am-form view-list" action="{{:MyUrl('admin/apphomenav/index')}}" method="POST">
-            <div class="am-g">
-                <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="名称" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-                <button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-                <label class="fs-12 m-l-5 c-p fw-100 more-submit">
-                    更多筛选
+        <form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/apphomenav/index')}}" request-type="form">
+            <div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="名称" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -18,35 +22,61 @@
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
                 </label>
-
-                <div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-                    <select name="is_enable" class="am-radius c-p m-t-10 m-l-5 param-where">
-                        <option value="-1">是否启用</option>
-                        {{foreach $common_is_enable_list as $v}}
-                            <option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    </select>
-                    <select name="platform" class="am-radius c-p m-t-10 m-l-5 param-where">
-                        <option value="">所属平台</option>
-                        {{foreach $common_platform_type as $v}}
-                            {{if !in_array($v['value'], ['pc'])}}
-                                <option value="{{$v.value}}" {{if isset($params['platform']) and $params['platform'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                            {{/if}}
-                        {{/foreach}}
-                    </select>
-                    <select name="event_type" class="am-radius c-p m-t-10 m-l-5 param-where">
-                        <option value="-1">事件类型</option>
-                        {{foreach $common_app_event_type as $v}}
-                            <option value="{{$v.value}}" {{if isset($params['event_type']) and $params['event_type'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    </select>
-                    <div class="param-date param-where m-l-5">
-                        <input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-                        <span>~</span>
-                        <input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-                    </div>
-                </div>
             </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                    <tr>
+                        <td>
+                            <span>启用：</span>
+                            <select name="is_enable" class="chosen-select" data-placeholder="是否启用...">
+                                <option value="-1">是否启用...</option>
+                                {{foreach $common_is_enable_list as $v}}
+                                    <option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            </select>
+                        </td>
+                        <td>
+                            <span>平台：</span>
+                            <select name="platform" class="chosen-select" data-placeholder="所属平台...">
+                                <option value="">所属平台...</option>
+                                {{foreach $common_platform_type as $v}}
+                                    {{if !in_array($v['value'], ['pc'])}}
+                                        <option value="{{$v.value}}" {{if isset($params['platform']) and $params['platform'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                    {{/if}}
+                                {{/foreach}}
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <span>类型：</span>
+                            <select name="event_type" class="chosen-select" data-placeholder="事件类型...">
+                                <option value="-1">事件类型...</option>
+                                {{foreach $common_app_event_type as $v}}
+                                    <option value="{{$v.value}}" {{if isset($params['event_type']) and $params['event_type'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            </select>
+                        </td>
+                        <td class="time">
+                            <span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/apphomenav/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </form>
         <!-- form end -->
 
@@ -108,11 +138,12 @@
                             </td>
                         </tr>
                     {{/foreach}}
-                {{else /}}
-                    <tr><td colspan="20" class="table-no">没有相关数据</td></tr>
                 {{/if}}
             </tbody>
         </table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
         <!-- list end -->
 
         <!-- page start -->
diff --git a/application/admin/view/default/appminialipaylist/index.html b/application/admin/view/default/appminialipaylist/index.html
index 3ccdbb9a2..c3e5bd5b8 100755
--- a/application/admin/view/default/appminialipaylist/index.html
+++ b/application/admin/view/default/appminialipaylist/index.html
@@ -35,8 +35,8 @@
 				</tr>
 			</thead>
 			<tbody>
-				{{if !empty($data)}}
-					{{foreach $data as $v}}
+				{{if !empty($data_list)}}
+					{{foreach $data_list as $v}}
 						<tr>
 							<td>{{$v.name}}</td>
 							<td>{{$v.size}}</td>
@@ -51,11 +51,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="4" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+		{{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- lis end -->
 	</div>
 </div>
diff --git a/application/admin/view/default/appminiweixinlist/index.html b/application/admin/view/default/appminiweixinlist/index.html
index a370409f9..6bbf4a4be 100755
--- a/application/admin/view/default/appminiweixinlist/index.html
+++ b/application/admin/view/default/appminiweixinlist/index.html
@@ -35,8 +35,8 @@
 				</tr>
 			</thead>
 			<tbody>
-				{{if !empty($data)}}
-					{{foreach $data as $v}}
+				{{if !empty($data_list)}}
+					{{foreach $data_list as $v}}
 						<tr>
 							<td>{{$v.name}}</td>
 							<td>{{$v.size}}</td>
@@ -51,11 +51,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="4" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+		{{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- lis end -->
 	</div>
 </div>
diff --git a/application/admin/view/default/article/index.html b/application/admin/view/default/article/index.html
index 30aa42403..1e0252049 100755
--- a/application/admin/view/default/article/index.html
+++ b/application/admin/view/default/article/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/article/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="标题关键字" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/article/index')}}" request-type="form">
+            <div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="标题关键字" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,34 +21,60 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-					<select  class="am-radius c-p m-t-10 param-where" name="article_category_id">
-						<option value="-1">文章分类</option>
-						{{foreach $article_category_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['article_category_id']) and $params['article_category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="is_enable" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">是否启用</option>
-						{{foreach $common_is_enable_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="is_home_recommended" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">首页推荐</option>
-						{{foreach $common_is_text_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['is_home_recommended']) and $params['is_home_recommended'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<div class="param-date param-where m-l-5">
-						<input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-						<span>~</span>
-						<input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-					</div>
-				</div>
-			</div>
+                </label>
+            </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                    <tr>
+                        <td>
+                            <span>启用：</span>
+                            <select name="is_enable" class="chosen-select" data-placeholder="是否启用...">
+                                <option value="-1">是否启用...</option>
+                                {{foreach $common_is_enable_list as $v}}
+                                    <option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            </select>
+                        </td>
+                        <td>
+                            <span>分类：</span>
+                            <select name="article_category_id" class="chosen-select" data-placeholder="文章分类...">
+								<option value="-1">文章分类...</option>
+								{{foreach $article_category_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['article_category_id']) and $params['article_category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                        </td>
+                    </tr>
+                    <tr>
+                    	<td>
+                    		<span>推荐：</span>
+                    		<select name="is_home_recommended" class="chosen-select" data-placeholder="首页推荐...">
+								<option value="-1">首页推荐...</option>
+								{{foreach $common_is_text_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['is_home_recommended']) and $params['is_home_recommended'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                    	</td>
+                        <td class="time">
+                            <span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                    </tr>
+                   	<tr>
+                   		<td></td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/article/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </form>
         <!-- form end -->
 
@@ -123,11 +153,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="10" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- page start -->
diff --git a/application/admin/view/default/brand/index.html b/application/admin/view/default/brand/index.html
index 855bf111b..35e7d466c 100755
--- a/application/admin/view/default/brand/index.html
+++ b/application/admin/view/default/brand/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
     <div class="content">
         <!-- form start -->
-        <form class="am-form view-list" action="{{:MyUrl('admin/brand/index')}}" method="POST">
-            <div class="am-g">
-                <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="名称" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-                <button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-                <label class="fs-12 m-l-5 c-p fw-100 more-submit">
-                    更多筛选
+        <form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/brand/index')}}" request-type="form">
+            <div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="名称" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -18,27 +22,47 @@
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
                 </label>
-
-                <div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-                    <select name="is_enable" class="am-radius c-p m-t-10 m-l-5 param-where">
-                        <option value="-1">是否启用</option>
-                        {{foreach $common_is_enable_list as $v}}
-                            <option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    </select>
-                    <select name="brand_category_id" class="am-radius c-p m-t-10 m-l-5 param-where">
-                        <option value="-1">品牌分类</option>
-                        {{foreach $brand_category as $v}}
-                            <option value="{{$v.id}}" {{if isset($params['brand_category_id']) and $params['brand_category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    </select>
-                    <div class="param-date param-where m-l-5">
-                        <input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-                        <span>~</span>
-                        <input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-                    </div>
-                </div>
             </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                    <tr>
+                        <td>
+                            <span>启用：</span>
+                            <select name="is_enable" class="chosen-select" data-placeholder="是否启用...">
+                                <option value="-1">是否启用...</option>
+                                {{foreach $common_is_enable_list as $v}}
+                                    <option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            </select>
+                        </td>
+                        <td>
+                            <span>分类：</span>
+                            <select name="brand_category_id" class="chosen-select" data-placeholder="品牌分类...">
+                                <option value="-1">品牌分类...</option>
+                                {{foreach $brand_category as $v}}
+                                    <option value="{{$v.id}}" {{if isset($params['brand_category_id']) and $params['brand_category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="time">
+                            <span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/brand/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </form>
         <!-- form end -->
 
@@ -96,11 +120,12 @@
                             </td>
                         </tr>
                     {{/foreach}}
-                {{else /}}
-                    <tr><td colspan="7" class="table-no">没有相关数据</td></tr>
                 {{/if}}
             </tbody>
         </table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
         <!-- list end -->
 
         <!-- page start -->
diff --git a/application/admin/view/default/customview/index.html b/application/admin/view/default/customview/index.html
index 1069432b4..29f727c27 100755
--- a/application/admin/view/default/customview/index.html
+++ b/application/admin/view/default/customview/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/customview/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="标题关键字" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/customview/index')}}" request-type="form">
+			<div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="标题/型号" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,34 +21,60 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-					<select name="is_header" class="am-radius c-p m-t-10 param-where">
-						<option value="-1">是否含头部</option>
-						{{foreach $common_is_header_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['is_header']) and $params['is_header'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="is_footer" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">是否含尾部</option>
-						{{foreach $common_is_footer_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['is_footer']) and $params['is_footer'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="is_enable" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">是否启用</option>
-						{{foreach $common_is_enable_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<div class="param-date param-where m-l-5">
-						<input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-						<span>~</span>
-						<input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-					</div>
-				</div>
-			</div>
+                </label>
+            </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                	<tr>
+                		<td>
+                			<span>头部：</span>
+							<select name="is_header" class="chosen-select" data-placeholder="包含头部...">
+								<option value="-1">包含头部...</option>
+								{{foreach $common_is_header_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['is_header']) and $params['is_header'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                		<td>
+							<span>尾部：</span>
+							<select name="is_footer" class="chosen-select" data-placeholder="包含尾部...">
+								<option value="-1">包含尾部...</option>
+								{{foreach $common_is_footer_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['is_footer']) and $params['is_footer'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                	</tr>
+                	<tr>
+                		<td>
+                			<span>启用：</span>
+                			<select name="is_enable" class="chosen-select" data-placeholder="是否启用...">
+								<option value="-1">是否启用...</option>
+								{{foreach $common_is_enable_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                		<td class="time">
+							<span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                	</tr>
+                    <tr>
+                        <td></td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/customview/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+			</table>
 		</form>
 		<!-- form end -->
 
@@ -135,11 +165,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="10" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- page start -->
diff --git a/application/admin/view/default/goods/index.html b/application/admin/view/default/goods/index.html
index ee51e935e..53cab8c70 100755
--- a/application/admin/view/default/goods/index.html
+++ b/application/admin/view/default/goods/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/goods/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="标题/型号" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/goods/index')}}" request-type="form">
+			<div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="标题/型号" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,28 +21,48 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-					<select name="is_shelves" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">上下架</option>
-						{{foreach $common_is_shelves_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['is_shelves']) and $params['is_shelves'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="is_home_recommended" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">首页推荐</option>
-						{{foreach $common_is_text_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['is_home_recommended']) and $params['is_home_recommended'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<div class="param-date param-where m-l-5">
-						<input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-						<span>~</span>
-						<input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-					</div>
-				</div>
-			</div>
+                </label>
+            </div>
+			<table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                	<tr>
+                		<td>
+                			<span>状态：</span>
+                			<select name="is_shelves" class="chosen-select" data-placeholder="上下架...">
+								<option value="-1">上下架...</option>
+								{{foreach $common_is_shelves_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['is_shelves']) and $params['is_shelves'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                		<td>
+                			<span>推荐：</span>
+                			<select name="is_home_recommended" class="chosen-select" data-placeholder="首页推荐...">
+								<option value="-1">首页推荐...</option>
+								{{foreach $common_is_text_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['is_home_recommended']) and $params['is_home_recommended'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                	</tr>
+                    <tr>
+                        <td class="time">
+							<span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/goods/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+			</table>
         </form>
         <!-- form end -->
 
@@ -65,8 +89,8 @@
 				</tr>
 			</thead>
 			<tbody>
-				{{if !empty($data)}}
-					{{foreach $data as $v}}
+				{{if !empty($data_list)}}
+					{{foreach $data_list as $v}}
 						<tr id="data-list-{{$v.id}}" {{if $v['is_shelves'] eq 0}}class="am-active"{{/if}}>
 							<td>{{$v.id}}</td>
 							<td>
@@ -163,15 +187,16 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="10" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+		{{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- page start -->
-		{{if !empty($data)}}
+		{{if !empty($data_list)}}
 			{{$page_html|raw}}
 		{{/if}}
 		<!-- page end -->
diff --git a/application/admin/view/default/integrallog/index.html b/application/admin/view/default/integrallog/index.html
index acd0e324c..85caca6d0 100755
--- a/application/admin/view/default/integrallog/index.html
+++ b/application/admin/view/default/integrallog/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/integrallog/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="姓名/手机/昵称/原因" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/integrallog/index')}}" request-type="form">
+            <div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="姓名/手机/昵称/原因" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,28 +21,48 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-					<select name="gender" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">性别</option>
-						{{foreach $common_gender_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="type" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">操作类型</option>
-						{{foreach $common_integral_log_type_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['type']) and $params['type'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<div class="param-date param-where m-l-5">
-						<input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-						<span>~</span>
-						<input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-					</div>
-				</div>
-			</div>
+                </label>
+            </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                	<tr>
+                		<td>
+                			<span>性别：</span>
+							<select name="gender" class="chosen-select" data-placeholder="性别...">
+								<option value="-1">性别...</option>
+								{{foreach $common_gender_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                		<td>
+                			<span>类型：</span>
+							<select name="type" class="chosen-select" data-placeholder="操作类型...">
+								<option value="-1">操作类型...</option>
+								{{foreach $common_integral_log_type_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['type']) and $params['type'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                	</tr>
+                    <tr>
+                        <td class="time">
+							<span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/integrallog/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+			</table>
         </form>
         <!-- form end -->
 
@@ -84,11 +108,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="6" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+		{{if empty($data)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- page start -->
diff --git a/application/admin/view/default/link/index.html b/application/admin/view/default/link/index.html
index e20b1c936..6d85124d3 100755
--- a/application/admin/view/default/link/index.html
+++ b/application/admin/view/default/link/index.html
@@ -77,11 +77,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="5" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+		{{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 	</div>
 </div>
diff --git a/application/admin/view/default/message/index.html b/application/admin/view/default/message/index.html
index e1dbfade2..28fc6c88f 100755
--- a/application/admin/view/default/message/index.html
+++ b/application/admin/view/default/message/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/message/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="姓名/手机/昵称/标题" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/message/index')}}" request-type="form">
+            <div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="名称" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,34 +21,60 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-					<select name="gender" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">性别</option>
-						{{foreach $common_gender_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="type" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">消息类型</option>
-						{{foreach $common_message_type_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['type']) and $params['type'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="is_read" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">是否已读</option>
-						{{foreach $common_is_read_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['is_read']) and $params['is_read'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<div class="param-date param-where m-l-5">
-						<input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-						<span>~</span>
-						<input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-					</div>
-				</div>
-			</div>
+                </label>
+            </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                    <tr>
+                        <td>
+                            <span>性别：</span>
+                            <select name="gender" class="chosen-select" data-placeholder="性别...">
+								<option value="-1">性别...</option>
+								{{foreach $common_gender_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                        </td>
+                        <td>
+                            <span>类型：</span>
+                            <select name="type" class="chosen-select" data-placeholder="消息类型...">
+								<option value="-1">消息类型...</option>
+								{{foreach $common_message_type_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['type']) and $params['type'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                        </td>
+                    </tr>
+                    <tr>
+                    	<td>
+                    		<span>已读：</span>
+                    		<select name="is_read" class="chosen-select" data-placeholder="是否已读...">
+								<option value="-1">是否已读...</option>
+								{{foreach $common_is_read_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['is_read']) and $params['is_read'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                    	</td>
+                    	<td class="time">
+                            <span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/message/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </form>
         <!-- form end -->
 
@@ -98,11 +128,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="7" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- page start -->
diff --git a/application/admin/view/default/navigation/index.html b/application/admin/view/default/navigation/index.html
index 805842c4a..b3aacac81 100755
--- a/application/admin/view/default/navigation/index.html
+++ b/application/admin/view/default/navigation/index.html
@@ -64,11 +64,12 @@
 							{{/foreach}}
 						{{/if}}
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="5" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+		{{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- custom save win start -->
diff --git a/application/admin/view/default/order/index.html b/application/admin/view/default/order/index.html
index fe72bf5b8..6133d7d3a 100755
--- a/application/admin/view/default/order/index.html
+++ b/application/admin/view/default/order/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/order/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="订单号/姓名/手机/地址/快递单号" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/order/index')}}" request-type="form">
+			<div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="订单号/姓名/手机/地址/快递单号" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,40 +21,68 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-					<select name="status" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">订单状态</option>
-						{{foreach $common_order_admin_status as $v}}
-							<option value="{{$v.id}}" {{if isset($params['status']) and $params['status'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="express_id" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">快递公司</option>
-						{{foreach $express_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['express_id']) and $params['express_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="payment_id" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">支付方式</option>
-						{{foreach $payment_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['payment_id']) and $params['payment_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="pay_status" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">支付状态</option>
-						{{foreach $common_order_pay_status as $v}}
-							<option value="{{$v.id}}" {{if isset($params['pay_status']) and $params['pay_status'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<div class="param-date param-where m-l-5">
-						<input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-						<span>~</span>
-						<input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-					</div>
-				</div>
-			</div>
+                </label>
+            </div>
+			<table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+				<tbody>
+                	<tr>
+                		<td>
+							<span>状态：</span>
+							<select name="status" class="chosen-select" data-placeholder="订单状态...">
+								<option value="-1">订单状态...</option>
+								{{foreach $common_order_admin_status as $v}}
+									<option value="{{$v.id}}" {{if isset($params['status']) and $params['status'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                		<td>
+                			<span>快递：</span>
+							<select name="express_id" class="chosen-select" data-placeholder="快递公司...">
+								<option value="-1">快递公司...</option>
+								{{foreach $express_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['express_id']) and $params['express_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                	</tr>
+                	<tr>
+                		<td>
+                			<span>支付：</span>
+							<select name="payment_id" class="chosen-select" data-placeholder="支付方式...">
+								<option value="-1">支付方式...</option>
+								{{foreach $payment_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['payment_id']) and $params['payment_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                		<td>
+                			<span>付款：</span>
+							<select name="pay_status" class="chosen-select" data-placeholder="支付状态...">
+								<option value="-1">支付状态...</option>
+								{{foreach $common_order_pay_status as $v}}
+									<option value="{{$v.id}}" {{if isset($params['pay_status']) and $params['pay_status'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                	</tr>
+					<tr>
+                        <td class="time">
+							<span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/order/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+			</table>
         </form>
         <!-- form end -->
 
@@ -301,11 +333,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="20" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+		{{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- 发货弹窗 -->
diff --git a/application/admin/view/default/paylog/index.html b/application/admin/view/default/paylog/index.html
index 203b717a2..7896a44be 100755
--- a/application/admin/view/default/paylog/index.html
+++ b/application/admin/view/default/paylog/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/paylog/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="姓名/手机/昵称/支付平台单号" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/paylog/index')}}" request-type="form">
+            <div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="姓名/手机/昵称/支付平台单号" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,36 +21,62 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-					<select name="gender" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">性别</option>
-						{{foreach $common_gender_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="pay_type" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="">支付类型</option>
-						{{foreach $common_pay_type_list as $v}}
-							{{if !empty($v['id']) && !empty($v['name'])}}
-								<option value="{{$v.id}}" {{if isset($params['pay_type']) and $params['pay_type'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-							{{/if}}
-						{{/foreach}}
-					</select>
-					<select name="business_type" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">业务类型</option>
-						{{foreach $common_business_type_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['business_type']) and $params['business_type'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<div class="param-date param-where m-l-5">
-						<input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-						<span>~</span>
-						<input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-					</div>
-				</div>
-			</div>
+                </label>
+            </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                    <tr>
+                        <td>
+                            <span>性别：</span>
+                            <select name="gender" class="chosen-select" data-placeholder="性别...">
+								<option value="-1">性别...</option>
+								{{foreach $common_gender_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                        </td>
+                        <td>
+                            <span>支付：</span>
+							<select name="pay_type" class="chosen-select" data-placeholder="支付类型...">
+								<option value="">支付类型...</option>
+								{{foreach $common_pay_type_list as $v}}
+									{{if !empty($v['id']) and !empty($v['name'])}}
+										<option value="{{$v.id}}" {{if isset($params['pay_type']) and $params['pay_type'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+									{{/if}}
+								{{/foreach}}
+							</select>
+                        </td>
+                    </tr>
+                    <tr>
+                    	<td>
+                    		<span>业务：</span>
+							<select name="business_type" class="chosen-select" data-placeholder="业务类型...">
+								<option value="-1">业务类型...</option>
+								{{foreach $common_business_type_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['business_type']) and $params['business_type'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                    	</td>
+                    	<td class="time">
+                            <span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/paylog/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </form>
         <!-- form end -->
 
@@ -112,11 +142,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="10" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- page start -->
diff --git a/application/admin/view/default/payment/index.html b/application/admin/view/default/payment/index.html
index 011e5d974..9e674ddd3 100755
--- a/application/admin/view/default/payment/index.html
+++ b/application/admin/view/default/payment/index.html
@@ -102,11 +102,12 @@
                             </td>
                         </tr>
                     {{/foreach}}
-                {{else /}}
-                    <tr><td colspan="20" class="table-no">没有相关数据</td></tr>
                 {{/if}}
             </tbody>
         </table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
         <!-- list end -->
 
         <!-- upload start -->
diff --git a/application/admin/view/default/power/role.html b/application/admin/view/default/power/role.html
index eeda53633..aff28f933 100755
--- a/application/admin/view/default/power/role.html
+++ b/application/admin/view/default/power/role.html
@@ -20,8 +20,8 @@
 				</tr>
 			</thead>
 			<tbody>
-				{{if !empty($data)}}
-					{{foreach $data as $v}}
+				{{if !empty($data_list)}}
+					{{foreach $data_list as $v}}
 						<tr id="data-list-{{$v.id}}" {{if $v['is_enable'] eq 0}}class="am-active"{{/if}}>
 							<td>{{$v.name}}</td>
 							<td>
@@ -40,11 +40,12 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="5" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+		{{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 	</div>
 </div>
diff --git a/application/admin/view/default/slide/index.html b/application/admin/view/default/slide/index.html
index 24206754c..d909f614d 100755
--- a/application/admin/view/default/slide/index.html
+++ b/application/admin/view/default/slide/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
     <div class="content">
         <!-- form start -->
-        <form class="am-form view-list" action="{{:MyUrl('admin/slide/index')}}" method="POST">
-            <div class="am-g">
-                <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="名称" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-                <button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-                <label class="fs-12 m-l-5 c-p fw-100 more-submit">
-                    更多筛选
+        <form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/slide/index')}}" request-type="form">
+            <div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="名称" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -18,33 +22,59 @@
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
                 </label>
-
-                <div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}}none{{/if}}">
-                    <select name="is_enable" class="am-radius c-p m-t-10 m-l-5 param-where">
-                        <option value="-1">是否启用</option>
-                        {{foreach $common_is_enable_list as $v}}
-                            <option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    </select>
-                    <select name="platform" class="am-radius c-p m-t-10 m-l-5 param-where">
-                        <option value="">所属平台</option>
-                        {{foreach $common_platform_type as $v}}
-                            <option value="{{$v.value}}" {{if isset($params['platform']) and $params['platform'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    </select>
-                    <select name="event_type" class="am-radius c-p m-t-10 m-l-5 param-where">
-                        <option value="-1">事件类型</option>
-                        {{foreach $common_app_event_type as $v}}
-                            <option value="{{$v.value}}" {{if isset($params['event_type']) and $params['event_type'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    </select>
-                    <div class="param-date param-where m-l-5">
-                        <input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-                        <span>~</span>
-                        <input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-                    </div>
-                </div>
             </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                    <tr>
+                        <td>
+                            <span>启用：</span>
+                            <select name="is_enable" class="chosen-select" data-placeholder="是否启用...">
+                                <option value="-1">是否启用...</option>
+                                {{foreach $common_is_enable_list as $v}}
+                                    <option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            </select>
+                        </td>
+                        <td>
+                            <span>平台：</span>
+                            <select name="platform" class="chosen-select" data-placeholder="所属平台...">
+                                <option value="">所属平台...</option>
+                                {{foreach $common_platform_type as $v}}
+                                    <option value="{{$v.value}}" {{if isset($params['platform']) and $params['platform'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <span>类型：</span>
+                            <select name="event_type" class="chosen-select" data-placeholder="事件类型...">
+                                <option value="-1">事件类型...</option>
+                                {{foreach $common_app_event_type as $v}}
+                                    <option value="{{$v.value}}" {{if isset($params['event_type']) and $params['event_type'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            </select>
+                        </td>
+                        <td class="time">
+                            <span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="time"></td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/slide/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </form>
         <!-- form end -->
 
@@ -100,11 +130,12 @@
                             </td>
                         </tr>
                     {{/foreach}}
-                {{else /}}
-                    <tr><td colspan="20" class="table-no">没有相关数据</td></tr>
                 {{/if}}
             </tbody>
         </table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
         <!-- list end -->
 
         <!-- page start -->
diff --git a/application/admin/view/default/user/index.html b/application/admin/view/default/user/index.html
index d2eafee51..02625f0d7 100755
--- a/application/admin/view/default/user/index.html
+++ b/application/admin/view/default/user/index.html
@@ -4,12 +4,16 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form view-list" action="{{:MyUrl('admin/user/index')}}" method="POST">
-			<div class="am-g">
-				<input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="姓名/手机/邮箱/昵称" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-				<button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-				<label class="fs-12 m-l-5 c-p fw-100 more-submit">
-					更多筛选
+		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/user/index')}}" request-type="form">
+			<div class="thin">
+                <div class="am-input-group am-input-group-sm am-fl so">
+                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="姓名/手机/邮箱/昵称" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                    </span>
+                </div>
+                <label class="am-fl thin_sub more-submit">
+                    更多筛选条件
                     {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                         <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                         <i class="am-icon-angle-up"></i>
@@ -17,28 +21,48 @@
                         <input type="checkbox" name="is_more" value="1" id="is_more" />
                         <i class="am-icon-angle-down"></i>
                     {{/if}}
-				</label>
-
-				<div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}} none{{/if}}">
-					<select name="gender" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">性别</option>
-						{{foreach $common_gender_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<select name="status" class="am-radius c-p m-t-10 m-l-5 param-where">
-						<option value="-1">状态</option>
-						{{foreach $common_user_status_list as $v}}
-							<option value="{{$v.id}}" {{if isset($params['status']) and $params['status'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					</select>
-					<div class="param-date param-where m-l-5">
-						<input type="text" autocomplete="off" name="time_start" class="Wdate am-radius m-t-10" placeholder="起始时间" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_start'])}}value="{{$params.time_start}}"{{/if}}/>
-						<span>~</span>
-						<input type="text" autocomplete="off" class="Wdate am-radius m-t-10" placeholder="结束时间" name="time_end" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" {{if isset($params['time_end'])}}value="{{$params.time_end}}"{{/if}}/>
-					</div>
-				</div>
-			</div>
+                </label>
+            </div>
+            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                <tbody>
+                	<tr>
+                		<td>
+                			<span>性别：</span>
+							<select name="gender" class="chosen-select" data-placeholder="性别...">
+								<option value="-1">性别...</option>
+								{{foreach $common_gender_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['gender']) and $params['gender'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                		<td>
+                			<span>状态：</span>
+							<select name="status" class="chosen-select" data-placeholder="状态...">
+								<option value="-1">状态...</option>
+								{{foreach $common_user_status_list as $v}}
+									<option value="{{$v.id}}" {{if isset($params['status']) and $params['status'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							</select>
+                		</td>
+                	</tr>
+                	<tr>
+                        <td class="time">
+							<span>时间：</span>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                            <em class="text-grey">~</em>
+                            <span>
+                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
+                            </span>
+                        </td>
+                        <td>
+                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                            <a href="{{:MyUrl('admin/user/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </form>
         <!-- form end -->
 
@@ -66,8 +90,8 @@
 				</tr>
 			</thead>
 			<tbody>
-				{{if !empty($data)}}
-					{{foreach $data as $v}}
+				{{if !empty($data_list)}}
+					{{foreach $data_list as $v}}
 						<tr id="data-list-{{$v.id}}">
 							<td>{{$v.id}}</td>
 							<td class="user-info">
@@ -170,15 +194,16 @@
 							</td>
 						</tr>
 					{{/foreach}}
-				{{else /}}
-					<tr><td colspan="8" class="table-no">没有相关数据</td></tr>
 				{{/if}}
 			</tbody>
 		</table>
+        {{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
 		<!-- list end -->
 
 		<!-- page start -->
-		{{if !empty($data)}}
+		{{if !empty($data_list)}}
 			{{$page_html|raw}}
 		{{/if}}
 		<!-- page end -->
diff --git a/application/index/view/default/answer/index.html b/application/index/view/default/answer/index.html
index 5c9438598..c1680b6a6 100755
--- a/application/index/view/default/answer/index.html
+++ b/application/index/view/default/answer/index.html
@@ -22,7 +22,7 @@
     <!-- content start -->
     <div class="user-content">
         <div class="user-content-body">
-            <form class="am-form form-validation" method="post" action="{{:MyUrl('index/answer/index')}}" request-type="form">
+            <form class="am-form form-validation form-search" method="post" action="{{:MyUrl('index/answer/index')}}" request-type="form">
                 <div class="thin">
                     <div class="am-input-group am-input-group-sm am-fl so">
                         <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="其实搜索很简单 ^_^！" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
@@ -32,8 +32,13 @@
                     </div>
                     <label class="am-fl thin_sub more-submit">
                         更多筛选条件
-                        <input type="checkbox" name="is_more" value="1" class="none am-field-valid" {{if isset($params['is_more'])}}checked{{/if}} />
-                        <i class="am-icon-angle-up"></i>
+                        {{if isset($params['is_more']) and $params['is_more'] eq 1}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" checked />
+                            <i class="am-icon-angle-up"></i>
+                        {{else /}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" />
+                            <i class="am-icon-angle-down"></i>
+                        {{/if}}
                     </label>
                 </div>
                 <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
diff --git a/application/index/view/default/message/index.html b/application/index/view/default/message/index.html
index 6496a4869..1961ffc18 100755
--- a/application/index/view/default/message/index.html
+++ b/application/index/view/default/message/index.html
@@ -22,7 +22,7 @@
     <!-- content start -->
     <div class="user-content">
         <div class="user-content-body">
-            <form class="am-form form-validation" method="post" action="{{:MyUrl('index/message/index')}}" request-type="form">
+            <form class="am-form form-validation form-search" method="post" action="{{:MyUrl('index/message/index')}}" request-type="form">
                 <div class="thin">
                     <div class="am-input-group am-input-group-sm am-fl so">
                         <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="其实搜索很简单 ^_^！" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
@@ -32,8 +32,13 @@
                     </div>
                     <label class="am-fl thin_sub more-submit">
                         更多筛选条件
-                        <input type="checkbox" name="is_more" value="1" class="none am-field-valid" {{if isset($params['is_more'])}}checked{{/if}} />
-                        <i class="am-icon-angle-up"></i>
+                        {{if isset($params['is_more']) and $params['is_more'] eq 1}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" checked />
+                            <i class="am-icon-angle-up"></i>
+                        {{else /}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" />
+                            <i class="am-icon-angle-down"></i>
+                        {{/if}}
                     </label>
                 </div>
                 <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html
index 5482557b4..7d7779971 100755
--- a/application/index/view/default/order/index.html
+++ b/application/index/view/default/order/index.html
@@ -22,7 +22,7 @@
     <!-- content start -->
     <div class="user-content">
         <div class="user-content-body">
-            <form class="am-form form-validation" method="post" action="{{:MyUrl('index/order/index')}}" request-type="form">
+            <form class="am-form form-validation form-search" method="post" action="{{:MyUrl('index/order/index')}}" request-type="form">
                 <div class="thin">
                     <div class="am-input-group am-input-group-sm am-fl so">
                         <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="订单号/收件信息" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
@@ -32,8 +32,13 @@
                     </div>
                     <label class="am-fl thin_sub more-submit">
                         更多筛选条件
-                        <input type="checkbox" name="is_more" value="1" class="none am-field-valid" {{if isset($params['is_more'])}}checked{{/if}} />
-                        <i class="am-icon-angle-up"></i>
+                        {{if isset($params['is_more']) and $params['is_more'] eq 1}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" checked />
+                            <i class="am-icon-angle-up"></i>
+                        {{else /}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" />
+                            <i class="am-icon-angle-down"></i>
+                        {{/if}}
                     </label>
                 </div>
                 <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
@@ -227,8 +232,7 @@
 
                 <!-- 分页 -->
                 {{$page_html|raw}}
-            {{/if}}
-            {{if empty($data_list)}}
+            {{else /}}
                 <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
             {{/if}}
         </div>
diff --git a/application/index/view/default/userfavor/goods.html b/application/index/view/default/userfavor/goods.html
index a7c32f95c..e8261c3a2 100755
--- a/application/index/view/default/userfavor/goods.html
+++ b/application/index/view/default/userfavor/goods.html
@@ -22,7 +22,7 @@
     <!-- content start -->
     <div class="user-content">
         <div class="user-content-body">
-            <form class="am-form form-validation" method="post" action="{{:MyUrl('index/userfavor/goods')}}" request-type="form">
+            <form class="am-form form-validation form-search" method="post" action="{{:MyUrl('index/userfavor/goods')}}" request-type="form">
                 <div class="thin">
                     <div class="am-input-group am-input-group-sm am-fl so">
                         <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="其实搜索很简单 ^_^！" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
diff --git a/application/index/view/default/usergoodsbrowse/index.html b/application/index/view/default/usergoodsbrowse/index.html
index d131c3d2b..9a331a1a3 100755
--- a/application/index/view/default/usergoodsbrowse/index.html
+++ b/application/index/view/default/usergoodsbrowse/index.html
@@ -22,7 +22,7 @@
     <!-- content start -->
     <div class="user-content">
         <div class="user-content-body">
-            <form class="am-form form-validation" method="post" action="{{:MyUrl('index/usergoodsbrowse/index')}}" request-type="form">
+            <form class="am-form form-validation form-search" method="post" action="{{:MyUrl('index/usergoodsbrowse/index')}}" request-type="form">
                 <div class="thin">
                     <div class="am-input-group am-input-group-sm am-fl so">
                         <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="其实搜索很简单 ^_^！" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
diff --git a/application/index/view/default/userintegral/index.html b/application/index/view/default/userintegral/index.html
index beeb100e2..54ad7cfab 100755
--- a/application/index/view/default/userintegral/index.html
+++ b/application/index/view/default/userintegral/index.html
@@ -25,19 +25,19 @@
             <div class="am-alert am-alert-secondary" data-am-alert>
                 <div class="available">
                     <span>正常可用</span>
-                    <span class="integral-value">{{$user.integral}}</span>
+                    <span class="panel-value">{{$user.integral}}</span>
                     <em>积分</em>
-                    <span class="integral-tips">可以正常使用的积分</span>
+                    <span class="panel-tips">可以正常使用的积分</span>
                 </div>
                 <div class="locking">
                     <span>当前锁定</span>
-                    <span class="integral-value">{{$user.locking_integral}}</span>
+                    <span class="panel-value">{{$user.locking_integral}}</span>
                     <em>积分</em>
-                    <span class="integral-tips">一般积分交易中，交易并未完成、锁定相应的积分</span>
+                    <span class="panel-tips">一般积分交易中，交易并未完成、锁定相应的积分</span>
                 </div>
             </div>
 
-            <form class="am-form form-validation" method="post" action="{{:MyUrl('index/userintegral/index')}}" request-type="form">
+            <form class="am-form form-validation form-search" method="post" action="{{:MyUrl('index/userintegral/index')}}" request-type="form">
                 <div class="thin">
                     <div class="am-input-group am-input-group-sm am-fl so">
                         <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="其实搜索很简单 ^_^！" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
@@ -47,8 +47,13 @@
                     </div>
                     <label class="am-fl thin_sub more-submit">
                         更多筛选条件
-                        <input type="checkbox" name="is_more" value="1" class="none am-field-valid" {{if isset($params['is_more'])}}checked{{/if}} />
-                        <i class="am-icon-angle-up"></i>
+                        {{if isset($params['is_more']) and $params['is_more'] eq 1}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" checked />
+                            <i class="am-icon-angle-up"></i>
+                        {{else /}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" />
+                            <i class="am-icon-angle-down"></i>
+                        {{/if}}
                     </label>
                 </div>
                 <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
diff --git a/application/plugins/view/answers/admin/admin/slider.html b/application/plugins/view/answers/admin/admin/slider.html
index b360ac7f8..3e7ac15a2 100755
--- a/application/plugins/view/answers/admin/admin/slider.html
+++ b/application/plugins/view/answers/admin/admin/slider.html
@@ -54,11 +54,12 @@
                                 </td>
                             </tr>
                         {{/foreach}}
-                    {{else /}}
-                        <tr><td colspan="6" class="table-no">没有相关数据</td></tr>
                     {{/if}}
                 </tbody>
             </table>
+            {{if empty($data_list)}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
             <!-- list end -->
         </div>
     </div>
diff --git a/application/plugins/view/footercustomerservice/admin/admin/dataindex.html b/application/plugins/view/footercustomerservice/admin/admin/dataindex.html
index 2824888c0..8afbe3d1a 100755
--- a/application/plugins/view/footercustomerservice/admin/admin/dataindex.html
+++ b/application/plugins/view/footercustomerservice/admin/admin/dataindex.html
@@ -54,11 +54,12 @@
                                 </td>
                             </tr>
                         {{/foreach}}
-                    {{else /}}
-                        <tr><td colspan="6" class="table-no">没有相关数据</td></tr>
                     {{/if}}
                 </tbody>
             </table>
+            {{if empty($data_list)}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
             <!-- list end -->
         </div>
     </div>
diff --git a/application/plugins/view/homemiddleadv/admin/admin/dataindex.html b/application/plugins/view/homemiddleadv/admin/admin/dataindex.html
index 879257047..a5c95c66f 100755
--- a/application/plugins/view/homemiddleadv/admin/admin/dataindex.html
+++ b/application/plugins/view/homemiddleadv/admin/admin/dataindex.html
@@ -58,11 +58,12 @@
                                 </td>
                             </tr>
                         {{/foreach}}
-                    {{else /}}
-                        <tr><td colspan="7" class="table-no">没有相关数据</td></tr>
                     {{/if}}
                 </tbody>
             </table>
+            {{if empty($data_list)}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
             <!-- list end -->
         </div>
     </div>
diff --git a/application/plugins/view/membershiplevel/admin/level/index.html b/application/plugins/view/membershiplevel/admin/level/index.html
index 42de13d47..dfb90154f 100644
--- a/application/plugins/view/membershiplevel/admin/level/index.html
+++ b/application/plugins/view/membershiplevel/admin/level/index.html
@@ -76,11 +76,12 @@
                                 {{/if}}
                             </tr>
                         {{/foreach}}
-                    {{else /}}
-                        <tr><td colspan="7" class="table-no">没有相关数据</td></tr>
                     {{/if}}
                 </tbody>
             </table>
+            {{if empty($data_list)}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
             <!-- list end -->
         </div>
     </div>
diff --git a/application/plugins/view/wallet/admin/cash/index.html b/application/plugins/view/wallet/admin/cash/index.html
index 7828175d2..eb43dc7cc 100644
--- a/application/plugins/view/wallet/admin/cash/index.html
+++ b/application/plugins/view/wallet/admin/cash/index.html
@@ -10,12 +10,16 @@
 
         <div class="cash-content">
             <!-- form start -->
-            <form class="am-form form-search" action="{{:PluginsAdminUrl('wallet', 'cash', 'index')}}" method="POST">
-                <div class="am-g">
-                    <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="用户名/昵称/手机/邮箱/申请单号" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-                    <button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-                    <label class="fs-12 m-l-5 c-p fw-100 more-submit">
-                        更多筛选
+            <form class="am-form form-validation form-search" method="post" action="{{:PluginsAdminUrl('wallet', 'cash', 'index')}}" request-type="form">
+                <div class="thin">
+                    <div class="am-input-group am-input-group-sm am-fl so">
+                        <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="用户名/昵称/手机/邮箱/申请单号" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                        <span class="am-input-group-btn">
+                            <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                        </span>
+                    </div>
+                    <label class="am-fl thin_sub more-submit">
+                        更多筛选条件
                         {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                             <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                             <i class="am-icon-angle-up"></i>
@@ -24,16 +28,26 @@
                             <i class="am-icon-angle-down"></i>
                         {{/if}}
                     </label>
-
-                    <div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}} none{{/if}}">
-                        <select name="status" class="am-radius m-t-10 chosen-select param-where" data-placeholder="状态...">
-                            <option value="-1">状态...</option>
-                            {{foreach $cash_status_list as $v}}
-                                <option value="{{$v.value}}" {{if isset($params['status']) and $params['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                            {{/foreach}}
-                        </select>
-                    </div>
                 </div>
+                <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                    <tbody>
+                        <tr>
+                            <td>
+                                <span>状态：</span>
+                                <select name="status" class="chosen-select" data-placeholder="状态...">
+                                    <option value="-1">状态...</option>
+                                    {{foreach $cash_status_list as $v}}
+                                        <option value="{{$v.value}}" {{if isset($params['status']) and $params['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                    {{/foreach}}
+                                </select>
+                            </td>
+                            <td>
+                                <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                                <a href="{{:PluginsAdminUrl('wallet', 'cash', 'index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </form>
             <!-- form end -->
 
diff --git a/application/plugins/view/wallet/admin/recharge/index.html b/application/plugins/view/wallet/admin/recharge/index.html
index f7232fc72..9a50f9d5f 100644
--- a/application/plugins/view/wallet/admin/recharge/index.html
+++ b/application/plugins/view/wallet/admin/recharge/index.html
@@ -10,12 +10,16 @@
 
         <div class="cash-content">
             <!-- form start -->
-            <form class="am-form form-search" action="{{:PluginsAdminUrl('wallet', 'recharge', 'index')}}" method="POST">
-                <div class="am-g">
-                    <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="用户名/昵称/手机/邮箱/充值单号" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-                    <button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-                    <label class="fs-12 m-l-5 c-p fw-100 more-submit">
-                        更多筛选
+            <form class="am-form form-validation form-search" method="post" action="{{:PluginsAdminUrl('wallet', 'recharge', 'index')}}" request-type="form">
+                <div class="thin">
+                    <div class="am-input-group am-input-group-sm am-fl so">
+                        <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="用户名/昵称/手机/邮箱/充值单号" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                        <span class="am-input-group-btn">
+                            <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                        </span>
+                    </div>
+                    <label class="am-fl thin_sub more-submit">
+                        更多筛选条件
                         {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                             <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                             <i class="am-icon-angle-up"></i>
@@ -24,16 +28,26 @@
                             <i class="am-icon-angle-down"></i>
                         {{/if}}
                     </label>
-
-                    <div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}} none{{/if}}">
-                        <select name="status" class="am-radius m-t-10 chosen-select param-where" data-placeholder="状态...">
-                            <option value="-1">状态...</option>
-                            {{foreach $recharge_status_list as $v}}
-                                <option value="{{$v.value}}" {{if isset($params['status']) and $params['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                            {{/foreach}}
-                        </select>
-                    </div>
                 </div>
+                <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                    <tbody>
+                        <tr>
+                            <td>
+                                <span>状态：</span>
+                                <select name="status" class="chosen-select" data-placeholder="状态...">
+                                    <option value="-1">状态...</option>
+                                    {{foreach $recharge_status_list as $v}}
+                                        <option value="{{$v.value}}" {{if isset($params['status']) and $params['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                    {{/foreach}}
+                                </select>
+                            </td>
+                            <td>
+                                <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                                <a href="{{:PluginsAdminUrl('wallet', 'recharge', 'index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </form>
             <!-- form end -->
 
diff --git a/application/plugins/view/wallet/admin/wallet/index.html b/application/plugins/view/wallet/admin/wallet/index.html
index c683dae5e..8cce1d8d1 100644
--- a/application/plugins/view/wallet/admin/wallet/index.html
+++ b/application/plugins/view/wallet/admin/wallet/index.html
@@ -10,12 +10,16 @@
 
         <div class="wallet-content">
             <!-- form start -->
-            <form class="am-form form-search" action="{{:PluginsAdminUrl('wallet', 'wallet', 'index')}}" method="POST">
-                <div class="am-g">
-                    <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="用户名/昵称/手机/邮箱" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
-                    <button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
-                    <label class="fs-12 m-l-5 c-p fw-100 more-submit">
-                        更多筛选
+            <form class="am-form form-validation form-search" method="post" action="{{:PluginsAdminUrl('wallet', 'wallet', 'index')}}" request-type="form">
+                <div class="thin">
+                    <div class="am-input-group am-input-group-sm am-fl so">
+                        <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="用户名/昵称/手机/邮箱" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
+                        <span class="am-input-group-btn">
+                            <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                        </span>
+                    </div>
+                    <label class="am-fl thin_sub more-submit">
+                        更多筛选条件
                         {{if isset($params['is_more']) and $params['is_more'] eq 1}}
                             <input type="checkbox" name="is_more" value="1" id="is_more" checked />
                             <i class="am-icon-angle-up"></i>
@@ -24,16 +28,26 @@
                             <i class="am-icon-angle-down"></i>
                         {{/if}}
                     </label>
-
-                    <div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}} none{{/if}}">
-                        <select name="status" class="am-radius m-t-10 chosen-select param-where" data-placeholder="状态...">
-                            <option value="-1">状态...</option>
-                            {{foreach $wallet_status_list as $v}}
-                                <option value="{{$v.value}}" {{if isset($params['status']) and $params['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                            {{/foreach}}
-                        </select>
-                    </div>
                 </div>
+                <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
+                    <tbody>
+                        <tr>
+                            <td>
+                                <span>状态：</span>
+                                <select name="status" class="chosen-select" data-placeholder="状态...">
+                                    <option value="-1">状态...</option>
+                                    {{foreach $wallet_status_list as $v}}
+                                        <option value="{{$v.value}}" {{if isset($params['status']) and $params['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                    {{/foreach}}
+                                </select>
+                            </td>
+                            <td>
+                                <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                                <a href="{{:PluginsAdminUrl('wallet', 'wallet', 'index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </form>
             <!-- form end -->
 
diff --git a/application/plugins/view/wallet/admin/walletlog/index.html b/application/plugins/view/wallet/admin/walletlog/index.html
index 78dd241a3..86d0a5948 100644
--- a/application/plugins/view/wallet/admin/walletlog/index.html
+++ b/application/plugins/view/wallet/admin/walletlog/index.html
@@ -69,8 +69,8 @@
                         <th>操作金额(元)</th>
                         <th class="am-hide-sm-only">原始金额(元)</th>
                         <th>最新金额(元)</th>
-                        <th class="am-hide-sm-only">变更说明</th>
-                        <th class="am-hide-sm-only">操作时间</th>
+                        <th class="am-hide-md-down">变更说明</th>
+                        <th>更多</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -100,8 +100,63 @@
                                 <td>
                                     <span class="money-bold">{{$v.latest_money}}</span>
                                 </td>
-                                <td class="am-hide-sm-only operation-msg">{{$v.msg|raw}}</td>
-                                <td class="am-hide-sm-only">{{$v.add_time_text}}</td>
+                                <td class="am-hide-md-down operation-msg">{{$v.msg|raw}}</td>
+                                <td>
+                                    <span class="am-icon-caret-down c-p" data-am-modal="{target: '#my-popup{{$v.id}}'}"> 查看更多</span>
+                                    <div class="am-popup am-radius" id="my-popup{{$v.id}}">
+                                        <div class="am-popup-inner">
+                                            <div class="am-popup-hd">
+                                                <h4 class="am-popup-title">详情内容</h4>
+                                                <span data-am-modal-close
+                                                class="am-close">&times;</span>
+                                            </div>
+                                            <div class="am-popup-bd">
+                                                <dl class="dl-content">
+                                                    <dt>业务类型</dt>
+                                                    <dd>{{$v.business_type_text}}</dd>
+
+                                                    <dt>操作类型</dt>
+                                                    <dd>
+                                                        {{if $v['operation_type'] eq 0}}
+                                                            <span class="operation-reduce-icon">{{$v.operation_type_text}}</span>
+                                                        {{elseif $v['operation_type'] eq 1}}
+                                                            <span class="operation-increase-icon">{{$v.operation_type_text}}</span>
+                                                        {{/if}}
+                                                    </dd>
+
+                                                    <dt>金额类型</dt>
+                                                    <dd>{{$v.money_type_text}}</dd>
+
+                                                    <dt>操作金额(元)</dt>
+                                                    <dd>
+                                                        {{if $v['operation_type'] eq 0}}
+                                                            <span class="operation-reduce-icon">-</span>
+                                                        {{elseif $v['operation_type'] eq 1}}
+                                                            <span class="operation-increase-icon">+</span>
+                                                        {{/if}}
+                                                        <span class="money-bold money">{{$v.operation_money}}</span>
+                                                    </dd>
+
+                                                    <dt>原始金额(元)</dt>
+                                                    <dd>
+                                                        <span class="money-bold">{{$v.original_money}}</span>
+                                                    </dd>
+
+                                                    <dt>最新金额(元)</dt>
+                                                    <dd>
+                                                        <span class="money-bold">{{$v.latest_money}}</span>
+                                                    </dd>
+
+                                                    <dt>变更说明</dt>
+                                                    <dd>{{$v.msg|raw}}</dd>
+
+                                                    <dt>操作时间</dt>
+                                                    <dd>{{$v.add_time_text}}</dd>
+                                                </dl>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </td>
                             </tr>
                         {{/foreach}}
                     {{/if}}
diff --git a/application/plugins/view/wallet/index/cash/createinfo.html b/application/plugins/view/wallet/index/cash/createinfo.html
index 590bdbdb3..86f998340 100644
--- a/application/plugins/view/wallet/index/cash/createinfo.html
+++ b/application/plugins/view/wallet/index/cash/createinfo.html
@@ -32,7 +32,7 @@
                     <div class="am-form-group">
                         <label>提现金额<span class="am-form-group-label-tips-must">必填</span></label>
                         <div class="am-input-group am-input-group-sm">
-                            <input type="number" autocomplete="off" name="money" step="0.01" min="0.00" max="{{$user_wallet.normal_money}}" class="am-radius" placeholder="提现金额" data-validation-message="请输入提现金额" required />
+                            <input type="number" autocomplete="off" name="money" step="0.01" min="0.00" max="{{$user_wallet.normal_money}}" class="am-radius" placeholder="提现金额" data-validation-message="提现金额，最低0.01元，最高{{$user_wallet.normal_money}}元" required />
                             <span class="am-input-group-btn">
                                 <button type="button" class="am-btn am-btn-default am-radius">元</button>
                             </span>
diff --git a/application/plugins/view/wallet/index/cash/index.html b/application/plugins/view/wallet/index/cash/index.html
index 6f8e4b8c0..f267e5014 100755
--- a/application/plugins/view/wallet/index/cash/index.html
+++ b/application/plugins/view/wallet/index/cash/index.html
@@ -37,8 +37,13 @@
                     </div>
                     <label class="am-fl thin_sub more-submit">
                         更多筛选条件
-                        <input type="checkbox" name="is_more" value="1" class="none am-field-valid" {{if isset($params['is_more'])}}checked{{/if}} />
-                        <i class="am-icon-angle-up"></i>
+                        {{if isset($params['is_more']) and $params['is_more'] eq 1}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" checked />
+                            <i class="am-icon-angle-up"></i>
+                        {{else /}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" />
+                            <i class="am-icon-angle-down"></i>
+                        {{/if}}
                     </label>
                 </div>
                 <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
diff --git a/application/plugins/view/wallet/index/public/nav.html b/application/plugins/view/wallet/index/public/nav.html
index 56a39561f..0ce3dca18 100755
--- a/application/plugins/view/wallet/index/public/nav.html
+++ b/application/plugins/view/wallet/index/public/nav.html
@@ -25,21 +25,21 @@
     <div class="am-alert am-alert-secondary" data-am-alert>
         <div class="normal">
             <span>有效金额</span>
-            <span class="integral-value">{{$user_wallet.normal_money}}</span>
+            <span class="panel-value">{{$user_wallet.normal_money}}</span>
             <em>元</em>
-            <span class="integral-tips">正常可以使用的金额、包含赠送金额</span>
+            <span class="panel-tips">正常可以使用的金额、包含赠送金额</span>
         </div>
         <div class="frozen">
             <span>冻结金额</span>
-            <span class="integral-value">{{$user_wallet.frozen_money}}</span>
+            <span class="panel-value">{{$user_wallet.frozen_money}}</span>
             <em>元</em>
-            <span class="integral-tips">一般积分预交易中、提现、交易并未完成，冻结相应的金额</span>
+            <span class="panel-tips">一般积分预交易中、提现、交易并未完成，冻结相应的金额</span>
         </div>
         <div class="give">
             <span>赠送金额</span>
-            <span class="integral-value">{{$user_wallet.give_money}}</span>
+            <span class="panel-value">{{$user_wallet.give_money}}</span>
             <em>元</em>
-            <span class="integral-tips">所有赠送金额总额</span>
+            <span class="panel-tips">所有赠送金额总额</span>
         </div>
     </div>
 {{else /}}
diff --git a/application/plugins/wallet/service/CashService.php b/application/plugins/wallet/service/CashService.php
index 919aa5921..541c5dd3d 100644
--- a/application/plugins/wallet/service/CashService.php
+++ b/application/plugins/wallet/service/CashService.php
@@ -310,6 +310,7 @@ class CashService
         // 钱包更新
         $wallet_data = [
             'normal_money'  => PriceNumberFormat($user_wallet['data']['normal_money']-$money),
+            'frozen_money'  => PriceNumberFormat($user_wallet['data']['frozen_money']+$money),
             'upd_time'      => time(),
         ];
         if(!Db::name('PluginsWallet')->where(['id'=>$user_wallet['data']['id']])->update($wallet_data))
@@ -319,25 +320,36 @@ class CashService
         }
 
         // 日志
-        $log_data = [
-            'user_id'           => $user_wallet['data']['user_id'],
-            'wallet_id'         => $user_wallet['data']['id'],
-            'business_type'     => 2,
-            'operation_type'    => 0,
-            'money_type'        => 0,
-            'operation_money'   => $money,
-            'original_money'    => $user_wallet['data']['normal_money'],
-            'latest_money'      => $wallet_data['normal_money'],
+        $money_field = [
+            ['field' => 'normal_money', 'money_type' => 0, 'msg' => ' [ 有效金额减少'.$money.'元 ]'],
+            ['field' => 'frozen_money', 'money_type' => 1, 'msg' => ' [ 冻结金额增加'.$money.'元 ]'],
         ];
-        $log_data['msg'] = '用户提现申请[ 减少有效金额'.$log_data['operation_money'].'元 ]';
-        if(!WalletService::WalletLogInsert($log_data))
+        foreach($money_field as $v)
         {
-            Db::rollback();
-            return DataReturn('日志添加失败', -101);
-        }
+            // 有效金额
+            if($user_wallet['data'][$v['field']] != $wallet_data[$v['field']])
+            {
+                $log_data = [
+                    'user_id'           => $user_wallet['data']['user_id'],
+                    'wallet_id'         => $user_wallet['data']['id'],
+                    'business_type'     => 2,
+                    'operation_type'    => ($user_wallet['data'][$v['field']] < $wallet_data[$v['field']]) ? 1 : 0,
+                    'money_type'        => $v['money_type'],
+                    'operation_money'   => ($user_wallet['data'][$v['field']] < $wallet_data[$v['field']]) ? PriceNumberFormat($wallet_data[$v['field']]-$user_wallet['data'][$v['field']]) : PriceNumberFormat($user_wallet['data'][$v['field']]-$wallet_data[$v['field']]),
+                    'original_money'    => $user_wallet['data'][$v['field']],
+                    'latest_money'      => $wallet_data[$v['field']],
+                    'msg'               => '用户提现申请 '.$v['msg'],
+                ];
+                if(!WalletService::WalletLogInsert($log_data))
+                {
+                    Db::rollback();
+                    return DataReturn('日志添加失败', -101);
+                }
 
-        // 消息通知
-        MessageService::MessageAdd($user_wallet['data']['user_id'], '账户余额变动', $log_data['msg'], 3, $cash_id);
+                // 消息通知
+                MessageService::MessageAdd($user_wallet['data']['user_id'], '账户余额变动', $log_data['msg'], 3, $cash_id);
+            }
+        }
 
         // 提交事务
         Db::commit();
@@ -506,7 +518,7 @@ class CashService
                     'operation_money'   => ($wallet[$v['field']] < $wallet_upd_data[$v['field']]) ? PriceNumberFormat($wallet_upd_data[$v['field']]-$wallet[$v['field']]) : PriceNumberFormat($wallet[$v['field']]-$wallet_upd_data[$v['field']]),
                     'original_money'    => $wallet[$v['field']],
                     'latest_money'      => $wallet_upd_data[$v['field']],
-                    'msg'               => $v['msg'],
+                    'msg'               => '管理员审核'.$v['msg'],
                 ];
                 if(!WalletService::WalletLogInsert($log_data))
                 {
diff --git a/application/plugins/wallet/service/WalletService.php b/application/plugins/wallet/service/WalletService.php
index c48258c25..5c918d2a2 100644
--- a/application/plugins/wallet/service/WalletService.php
+++ b/application/plugins/wallet/service/WalletService.php
@@ -252,7 +252,7 @@ class WalletService
                     'latest_money'      => $data[$v['field']],
                 ];
                 $operation_type_text = ($log_data['operation_type'] == 1) ? '增加' : '减少';
-                $log_data['msg'] = '管理员操作[ '.self::$money_type_list[$v['money_type']]['name'].'金额'.$operation_type_text.$log_data['operation_money'].'元 ]'.$operation_msg;
+                $log_data['msg'] = '管理员操作 [ '.self::$money_type_list[$v['money_type']]['name'].'金额'.$operation_type_text.$log_data['operation_money'].'元 ]'.$operation_msg;
                 if(!self::WalletLogInsert($log_data))
                 {
                     Db::rollback();
diff --git a/application/service/AdminService.php b/application/service/AdminService.php
index 051a90458..7de5fc901 100755
--- a/application/service/AdminService.php
+++ b/application/service/AdminService.php
@@ -61,9 +61,9 @@ class AdminService
     public static function AdminListWhere($params = [])
     {
         $where = [];
-        if(!empty($params['username']))
+        if(!empty($params['keywords']))
         {
-            $where[] = ['username', 'like', '%'.$params['username'].'%'];
+            $where[] = ['username', 'like', '%'.$params['keywords'].'%'];
         }
         if(isset($params['role_id']) && $params['role_id'] > -1)
         {
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index e18ffc010..f63efbd97 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -306,9 +306,8 @@ button.colorpicker-submit img {
 .form-search .so-list * { font-size:1.2rem !important; }
 .form-search .so-list input { height:28px; display:inline !important; }
 .form-search .time input, .form-search .so-list .chosen-container { background:#FFF !important; }
-.form-search .time input { width:100px !important; }
+.form-search .time input, .form-search .price input { width:101px !important; }
 .form-search .time i { position:absolute; margin:4px 0px 0px -15px; }
-.form-search .price input { width:101px !important; }
 .form-search .time { width:50%; }
 .form-search .so-list tr+tr>td { padding-top:10px; }
 .form-search .so-list .chosen-container { border-radius:2px; }
@@ -316,17 +315,16 @@ button.colorpicker-submit img {
 .form-search .chosen-container-single .chosen-single, .form-search .so-list select { height: 28px; line-height: 28px; width: 100%; }
 .form-search .reset-submit { margin-left: 20px; }
 .form-search .so-list select { padding: 0 0 0 8px; }
+.form-search .more-submit input { display: none; }
 @media only screen and (min-width: 641px) {
     .form-search .so-list .chosen-container, .form-search .so-list select { width:217px !important; display: -webkit-inline-box; }
     .form-search .thin_sub:hover { color:#F60; }
 }
 @media only screen and (max-width: 641px) {
-    .form-search .so-list input { width:40% !important; }
+    .form-search .so-list input { width:calc(50% - 29px) !important; }
     .form-search .so-list td { width:100%; display:block; }
     .form-search .so-list tr td:last-child { margin-top:10px; }
-    .form-search .so-list .chosen-container { width:85%; }
-    .form-search .so-list .chosen-container { width:100%; }
     .form-search .so-list tr td:last-child { padding-top:0px !important; }
     .form-search .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
-    .form-search .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; }
+    .form-search .so-list select, .form-search .so-list .chosen-container { width: calc(100% - 44px) !important; display: -webkit-inline-box; }
 }
\ No newline at end of file
diff --git a/public/static/index/default/css/answer.css b/public/static/index/default/css/answer.css
index 528be271a..21481b8fc 100755
--- a/public/static/index/default/css/answer.css
+++ b/public/static/index/default/css/answer.css
@@ -1,36 +1,3 @@
-/* 筛选 */
-.thin, .pay-list { overflow:hidden; }
-.thin .so { width:66%; }
-.thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; }
-.so-list { width:100%; margin-top: 20px; }
-.so-list * { font-size:1.2rem !important; }
-.so-list input { height:28px; display:inline !important; }
-.time input, .so-list .chosen-container { background:#FFF !important; }
-.time input { width:100px !important; }
-.time i { position:absolute; margin:4px 0px 0px -15px; }
-.price input { width:101px !important; }
-.time, .time { width:50%; }
-.so-list tr+tr>td:first-child { padding-top:10px; }
-.so-list .chosen-container { border-radius:2px; }
-.text-grey { color: #999; }
-.chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; }
-.reset-submit { margin-left: 20px; }
-.so-list select { padding: 0 0 0 8px; }
-@media only screen and (min-width: 641px){
-    .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
-    .thin_sub:hover { color:#F60; }
-}
-@media only screen and (max-width: 641px){
-    .so-list input { width:40% !important; }
-    .so-list td { width:100%; display:block; }
-    .so-list tr td:last-child { margin-top:10px; }
-    .so-list .chosen-container { width:85%; }
-    .so-list .chosen-container { width:100%; }
-    .so-list tr td:last-child { padding-top:0px !important; }
-    .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
-    .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; }
-}
-
 /**
  * 列表
  */
diff --git a/public/static/index/default/css/message.css b/public/static/index/default/css/message.css
deleted file mode 100755
index df9904db5..000000000
--- a/public/static/index/default/css/message.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 筛选 */
-.thin, .pay-list { overflow:hidden; }
-.thin .so { width:66%; }
-.thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; }
-.so-list { width:100%; margin-top: 20px; }
-.so-list * { font-size:1.2rem !important; }
-.so-list input { height:28px; display:inline !important; }
-.time input, .so-list .chosen-container { background:#FFF !important; }
-.time input { width:100px !important; }
-.time i { position:absolute; margin:4px 0px 0px -15px; }
-.price input { width:101px !important; }
-.time, .time { width:50%; }
-.so-list tr+tr>td { padding-top:10px; }
-.so-list .chosen-container { border-radius:2px; }
-.text-grey { color: #999; }
-.chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; }
-.reset-submit { margin-left: 20px; }
-.so-list select { padding: 0 0 0 8px; }
-@media only screen and (min-width: 641px){
-    .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
-    .thin_sub:hover { color:#F60; }
-}
-@media only screen and (max-width: 641px){
-    .so-list input { width:40% !important; }
-    .so-list td { width:100%; display:block; }
-    .so-list tr td:last-child { margin-top:10px; }
-    .so-list .chosen-container { width:85%; }
-    .so-list .chosen-container { width:100%; }
-    .so-list tr td:last-child { padding-top:0px !important; }
-    .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
-    .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; }
-}
\ No newline at end of file
diff --git a/public/static/index/default/css/order.css b/public/static/index/default/css/order.css
index dfa5cd15c..c8cad941c 100755
--- a/public/static/index/default/css/order.css
+++ b/public/static/index/default/css/order.css
@@ -1,36 +1,3 @@
-/* 筛选 */
-.thin, .pay-list { overflow:hidden; }
-.thin .so { width:66%; }
-.thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; }
-.so-list { width:100%; margin-top: 20px; }
-.so-list * { font-size:1.2rem !important; }
-.so-list input { height:28px; display:inline !important; }
-.time input, .so-list .chosen-container { background:#FFF !important; }
-.time input { width:100px !important; }
-.time i { position:absolute; margin:4px 0px 0px -15px; }
-.price input { width:101px !important; }
-.time, .time { width:50%; }
-.so-list tr+tr>td:first-child { padding-top:10px; }
-.so-list .chosen-container { border-radius:2px; }
-.text-grey { color: #999; }
-.chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; }
-.reset-submit { margin-left: 20px; }
-.so-list select { padding: 0 0 0 8px; }
-@media only screen and (min-width: 641px){
-    .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
-    .thin_sub:hover { color:#F60; }
-}
-@media only screen and (max-width: 641px){
-    .so-list input { width:40% !important; }
-    .so-list td { width:100%; display:block; }
-    .so-list tr td:last-child { margin-top:10px; }
-    .so-list .chosen-container { width:85%; }
-    .so-list .chosen-container { width:100%; }
-    .so-list tr td:last-child { padding-top:0px !important; }
-    .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
-    .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; }
-}
-
 /**
  * 订单列表
  */
diff --git a/public/static/index/default/css/userfavor.css b/public/static/index/default/css/userfavor.css
index b87f9f348..334ea8c7e 100755
--- a/public/static/index/default/css/userfavor.css
+++ b/public/static/index/default/css/userfavor.css
@@ -1,8 +1,3 @@
-/**
- * 搜索
- */
-.thin { overflow: hidden; }
-
 /**
  * 商品列表
  */
@@ -23,11 +18,6 @@
     .data-list tr .base { width: 50%; }
     .data-list tr .price { width: 20%; }
     .data-list tr .operate { width: 10%; }
-
-    /**
-     * 搜索
-     */
-    .thin .so { width:66%; }
 }
 @media only screen and (max-width:640px)  {
     .data-list tr .base { width: 65%; }
diff --git a/public/static/index/default/css/usergoodsbrowse.css b/public/static/index/default/css/usergoodsbrowse.css
index b87f9f348..334ea8c7e 100755
--- a/public/static/index/default/css/usergoodsbrowse.css
+++ b/public/static/index/default/css/usergoodsbrowse.css
@@ -1,8 +1,3 @@
-/**
- * 搜索
- */
-.thin { overflow: hidden; }
-
 /**
  * 商品列表
  */
@@ -23,11 +18,6 @@
     .data-list tr .base { width: 50%; }
     .data-list tr .price { width: 20%; }
     .data-list tr .operate { width: 10%; }
-
-    /**
-     * 搜索
-     */
-    .thin .so { width:66%; }
 }
 @media only screen and (max-width:640px)  {
     .data-list tr .base { width: 65%; }
diff --git a/public/static/index/default/css/userintegral.css b/public/static/index/default/css/userintegral.css
index 50b927b55..eb40247c1 100755
--- a/public/static/index/default/css/userintegral.css
+++ b/public/static/index/default/css/userintegral.css
@@ -1,53 +1,23 @@
-/* 筛选 */
-.thin, .pay-list { overflow:hidden; }
-.thin .so { width:66%; }
-.thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; }
-.so-list { width:100%; margin-top: 20px; }
-.so-list * { font-size:1.2rem !important; }
-.so-list input { height:28px; display:inline !important; }
-.time input, .so-list .chosen-container { background:#FFF !important; }
-.time input { width:100px !important; }
-.time i { position:absolute; margin:4px 0px 0px -15px; }
-.price input { width:101px !important; }
-.time, .time { width:50%; }
-.so-list tr+tr>td { padding-top:10px; }
-.so-list .chosen-container { border-radius:2px; }
-.text-grey { color: #999; }
-.chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; }
-.reset-submit { margin-left: 20px; }
-.so-list select { padding: 0 0 0 8px; }
-@media only screen and (min-width: 641px){
-    .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
-    .thin_sub:hover { color:#F60; }
-}
-@media only screen and (max-width: 641px){
-    .so-list input { width:40% !important; }
-    .so-list td { width:100%; display:block; }
-    .so-list tr td:last-child { margin-top:10px; }
-    .so-list .chosen-container { width:85%; }
-    .so-list .chosen-container { width:100%; }
-    .so-list tr td:last-child { padding-top:0px !important; }
-    .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
-    .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; }
-}
-
-.user-content-body .available .integral-value {
+/**
+ * 积分
+ */
+.user-content-body .available .panel-value {
     color: #4CAF50;
 }
 .user-content-body .locking {
     margin-top: 5px;
 }
-.user-content-body .locking .integral-value {
+.user-content-body .locking .panel-value {
     color: #FF9800;
 }
-.user-content-body .integral-value {
+.user-content-body .panel-value {
     font-size: 18px;
     font-weight: 700;
 }
-.user-content-body .integral-tips {
-    color: #c27300;
-    background: #e7e3d9;
+.user-content-body .panel-tips {
+    color: #ff9600;
+    background: #fdf8ed;
     padding: 3px 6px;
-    border: 1px solid #e7d8c2;
+    border: 1px solid #f4eadb;
     margin-left: 10px;
 }
\ No newline at end of file
diff --git a/public/static/plugins/css/wallet/index/common.css b/public/static/plugins/css/wallet/index/common.css
index 2baa72432..7c0099713 100644
--- a/public/static/plugins/css/wallet/index/common.css
+++ b/public/static/plugins/css/wallet/index/common.css
@@ -76,17 +76,17 @@
 .user-content-body .am-alert-secondary {
     margin-bottom: 20px;
 }
-.user-content-body .normal .integral-value {
+.user-content-body .normal .panel-value {
     color: #4CAF50;
 }
-.user-content-body .frozen .integral-value {
+.user-content-body .frozen .panel-value {
     color: #FF9800;
 }
-.user-content-body .integral-value {
+.user-content-body .panel-value {
     font-size: 18px;
     font-weight: 700;
 }
-.user-content-body .integral-tips {
+.user-content-body .panel-tips {
     color: #ff9600;
     background: #fdf8ed;
     padding: 3px 6px;
@@ -94,7 +94,7 @@
     margin-left: 10px;
 }
 @media only screen and (max-width: 641px) {
-    .user-content-body .integral-tips {
+    .user-content-body .panel-tips {
         display: none;
     }
 }