分销修改

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

@@ -55,7 +55,7 @@
         <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>
+       <!--  <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>
@@ -373,10 +373,10 @@
 
                             <else/>
                                  <php> $adminId = cmf_get_current_admin_id(); </php>
-           
+           <!-- 
                              <if condition="$adminId eq 1">
                                 <a class="btn btn-xs btn-danger" href="{:url('user/adminIndex/accountadd',array('id'=>$vo['id']))}">爱心充值</a>
-                             </if>
+                             </if> -->
                           </if>
 
                           <a class="btn btn-xs btn-primary" onclick="getPaike2({$vo['id']})"  >

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

@@ -408,9 +408,9 @@
                             <else/>
                                  <php> $adminId = cmf_get_current_admin_id(); </php>
            
-                             <if condition="$adminId eq 1">
+                             <!-- <if condition="$adminId eq 1">
                                 <a class="btn btn-xs btn-danger" href="{:url('adminIndex/accountadd',array('id'=>$vo['id']))}">爱心充值</a>
-                             </if>
+                             </if> -->
                           </if>
 
                        

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

@@ -60,8 +60,8 @@
 
         <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>
+<!-- 
+        <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>
@@ -420,9 +420,9 @@
                             <else/>
                                  <php> $adminId = cmf_get_current_admin_id(); </php>
            
-                             <if condition="$adminId eq 1">
+                            <!--  <if condition="$adminId eq 1">
                                 <a class="btn btn-xs btn-danger" href="{:url('adminIndex/accountadd',array('id'=>$vo['id']))}">爱心充值</a>
-                             </if>
+                             </if> -->
                           </if>
 
                        

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

@@ -166,46 +166,8 @@
 
                     <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('user/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" onclick="getPaike({$vo['id']})" 
-                                    >冻结</a>
-                              </empty>
-                              <else/>
-                              <a class="btn btn-xs btn-warning disabled">冻结</a>
-
-                          </neq>
-                                       <a class="btn btn-xs btn-warning js-ajax-dialog-btn" style="background-color: #5c0d8e;border-color:#5c0d8e"  href="{:url('Market/todelete',array('yes'=>1,'ids'=>$vo['id']))}" data-msg="确认删除该用户？">删除</a>
+                      <a class="btn btn-xs btn-primary" onclick="getPaike({$vo['id']})" >查看</a>
                        
-                          <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('user/adminIndex/accountadd',array('id'=>$vo['id']))}">爱心充值</a>
-                             </if>
-                          </if> -->
-
-                          <a class="btn btn-xs btn-primary" 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>
                      
@@ -225,21 +187,12 @@
 
 <script >
 
-function getPaike2(id,user_id){
-      var addUrl = "{:url('Market/godrawconfrom')}?id="+id+"&=userid"+user_id;
-      layer.open({
-      type: 2, //1：页面层，2：iframe层，3：加载层，4：tips层。
-      title: '提现审核操作',
-      shadeClose: false, //不开启遮罩关闭,也就是说，点击弹出层其它地方不会关闭弹出框
-      shade: 0.8, //遮罩
-      area: ['380px', '260px'],
-      content: addUrl,
-      end: function () { //最后执行reload
-                  location.reload();
-              }
-      });
-
-     }
+    function getPaike(id){
+          openIframeLayer("{:url('Market/transinfo')}?id=" + id +"&type=tixian", "", {
+              area: ['880px', '600px'],
+              btn: ['确定', '取消'],
+          })
+      }
   </script>
 </body>
 </html>

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

@@ -10,8 +10,136 @@
 </head>
 <body>
 <div class="wrap js-check-wrap"> 
+ 
+
+    <if condition="$Request.param.type eq 'tixian'">
+    <ul class="nav nav-tabs">
+        <li class="active"><a href="#" color="blue">提现明细详情</a></li>
+    </ul>
+    <form action="{:url('Activity/editPost')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
+        <div class="row">
+            <div class="col-md-9">
+                <table class="table table-bordered">
+                    <tr>
+                        <th style="width:120px;">单号</th>
+                        <td>
+                            <input class="form-control" type="text" name="title"
+                                   id="title" required value="{$order_sn}" readonly="readonly" placeholder=""/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th style="width:120px;">昵称</th>
+                        <td>
+                            <input class="form-control" type="text" name="title"
+                                   id="title" required value="{$user_nickname}" readonly="readonly" placeholder=""/>
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <th style="width:120px;">真实姓名</th>
+                        <td>
+                            <input class="form-control" type="text" name="title"
+                                   id="title" required value="{$real_name}" readonly="readonly" placeholder=""/>
+                        </td>
+                    </tr>
+                    
+                    <tr>
+                        <th style="width:120px;">提现金额</th>
+                        <td>
+                            <input class="form-control" type="text" name="title"
+                                   id="title" required value="{$change}" readonly="readonly" placeholder=""/>
+                        </td>
+                    </tr>
+                     <tr>
+                        <th style="width:120px;">实付金额</th>
+                        <td>
+                            <input class="form-control" type="text" name="title"
+                                   id="title" required value="{$pay_money}" readonly="readonly" placeholder=""/>
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <th style="width:120px;">账户余额</th>
+                        <td>
+                            <input class="form-control" type="text" name="title"
+                                   id="title" required value="{$balance}" readonly="readonly" placeholder=""/>
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <th style="width:120px;">提现时间</th>
+                        <td>
+                            <input class="form-control" type="text" name="act_nums"
+                                   id="title" required value="{:date('Y-m-d H:i:s',$create_time)}" readonly="readonly" placeholder=""/>
+                        </td>
+                    </tr>
+                    
+                    <tr>
+                        <th style="width:120px;"> 来源</th>
+                        <td>
+                            <input class="form-control" type="text" name="price"
+                                   id="title" required value="{$source_username}" readonly="readonly" placeholder=""/>
+                        </td>
+                    </tr>
+                    
+                        
+                    <tr>
+                        <th> 变动类型</th>
+                        <td>
+
+                         <input class="form-control js-bootstrap-datetime" type="text" readonly="readonly" name="starttime"
+                                value="<switch name="type">
+                                    <case value="1">提现</case>
+                                  
+                                 
+                            </switch>">
+                            
+                        
+                                
+                         </td>
+                    </tr>
+                      
+                    <tr>
+                        <th style="width:120px;">操作类型</th>
+                        <td>
+                            <input class="form-control" type="text" readonly="readonly" name="address"
+                                   id="title"  value="<switch name="change_type">
+                            <case value="1">收入</case>
+                            <case value="2">支出</case>
+                        </switch>" placeholder=""/>
+                        </td>
+                    </tr>
+             
+                    <tr>
+                        <th style="width:120px;">状态</th>
+                        <td>
+                                <input class="form-control" type="text" readonly="readonly" name="address"
+                                   id="title"  value="<switch name="status">
+                            <case value="1">待支付 </case>
+                            <case value="2">已完成 </case>
+                         </switch>" placeholder=""/>
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <th>描述</th>
+                        <td >
+                              <textarea class="form-control" name="act_flow" readonly="readonly" style="height: 80px;"
+                                      placeholder="" >{$description}</textarea>
+                        </td>
+                    </tr>
+
+                   
+                </table>
+             
+            </div>
+          
+        </div>
+    </form>
+     <else/>
+
     <ul class="nav nav-tabs">
-        <li class="active"><a href="#" color="blue">爱心明细详情</a></li>
+        <li class="active"><a href="#" color="blue">分销明细详情</a></li>
     </ul>
     <form action="{:url('Activity/editPost')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
         <div class="row">
@@ -91,18 +219,15 @@
 
                    
                 </table>
-                
-              <!--   <div class="form-group">
-                    <div class="col-sm-offset-2 col-sm-10">
-                      
-                        <button type="submit"  class="btn btn-primary js-ajax-submit">{:lang('SAVE')}</button>
-                        <a class="btn btn-default" href="{:url('Activity/index')}">{:lang('BACK')}</a>
-                    </div>
-                </div> -->
+             
             </div>
           
         </div>
     </form>
+    
+
+    </if>
+
 </div>
 
 

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

@@ -559,161 +559,7 @@ class MarketController extends AdminBaseController
     }
 
 
-    //显示子级用户显示
-    public function Markettwouser(){
-
-        $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.create_time,u.is_heart,u.user_status,u.mobile,u.freezing,u.updated_at,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')
-            
-            ->where(function (Query $query) use($data){
-                $query->where('u.user_type', 2);
-                $query->where('u.openid', 'not in','');
-                $query->where('u.agent_type',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->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);
-                }
-
-                //代表是否筛选
-                 ($this->request->action()=='screen' || $this->request->param('u')==4)?$query->where('u.is_screen', 1):$query->where('u.is_screen', 0);
-
-                  //代表是否注销
-                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);
-                }
-
-                //$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_nickname|u.real_name|u.mobile', 'like', "%$keyword%");
-                }
-                //年龄区间查询
-                if((!empty($data['age1']) && $data['age1']!='none') && (!empty($data['age2']) && $data['age2']!='none')){
-
-                    $query->where('u.birthday',['>',strtotime($data['age1'])],['<',strtotime($data['age2'])],'and');
-                    $query->whereNotNull('u.birthday');
-                }
-
-                // //只有第一个年龄的情况下
-                if((!empty($data['age1']) && $data['age1']!='none') && (empty($data['age2']) || $data['age2']=='none')){
-                    $birthday = $data['age1'];
-                    $query->whereRaw("YEAR(from_unixtime(u.`birthday`))=$birthday and u.birthday is not null ");
-                }
-
-                // //只有第二个年龄的情况下
-                if((empty($data['age1']) || $data['age1']=='none') && (!empty($data['age2']) && $data['age2']!='none')){
-                    $birthday = $data['age2'];
-                    $query->whereRaw("YEAR(from_unixtime(u.`birthday`))=$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_province|up.home_city','like','%'.input('home_city').'%','or');
-                }
-                //居住地(市)
-
-                if((!empty(input('city')) && input('city')!='none') ){
-
-                    $query->where('up.city','like','%'.input('city').'%');
-                }
-                //婚姻状况
-                if((!empty(input('married')) && input('married')!='none') ){
-
-                    $query->where('up.married',input('married'));
-                }
-
-                //性别
-                if((!empty(input('sex')) && input('sex')!='none') ){
-
-                    $query->where('u.sex',input('sex'));
-                }
-
-
-            })
-
-            //待审核
-            ->order("u.create_time DESC")
-            ->paginate(10,false,['query'=>request()->param()]);
-       // echo Db::name('user')->getLastSql();die;
-        // 获取分页显示
-        $page = $list->render();
-        $this->assign('list', $list);
-        $this->assign('page', $page);
-        
-
-        return $this->fetch();
-
-
-    }
+  
 
     
     /**
@@ -831,10 +677,13 @@ class MarketController extends AdminBaseController
             }
 
         })
-        ->field('blog.*,u.user_nickname')
+        ->field('blog.*,u.user_nickname,u.real_name')
         ->find();
+        
+            
+         $source_username= Db::name('user')->where(['id'=> $balance_log['source_uid'], 'user_type'=> 2])->field('user_nickname')->find();
 
-     
+        $this->assign('source_username',$source_username['user_nickname']);
         $this->assign($balance_log);
         return $this->fetch();
 
@@ -1170,6 +1019,57 @@ class MarketController extends AdminBaseController
 
      }
 
+     //显示分销员提现记录 
+     public function withdrawrecord(){
+
+        $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
+
+        $list = Db::name('user_balance_log')
+
+            ->alias('ub')
+            ->join('user u','u.id = ub.user_id','left')
+            ->where(function (Query $query) use($data){
+
+                $query->where('ub.type', 1);  
+                $query->where('ub.status',2);   //已审核
+
+            })
+            
+            ->field('ub.*,u.user_nickname,u.real_name')
+
+            //待审核
+            ->order("ub.create_time DESC")
+            ->paginate(10,false,['query'=>request()->param()])
+            ->each(function($item,$key){
+
+                 $item['source_username'] = Db::name('user')->where(['id'=> $item['source_uid'], 'user_type'=> 2])->field('real_name,user_nickname')->find();
+          
+               return $item;
+
+            })
+            ;
+         //echo Db::name('user')->getLastSql();die;
+        // 获取分页显示
+        $page = $list->render();
+        $this->assign('list', $list);
+        $this->assign('page', $page);
+
+        return $this->fetch('marketwithdraw');
+     }
+