Merge remote-tracking branch 'origin/release' into release

Application/Admin/Controller/MemberController.class.php

@@ -209,7 +209,7 @@ class MemberController extends ThinkController
             
             $field = array(
                 "id"=>"账号ID","account"=>"玩家账号","promote_account"=>"所属推广员","balance"=>"账户平台币","recharge_total"=>"累计充值","gold_coin"=>"金币",
-                "small_count"=>"小号","vip_level"=>"VIP等级","register_type"=>"注册方式","register_time"=>"注册时间","register_ip"=>"注册IP","login_time"=>"最后登录时间",
+                "vip_level"=>"VIP等级","register_type"=>"注册方式","register_time"=>"注册时间","register_ip"=>"注册IP","login_time"=>"最后登录时间",
                 "device_number"=>"设备号","lock_remark"=>"锁定备注","lock_status"=>"账号状态","check_status"=>"拉黑状态"
             );
             data2csv($data,"玩家_玩家列表",$field);

Application/Admin/View/Query/marketList.html

@@ -265,6 +265,7 @@
             console.log(game_name)
             console.log(count_date)
             console.log(device)
+            $(".tooltiptext").hide();
             if ($(_this).children().children().text()=='') {
                 $.ajax({
                     url: "{:U('Query/getChannelStream')}",