Главная Обзор Помощь
Вход
waibao
/
NN2021012701
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

分销的提交

bbylq 5 лет назад
Родитель
5dc4e25800
Сommit
4e73440ec6
5 измененных файлов с 275 добавлено и 14 удалено
Единый вид Показать статистику Diff
  1. 3 4
      public/themes/admin_simpleboot3/admin/market/marketrecord.html
  2. 2 2
      public/themes/admin_simpleboot3/admin/market/markettrans.html
  3. 216 0
      public/themes/admin_simpleboot3/admin/market/marketwithdrawrecord.html
  4. 1 7
      public/themes/admin_simpleboot3/admin/market/transinfo.html
  5. 53 1
      vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php

+ 3 - 4
public/themes/admin_simpleboot3/admin/market/marketrecord.html
Просмотреть файл 

@@ -9,8 +9,8 @@
 
         <form class="well form-inline margin-top-20" method="get" action="{:url('Love/index')}">
 
         <form class="well form-inline margin-top-20" method="get" action="{:url('Love/index')}">
 
             昵称:
 
             昵称:
 
             <input type="text" class="form-control" name="user_nickname" style="width: 150px;" value="{:input('request.user_login/s','')}" placeholder="请输入用户名称">
 
             <input type="text" class="form-control" name="user_nickname" style="width: 150px;" value="{:input('request.user_login/s','')}" placeholder="请输入用户名称">
 
-             爱心数量:
 
-            <input type="text" class="form-control" name="money" id="money" style="width: 120px;" value="" placeholder="请输入爱心数量">
 
+           <!--   爱心数量:
 
+            <input type="text" class="form-control" name="money" id="money" style="width: 120px;" value="" placeholder="请输入爱心数量"> -->
 
 <!--            邮箱:
 
 <!--            邮箱:
 
             <input type="text" class="form-control" name="user_email" style="width: 120px;" value="{:input('request.user_email/s','')}" placeholder="请输入">-->
 
             <input type="text" class="form-control" name="user_email" style="width: 120px;" value="{:input('request.user_email/s','')}" placeholder="请输入">-->
 
             <input type="submit" class="btn btn-primary" value="搜索" />
 
             <input type="submit" class="btn btn-primary" value="搜索" />
 
@@ -43,8 +43,7 @@
 
 				<tr>
 
 				<tr>
 
 
 
 					 <td>
 
 					 <td>
 
-                        <input type="checkbox" class="js-check" data-yid="js-check-y" data-xid="js-check-x" name="ids[]"
 
-                               value="{$vo.id}">
 
+                        <input type="checkbox" class="js-check" data-yid="js-check-y" data-xid="js-check-x" name="ids[]" value="{$vo.id}">
 
                     </td>
 
                     </td>
 
                     
                     
 					<td>{$vo.id}</td>
 
 					<td>{$vo.id}</td>

+ 2 - 2
public/themes/admin_simpleboot3/admin/market/markettrans.html
Просмотреть файл 

@@ -9,8 +9,8 @@
 
         <form class="well form-inline margin-top-20" method="get" action="{:url('Love/index')}">
 
         <form class="well form-inline margin-top-20" method="get" action="{:url('Love/index')}">
 
             昵称:
 
             昵称:
 
             <input type="text" class="form-control" name="user_nickname" style="width: 150px;" value="{:input('request.user_login/s','')}" placeholder="请输入用户名称">
 
             <input type="text" class="form-control" name="user_nickname" style="width: 150px;" value="{:input('request.user_login/s','')}" placeholder="请输入用户名称">
 
-             爱心数量:
 
-            <input type="text" class="form-control" name="money" id="money" style="width: 120px;" value="" placeholder="请输入爱心数量">
 
+           <!--   爱心数量:
 
+            <input type="text" class="form-control" name="money" id="money" style="width: 120px;" value="" placeholder="请输入爱心数量"> -->
 
 <!--            邮箱:
 
 <!--            邮箱:
 
             <input type="text" class="form-control" name="user_email" style="width: 120px;" value="{:input('request.user_email/s','')}" placeholder="请输入">-->
 
             <input type="text" class="form-control" name="user_email" style="width: 120px;" value="{:input('request.user_email/s','')}" placeholder="请输入">-->
 
             <input type="submit" class="btn btn-primary" value="搜索" />
 
             <input type="submit" class="btn btn-primary" value="搜索" />

+ 216 - 0
public/themes/admin_simpleboot3/admin/market/marketwithdrawrecord.html
Просмотреть файл 

@@ -0,0 +1,216 @@
 
+<include file="public@header"/>
 
+</head>
 
+<body>
 
+<div class="wrap js-check-wrap">
 
+    <ul class="nav nav-tabs">
 
+        <li class="active">
 
+        <a> 分销用户待提现</a>
 
+        </li>
 
+    </ul>
 
+
 
+    
+      <form class="well form-inline margin-top-20" method="post" action="{:url('Market/marketexamine',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> -->
 
+
 
+        
+
 
+    </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>单号</th>
 
+                <th>昵称</th>
 
+                <th>真实姓名</th>
 
+                <th>提现金额</th>
 
+                <th>实付金额</th>
 
+                <th>账户余额</th>
 
+                <th>提现时间</th>
 
+          
+                <th>来源</th>
 
+                <th>用户层级</th>
 
+        
+
 
+                <th>操作类型</th>
 
+                <th>{:lang('STATUS')}</th>
 
+                <th>操作</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_id']}</td>
 
+                    <td>{$vo.order_sn}</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['change']}</td>
 
+                    <td>{$vo['pay_money']}</td>
 
+                    <td>{$vo['balance']}</td>
 
+                 
+                    <td>{:date('Y-m-d H:i:s',$vo['create_time'])} </td>
 
+                      
+                    <td><span style="color:red"><!-- {$vo.source_username.real_name} -->{$vo.source_username.user_nickname}</span></td>
 
+                    
+                    <td>{$vo.level}</td>
 
+     
+                    <td> 
+                      <switch name="vo.change_type">
 
+                            <case value="1">
 
+                               <span style="color:red">收入</span>
 
+                            </case>
 
+                            <case value="2">
 
+                              <span style="color:green">支出</span>
 
+                            </case>
 
+                            <case value="">
 
+                                <span style="color:blue">未填</span>
 
+                            </case>
 
+                        </switch> 
+                    </td>
 
+
 
+                    <td>
 
+                      
+                       <switch name="vo.status">
 
+                            <case value="1">
 
+                               <span style="color:red">待审核</span>
 
+                            </case>
 
+                            <case value="2">
 
+                              <span style="color:green">审核成功</span>
 
+                            </case>
 
+                            <case value="3">
 
+                                <span style="color:blue">审核失败</span>
 
+                            </case>
 
+                            <case value="4">
 
+                                <span style="color:blue">删除</span>
 
+                            </case>
 
+                            <case value="">
 
+                                <span style="color:blue">未填</span>
 
+                            </case>
 
+                        </switch> 
+                    </td>
 
+                    
+                   
+                    <td>
 
+
 
+                      <if condition="$Request.action eq 'userlogout' || $Request.param.u eq 5">
 
+                    <a class="btn btn-xs btn-primary" href="{:url('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/>
 
+
 
+                      <a class="btn btn-xs btn-primary" onclick="getPaike({$vo['id']})" >查看</a>
 
+                     <!--  <a class="btn btn-xs btn-primary" onclick="getPaike2({$vo['id']},{$vo['balance']})" >
 
+                              审核</a> -->
 
+
 
+                      </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 getPaike(id){
 
+          openIframeLayer("{:url('Market/transinfo')}?id=" + id +"&type=tixian", "", {
 
+              area: ['880px', '600px'],
 
+              btn: ['确定', '取消'],
 
+          })
 
+      }
 
+      
+      function getPaike2(id,balance){
 
+      var addUrl = "{:url('Market/godrawconfrom')}?id="+id+"&balance="+balance;
 
+      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();
 
+              }
 
+      });
 
+
 
+     }
 
+
 
+  </script>
 
+</body>
 
+</html>

+ 1 - 7
public/themes/admin_simpleboot3/admin/market/transinfo.html
Просмотреть файл 

@@ -74,13 +74,7 @@
 
                         </td>
 
                         </td>
 
                     </tr>
 
                     </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>
 
                     <tr>

+ 53 - 1
vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php
Просмотреть файл 

@@ -831,7 +831,7 @@ class MarketController extends AdminBaseController
 
             }
 
             }
 
 
 
         })
 
         })
 
-        ->field('blog.*,u.user_nickname')
 
+        ->field('blog.*,u.user_nickname,u.real_name')
 
         ->find();
 
         ->find();
 
 
 
      
      
@@ -1234,6 +1234,58 @@ 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
 
+
 
+        //var_dump($data);die;
 
+        $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','neq',1);   //已审核
 
+
 
+            })
 
+            
+            ->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('marketwithdrawrecord');
 
+
 
+     }
 
+