From e0e5b7a0bb4d48d24a612d88abc15889e48f1363 Mon Sep 17 00:00:00 2001
From: zhao <changlin_zhao@qq.com>
Date: Thu, 13 Feb 2020 13:18:17 +0800
Subject: [PATCH] sex status

---
 app/admin/controller/User.php |  8 ++++----
 view/admin/set/user/info.html |  4 ++--
 view/admin/user/list.html     | 10 +++++-----
 view/admin/user/useredit.html |  4 ++--
 view/admin/user/userform.html |  4 ++--
 view/index/user/set.html      |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index ee7ce21..e774f48 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -26,16 +26,16 @@ class User extends AdminController
 	public function list()
 	{
 		if(Request::isAjax()){
-			$data = Request::only(['id','name','email','sex']);
-			$map = array_filter($data);
+			$datas = Request::only(['id','name','email','sex']);
+			$map = array_filter($datas);
 			$user = Db::name('user')->where(['delete_time'=>0])->where($map)->order('id desc')->select();
 			$count = $user->count();
 			$res = [];
 			if($count){
+				$res = ['code'=>0,'msg'=>'','count'=>$count];
 				foreach($user as $k => $v){
 				$data = ['id'=>$v['id'],'username'=>$v['name'],'avatar'=>$v['user_img'],'phone'=>$v['phone'],'email'=>$v['email'],'sex'=>$v['sex'],'ip'=>$v['last_login_ip'],'jointime'=>date("Y-m-d",$v['create_time']),'check'=>$v['status'],'auth'=>$v['auth']];
-				//$res['data'][] = $data; 
-				$res = ['code'=>0,'msg'=>'','count'=>$count,'data'=>[$data]];
+				$res['data'][] = $data; 
 				}
 			} else {
 				$res = ['code'=>-1,'msg'=>'没有查询结果！'];
diff --git a/view/admin/set/user/info.html b/view/admin/set/user/info.html
index 50c9dfb..d9c1300 100644
--- a/view/admin/set/user/info.html
+++ b/view/admin/set/user/info.html
@@ -36,8 +36,8 @@
               <div class="layui-form-item">
                 <label class="layui-form-label">性别</label>
                 <div class="layui-input-block">
-                  <input type="radio" name="sex" value="1" {if condition="$admin['sex'] eq 1"} checked {/if} title="男">
-                  <input type="radio" name="sex" value="0" {if condition="$admin['sex'] eq 0"} checked {/if} title="女">
+                  <input type="radio" name="sex" value="0" {if condition="$admin['sex'] eq 1"} checked {/if} title="男">
+                  <input type="radio" name="sex" value="1" {if condition="$admin['sex'] eq 0"} checked {/if} title="女">
                 </div>
               </div>
               <!--div class="layui-form-item">
diff --git a/view/admin/user/list.html b/view/admin/user/list.html
index bc1466a..3d0d769 100644
--- a/view/admin/user/list.html
+++ b/view/admin/user/list.html
@@ -28,9 +28,9 @@
             <label class="layui-form-label">性别</label>
             <div class="layui-input-block">
               <select name="sex">
-                <option value="0">不限</option>
-                <option value="1">男</option>
-                <option value="2">女</option>
+                <option value="">不限</option>
+                <option value="0">男</option>
+                <option value="1">女</option>
               </select>
             </div>
           </div>
@@ -53,7 +53,7 @@
           <img style="display: inline-block; width: 50%; height: 100%;" src= {{ d.avatar }}>
         </script>
         <script type="text/html" id="sex">
-          {{#  if(d.sex == 1){ }}
+          {{#  if(d.sex == 0){ }}
           <button class="layui-btn layui-btn-normal layui-btn-xs" >男</button>
           {{#  } else { }}
           <button class="layui-btn layui-btn-danger layui-btn-xs">女</button>
@@ -96,7 +96,7 @@
     //监听搜索
     form.on('submit(LAY-user-front-search)', function(data){
       var field = data.field;
-	  console.log(field);
+	  //console.log(field);
 	  
 	  //提交 Ajax 成功后，静态更新表格中的数据
               $.ajax({
diff --git a/view/admin/user/useredit.html b/view/admin/user/useredit.html
index fc63076..625f3f5 100644
--- a/view/admin/user/useredit.html
+++ b/view/admin/user/useredit.html
@@ -34,8 +34,8 @@
     <div class="layui-form-item" lay-filter="sex">
       <label class="layui-form-label">选择性别</label>
       <div class="layui-input-block">
-        <input type="radio" name="sex" value="1" title="男" {if condition="$user['sex'] eq 1"} checked {/if}>
-        <input type="radio" name="sex" value="0" title="女" {if condition="$user['sex'] eq 0"} checked {/if}>
+        <input type="radio" name="sex" value="0" title="男" {if condition="$user['sex'] eq 0"} checked {/if}>
+        <input type="radio" name="sex" value="1" title="女" {if condition="$user['sex'] eq 1"} checked {/if}>
       </div>
     </div>
     <div class="layui-form-item layui-hide">
diff --git a/view/admin/user/userform.html b/view/admin/user/userform.html
index 3d1cec2..b1c95f8 100644
--- a/view/admin/user/userform.html
+++ b/view/admin/user/userform.html
@@ -31,8 +31,8 @@
     <div class="layui-form-item" lay-filter="sex">
       <label class="layui-form-label">选择性别</label>
       <div class="layui-input-block">
-        <input type="radio" name="sex" value="1" title="男" checked>
-        <input type="radio" name="sex" value="0" title="女">
+        <input type="radio" name="sex" value="0" title="男" checked>
+        <input type="radio" name="sex" value="1" title="女">
       </div>
     </div>
     <div class="layui-form-item layui-hide">
diff --git a/view/index/user/set.html b/view/index/user/set.html
index 57c3c00..9e9f4c1 100644
--- a/view/index/user/set.html
+++ b/view/index/user/set.html
@@ -26,8 +26,8 @@
               </div>
               <div class="layui-inline">
                 <div class="layui-input-inline">
-                  <input type="radio" name="sex" value="1" {if condition="$user['sex'] eq 1"} checked {/if} title="男">
-                  <input type="radio" name="sex" value="0" {if condition="$user['sex'] eq 0"} checked {/if} title="女">
+                  <input type="radio" name="sex" value="0" {if condition="$user['sex'] eq 0"} checked {/if} title="男">
+                  <input type="radio" name="sex" value="1" {if condition="$user['sex'] eq 1"} checked {/if} title="女">
                 </div>
               </div>
             </div>