From 0f094c0376e64d1a0a700979745e8ade5cacaa42 Mon Sep 17 00:00:00 2001
From: Anyon <Anyon@windows10.microdone.cn>
Date: Fri, 5 May 2017 16:45:01 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E7=B2=89?=
 =?UTF-8?q?=E4=B8=9D=E9=BB=91=E5=90=8D=E5=8D=95=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/controller/Fans.php  |  6 ++--
 application/wechat/view/fans.back.html  | 41 ++++++++++++++++++++++++-
 application/wechat/view/fans.index.html | 40 +++++++++++++++++++++++-
 static/theme/default/css/console.css    |  3 +-
 4 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/application/wechat/controller/Fans.php b/application/wechat/controller/Fans.php
index a3d87aa7e..91ef40dc1 100644
--- a/application/wechat/controller/Fans.php
+++ b/application/wechat/controller/Fans.php
@@ -42,7 +42,8 @@ class Fans extends BasicAdmin {
         $this->title = '微信粉丝管理';
         $db = Db::name($this->table)->where('is_back', '0')->order('id desc');
         $get = $this->request->get();
-        foreach (['nickname'] as $key) {
+        !empty($get['sex']) && $db->where('sex', $get['sex']);
+        foreach (['nickname', 'country', 'province', 'city'] as $key) {
             if (isset($get[$key]) && $get[$key] !== '') {
                 $db->where($key, 'like', "%{$get[$key]}%");
             }
@@ -57,7 +58,8 @@ class Fans extends BasicAdmin {
         $this->title = '微信粉丝黑名单管理';
         $db = Db::name($this->table)->where('is_back', '1')->order('id desc');
         $get = $this->request->get();
-        foreach (['nickname'] as $key) {
+        !empty($get['sex']) && $db->where('sex', $get['sex']);
+        foreach (['nickname', 'country', 'province', 'city'] as $key) {
             if (isset($get[$key]) && $get[$key] !== '') {
                 $db->where($key, 'like', "%{$get[$key]}%");
             }
diff --git a/application/wechat/view/fans.back.html b/application/wechat/view/fans.back.html
index 68a3f6bb6..f5d996a3b 100644
--- a/application/wechat/view/fans.back.html
+++ b/application/wechat/view/fans.back.html
@@ -18,17 +18,56 @@
 <form class="animated form-search" action="__SELF__" onsubmit="return false" method="get">
 
     <div class="row">
-        <div class="col-xs-3">
+
+        <div class="col-xs-2">
             <div class="form-group">
                 <input type="text" name="nickname" value="{$Think.get.nickname|default=''}" placeholder="昵称" class="input-sm form-control">
             </div>
         </div>
 
+        <div class="col-xs-2">
+            <div class="form-group">
+                <select name="sex" class="input-sm form-control">
+                    <option value="">- 性别 -</option>
+                    <!--{if $Think.get.sex eq 1}-->
+                    <option selected value="1">- 男 -</option>
+                    <!--{else}-->
+                    <option value="1">- 男 -</option>
+                    <!--{/if}-->
+                    <!--{if $Think.get.sex eq 2}-->
+                    <option selected value="2">- 女 -</option>
+                    <!--{else}-->
+                    <option value="2">- 女 -</option>
+                    <!--{/if}-->
+                </select>
+            </div>
+        </div>
+
+        <div class="col-xs-2">
+            <div class="form-group">
+                <input type="text" name="country" value="{$Think.get.country|default=''}" placeholder="国家" class="input-sm form-control">
+            </div>
+        </div>
+
+        <div class="col-xs-2">
+            <div class="form-group">
+                <input type="text" name="province" value="{$Think.get.province|default=''}" placeholder="省份" class="input-sm form-control">
+            </div>
+        </div>
+
+        <div class="col-xs-2">
+            <div class="form-group">
+                <input type="text" name="city" value="{$Think.get.city|default=''}" placeholder="城市" class="input-sm form-control">
+            </div>
+        </div>
+
+
         <div class="col-xs-1">
             <div class="form-group">
                 <button type="submit" class="btn btn-sm btn-white"><i class="fa fa-search"></i> 搜索</button>
             </div>
         </div>
+
     </div>
 </form>
 <!-- 表单搜索 结束 -->
diff --git a/application/wechat/view/fans.index.html b/application/wechat/view/fans.index.html
index 8f7c51b81..523ea40f6 100644
--- a/application/wechat/view/fans.index.html
+++ b/application/wechat/view/fans.index.html
@@ -18,17 +18,55 @@
 <form class="animated form-search" action="__SELF__" onsubmit="return false" method="get">
 
     <div class="row">
-        <div class="col-xs-3">
+
+        <div class="col-xs-2">
             <div class="form-group">
                 <input type="text" name="nickname" value="{$Think.get.nickname|default=''}" placeholder="昵称" class="input-sm form-control">
             </div>
         </div>
 
+        <div class="col-xs-2">
+            <div class="form-group">
+                <select name="sex" class="input-sm form-control">
+                    <option value="">- 性别 -</option>
+                    <!--{if $Think.get.sex eq 1}-->
+                    <option selected value="1">- 男 -</option>
+                    <!--{else}-->
+                    <option value="1">- 男 -</option>
+                    <!--{/if}-->
+                    <!--{if $Think.get.sex eq 2}-->
+                    <option selected value="2">- 女 -</option>
+                    <!--{else}-->
+                    <option value="2">- 女 -</option>
+                    <!--{/if}-->
+                </select>
+            </div>
+        </div>
+
+        <div class="col-xs-2">
+            <div class="form-group">
+                <input type="text" name="country" value="{$Think.get.country|default=''}" placeholder="国家" class="input-sm form-control">
+            </div>
+        </div>
+
+        <div class="col-xs-2">
+            <div class="form-group">
+                <input type="text" name="province" value="{$Think.get.province|default=''}" placeholder="省份" class="input-sm form-control">
+            </div>
+        </div>
+
+        <div class="col-xs-2">
+            <div class="form-group">
+                <input type="text" name="city" value="{$Think.get.city|default=''}" placeholder="城市" class="input-sm form-control">
+            </div>
+        </div>
+
         <div class="col-xs-1">
             <div class="form-group">
                 <button type="submit" class="btn btn-sm btn-white"><i class="fa fa-search"></i> 搜索</button>
             </div>
         </div>
+
     </div>
 </form>
 <!-- 表单搜索 结束 -->
diff --git a/static/theme/default/css/console.css b/static/theme/default/css/console.css
index 2006b58f0..d8f50f7a0 100644
--- a/static/theme/default/css/console.css
+++ b/static/theme/default/css/console.css
@@ -10,8 +10,9 @@ html{overflow:auto;overflow-y:scroll !important}
 body{min-width:1024px;font-size:12px;line-height:24px;font-family:'微软雅黑',"Microsoft YaHei","Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB",serif}
 a{color:#06C;cursor:pointer}
 a:hover{color:#039}
-label{font-size:100%;font-weight:500}
 input::-ms-clear{display:none}
+button{border-radius:0!important}
+label{font-size:100%;font-weight:500}
 
 /** 后台框架 */
 .framework-topbar{position:fixed;width:100%;height:50px;background:#09C;z-index:101}