Merge branch 'release-1.0.0' into dev

# Conflicts:
#	Application/Home/Controller/QueryController.class.php

Application/Admin/Controller/MemberController.class.php

@@ -812,20 +812,13 @@ class MemberController extends ThinkController
             $map['server_name'] = $_REQUEST['server_name'];
             unset($_REQUEST['server_name']);
         }
-        if (isset($_REQUEST['promote_id'])) {
-            $map['promote_id'] = $_REQUEST['promote_id'];
-            unset($_REQUEST['promote_id']);
-        }
         // $map['type'] = 1;
         // $map['login_time'] = ['exp', 'login_time<>0'];
         $extend = array();
         $extend['map'] = $map;
-        $count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false);
-        $sql = "select count(user_id) as count from ({$count})t";
-        $count = M('UserLoginRecord','tab_')->query($sql);
+
 
         $this->m_title = '登录记录';
-        $this->assign('user_count',$count[0]['count']);
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find());
 
         parent::lists("UserLoginRecord", $p, $extend['map']);

Application/Admin/View/Spend/lists.html

@@ -169,7 +169,7 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name="list_data">
-                    <td colspan="15" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="17" class="text-center">aOh! 暂时还没有内容!</td>
                     <else/>
                     <volist name="list_data" id="data">
                         <tr>
@@ -212,7 +212,6 @@
                                 </if>
                             </td>
                             <td style="text-indent:0;">
-
                                 <if condition="$data['pay_game_status'] eq 0 and $data['pay_status'] eq 1">
                                     <a class=" budan" href="javascript:void(0);"
                                        href-data="{$data.pay_order_number}" href-hhh="{:U('Repair/repairEdit')}" style="width:100%;">补单</a>
@@ -227,19 +226,17 @@
                     </volist>
                 </empty>
                 <tr class="data_summary">
-
-
                     <td>汇总</td>
-                    <td colspan="6">
+                    <td colspan="16">
                         当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
-                        今日充值：{$ttotal}
-                        昨日充值：{$ytotal}
+                       <!-- 今日充值：{$ttotal}-->
+                       <!-- 昨日充值：{$ytotal}-->
                         累计充值：{$total}（此处只汇总充值成功的订单）
                     </td>
-                    <td colspan="99" style="color: #a9a9a9;">
+                    <!--<td colspan="99" style="color: #a9a9a9;">
                         今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
                         昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
-                    </td>
+                    </td>-->
                 </tr>
                 </tbody>
             </table>

Application/Home/View/default/Home/landingPage.html

@@ -56,7 +56,7 @@
     </div>
     <?php endif;?>
 
-      <div class="fiexd-heard">
+    <div class="fiexd-heard" style="z-index: 10001">
       <div class="fiexd-heardBox" style="display: none;">
         <!--          <div>完成</div>-->
         <img src="{$game['icon']}" alt="" style="">
@@ -69,11 +69,15 @@
 <!--落地页视频不置顶-->
 <?php else:?>
 
-<div class="home-fiexd-two" style="background: #fff;width: 100%;height: 4.22rem;">
+<div class="home-fiexd-two" style="background: #fff;width: 100%;
+<?php if (empty($game['flooring_page_video'])):?>height: 0;  <?php else :?> height: 4.22rem; <?php endif;?>
+">
+  <?php if (!empty($game['flooring_page_video'])):?>
   <div class="home-video">
     <video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
   </div>
-  <div class="fiexd-heard" style="width: 100%;position: fixed;top: 0; left: 0;background: rgba(255, 255, 255,0);display: none;">
+  <?php endif;?>
+  <div class="fiexd-heard" style="width: 100%;position: fixed;top: 0; left: 0;background: rgba(255, 255, 255,0);display: none;z-index: 10001;">
     <div class="fiexd-heardBox">
       <img src="{$game['icon']}" alt="" style="">
       <div class="download">下载</div>
@@ -359,6 +363,7 @@
       $(".home-fiexd .fiexd-heardBox").hide();
     }
   <?php else:?>
+  <?php if (!empty($game['flooring_page_video'])):?>
     var t = $(window).scrollTop();
     var h=$('.home-video').height();
     if(t>h){
@@ -370,7 +375,7 @@
         $(".home-fiexd-two .fiexd-heard").hide();
       }
     }
-
+  <?php endif;?>
   <?php endif;?>
 
   })