Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Base/Repository/SpendRepository.class.php

@@ -200,7 +200,7 @@ class SpendRepository {
 
         $records = [];
         foreach ($dayList as $day) {
-            $time = strtotime($day);
+            $time = strtotime($day) + 24 * 3600;
             $conditions['pay_time'] = ['elt', $time];
             $result = M('spend', 'tab_')->field('count(DISTINCT user_id) as count')->where($conditions)->find();
             $records[$day] = $result['count'];

Application/Home/View/default/Query/arpu.html

@@ -135,6 +135,9 @@
               <div class="form-group normal_space">
                 <select id="promote-select" name="sub_promote_id" class="reselect select_gallery" style="width: 220px;" data-promote="{:I('sub_promote_id', 0)}">
                   <option value="0">请选择推广员</option>
+                  <volist name="subPromotes" id="promote">
+                  <option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('promote_id') == $promote['id']">selected</if>>{$promote.account}({$promote.real_name})</option>
+                  </volist>
                 </select>
               </div>
               </if>

Application/Media/View/default/Public/base.html

@@ -229,8 +229,8 @@
 </div>
 <!--浮动层-->
 <div class="float_contact_position ">
-  <div class="float_contact ">
+  <div class="float_contact " style="right: 100px;">
-      <img src="/Public/Media/images/index_about/qrcode.png" width="270">
+      <img src="/Public/Media/images/index_about/qrcode.png" width="200">
     <!-- <div class="float-bg "></div>
     <ul>
       <li class="show kf ">