分销的员列表的展示

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

@@ -26,7 +26,7 @@
                         <input type="checkbox" class="js-check-all" data-direction="x" data-checklist="js-check-x">
                     </label>
                 </th>
-                <th width="100">ID</th>
+                <th >ID</th>
                 <th>标题</th>
                 <th>参数标识</th>
                 <th >奖励方式</th>

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

@@ -271,6 +271,7 @@ class MarketController extends AdminBaseController
             ->where(function (Query $query) use($data){
                 $query->where('u.user_type', 2);
                 $query->where('u.openid', 'not in','');
+                $query->where('u.agent_type',1);
                 $query->where('u.agent_status',2);   //待审核
 
                 //代表是否付费定制
@@ -427,6 +428,8 @@ class MarketController extends AdminBaseController
             ->where(function (Query $query) use($data){
 
                 $query->where('u.user_type', 2);
+                $query->where('u.agent_type', 1);
+                
                 $query->where('u.openid', 'not in','');
                 if($data['agent_type']==0){
                  $query->where(array('u.parent_id' =>$data['id'],'agent_type'=>0));
@@ -763,7 +766,7 @@ class MarketController extends AdminBaseController
                     $checkTime = date('Y.m.d H:i');
                     $remark = "感谢您对拾光的信任，我们一起解救单身青年！点击查看分销中心";
                     $msgParams = [
-                        'title' => "您的分销员已审核通过！",
+                        'title' => "您的推广红娘账号已审核通过！",
                         'remark' => $remark,
                         'type' => 'confirm',
                         'keywords' => [
@@ -805,7 +808,7 @@ class MarketController extends AdminBaseController
                     $checkTime = date('Y.m.d H:i');
                     $remark = $param['noremark'];
                     $msgParams = [
-                        'title' => "您的分销员不通过审核！",
+                        'title' => "您的推广红娘账号不通过审核！",
                         'remark' => $remark,
                         'type' => 'confirm',
                         'keywords' => [
@@ -1013,19 +1016,17 @@ class MarketController extends AdminBaseController
 
 
         $this->assign("id",input('id'));
-
-        $level2Award = isset($marketConfig['level_2']) ? floatval($marketConfig['level_2']) : 0;
-        $awardMoneyTwo = $marketType==1? moneyFormat($level2Award) : moneyFormat($money * ($level2Award / 100));
         
-        $logData['levelAward'] = $level2Award;
-        if ($level2Award > 0 && $level2Award <= 100 && $awardMoneyTwo > 0) {
+        $where = ['id' => input('id'), 'agent_type' => 1, 'agent_status' => 1];
+        $result=Db::name('user')->where($where)->find();
+        if ($result) {
+            $awardMoney=$result['balance']+input('am');
             // 账户变动
             Db::startTrans();
-            if (Member::where($whereTwo)->setInc('balance', $awardMoneyTwo)) {
-                // 写入奖励日志
-                $levelName = "您的下级[{$nickname}]邀请的[{$sourceNickname}]用户";
-                $marketName = isset($marketConfig['name']) ? $marketConfig['name'] : '分销收益';
-                $logTitle = "{$levelName}消费{$money}元,获得{$marketName}{$awardMoneyTwo}元";
+            if (Member::where($where)->setInc('balance', $awardMoney)) {
+                // 写入分销奖励日志
+           
+                $logTitle = "你获得了".input('ar')."奖励,额度".input('am')."元";
                 $log = [
                     'change' => $awardMoneyTwo,
                     'type' => $type,