后台的审核分销的

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

@@ -403,195 +403,7 @@
 <script src="__STATIC__/js/admin.js"></script>
 <script src="__STATIC__/js/clipboard.min.js"></script>
 <script src="__STATIC__/js/layer/layer.js"></script>
-<script src="__STATIC__/js/position/position1.js" type="text/javascript"></script>
-<script src="__STATIC__/js/height/height.js" type="text/javascript"></script>
-<script>
-
-    function reloadPage(win) {
-        win.location.reload();
-    }
-
-    /**
-     * 生成二维啊
-     * @returns {boolean}
-     */
-    function makeQrcode() {
-        var url = $("#url").val();
-        if(url == '' || url == null){
-            showMsg('请填写生成参数');
-            return false;
-        }
-
-        // 生成处理
-        $(".qrcode a").html("二维码生成中...");
-        $.post('/user/recommend/makeQrcode', {url: url}, function(res){
-            if(res.code == 'success'){
-                showMsg(res.message);
-                $(".qrcode a").attr('data-href', res.data.qrcode);
-                $(".qrcode a").html('<img src="'+res.data.qrcode+'" width="48" height="48"/>');
-            }else{
-                $(".qrcode a").html("");
-                showMsg(res.message);
-            }
-        },'json');
-    }
-
-    $(function () {
-        var copyText = '';
-        var copyBox = new ClipboardJS('.copy',{
-            text: function (e) {
-                if(copyText=='' || copyText == null){
-                    showMsg('暂无复制内容');
-                    return false;
-                }
-                return copyText;
-            }
-        });
-        copyBox.on("success",function(e){
-            console.log(e);
-            showMsg('复制成功');
-        });
-        copyBox.on("error",function(e){
-            showMsg('复制失败');
-        });
-
-        $(".copy-btn").click(function(){
-            copyText = $(this).attr('data-url');
-        });
-
-        $(".qrcode a").click(function(){
-            var url = $(this).attr('data-href');
-            if(url){
-                imagePreviewDialog(url);
-            }
-        })
-
-        setCookie("refersh_time", 3);
-        Wind.use('ajaxForm', 'artDialog', 'iframeTools', function () {
-            //批量冻结
-            $('#js-batch-delete').click(function (e) {
-                var ids = [];
-                $("input[name='ids[]']").each(function () {
-                    if ($(this).is(':checked')) {
-                        ids.push($(this).val());
-                    }
-                });
-
-                if (ids.length == 0) {
-
-                    return false;
-                }
-
-                ids = ids.join(',');
-                /*art.dialog.open("/user/admin_index/del.html?ids="+ids, {
-                    title: "批量冻结",
-                    width: "300px",
-                    close : function () {
-                        art.dialog.open.origin.location.reload();
-                    }
-                });*/
-            });
-            //end
-        });
-    });
-
-</script>
-<script type="text/javascript" >
-         //获得大职位下拉框对象
-          var province = document.getElementById("position1");
-          //遍历大职位数据,并把里面大职位的数据追加到option选项中
-          for (var i=0; i<positions.length; i++) {
-              var option = document.createElement("option");
-              option.value = positions[i].p_name;
-              option.innerHTML = positions[i].p_name;
-              province.appendChild(option);
-          }
-
-          
-           
-          //  function abc(){   
-          //   alert(document.getElementById('position1').value);
-
-          //   var  proindex=  document.getElementById('position1').selectedIndex;
-          //   var  cityindex=  document.getElementById('position2').selectedIndex;
-          //   alert(document.getElementById('position1').options[proindex].text+document.getElementById('position2').options[cityindex].text);
-          // }
-      </script>
-
-  <script type="text/javascript" >
-         //获得身高下拉框对象
-          var province = document.getElementById("height");
-          //遍历身高数据,并把里面身高的数据追加到option选项中
-          for (var i=0; i<heights.length; i++) {
-              var option = document.createElement("option");
-              option.value = heights[i].p_id;
-              option.innerHTML = heights[i].p_name;
-              province.appendChild(option);
-          }
-
-    </script>
-
-     <script type="text/javascript" >
-         //获得身高下拉框对象
-          var provincet = document.getElementById("heightt");
-          //遍历身高数据,并把里面身高的数据追加到option选项中
-          for (var i=0; i<heights.length; i++) {
-              var option = document.createElement("option");
-              option.value = heights[i].p_id;
-              option.innerHTML = heights[i].p_name;
-              provincet.appendChild(option);
-          }
-
-            provincet.onchange = function() { 
-                 var heightval=this.value;
-              
-                 if($('#height').val()!='none'){
-                     if($('#height').val()>this.value){
-                        alert('开始升高不能大于结束身高！');
-                     }
-   
-                 }
-                 
-            }
 
-    </script>
-
-<script>
-    function reloadPage(win) {
-        win.location.reload();
-    }
-
-    $(function () {
-        setCookie("refersh_time", 3);
-        Wind.use('ajaxForm', 'artDialog', 'iframeTools', function () {
-            //批量冻结
-            $('#js-batch-delete').click(function (e) {
-                var ids = [];
-                $("input[name='ids[]']").each(function () {
-                    if ($(this).is(':checked')) {
-                        ids.push($(this).val());
-                    }
-                });
-
-                if (ids.length == 0) {
-
-                    return false;
-                }
-
-                ids = ids.join(',');
-                /*art.dialog.open("/user/admin_index/del.html?ids="+ids, {
-                    title: "批量冻结",
-                    width: "300px",
-                    close : function () {
-                        art.dialog.open.origin.location.reload();
-                    }
-                });*/
-            });
-            //end
-        });
-    });
-
-</script>
 <script>
     function doDelete() {
         // Wind.use('artDialog', function () {

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

@@ -4,7 +4,7 @@
 <div class="wrap js-check-wrap">
      <ul class="nav nav-tabs">
         <li class="active"><a href="{:url('Market/showmarklist')}">分销设置列表</a></li>
-        <li><a href="{:url('Market/marketset')}">添加分销设置</a></li>
+        <!-- <li><a href="{:url('Market/marketset')}">添加分销设置</a></li> -->
     </ul>
     <form class="well form-inline margin-top-20" method="post" action="{:url('AdminPage/index')}">
         标题:
@@ -14,9 +14,9 @@
     </form>
     <form class="js-ajax-form" method="post">
         <div class="table-actions">
-            <button class="btn btn-danger btn-sm js-ajax-submit" type="submit" data-action="{:url('AdminPage/delete')}"
+         <!--    <button class="btn btn-danger btn-sm js-ajax-submit" type="submit" data-action="{:url('Market/deleteset',array('yes'=>1))}"
                     data-subcheck="true" data-msg="{:lang('DELETE_CONFIRM_MESSAGE')}">{:lang('DELETE')}
-            </button>
+            </button> -->
         </div>
         <table class="table table-hover table-bordered table-list">
             <thead>
@@ -34,6 +34,7 @@
                 <th >二级分成金额/比例</th>
                 <th >三级级分成金额/比例</th>
                 <th >更新时间</th>
+                <th >状态</th>
                 <th >备注</th>
                 <th width="80">操作</th>
             </tr>
@@ -64,6 +65,17 @@
                     <td>{$vo.level_3}</td>
 
                     <td>{$vo.updated_at}</td>
+                    <td>
+                     <switch name="vo.status">
+                            <case value="1">
+                                <span style="color:green">开启</span>
+                            </case>
+                            <case value="2">
+                                <span style="color:red">关闭</span>
+                            </case>
+                      </switch>
+
+                    </td>
                     <td>{$vo['remark']}</td>
                   
 
@@ -74,11 +86,7 @@
             </foreach>
        
         </table>
-        <div class="table-actions">
-            <button class="btn btn-danger btn-sm js-ajax-submit" type="submit" data-action="{:url('Market/deleteset')}"
-                    data-subcheck="true" data-msg="你确定删除吗？">{:lang('DELETE')}
-            </button>
-        </div>
+      
         <div class="pagination">{$page}</div>
     </form>
 

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

@@ -12,6 +12,7 @@
 <div class="wrap js-check-wrap"> 
 
     <form action="" method="post" class="form-horizontal js-ajax-form margin-top-10">
+    <input type="hidden" name="id" id="id" value="{$id}">
         <div class="row">
             <div class="col-md-9">
 
@@ -20,7 +21,7 @@
                  </div>
 
                  <div class="col-sm-offset-2 col-sm-10"  style=" margin-top: 3px;margin-bottom: 10px;">
-                   <input type="text" name="alert_time1" id="alert_time1" value=""  placeholder="输入额外奖励金额" class="form-control">
+                   <input type="text" name="awardMoney" id="awardMoney" value=""  placeholder="输入额外奖励金额" class="form-control">
                  </div>
 
                 <div class="col-sm-offset-2 col-sm-10">
@@ -28,8 +29,7 @@
                  </div>
 
                  <div class="col-sm-offset-2 col-sm-10"  style=" margin-top: 3px;">
-                  <textarea class="form-control" name="noremark" id="noremark" style="height: 60px;"
-                                      placeholder="请输入奖励的原因！" ></textarea>
+                  <textarea class="form-control" name="awardremark" id="awardremark" style="height: 60px;" placeholder="请输入奖励的原因！" ></textarea>
                 </div>
 
 
@@ -52,17 +52,27 @@
     <script >
 
         function closeAllOpen1(){
+        var am= $('#awardMoney').val();
+        var ar= $('#awardremark').val();
+        var id= $('#id').val();
          
             $.ajax({ 
 
-                 url: "{:url('Market/markettoreward',array('id'=>$id,'yes'=>1))}",
-              
+                url: "{:url('Market/markettoreward')}",
+                 type:'POST',
+                 data:{
+                  'id':id,
+                  'am':am,
+                  'ar':ar,
+                  'yes':1,
+                },
+                
                 success: function(data){
-                 
+                 console.log(data);
                  if(data==1){
-                        alert('审核通过成功！');
+                        alert('奖励审核通过成功！');
                  }else{
-                        alert('审核通过失败！');
+                        alert('奖励审核通过失败！');
                  }
 
                   var index = parent.layer.getFrameIndex(window.name);
@@ -86,7 +96,7 @@
             $.ajax({ 
 
 
-                url: "{:url('Market/doconfrom',array('id'=>$id))}",
+                url: "{:url('Market/markettorewards',array('id'=>$id))}",
                 data:data1,
                 success: function(data){
                

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

@@ -29,7 +29,8 @@
                     <th>昵称</th>
 					<th>交易日期</th>
 					<th>来源</th>
-					<th>金额</th>
+					<th>充值金额</th>
+					<th>余额</th>
 					<th>变动类型</th>
                     <th>操作类型</th>
 					<th>{:lang('STATUS')}</th>
@@ -51,6 +52,7 @@
 					<td>{$vo.user_nickname}</td>
 					<td>{:date('Y-m-d H:i:s',$vo.create_time)}</td>
 					<td>{$vo.source_username.user_nickname}</td>
+					<td>{$vo.pay_money}</td>
 					<td>{$vo.balance}</td>
 					<td>
 						<switch name="vo.type">

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

@@ -14,6 +14,11 @@ use cmf\controller\AdminBaseController;
 use think\Db;
 use think\db\Query;
 use app\admin\model\MarketModel;
+use app\weixin\model\AccountLog;
+use app\weixin\model\Market;
+use app\weixin\model\Member;
+use app\weixin\model\UserBalanceLog;
+
 use app\weixin\model\Wechat;
 use app\weixin\service\PRedis;
 
@@ -37,7 +42,7 @@ class MarketController extends AdminBaseController
     public function marketsetlist(){
 
          //查询得到分销表
-        $marketlist=Db::name('market')->where('status',1)
+        $marketlist=Db::name('market')
             ->order("updated_at DESC")
             ->paginate(15,false,['query'=>request()->param()]);
        
@@ -55,7 +60,7 @@ class MarketController extends AdminBaseController
     public function marketset(){
 
        //查询得到分销表
-        $market=Db::name('market')->where(array('status'=>1,'id'=> input('id')))->find();
+        $market=Db::name('market')->where(array('id'=> input('id')))->find();
        
         // var_dump($market);die();
         $this->assign('market', $market);
@@ -618,6 +623,7 @@ class MarketController extends AdminBaseController
             //开始进行调用成功发送
 
            $data['agent_status'] = 1;
+           $data['agent_type'] = 1;
            $result=Db::name('user')->where('id',$param['id'])->update($data);
 
       // echo Db::name('user')->getLastSql();die();
@@ -820,65 +826,70 @@ class MarketController extends AdminBaseController
 
 
      /**
-     * 进行奖励充值
+     * 后台进行奖励充值
      */
 
      public function markettoreward(){
 
+      
+        $where = ['id' => input('id'), 'agent_type' => 1, 'agent_status' => 1];
+      
+        $field = 'id,openid,user_nickname,parent_id,user_login,balance';
+        $userInfo = Member::getInfo($where, $field);
 
-        $this->assign("id",input('id'));
+        $nickname = isset($userInfo['nickname']) ? trim($userInfo['nickname']) : '';
+        $userLogin = isset($userInfo['user_login']) ? trim($userInfo['user_login']) : '';
+        $balance = isset($userInfo['balance']) ? floatval($userInfo['balance']) : 0;
+        $awardMoney = input('am');
+        $rm = input('ar');
+        $userId = 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) {
-            // 账户变动
+         // 账户变动
             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', input('am'))) {
+                 // 写入奖励日志
+        
+                $logTitle = "后台为你进行了{$rm}，奖励额度为：{$awardMoney}元";
                 $log = [
-                    'change' => $awardMoneyTwo,
-                    'type' => $type,
-                    'level' => 2,
+                    'change' => $awardMoney,
+                    'type' => 31,   //平台奖励
+                    'level' => 1,
                     'change_type' => 1,
-                    'pay_money' => $awardMoneyTwo,
-                    'user_id' => $userTwoId,
-                    'source_uid' => $userId,
-                    'balance' => moneyFormat($balanceTwo + $awardMoneyTwo),
+                    'pay_money' => $awardMoney,
+                    'user_id' => $userId,
+                    'source_uid' => '',
+                    'balance' => moneyFormat($balance + $awardMoney),
                     'description' => $logTitle,
                     'create_time' => time(),
                     'status' => 1,
                 ];
-                $logData['log'] = $log;
-                PRedis::set("{$cacheKey}:log", $logData, 7200);
+              
                 if(UserBalanceLog::insertGetId($log)){
-                    // 账户明细
+
+                      // 账户明细
                     $accountData = [
                         'type' => 4,
                         'account_type' => 2,
                         'change_type' => 1,
-                        'user_id' => $userTwoId,
-                        'money' => $awardMoneyTwo,
-                        'balance' => $balanceTwo,
+                        'user_id' => $userId,
+                        'money' => $awardMoney,
+                        'balance' => $balance,
                         'created_at' => date('Y-m-d H:i:s'),
                         'remark' => $logTitle,
                     ];
                     if(AccountLog::insertGetId($accountData)){
                         // 发送模板消息
-                        $openid = isset($userInfoTwo['openid'])? $userInfoTwo['openid'] : '';
+                        $openid = isset($userInfo['openid'])? $userInfo['openid'] : '';
                         if($openid){
                             $checkTime = date('Y.m.d H:i');
                             $remark = "感谢您对拾光的信任，我们一起解救单身青年！点击查看收益明细";
                             $msgParams = [
-                                'title' => "您的下级[$nickname]邀请的用户[{$sourceNickname}]消费所得的收益已到账！\n\n类型：\t{$marketName}",
+                                'title' => "管理员后台为你奖励的收益已到账！\n\n类型：\t{$rm}",
                                 'remark' => $remark,
                                 'type' => 'income',
                                 'keywords' => [
                                     'keyword1' => [
-                                        'value' => "{$awardMoneyTwo}",
+                                        'value' => "{$awardMoney}",
                                         'color' => '#173177',
                                     ],
                                     'keyword2' => [
@@ -888,33 +899,29 @@ class MarketController extends AdminBaseController
                                 ],
                                 'url' => url('/weixin/market/income', '', '', true),
                             ];
-                            PRedis::set("{$cacheKey}:message", ['result' => $userInfoTwo, 'params' => $msgParams], 600);
+                            // PRedis::set("{$cacheKey}:message", ['result' => $userInfo, 'params' => $msgParams], 600);
                             Wechat::sendTplMsg($openid, $msgParams);
                         }
 
-                        Db::commit();
+                        Db::commit();;
                     }else{
-                        PRedis::set("{$cacheKey}:account_log", $logData, 7200);
+                        //PRedis::set("{$cacheKey}:account_log", $logData, 7200);
                         Db::rollback();
-                        return false;
                     }
+                   
                 }else{
-                    PRedis::set("{$cacheKey}:balance_log", $logData, 7200);
-                    Db::rollback();
-                    return false;
+                       
+                        Db::rollback();
                 }
-
-            } else {
-                PRedis::set("{$cacheKey}:update_balance", $logData, 7200);
-                Db::rollback();
-                return false;
+            }else{
+               Db::rollback();
+               echo 0;die();
             }
-        } else {
-            PRedis::set("{$cacheKey}:error_awardMoney", $logData, 7200);
-            return false;
-        }
 
-        return $this->fetch();
+            
+
+
+         echo 1;die();
 
      }
 
@@ -1107,10 +1114,22 @@ class MarketController extends AdminBaseController
         return $this->fetch('marketwithdraw');
      }
 
+     //删除分销设置
 
+     public function deleteset(){
 
+        $param = $this->request->param();
 
+        if (isset($param['ids']) && isset($param["yes"])) {
+            $ids = $this->request->param('ids/a');
 
+            Db::name('market')->where('id', 'in', $ids)->update(['status' => 2]);
+
+            $this->success("活动删除成功！", '');
+
+        }
+
+    }