Merge branch 'release' into dev

# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html

Application/Admin/Controller/AjaxController.class.php

@@ -362,14 +362,18 @@ class AjaxController extends ThinkController{
         }
 //        var_dump($map);die();
         if ($_REQUEST['company_id']) {
-            $map['company_id'] = $_REQUEST['company_id'];
+            $map['_string'] = "tab_promote.company_id={$_REQUEST['company_id']} and ext_field is null";
         }
 
+//       $map['widthdraw_number'] = ['neq',''];
+
         $data = M("withdraw","tab_")
-            ->field("widthdraw_number,promote_account,tab_promote_company.id as company_id,company_name,tab_withdraw.settlement_type,mobile_phone,real_name,bank_card,account_openin,address,game_ratio,bank_account")
+            ->field("widthdraw_number,promote_account,tab_promote_company.id as company_id,tab_promote_company.company_name,tab_withdraw.settlement_type,mobile_phone,real_name,bank_card,account_openin,address,game_ratio,bank_account")
             ->join("left join tab_promote on tab_withdraw.promote_id=tab_promote.id")
             ->join("left join tab_promote_company on tab_promote.company_id=tab_promote_company.id")
+            ->join("left join tab_statement as statement on tab_withdraw.widthdraw_number = statement.ext_field")
             ->where($map)
+//            ->where("widthdraw_number is not NULL")
             ->select();
 
 

Application/Admin/Controller/AutoController.class.php

@@ -1070,7 +1070,6 @@ public function  auto_rrdae(){
     private function promoteWithdraw($settlement = 1, $initial = false)
     {
         $withdrawModel = new WithdrawModel();
-        $map['id'] = 84;
         $map['level'] = 1;
         $map['ver_status'] = 1;
         $map['settlement_type'] = ($settlement == 3) ? 1 : $settlement;

Application/Admin/Controller/MemberController.class.php

@@ -14,9 +14,9 @@ class MemberController extends ThinkController
      */
     public function user_info($p=0){
         //设定默认时间
-//        if(!array_key_exists("time_start",$_REQUEST) && I('type') != 2){
-//            $this->redirect(ACTION_NAME, array('time_start' => date('Y-m-d',strtotime('-30 day')),"time_end"=>date('Y-m-d')));
-//        }
+        if(!array_key_exists("time_start",$_REQUEST) && I('type') != 2){
+            $this->redirect(ACTION_NAME, array('time_start' => date('Y-m-d',strtotime('-30 day')),"time_end"=>date('Y-m-d')));
+        }
          //基础信息
         $page = intval($p);
         $page = $page ? $page : 1; //默认显示第一页数据
@@ -204,9 +204,6 @@ class MemberController extends ThinkController
                 $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']);
                 $v['lock_status'] = get_info_status($v['lock_status'],4);
                 $v['check_status'] = $v['check_status']==1 ? "正常" :"拉黑";
-                if(get_info_status($v['lock_status'],4) != '锁定') {
-                    $v['lock_status'] = '';
-                }
                 // $data[$k] = $v;
             }
             

Application/Admin/Controller/QueryController.class.php

@@ -1352,6 +1352,7 @@ class QueryController extends ThinkController
             foreach ($gameRatios as $gameId => $gameRatio) {
                 $gameName = D('game')->where(array('id' => $gameId))->getField('game_name');
                 foreach ($gameRatio as $list) {
+                    $list['selle_ratio'] = $list['selle_ratio'] ?? '0.00';
                     $records[] = [
                         'settlement_time' => "{$list['begin_time']} - {$list['end_time']}",
                         'game_name' => $gameName ?? '未知',

Application/Admin/View/Promote/belong.html

@@ -181,7 +181,7 @@
                                     <span>只维护</span>
                                     <?php }?>
                                 </td>
-                                <td>{$data['applicant_time']}</td>
+                                <td>{:set_show_time($data['applicant_time'])}</td>
                                 <td>{$data['remark']}</td>
                                 <td>
                                     <?php if($data['verify_status'] == 0) {?>

Application/Admin/View/Promote/belong_edit.html

@@ -50,7 +50,7 @@
                         <tr>
                             <td class="l">会长账号：</td>
                             <td class="r">
-                                <select id="promote_id" name="" class="select_gallery"  style="width:120px;" disabled>
+                                <select id="promote_id" name="promote_id" class="select_gallery"  style="width:120px;">
                                     <option value="">请选择会长账号</option>
                                     <volist name=":promote_listsOther(1)" id="vo">
                                         <option promote_id-id="{$vo.id}" value="{$vo.id}" <if condition="$vo.id eq $data['promote_id']">selected=selected</if>>{$vo.account}</option>
@@ -60,6 +60,7 @@
                         </tr>
                         <input type="hidden" name="promote_id" value="{$data['promote_id']}">
 
+
                         <tr>
                             <td class="l">工会归属：</td>
                             <td class="r table_radio">

Application/Admin/View/Query/marketList.html

@@ -265,6 +265,9 @@
             console.log(game_name)
             console.log(count_date)
             console.log(device)
+            var display=$(_this).children().css('display');
+            $(".tooltiptext").hide();
+            console.log(display)
             if ($(_this).children().children().text()=='') {
                 $.ajax({
                     url: "{:U('Query/getChannelStream')}",
@@ -278,7 +281,11 @@
                     }
                 });
             } else {
-                $(_this).children().toggle();
+
+                    $(_this).children().toggle();
+                if(display!='none') {
+                    $(_this).children().toggle();
+                }
             }
         }