分销的用户

public/themes/admin_simpleboot3/admin/market/marketoneuser.html

@@ -213,7 +213,7 @@
                 </if>
               <!--   <th>登录时间</th> -->
               
-         
+                 <th>资料完善</th>
                 <th>{:lang('STATUS')}</th>
                 <th>{:lang('ACTIONS')}</th>
             </tr>
@@ -274,7 +274,7 @@
                     <else/>
                         <td>{$vo.mobile}</td>
                     </if>
-                      <if condition="$Request.action eq 'custom' || $Request.param.u eq 2 || $Request.param.u eq 4">
+              <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>
@@ -286,67 +286,22 @@
                         <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>
+                        <switch name="vo.is_reg_profile">
+                       
+                              <case value="1">
+                                  <span class="label label-success">已完善</span>
+                              </case>
+                              <case value="2">
+                                  <span class="label label-warning">未完善</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>

vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php

@@ -103,7 +103,7 @@ class MarketController extends AdminBaseController
         // 修改 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,last_login_time,up.idcard,
+        $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,up.idcard,
             up.idcard_check,up.position_check,up.education_check')
             ->alias('u')
             ->join('user_profile up','u.id=up.userid','left')
@@ -229,9 +229,9 @@ class MarketController extends AdminBaseController
             ->order("u.create_time DESC")
             ->paginate(10,false,['query'=>request()->param()])
             ->each(function($item,$key){
-                $item['marketusername'] = Db::name('user')->where('id',$item['parent_id'])->field('real_name,user_nickname')->find();
-                $item['marketcount'] = Db::name('user')->where(array('parent_id'=>$item['id'],'agent_type'=>1))->count('id');
-                $item['marketusercount'] = Db::name('user')->where(array('parent_id' =>$item['id'],'agent_type'=>0))->count('id');
+                $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,'agent_type'=>1))->count('id');
+                $item['marketusercount'] = Db::name('user')->where(array('parent_id' =>$item['id'],'user_status'=>1,'agent_type'=>0))->count('id');
 
 
                 return $item;
@@ -424,10 +424,9 @@ class MarketController extends AdminBaseController
         // 修改 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,last_login_time,up.idcard,
-            up.idcard_check,up.position_check,up.education_check')
+        $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')
             ->alias('u')
-            ->join('user_profile up','u.id=up.userid','left')
+     
             
             ->where(function (Query $query) use($data){
 
@@ -559,15 +558,15 @@ class MarketController extends AdminBaseController
             ->order("u.create_time DESC")
             ->paginate(10,false,['query'=>request()->param()])
             ->each(function($item,$key){
-                $item['marketusername'] = Db::name('user')->where('id',$item['parent_id'])->field('real_name,user_nickname')->find();
-                $item['marketcount'] = Db::name('user')->where('parent_id',$item['id'])->count('id');
-                $item['marketusercount'] = Db::name('user')->where(array('parent_id'=>$item['id'],'agent_type'=>0))->count('id');//普通用户会员，不是分销员
+                $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;
+    // echo Db::name('user')->getLastSql();die;
         // 获取分页显示
         $page = $list->render();
       
@@ -1260,7 +1259,7 @@ class MarketController extends AdminBaseController
                                         'color'=>'#173177',
                                     ]
                                 ],
-                                'url' =>url('/weixin/Account/withdraw','','',true),
+                                'url' =>url('/weixin/Account/withdrawLog','','',true),
 
                             ];
 
@@ -1329,7 +1328,7 @@ class MarketController extends AdminBaseController
                                         'color' => '#c9302c',
                                     ],
                                 ],
-                                'url' => url('/weixin/market/index', '', '', true),
+                                'url' => url('/weixin/Account/withdrawLog', '', '', true),
                             ];
                     
                         Wechat::sendTplMsg($result['openid'], $msgParams);