From 898dc343b2ab3578bcd522a06aa34ff875e1262e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 24 Mar 2021 18:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/User.php         |  8 +++++--
 app/data/view/user/index.html        |  4 ++--
 app/data/view/user/index_search.html | 31 ++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/app/data/controller/User.php b/app/data/controller/User.php
index 82c5531c4..69754c6e2 100644
--- a/app/data/controller/User.php
+++ b/app/data/controller/User.php
@@ -31,8 +31,12 @@ class User extends Controller
     {
         $this->title = '普通用户管理';
         $query = $this->_query($this->table);
-        $query->like('phone,username|nickname#username')->equal('vip_code');
-        $query->order('id desc')->equal('status')->dateBetween('create_at')->page();
+        // 用户搜索查询
+        $db = $this->_query('DataUser')->equal('vip_code#from_vipcode')->like('phone#from_phone,username|nickname#from_username')->db();
+        if ($db->getOptions('where')) $query->whereRaw("pid1 in {$db->field('id')->buildSql()}");
+        // 数据查询分页
+        $query->like('phone,username|nickname#username')->equal('status,vip_code');
+        $query->order('id desc')->dateBetween('create_at')->page();
     }
 
     /**
diff --git a/app/data/view/user/index.html b/app/data/view/user/index.html
index 352a290cf..93b716132 100644
--- a/app/data/view/user/index.html
+++ b/app/data/view/user/index.html
@@ -18,7 +18,7 @@
             </th>
             <th class='nowrap'>用户信息</th>
             <th class='nowrap'>推荐人信息</th>
-            <th class='nowrap'>余额信息</th>
+            <th class='nowrap'>余额返利</th>
             <th class='nowrap'>注册时间</th>
             <th class='nowrap'></th>
         </tr>
@@ -71,7 +71,7 @@
             </td>
             <td class="nowrap sub-strong-blue">
                 <div>账户余额：累计充值 <b>{$vo.balance_total+0}</b> 元，已使用 <b>{$vo.balance_used+0}</b> 元，可用 <b>{:round($vo.balance_total-$vo.balance_used,2)+0}</b> 元</div>
-                <div>返利奖励：共奖励金额 <b>{$vo.rebate_total+$vo.rebate_lock}</b> 元 ( 含未到账 <b>{$vo.rebate_lock+0}</b> 元 ) 已提现 <b>{$vo.rebate_used+0}</b> 元，可提现 <b>{:round($vo.rebate_total-$vo.rebate_used,2)+0}</b> 元</div>
+                <div>返利奖励：累计返利 <b>{$vo.rebate_total+$vo.rebate_lock}</b> 元 ( 含未到账 <b>{$vo.rebate_lock+0}</b> 元 ) 已提现 <b>{$vo.rebate_used+0}</b> 元，可提现 <b>{:round($vo.rebate_total-$vo.rebate_used,2)+0}</b> 元</div>
             </td>
             <td class="nowrap">
                 使用状态：{if $vo.status eq 0}<b class="color-red margin-right-5">已冻结</b>{elseif $vo.status eq 1}<b class="color-green margin-right-5">已激活</b>{/if}<br>
diff --git a/app/data/view/user/index_search.html b/app/data/view/user/index_search.html
index 57fca11e9..9b12d321a 100644
--- a/app/data/view/user/index_search.html
+++ b/app/data/view/user/index_search.html
@@ -31,6 +31,36 @@
         </div>
         <!--{/notempty}-->
 
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">推荐人手机</label>
+            <label class="layui-input-inline">
+                <input name="from_phone" value="{:input('from_phone')}" placeholder="请输入推荐人手机" class="layui-input">
+            </label>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">推荐人昵称</label>
+            <label class="layui-input-inline">
+                <input name="from_username" value="{:input('from_username')}" placeholder="请输入推荐人昵称" class="layui-input">
+            </label>
+        </div>
+
+        <!--{notempty name='upgrades'}-->
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">推荐人等级</label>
+            <div class="layui-input-inline">
+                <select name="from_vipcode" class="layui-select">
+                    <option value="">-- 全部 --</option>
+                    {foreach $upgrades as $upgrade}{if input('from_vipcode') eq $upgrade.number}
+                    <option selected value="{$upgrade.number|default=0}">[ {$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
+                    {else}
+                    <option value="{$upgrade.number|default=0}">[ {$upgrade.number|default='0'} ] {$upgrade.name|default=''}</option>
+                    {/if}{/foreach}
+                </select>
+            </div>
+        </div>
+        <!--{/notempty}-->
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
@@ -58,5 +88,6 @@
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
         </div>
     </form>
+
     <script>form.render()</script>
 </fieldset>
\ No newline at end of file