Начало Каталог Помощ
Вход
waibao
/
NN2021012701
2
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

举报提交

binbinyouli преди 5 години
родител
42c58c3712
ревизия
e88112ec77
променени са 6 файла, в които са добавени 772 реда и са изтрити 15 реда
Обединен изглед Покажи статистика за разликите
  1. 526 0
      public/themes/admin_simpleboot3/admin/market/marketlogout.html
  2. 35 0
      public/themes/admin_simpleboot3/user/admin_index/complain.html
  3. 5 1
      public/themes/admin_simpleboot3/user/admin_index/index.html
  4. 153 0
      vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php
  5. 1 0
      vendor/thinkcmf/cmf-app/src/admin/controller/PullwireController.php
  6. 52 14
      vendor/thinkcmf/cmf-app/src/user/controller/AdminIndexController.php

+ 526 - 0
public/themes/admin_simpleboot3/admin/market/marketlogout.html
Целия файл 

@@ -0,0 +1,526 @@
 
+<include file="public@header"/>
 
+</head>
 
+<body>
 
+<div class="wrap js-check-wrap">
 
+    <ul class="nav nav-tabs">
 
+        <li class="active">
 
+            <a> 分销注销</a>
 
+         </if>
 
+        </li>
 
+    </ul>
 
+
 
+    
+      <form class="well form-inline margin-top-20" method="post" action="{:url('user/adminIndex/index',array('u'=>1))}">
 
+    
+        <!-- 用户ID：
 
+        <input class="form-control" type="text" name="uid" style="width: 200px;" value="{:input('request.uid')}"
 
+               placeholder="请输入用户ID"> -->
 
+        关键字：
 
+        <input class="form-control" type="text" name="keyword" style="width: 200px;" value="{:input('request.keyword')}" placeholder="昵称/真实姓名/手机">
 
+
 
+
 
+        <input type="submit" class="btn btn-primary"  value="搜索"/>
 
+          
+          <if condition="$Request.action eq 'custom' || $Request.param.u eq 2">
 
+        <a class="btn btn-default" href="{:url('user/adminIndex/index',array('u'=>2))}">清空</a>
 
+        
+         <elseif condition="$Request.action eq 'userban' || $Request.param.u eq 3">
 
+        <a class="btn btn-default" href="{:url('user/adminIndex/index',array('u'=>3))}">清空</a>
 
+
 
+        <elseif condition="$Request.action eq 'screen' || $Request.param.u eq 4">
 
+          
+         <a class="btn btn-default" href="{:url('user/adminIndex/index',array('u'=>4))}">清空</a>
 
+
 
+        <elseif condition="$Request.action eq 'userlogout' || $Request.param.u eq 5">
 
+          
+         <a class="btn btn-default" href="{:url('user/adminIndex/index',array('u'=>5))}">清空</a>
 
+
 
+         <else/>
 
+        <a class="btn btn-default" href="{:url('user/adminIndex/index',array('u'=>1))}">清空</a>
 
+        </if>
 
+
 
+        <if condition="$Request.action eq 'custom' || $Request.param.u eq 2">
 
+        <a class="btn btn-warning" href="{:url('user/adminIndex/export',array('uid'=>$Request.param.uid,'keyword'=>$Request.param.keyword,'u'=>2))}">导出</a>
 
+        
+        <elseif condition="$Request.action eq 'userban' || $Request.param.u eq 3">
 
+             <a class="btn btn-warning" href="{:url('user/adminIndex/export',array('uid'=>$Request.param.uid,'keyword'=>$Request.param.keyword,'u'=>3))}">导出</a>
 
+        <elseif condition="$Request.action eq 'screen' || $Request.param.u eq 4">     
+             <a class="btn btn-warning" href="{:url('user/adminIndex/export',array('uid'=>$Request.param.uid,'keyword'=>$Request.param.keyword,'u'=>4))}">导出</a>
 
+       <elseif condition="$Request.action eq 'userlogout' || $Request.param.u eq 5">     
+             <a class="btn btn-warning" href="{:url('user/adminIndex/export',array('uid'=>$Request.param.uid,'keyword'=>$Request.param.keyword,'u'=>5))}">导出</a>
 
+
 
+        <else/>
 
+         <a class="btn btn-warning" href="{:url('user/adminIndex/export',array('uid'=>$Request.param.uid,'keyword'=>$Request.param.keyword,'u'=>1))}">导出</a>
 
+       </if>
 
+
 
+        <a class="btn btn-danger" onclick="doDelete()">批量删除</a>
 
+        <!-- <a class="btn btn-danger" href="{:url('user/adminIndex/index')}" style="border-color:#7349B8;background-color:#7349B8">已冻结的用户</a> -->
 
+<!-- 
+        <a class="btn btn-danger"  id="showcho" style="border-color:#7349B8;background-color:#7349B8">条件筛选</a> -->
 
+
 
+        <div id="showchoice" style="display: none;  margin-top: 10px;">
 
+          <php>$educationarray=array(1=>'大专',2=>'本科',3=>'硕士',4=>'博士');</php>
 
+          <php>$marriedarray=array(1=>'未婚',2=>'离异',3=>'离异有孩子');</php>
 
+          <php>$propertyarray=array(0=>'无',1=>'有房',2=>'有车',3=>'有房有车');</php>
 
+          <php>$agearray=array('1980','1981','1982','1983','1984','1985','1986','1987','1988','1989','1990','1991','1992','1993','1994','1995','1996','1997','1998','1999','2000');</php>
 
+          <php>$sexarray=array(1=>'男',2=>'女');</php>
 
+        <div>
 
+            
+              <div style="margin-top: 10px;"> 
+            <!--  年龄: <input class="form-control js-bootstrap-datetime" type="text" name="age1" style="width: 150px;margin-right:10px;" value="" placeholder="请选择年龄"> 
+             <font style="color: red">至</font> &nbsp;
 
+                 <input class="form-control js-bootstrap-datetime" type="text" name="age2" style="width: 150px;margin-right:25px;" value="" placeholder="请选择年龄">  -->
 
+              年龄: <select class="form-control" name="age1" id="age1" style="width: 150px;margin-right:10px;">
 
+                    <option value="none">--请选择年龄--</option>
 
+                    <volist name="$agearray" id="vo">
 
+                        <option value="{$vo}">{$vo}</option>
 
+                    </volist>
 
+                </select> 
+             <font style="color: red">至</font> &nbsp;
 
+                 <select class="form-control" name="age2" id="age2" style="width: 150px;margin-right:10px;">
 
+                    <option value="none">--请选择年龄--</option>
 
+                    <volist name="$agearray" id="vo">
 
+                        <option value="{$vo}">{$vo}</option>
 
+                    </volist>
 
+                </select>
 
+
 
+            身高: <select class="form-control" name="height" id="height"  style="width: 150px;margin-right:10px;">
 
+                    <option value="none">--请选择身高--</option>
 
+                  
+                </select>
 
+            <font style="color: red">至</font> &nbsp;
 
+                <select class="form-control" name="heightt" id="heightt"  style="width: 150px;margin-right:10px;">
 
+                    <option value="none">--请选择身高--</option>
 
+                   
+                </select>
 
+            
+            
+           
+
 
+        </div>  
+
 
+        <div style="margin-top: 10px;">       
+              学历: <select class="form-control" name="education" id="education" style="width: 150px;margin-right:10px;">
 
+                    <option value="none">--请选择学历--</option>
 
+                    <volist name="$educationarray" id="vo">
 
+                        <option value="{$key}">{$vo}</option>
 
+                    </volist>
 
+                </select>
 
+            职业: 
+              <select class="form-control" name="occupation" style="margin-right: 15px;width: 150px;" id="position1">
 
+                    <option value="none">--请选择职位--</option>
 
+                </select>
 
+
 
+            收入: <select class="form-control" name="salary" id="salary"  style="width: 150px;margin-right:10px;">
 
+                    <option value="none">--请选择收入--</option>
 
+                    <option value="1">5-10w</option>
 
+                    <option value="2">10-20w</option>
 
+                    <option value="3">20-35w</option>
 
+                    <option value="4">35-55w</option>
 
+                    <option value="5">100w以上</option>
 
+                </select>
 
+                        
+             资产: <select class="form-control" name="property" id="property" style="width: 150px;margin-right:10px;">
 
+                    <option value="none">--请选择资产--</option>
 
+                    <volist name="$propertyarray" id="vo">
 
+                        <option value="{$key}">{$vo}</option>
 
+                    </volist>  
+                 </select>   
+
 
+                      
+         </div> 
+
 
+           <div style="margin-top: 10px;">
 
+            家乡: <input class="form-control" type="text" name="home_city" style="width: 150px;margin-right:10px;" value="" placeholder="请输入省/市">
 
+
 
+            居住地: <input class="form-control" type="text" name="city" style="width: 150px;margin-right:10px;" value="" placeholder="请输入市">
 
+           
+                婚姻状况: <select class="form-control" name="married" id="married" style="width: 150px;margin-right:10px;">
 
+                    <option value="none">--请选择婚姻--</option>
 
+                    <volist name="$marriedarray" id="vo">
 
+                        <option value="{$key}">{$vo}</option>
 
+                    </volist>
 
+                </select>
 
+
 
+                  
+                 性别: <select class="form-control" name="sex" id="sex" style="width: 150px;margin-right:10px;">
 
+                    <option value="none">--请选择性别--</option>
 
+                    <volist name="$sexarray" id="vo">
 
+                        <option value="{$key}">{$vo}</option>
 
+                    </volist>
 
+                </select>
 
+    
+                 <a class="btn btn-warning" style=" padding: 3px 10px; border-color:#ca1883;background-color:#ca1883;color: #fff" id="nonecho">隐藏</a>
 
+           </div>
 
+
 
+            
+        </div> 
+       
+       </div>
 
+
 
+    </form>
 
+    <form method="post" class="js-ajax-form">
 
+    <div class="table-actions">
 
+       
+         
+         <if condition="$Request.action eq 'custom' || $Request.param.u eq 2">
 
+            
+            
+
 
+              <button class="btn btn-primary btn-sm js-ajax-submit" type="submit"
 
+                    data-action="{:url('AdminIndex/tozhuxiao',array('yes'=>1))}" onclick="return confirm('确定要成为注销吗？')" data-subcheck="true">
 
+                    
+              </button>
 
+
 
+        </if> 
+           
+        </div>
 
+        <table class="table table-hover table-bordered">
 
+            <thead>
 
+            <tr>
 
+                <th><input type="checkbox" class="js-check-all" data-direction="x" data-checklist="js-check-x">全选</th>
 
+                <th>ID</th>
 
+                <th>账号</th>
 
+                <th>{:lang('NICENAME')}</th>
 
+                <th>真实姓名</th>
 
+                <th>爱心</th>
 
+          
+                <th style="text-align: center;">是否推荐</th>
 
+                <th style="text-align: center;">推荐人</th>
 
+                <th style="text-align: center;">下级分销员数</th>
 
+                <th style="text-align: center;">下级普通会员数</th>
 
+                <th style="text-align: center;">可提佣金</th>
 
+               <!--  <th>等级</th> -->
 
+
 
+                <if condition="$Request.action eq 'userban' || $Request.param.u eq 3">
 
+                  <th>冻结原因</th>
 
+                <else/>
 
+                  <th>手机</th>
 
+                </if>
 
+                <if condition="$Request.action eq 'custom' || $Request.param.u eq 2 || $Request.param.u eq 4">
 
+                  <th>网址</th>
 
+               
+                </if>
 
+              
+
 
+                <if condition="$Request.action eq 'userban' || $Request.param.u eq 3">
 
+                  <th>冻结时间</th>
 
+                <else/>
 
+                <th>{:lang('REGISTRATION_TIME')}</th>
 
+                </if>
 
+              <!--   <th>登录时间</th> -->
 
+              
+         
+                <th>{:lang('STATUS')}</th>
 
+                <th>{:lang('ACTIONS')}</th>
 
+            </tr>
 
+            </thead>
 
+            <tbody>
 
+            <php>
 
+                $user_statuses=array("0"=>lang('USER_STATUS_BLOCKED'),"1"=>lang('USER_STATUS_ACTIVATED'),"2"=>lang('USER_STATUS_UNVERIFIED'));
 
+            </php>
 
+            <foreach name="list" item="vo">
 
+                <tr>
 
+                    <td><input type="checkbox" class="js-check" data-yid="js-check-y" data-xid="js-check-x" name="ids[]"
 
+                               value="{$vo.id}" title="ID:{$vo.id}"></td>
 
+                    <td>{$vo.id}</td>
 
+                    <td>{$vo['user_login']?$vo['user_login']:($vo['mobile']?$vo['mobile']:lang('THIRD_PARTY_USER'))}
 
+                    </td>
 
+                    <td>{$vo['user_nickname']?$vo['user_nickname']:lang('NOT_FILLED')}</td>
 
+                    <td>{$vo['real_name']?$vo['real_name']:lang('NOT_FILLED')}</td>
 
+                    <td>{$vo['redheart']}</td>
 
+                 
+                    <td style="text-align: center;">
 
+                      <switch name="vo.is_tuijian">
 
+                            <case value="1">
 
+                                <span style="color: blue">是</span>
 
+                            </case>
 
+                            <case value="0">
 
+                                <span style="color: red">否</span>
 
+                            </case>
 
+                      </switch>
 
+
 
+                    </td>
 
+
 
+                    <td style="text-align: center;">
 
+                      <if condition="$vo.marketusername.user_nickname eq ''">
 
+                        <span style="color: red">无</span>
 
+                         <else/>
 
+                        <span style="color: blue">{$vo.marketusername.user_nickname}</span>
 
+                      </if>
 
+
 
+                    </td>
 
+
 
+                   <td style="text-align: center;">
 
+                     <if condition="$vo.marketcount eq 0">
 
+                       <a href="#">{$vo.marketcount}</a>
 
+                    <else/>
 
+                       <a href="{:url('Market/marketoneuser',array('id'=>$vo.id,'user_nickname'=>$vo.user_nickname,'agent_type'=>1))}">{$vo.marketcount}</a>
 
+                    </if>
 
+
 
+                    </td>
 
+
 
+                    <td style="text-align: center;">
 
+                       <if condition="$vo.marketusercount eq 0">
 
+                         <a href="#">{$vo.marketusercount}</a>
 
+                       <else/>
 
+                           <a href="{:url('Market/marketoneuser',array('id'=>$vo.id,'user_nickname'=>$vo.user_nickname,'agent_type'=>0))}">{$vo.marketusercount}</a>
 
+                       </if>
 
+                    </td>
 
+
 
+                    <td style="text-align: center;">
 
+                    {$vo.balance}
 
+                    </td>
 
+
 
+
 
+                  <!-- <td>{$vo.level}</td> -->
 
+                 
+
 
+                    <if condition="$Request.action eq 'userban' || $Request.param.u eq 3">
 
+                       <td><span style="color:red">{$vo.freezing}</span></td>
 
+                    <else/>
 
+                        <td>{$vo.mobile}</td>
 
+                    </if>
 
+                      <if condition="$Request.action eq 'custom' || $Request.param.u eq 2 || $Request.param.u eq 4">
 
+                     <td>
 
+                      <span class="label label-primary copy-btn copy" data-url="{:url('/weixin/member/home?id=','','',true)}{$vo.id}">复制</span>
 
+                      </td>
 
+
 
+                </if>
 
+                    
+                  <if condition="$Request.action eq 'userban' || $Request.param.u eq 3">
 
+                       <td>{$vo.updated_at}</td>
 
+                        <else/> 
+                         <td>{:date('Y-m-d H:i',$vo['create_time'])}</td>
 
+                    </if>
 
+                   
+               <!--        <td>{:date('Y-m-d H:i',$vo['last_login_time'])}</td> -->
 
+                   <!--  <td>
 
+                         <switch name="vo.idcard_check">
 
+                            <case value="1">
 
+                               <span style="color:red">未审</span>
 
+                            </case>
 
+                            <case value="2">
 
+                              <span style="color:green">已审</span>
 
+                            </case>
 
+                            <case value="3">
 
+                               <span style="color:#ef9413">驳回</span>
 
+                            </case>
 
+                            <case value="">
 
+                                <span style="color:blue">未填</span>
 
+                            </case>
 
+                        </switch>
 
+                    </td>
 
+                    <td>
 
+                        <switch name="vo.position_check">
 
+                           <case value="0">
 
+                               <span style="color:blue">未填</span>
 
+                            </case>
 
+                            <case value="1">
 
+                               <span style="color:red">未审</span>
 
+                            </case>
 
+                            <case value="2">
 
+                              <span style="color:green">已审</span>
 
+                            </case>
 
+                            <case value="3">
 
+                               <span style="color:#ef9413">驳回</span>
 
+                            </case>
 
+                              <case value="">
 
+                               <span style="color:blue">未填</span>
 
+                            </case>
 
+                        </switch>
 
+                    </td>
 
+                    <td>
 
+                        <switch name="vo.education_check">
 
+                           <case value="0">
 
+                               <span style="color:blue">未填</span>
 
+                            </case>
 
+                            <case value="1">
 
+                               <span style="color:red">未审</span>
 
+                            </case>
 
+                            <case value="2">
 
+                              <span style="color:green">已审</span>
 
+                            </case>
 
+                            <case value="3">
 
+                               <span style="color:#ef9413">驳回</span>
 
+                            </case>
 
+                              <case value="">
 
+                               <span style="color:blue">未填</span>
 
+                            </case>
 
+                        </switch>
 
+
 
+                    </td> -->
 
+                  
+                    <td>
 
+
 
+                        
+                  <if condition="$Request.action eq 'userlogout' || $Request.param.u eq 5">
 
+                        <if condition="$vo.idcard eq '' || $vo.idcard eq null">
 
+                               <span style="color:green">身份已清除</span>
 
+                                
+                           <else/>
 
+                               <span style="color:red">身份未清除</span>
 
+                        </if>
 
+                      <else/>
 
+                        <switch name="vo.user_status">
 
+                              <case value="0">
 
+                                  <span class="label label-danger">已冻结</span>
 
+                              </case>
 
+                              <case value="1">
 
+                                  <span class="label label-success">{$user_statuses[$vo['user_status']]}</span>
 
+                              </case>
 
+                              <case value="2">
 
+                                  <span class="label label-warning">{$user_statuses[$vo['user_status']]}</span>
 
+                              </case>
 
+                          </switch>
 
+                    </if>
 
+                      
+                    </td>
 
+                   
+                    <td>
 
+
 
+                      <if condition="$Request.action eq 'userlogout' || $Request.param.u eq 5">
 
+                    <a class="btn btn-xs btn-primary" href="{:url('user/adminIndex/edit',array('id'=>$vo['id']))}">编辑</a>
 
+                   
+                              <a class="btn btn-xs btn-warning js-ajax-dialog-btn" style="background-color: #d00a81;border-color:#d00a81"  href="{:url('adminIndex/touserlogout',array('yes'=>1,'ids'=>$vo['id']))}" data-msg="确认清理该用户身份证信息？">清除身份证信息</a>
 
+
 
+                    <else/>
 
+
 
+                            <if condition="$Request.action eq 'custom' || $Request.param.u eq 2">
 
+                          <a class="btn btn-xs btn-primary" href="{:url('user/adminIndex/edit',array('id'=>$vo['id'],'u'=>2))}">编辑</a>
 
+                          <else/>
 
+                           <a class="btn btn-xs btn-primary" href="{:url('user/adminIndex/edit',array('id'=>$vo['id']))}">编辑</a>
 
+                        </if>
 
+
 
+                          <neq name="vo.id" value="1">
 
+                              <empty name="vo.user_status">
 
+                                  <a class="btn btn-xs btn-success js-ajax-dialog-btn"
 
+                                     href="{:url('adminIndex/cancelban',array('id'=>$vo['id']))}"
 
+                                     data-msg="{:lang('ACTIVATE_USER_CONFIRM_MESSAGE')}">{:lang('ACTIVATE_USER')}</a>
 
+                                  <else/>
 
+                                <!--   <a class="btn btn-xs btn-warning js-ajax-dialog-btn"
 
+                                     href="{:url('adminIndex/ban',array('id'=>$vo['id']))}"
 
+                                     data-msg="确认冻结该用户？">冻结</a> -->
 
+                             <!--          <a class="btn btn-xs btn-warning" onclick="getPaike({$vo['id']})" 
+                                    >冻结</a> -->
 
+                              </empty>
 
+                              <else/>
 
+                            <!--   <a class="btn btn-xs btn-warning disabled">冻结</a> -->
 
+
 
+                          </neq>
 
+
 
+                        
+                          <if condition="$Request.action eq 'userban' || $Request.param.u eq 3">
 
+
 
+                            <else/>
 
+                                 <php> $adminId = cmf_get_current_admin_id(); </php>
 
+           
+                            <!--  <if condition="$adminId eq 1">
 
+                                <a class="btn btn-xs btn-danger" href="{:url('adminIndex/accountadd',array('id'=>$vo['id']))}">爱心充值</a>
 
+                             </if> -->
 
+                          </if>
 
+
 
+                       
+                            <a class="btn btn-xs btn-danger" style="background-color: #5c0d8e;border-color:#5c0d8e"  onclick="getPaike2({$vo['id']})">奖励充值</a>
 
+
 
+                          <if condition="$Request.action eq 'screen' || $Request.param.u eq 2">
 
+                             
+                              <a class="btn btn-xs btn-danger" style="background-color: #e807b8;border-color:#e807b8" onclick="getPaike2({$vo['id']})">备注</a>
 
+
 
+                          </if>
 
+
 
+                      </if>
 
+                     
+                        
+                         
+                    </td>
 
+                </tr>
 
+            </foreach>
 
+            </tbody>
 
+        </table>
 
+        <div class="pagination">{$page}</div>
 
+    </form>
 
+</div>
 
+<script src="__STATIC__/js/admin.js"></script>
 
+<script src="__STATIC__/js/clipboard.min.js"></script>
 
+<script src="__STATIC__/js/layer/layer.js"></script>
 
+
 
+
 
+<script>
 
+    function doDelete() {
 
+        // Wind.use('artDialog', function () {
 
+            var ids = [];
 
+            $(".js-check:checked").each(function () {
 
+                var id = $(this).val();
 
+                if (id > 0) {
 
+                    ids.push(id);
 
+                }
 
+            });
 
+            if (ids.length <= 0) {
 
+                showMsg('请先选择操作项');
 
+                return false;
 
+            }
 
+            if(confirm('确定批量删除选择项？不可恢复')){
 
+                $.post('/user/admin_index/del',{id:ids},function(res){
 
+                    if(res.code == 1){
 
+                        showMsg(res.msg);
 
+                        setTimeout(function () {
 
+                            location.reload();
 
+                        }, 800)
 
+                    }else{
 
+                        showMsg(res.msg);
 
+                    }
 
+                },"json")
 
+            }
 
+
 
+
 
+        // });
 
+    }
 
+
 
+    function getPaike(id){ 
+        var addUrl = "{:url('AdminIndex/ban')}?id="+id;
 
+        layer.open({
 
+            type: 2, //1：页面层，2：iframe层，3：加载层，4：tips层。
 
+            title: '条件筛选',
 
+            shadeClose: false, //不开启遮罩关闭,也就是说，点击弹出层其它地方不会关闭弹出框
 
+            shade: 0.8, //遮罩
 
+            area: ['480px', '360px'],
 
+            content: addUrl,
 
+            end: function () { //最后执行reload
 
+                   location.reload();
 
+                }
 
+            });
 
+
 
+       } 
+
 
+
 
+       $("#showcho").click(function(){
 
+          $("#showchoice").show();
 
+        });     
+        $("#nonecho").click(function(){
 
+          $("#showchoice").hide();
 
+        });     
+
 
+  /*  function showMsg(msg, time){
 
+        time = time? time : 1000;
 
+        art.dialog({
 
+            content: msg,
 
+            icon: 'warning'
 
+        });
 
+
 
+        setTimeout(function () {
 
+
 
+        }, time)
 
+    }*/
 
+</script>
 
+<script >
 
+
 
+    function getPaike2(id){
 
+          openIframeLayer("{:url('market/marketshowreward')}?id=" + id , "", {
 
+              area: ['600px', '300px'],
 
+              // btn: ['确定', '取消'],
 
+          })
 
+      }
 
+  </script>
 
+</body>
 
+</html>

+ 35 - 0
public/themes/admin_simpleboot3/user/admin_index/complain.html
Целия файл 

@@ -194,6 +194,7 @@
 
                 <th>ID</th>
 
                 <th>ID</th>
 
                 <th>举报人</th>
 
                 <th>举报人</th>
 
                 <th>被举报人</th>
 
                 <th>被举报人</th>
 
+                <th>举报类型</th>
 
                 <th>举报内容</th>
 
                 <th>举报内容</th>
 
                 <th>图片</th>
 
                 <th>图片</th>
 
                 <th>举报时间</th>
 
                 <th>举报时间</th>
 
@@ -204,6 +205,9 @@
 
             <tbody>
 
             <tbody>
 
             <php>
 
             <php>
 
                 $user_statuses=array("0"=>lang('USER_STATUS_BLOCKED'),"1"=>lang('USER_STATUS_ACTIVATED'),"2"=>lang('USER_STATUS_UNVERIFIED'));
 
                 $user_statuses=array("0"=>lang('USER_STATUS_BLOCKED'),"1"=>lang('USER_STATUS_ACTIVATED'),"2"=>lang('USER_STATUS_UNVERIFIED'));
 
+
 
+                $complainTypes=config('complainTypes');
 
+
 
             </php>
 
             </php>
 
             <foreach name="list" item="vo">
 
             <foreach name="list" item="vo">
 
                 <tr>
 
                 <tr>
 
@@ -212,6 +216,37 @@
 
                     <td>{$vo.id}</td>
 
                     <td>{$vo.id}</td>
 
                     <td><a class="" href="{:url('adminIndex/edit',array('id'=>$vo['ids']))}">{$vo.user_nickname}</a></td>
 
                     <td><a class="" href="{:url('adminIndex/edit',array('id'=>$vo['ids']))}">{$vo.user_nickname}</a></td>
 
                     <td>  <a class="" href="{:url('adminIndex/edit',array('id'=>$vo['c_uid']))}">{$vo.c_uid}</a></td>
 
                     <td>  <a class="" href="{:url('adminIndex/edit',array('id'=>$vo['c_uid']))}">{$vo.c_uid}</a></td>
 
+                      <td> 
+                      <switch name="vo.type">
 
+                            <case value="1">
 
+                               <span >头像非本人或无法看清正面</span>
 
+                            </case>
 
+                            <case value="2">
 
+                              <span >个人介绍乱填/虚假资料信息</span>
 
+                            </case>
 
+                             <case value="3">
 
+                              <span >资料透露联系方式/含有广告</span>
 
+                            </case>
 
+                            <case value="4">
 
+                              <span >婚托、饭托、酒托、诈骗等</span>
 
+                            </case>
 
+                             <case value="5">
 
+                              <span >发布垃圾营销广告</span>
 
+                            </case>
 
+                                      <case value="6">
 
+                              <span >虚假中奖消息、诱导消费等</span>
 
+                            </case>
 
+                             <case value="7">
 
+                              <span >聊天内容引起不适/恶意骚扰</span>
 
+                            </case>
 
+                             <case value="8">
 
+                              <span >其他</span>
 
+                            </case>
 
+                                     
+                            
+                        </switch>
 
+
 
+                      </td>
 
                     <td>{$vo.remark}</td>
 
                     <td>{$vo.remark}</td>
 
                     <td><img src="{:cmf_get_image_preview_url($vo.image)}" style="width: 80px;height: 50px;" onclick="javascript:imagePreviewDialog(this.src)";></td>
 
                     <td><img src="{:cmf_get_image_preview_url($vo.image)}" style="width: 80px;height: 50px;" onclick="javascript:imagePreviewDialog(this.src)";></td>

+ 5 - 1
public/themes/admin_simpleboot3/user/admin_index/index.html
Целия файл 

@@ -245,7 +245,10 @@
 
                 <th>{:lang('NICENAME')}</th>
 
                 <th>{:lang('NICENAME')}</th>
 
                 <th>真实姓名</th>
 
                 <th>真实姓名</th>
 
                 <th>爱心</th>
 
                 <th>爱心</th>
 
+               
+    
                 <if condition="$Request.action eq 'viprechange'">
 
                 <if condition="$Request.action eq 'viprechange'">
 
+                  <th>充值金额</th>
 
                   <th>是否vip</th>
 
                   <th>是否vip</th>
 
                   <th style="text-align: center;">是否过期</th>
 
                   <th style="text-align: center;">是否过期</th>
 
                   <else/>
 
                   <else/>
 
@@ -291,8 +294,9 @@
 
                     <td>{$vo['user_nickname']?$vo['user_nickname']:lang('NOT_FILLED')}</td>
 
                     <td>{$vo['user_nickname']?$vo['user_nickname']:lang('NOT_FILLED')}</td>
 
                     <td>{$vo['real_name']?$vo['real_name']:lang('NOT_FILLED')}</td>
 
                     <td>{$vo['real_name']?$vo['real_name']:lang('NOT_FILLED')}</td>
 
                     <td>{$vo['redheart']}</td>
 
                     <td>{$vo['redheart']}</td>
 
+                  
                     <if condition="$Request.action eq 'viprechange'">
 
                     <if condition="$Request.action eq 'viprechange'">
 
-
 
+                      <td>{$vo['pay_money']}</td>
 
                          <td>
 
                          <td>
 
                            <switch name="vo.vip_auth">
 
                            <switch name="vo.vip_auth">
 
                              <case value="1">
 
                              <case value="1">

+ 153 - 0
vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php
Целия файл 

@@ -577,6 +577,159 @@ class MarketController extends AdminBaseController
 
 
 
     }
 
     }
 
 
 
+    //分销用户注销
 
+    public function marketlogout(){
 
+
 
+         $data = $this->request->param();
 
+        session('search',[
 
+            'uid' => isset($data['uid'])? intval($data['uid']) : 0,
 
+            'keyword' => isset($data['keyword'])? trim($data['keyword']) : '',
 
+        ]);
 
+        // 添加返回历史修改 by  wesmiler 2020-02-16
 
+        $history = isset($data['history'])? intval($data['history']) : 0;
 
+        if($history){
 
+            $data = session('user_search');
 
+        }else{
 
+            session('user_search', $data);
 
+        }
 
+        // 修改 end
 
+        //var_dump($data);die;
 
+        $list = Db::name('user')->field('u.id,u.user_login,u.user_nickname,u.real_name,u.redheart,u.is_tuijian,u.parent_id,u.create_time,u.is_heart,u.user_status,u.balance,u.mobile,u.level,u.freezing,u.updated_at,u.last_login_time,u.is_reg_profile,up.idcard_check,up.position_check,up.education_check')
 
+            ->alias('u')
 
+     
+             ->join('user_profile up','up.userid=u.id','left')
 
+            ->where(function (Query $query) use($data){
 
+
 
+                $query->where('u.user_type', 2);
 
+                $query->where('u.agent_type', 1);           //分销用户
 
+                $query->where('u.user_status',-1);
 
+                $query->where('u.openid', 'not in','');
 
+              
+
 
+              $this->screenpublic();
 
+
 
+
 
+            })
 
+
 
+            //待审核
 
+            ->order("u.create_time DESC")
 
+            ->paginate(10,false,['query'=>request()->param()])
 
+            ->each(function($item,$key){
 
+                $item['marketusername'] = Db::name('user')->where(array('id'=>$item['parent_id'],'user_status'=>1))->field('real_name,user_nickname')->find();
 
+                $item['marketcount'] = Db::name('user')->where(array('parent_id'=>$item['id'],'user_status'=>1))->count('id');
 
+                $item['marketusercount'] = Db::name('user')->where(array('parent_id'=>$item['id'],'user_status'=>1,'agent_type'=>0))->count('id');//普通用户会员，不是分销员
 
+
 
+
 
+                return $item;
 
+            })
 
+            ;
 
+   // echo Db::name('user')->getLastSql();die;
 
+        // 获取分页显示
 
+        $page = $list->render();
 
+      
+        $this->assign('list', $list);
 
+        $this->assign('page', $page);
 
+        
+
 
+        return $this->fetch();
 
+        $this->fetch();
 
+
 
+    }
 
+
 
+     //筛选方法，公用
 
+
 
+    public function screenpublic(){
 
+
 
+        $data = $this->request->param();
 
+        if (!empty($data['uid'])) {
 
+            $query->where('u.id', intval($data['uid']));
 
+        }
 
+
 
+        if (!empty($data['keyword'])) {
 
+            $keyword = $data['keyword'];
 
+            $query->where('u.user_login|u.user_nickname|u.real_name|u.mobile', 'like', "%$keyword%");
 
+        }
 
+        //年龄区间查询
 
+        if(!empty($data['age1']) && !empty($data['age2'])){
 
+
 
+            $query->where('u.birthday',['>',strtotime($data['age1'])],['<',strtotime($data['age2'])],'and');
 
+            $query->whereNotNull('u.birthday');
 
+        }
 
+
 
+        // //只有第一个年龄的情况下
 
+        if(!empty($data['age1']) && empty($data['age2'])){
 
+            $birthday = $data['age1'];
 
+            $query->whereRaw("YEAR(from_unixtime(u.`birthday`))=YEAR('$birthday') and u.birthday is not null ");
 
+        }
 
+
 
+        // //只有第二个年龄的情况下
 
+        if(empty($data['age1']) && !empty($data['age2'])){
 
+            $birthday = $data['age2'];
 
+            $query->whereRaw("YEAR(from_unixtime(u.`birthday`))=YEAR('$birthday') and u.birthday is not null ");
 
+        }
 
+
 
+        //身高区间查询
 
+
 
+
 
+
 
+        if((!empty(input('height')) && input('height')!='none') && (!empty(input('heightt')) && input('heightt')!='none')){
 
+
 
+            $query->where('up.height',['>',input('height')],['<',input('heightt')],'and');
 
+        }
 
+
 
+        //身高第一个查找
 
+        if((!empty(input('height')) && input('height')!='none') && (empty(input('heightt')) || input('heightt')=='none')){
 
+
 
+            $query->where('up.height',input('height'));
 
+        }
 
+
 
+        //身高第二个查找
 
+        if((empty(input('height')) ||input('height')=='none') && (!empty(input('heightt')) && input('heightt')!='none')){
 
+
 
+            $query->where('up.height',input('heightt'));
 
+        }
 
+
 
+
 
+        //学历
 
+        if((!empty(input('education')) && input('education')!='none') ){
 
+
 
+            $query->where('up.education',input('education'));
 
+        }
 
+        //职位
 
+        if((!empty(input('occupation')) && input('occupation')!='none') ){
 
+
 
+            $query->where('up.occupation',input('occupation'));
 
+        }
 
+        //收入
 
+        if((!empty(input('salary')) && input('salary')!='none') ){
 
+
 
+            $query->where('up.salary',input('salary'));
 
+        }
 
+
 
+        //资产
 
+        if((!empty(input('property')) && input('property')!='none') ){
 
+
 
+            $query->where('up.property',input('property'));
 
+        }
 
+
 
+        //籍贯
 
+        if((!empty(input('home_city')) && input('home_city')!='none') ){
 
+
 
+            $query->where('up.home_city','like','%'.input('home_city').'%');
 
+        }
 
+        //居住地
 
+
 
+        if((!empty(input('district')) && input('district')!='none') ){
 
+
 
+            $query->where('up.district','like','%'.input('district').'%');
 
+        }
 
+        //婚姻状况
 
+        if((!empty(input('married')) && input('married')!='none') ){
 
+
 
+            $query->where('up.married',input('married'));
 
+        }
 
+    }
 
+
 
 
 
     //显示子级用户显示
 
     //显示子级用户显示
 
     public function Markettwouser(){
 
     public function Markettwouser(){

+ 1 - 0
vendor/thinkcmf/cmf-app/src/admin/controller/PullwireController.php
Целия файл 

@@ -44,6 +44,7 @@ class PullwireController extends AdminBaseController
 
             ->alias('rl')
 
             ->alias('rl')
 
             ->join('user u','rl.user_id=u.id','left')
 
             ->join('user u','rl.user_id=u.id','left')
 
             ->where('rl.type',5)
 
             ->where('rl.type',5)
 
+             ->where('rl.status',2)
 
             ->where(function (Query $query) use ($nick_name,$pay_money) {
 
             ->where(function (Query $query) use ($nick_name,$pay_money) {
 
                 if ($nick_name) {
 
                 if ($nick_name) {
 
                     $query->where('u.user_nickname', 'like', "%$nick_name%");
 
                     $query->where('u.user_nickname', 'like', "%$nick_name%");

+ 52 - 14
vendor/thinkcmf/cmf-app/src/user/controller/AdminIndexController.php
Целия файл 

@@ -93,22 +93,34 @@ class AdminIndexController extends AdminBaseController
 
             ->where(function (Query $query) use($data){
 
             ->where(function (Query $query) use($data){
 
                 $query->where('u.user_type', 2);
 
                 $query->where('u.user_type', 2);
 
                 $query->where('u.openid', 'not in','');
 
                 $query->where('u.openid', 'not in','');
 
-
 
+            
+               if($this->request->param('u')==1){
 
+                     $query->where('u.user_status', 1);
 
+                }
 
                 //代表是否付费定制
 
                 //代表是否付费定制
 
-                ($this->request->action()=='custom' || $this->request->param('u')==2)?$query->where('u.is_vip', 1):$query->where('u.is_vip', 0);
 
+                if($this->request->param('u')==2){
 
+                     $query->where('u.user_status', 1);
 
+                    $query->where('u.is_vip', 1);
 
+
 
+                }
 
 
 
                 //代表是否冻结
 
                 //代表是否冻结
 
-                if($this->request->action()!='userlogout' && $this->request->param('u')!=5){
 
-                    ($this->request->action()=='userban' || $this->request->param('u')==3)?$query->where('u.user_status', 0):$query->where('u.user_status', 1);
 
+                if($this->request->param('u')==3){
 
+                    $query->where('u.user_status', 0);
 
                 }
 
                 }
 
+                
 
 
                 //代表是否筛选
 
                 //代表是否筛选
 
-                 ($this->request->action()=='screen' || $this->request->param('u')==4)?$query->where('u.is_screen', 1):$query->where('u.is_screen', 0);
 
+                 if($this->request->param('u')==4){
 
+                     $query->where('u.user_status', 1);
 
+                    $query->where('u.is_screen', 1);
 
+                }
 
 
 
                   //代表是否注销
 
                   //代表是否注销
 
-                if($this->request->action()!='userban' && $this->request->param('u')!=3){
 
-                  ($this->request->action()=='userlogout' || $this->request->param('u')==5)?$query->where('u.user_status', -1):$query->where('u.user_status', 1);
 
+                if($this->request->param('u')==5){
 
+                    $query->where('u.user_status', -1);
 
                 }
 
                 }
 
+                
 
 
                 //$data = $this->request->param();
 
                 //$data = $this->request->param();
 
                 if (!empty($data['uid'])) {
 
                 if (!empty($data['uid'])) {
 
@@ -209,7 +221,7 @@ class AdminIndexController extends AdminBaseController
 
             //待审核
 
             //待审核
 
             ->order("u.create_time DESC")
 
             ->order("u.create_time DESC")
 
             ->paginate(10,false,['query'=>request()->param()]);
 
             ->paginate(10,false,['query'=>request()->param()]);
 
-       //echo Db::name('user')->getLastSql();die;
 
+     // echo Db::name('user')->getLastSql();die;
 
         // 获取分页显示
 
         // 获取分页显示
 
         $page = $list->render();
 
         $page = $list->render();
 
         $this->assign('list', $list);
 
         $this->assign('list', $list);
 
@@ -961,8 +973,34 @@ class AdminIndexController extends AdminBaseController
 
 
 
         if (isset($param['ids'])) {
 
         if (isset($param['ids'])) {
 
             $ids = $this->request->param('ids');
 
             $ids = $this->request->param('ids');
 
+            //通过id来获取举报页面
 
+            Db::startTrans();
 
+            $result=Db::name('complain')->where('id',$ids)->find();
 
+            if($result){
 
+                //进行奖励
 
+                $member=Member::checkComplain($result['uid'],$result);
 
+                if($member){
 
+                     //变更举报状态
 
+                    $complain=Db::name('complain')->where('id', 'in', $ids)->update(['status' => 2]);
 
+                    if($complain){
 
+
 
+                    }else{
 
+                          Db::rollback();   
+                         $this->error("处理失败！");
 
+                    }
 
+
 
+                }else{
 
+                    Db::rollback();   
+                    $this->error("处理失败！");
 
+                }
 
+              
+                Db::commit();   
+            }else{
 
+                Db::rollback();   
+                $this->error("处理失败！");
 
+            }
 
+            
 
 
-            Db::name('complain')->where('id', 'in', $ids)->update(['status' => 2]);
 
          // echo   Db::name('complain')->getLastSql();die;
 
          // echo   Db::name('complain')->getLastSql();die;
 
             $this->success("处理成功！");
 
             $this->success("处理成功！");
 
 
 
@@ -1545,14 +1583,14 @@ class AdminIndexController extends AdminBaseController
 
 
 
         // 修改 end
 
         // 修改 end
 
         $list = Db::name('user')->field('u.id,u.user_login,u.user_nickname,u.real_name,u.redheart,u.is_tuijian,u.create_time,u.is_heart,u.user_status,u.mobile,u.freezing,u.updated_at,u.last_login_time,u.vip_auth,u.vip_expire,up.idcard,
 
         $list = Db::name('user')->field('u.id,u.user_login,u.user_nickname,u.real_name,u.redheart,u.is_tuijian,u.create_time,u.is_heart,u.user_status,u.mobile,u.freezing,u.updated_at,u.last_login_time,u.vip_auth,u.vip_expire,up.idcard,
 
-            up.idcard_check,up.position_check,up.education_check')
 
+            up.idcard_check,up.position_check,rl.money,rl.pay_money,up.education_check')
 
             ->alias('u')
 
             ->alias('u')
 
             ->join('user_profile up','u.id=up.userid','left')
 
             ->join('user_profile up','u.id=up.userid','left')
 
-            
+            ->join('user_recharge_log rl','rl.user_id=u.id','left')
 
             ->where(function (Query $query) use($data){
 
             ->where(function (Query $query) use($data){
 
                 $query->where('u.user_type', 2);
 
                 $query->where('u.user_type', 2);
 
                 $query->where('u.openid', 'not in','');
 
                 $query->where('u.openid', 'not in','');
 
-
 
+                $query->where('rl.type', 4);
 
                 $query->where('u.vip_auth', 1);
 
                 $query->where('u.vip_auth', 1);
 
 
 
                 $this->screenpublic();
 
                 $this->screenpublic();
 
@@ -1561,7 +1599,7 @@ class AdminIndexController extends AdminBaseController
 
             })
 
             })
 
 
 
             //待审核
 
             //待审核
 
-            ->order("u.create_time DESC")
 
+            ->order("rl.created_at DESC")
 
             ->paginate(10,false,['query'=>request()->param()]);
 
             ->paginate(10,false,['query'=>request()->param()]);
 
        //echo Db::name('user')->getLastSql();die;
 
        //echo Db::name('user')->getLastSql();die;
 
         // 获取分页显示
 
         // 获取分页显示
 
@@ -1600,7 +1638,7 @@ class AdminIndexController extends AdminBaseController
 
         // 修改 end
 
         // 修改 end
 
 
 
         //var_dump($data);die;
 
         //var_dump($data);die;
 
-        $list = Db::name('complain')->field('u.id as ids,u.user_login,u.user_nickname,u.real_name,u.redheart,u.is_tuijian,u.create_time,u.is_heart,u.user_status,u.mobile,u.freezing,u.updated_at,u.last_login_time,c.id,c.c_uid,
 
+        $list = Db::name('complain')->field('u.id as ids,u.user_login,u.user_nickname,u.real_name,u.redheart,u.is_tuijian,u.create_time,u.is_heart,u.user_status,u.mobile,u.freezing,u.updated_at,u.last_login_time,c.id,c.type,c.c_uid,
 
             c.remark,c.image,c.created_time,c.status')
 
             c.remark,c.image,c.created_time,c.status')
 
             ->alias('c')
 
             ->alias('c')
 
             ->join('user u','u.id=c.uid','left')
 
             ->join('user u','u.id=c.uid','left')