From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html
index b8550a3..1878689 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html
@@ -43,10 +43,10 @@
                                             所在省
                                         </button>
                                     </div>
-                                    <select class="form-control" id="pCode" onchange="TQuestion.oneChange(1)">
-                                        <option value="">全部</option>
+                                    <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TQuestion.oneChange(this)">
+                                        <option value="">请选择省</option>
                                         @for(obj in list){
-                                        <option value="${obj}">${obj}</option>
+                                        <option style="width: 300px" value="${obj.code}">${obj.name}</option>
                                         @}
                                     </select>
                                 </div>
@@ -60,9 +60,11 @@
                                             所在市
                                         </button>
                                     </div>
-                                    <select class="form-control" id="cCode">
-                                        <option value="">请先选择省</option>
-                                    </select>
+                                    <div class="col-sm-9">
+                                        <select style="width: 300px" class="form-control" id="cCode" name="cCode" >
+                                            <option value="">请选择市</option>
+                                        </select>
+                                    </div>
                                 </div>
                             </div>
                             @}
@@ -77,7 +79,7 @@
                                 <#SelectCon id="isVip" name="年度会员" >
                                 <option value="">全部</option>
                                 <option value="1">是</option>
-                                <option value="2">否</option>
+                                <option value="0">否</option>
                             </#SelectCon>
                         </div>
                         <div class="col-sm-3">
@@ -93,7 +95,7 @@
                         <div style="margin-top: 10px" class="hidden-xs" id="TCouponTableToolbar" role="group">
                             <#button name="添加" icon="fa-plus" clickFun="TQuestion.openAdd()"/>
                             <#button name="编辑" icon="fa-edit" clickFun="TQuestion.openChange()" space="true"/>
-                            <#button name="查看详情" icon="fa-edit" clickFun="TQuestion.openChange()" space="true"/>
+                            <#button name="查看详情" icon="fa-edit" clickFun="TQuestion.openInfo()" space="true"/>
                             <#button name="冻结" icon="fa-check" clickFun="TQuestion.onShelf()" space="true"/>
                             <#button name="解冻" icon="fa-check" clickFun="TQuestion.onShelf()" space="true"/>
                             <#button name="添加学员" icon="fa-edit" clickFun="TQuestion.openChange()" space="true"/>

--
Gitblit v1.7.1