Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0

Application/Admin/Controller/AjaxController.class.php

@@ -77,6 +77,8 @@ class AjaxController extends ThinkController{
         $game_map = [];
         if ($game_name) {
             $game_map['relation_game_name'] = $game_name;
+        }else {
+            $this->AjaxReturn([]);
         }
         if ($sdk_version) {
             $map['server_version'] = $game_map['sdk_version'] = $sdk_version;

Application/Admin/Controller/BehaviorLogController.class.php

@@ -9,34 +9,27 @@ class BehaviorLogController extends ThinkController
     {
         $params = I('get.');
 
-        $ignoreData = ['p', 'row', 'timestart', 'timeend', 'promote_id'];
         $map        = [];
-        // if (isset($params['user_account'])) {
-        //     $map['user_account'] = $params['user_account'];
-        // }
-        // if (isset($params['extend'])) {
-        //     $map['extend'] = $params['extend'];
-        // }
-        // if (isset($params['game_name'])) {
-        //     $map['game_name'] = $params['game_name'];
-        // }
-        // if (isset($params['server_name'])) {
-        //     $map['server_name'] = $params['server_name'];
-        // }
-        // if (isset($params['sdk_version'])) {
-        //     $map['sdk_version'] = $params['sdk_version'];
-        // }
-        // if (isset($params['user_nickname'])) {
-        //     $map['user_nickname'] = $params['user_nickname'];
-        // }
-        // if (isset($params['game_player_id'])) {
-        //     $map['game_player_id'] = $params['game_player_id'];
-        // }
-        foreach ($params as $k => $v) {
-            if (!in_array($k, $ignoreData)) {
-                $map[$k] = $v;
-            }
+        if (isset($params['user_account'])) {
+            $map['user_account'] = $params['user_account'];
+        }
+        if (isset($params['extend'])) {
+            $map['extend'] = $params['extend'];
+        }
+        if (isset($params['game_name'])) {
+            $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')];
+            $map['game_id'] = $game_id;
+        }
+        if (isset($params['server_name'])) {
+            $map['server_name'] = $params['server_name'];
         }
+        if (isset($params['user_nickname'])) {
+            $map['user_nickname'] = $params['user_nickname'];
+        }
+        if (isset($params['game_player_id'])) {
+            $map['game_player_id'] = $params['game_player_id'];
+        }
+
 
         $p   = $params['p'] ? $params['p'] : 1;
         $row = $params['row'] ? $params['row'] : 10;
@@ -52,10 +45,8 @@ class BehaviorLogController extends ThinkController
             } else {
                 $promoteMap['chain'] = ['like', "%/$promoteId/%"];
                 $promoteIds          = M('Promote', 'tab_')->where($promoteMap)->getField('id', true);
-                if(empty($promoteIds)) {
-                	$promoteIds[] = $promoteIds;
-                }
-                $map['promote_id']   = ['in', $promoteIds];
+                $promoteIds[] = $promoteId;
+                $map['promote_id'] = ['in', $promoteIds];
             }
         }
         $data = M('pay_info', 'tab_')->where($map)->order('id DESC')->page($p, $row)->select();

Application/Admin/Controller/ExportController.class.php

@@ -1802,6 +1802,62 @@ class ExportController extends Controller
                         $xlsData[$key]['developers'] = get_developers_account($value['developers'],'account');
                     }
                     break;
+                case 21:
+                    $xlsCell = array(
+                        array('extend', 'CP订单号'),
+                        array('create_time', '充值时间'),
+                        array('user_account', '玩家账号'),
+                        array('game_name', '游戏名称'),
+                        array('server_name', '游戏区服'),
+                        array('promote_account', '所属推广员'),
+                        array('game_player_id', '角色ID'),
+                        array('game_player_name', '角色名称'),
+                        array('price', '订单金额'),
+                    );
+                     $params = I('get.');
+
+                    $map        = [];
+                    if (isset($params['user_account'])) {
+                        $map['user_account'] = $params['user_account'];
+                    }
+                    if (isset($params['extend'])) {
+                        $map['extend'] = $params['extend'];
+                    }
+                    if (isset($params['game_name'])) {
+                        $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')];
+                        $map['game_id'] = $game_id;
+                    }
+                    if (isset($params['server_name'])) {
+                        $map['server_name'] = $params['server_name'];
+                    }
+                    if (isset($params['user_nickname'])) {
+                        $map['user_nickname'] = $params['user_nickname'];
+                    }
+                    if (isset($params['game_player_id'])) {
+                        $map['game_player_id'] = $params['game_player_id'];
+                    }
+
+                    $startDate          = empty($params['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $params['timestart'];
+                    $endDate            = empty($params['timeend']) ? date('Y-m-d') : $params['timeend'];
+                    $startTime          = strtotime($startDate);
+                    $endTime            = strtotime($endDate) + 86399;
+                    $map['create_time'] = array('BETWEEN', [$startTime, $endTime]);
+                    if ($promoteId = I('promote_id')) {
+                        if ($promoteId == 0) {
+                            $map['promote_id'] = 0;
+                        } else {
+                            $promoteMap['chain'] = ['like', "%/$promoteId/%"];
+                            $promoteIds          = M('Promote', 'tab_')->where($promoteMap)->getField('id', true);
+                            $promoteIds[] = $promoteId;
+                            $map['promote_id'] = ['in', $promoteIds];
+                        }
+                    }
+                    $xlsData = M('pay_info', 'tab_')->where($map)->order('id DESC')->select();
+                    foreach($xlsData as $k => $v) {
+                        $xlsData[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
+                    }
+                    break;
+
             default:
             $xlsName = $xlsCell = $xlsData = [];
 

Application/Admin/View/BehaviorLog/index.html

@@ -169,7 +169,7 @@
         </div>
     </div>
     <div class="page">
-				<!-- <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>7,'xlsname'=>'游戏订单_游戏充值'),I('get.')))}">导出</a> -->
+				<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>21,'xlsname'=>'游戏充值预下单'),I('get.')))}">导出</a>
         {$_page|default=''}
     </div>
 

Application/Home/Controller/QueryController.class.php

@@ -21,7 +21,7 @@ class QueryController extends BaseController
         1 => '支付宝',
         2 => '微信',
         9 => '双乾支付',
-        15 => '双乾支付'
+        15 => '双乾支付-快捷'
     ];
 
     public static $payStatus = [
@@ -174,6 +174,7 @@ class QueryController extends BaseController
                         break;
                 }
                 $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8);
+                $list['pay_time'] = ($list['pay_status'] == 1) ? date('Y-m-d H:i:s', $list['pay_time']) : '--';
                 $list['pay_status'] = isset(QueryController::$payStatus[$list['pay_status']]) ? QueryController::$payStatus[$list['pay_status']] : '未知状态';
                 $list['sdk_version'] = getSDKTypeName($list['sdk_version']);
 

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

@@ -48,32 +48,36 @@
   <!--落地页视频置顶-->
   <?php if ($game['ios_video_top'] == 1):?>
   <div class="home-fiexd" <?php if (empty($game['flooring_page_video'])):?> style="height: 0" <?php endif;?> >
-    <div class="home-fiexdBox">
+  <div class="home-fiexdBox">
 
-      <?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>
-      <?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>
+    <?php endif;?>
 
-      <div class="fiexd-heard">
-        <div class="fiexd-heardBox" style="display: none;">
-<!--          <div>完成</div>-->
-          <img src="{$game['icon']}" alt="" style="">
-          <div class="download">下载</div>
-        </div>
+    <div class="fiexd-heard" style="z-index: 10001">
+      <div class="fiexd-heardBox" style="display: none;">
+        <!--          <div>完成</div>-->
+        <img src="{$game['icon']}" alt="" style="">
+        <div class="download">下载</div>
       </div>
     </div>
   </div>
+</div>
 
 <!--落地页视频不置顶-->
 <?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>
@@ -83,165 +87,165 @@
 
 <?php endif;?>
 
-  <div class="home-box">
-    <div class="heard">
-      <div style="height: 2.5rem;width: 2.5rem">
-        <img src="{$game['icon']}" alt="">
-      </div>
-      <div class="right">
-        <div>{$game['relation_game_name']}</div>
-        <div>{$game['features']}</div>
-        <div>
-          <?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
-          <div class="download">免费安装</div>
-          <?php else :?>
-          <div class="download">免费安装</div>
-          <?php endif ;?>
-          <img src="__IMG__/wenhao.png" class="doubt" alt="">
-        </div>
+<div class="home-box">
+  <div class="heard">
+    <div style="height: 2.5rem;width: 2.5rem">
+      <img src="{$game['icon']}" alt="">
+    </div>
+    <div class="right">
+      <div>{$game['relation_game_name']}</div>
+      <div>{$game['features']}</div>
+      <div>
+        <?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
+        <div class="download">免费安装</div>
+        <?php else :?>
+        <div class="download">免费安装</div>
+        <?php endif ;?>
+        <img src="__IMG__/wenhao.png" class="doubt" alt="">
       </div>
     </div>
-    <div class="evaluate">
-      <div class="evaluate-box">
-        <div class="number">
-          <span>{$game['game_score']}</span>
+  </div>
+  <div class="evaluate">
+    <div class="evaluate-box">
+      <div class="number">
+        <span>{$game['game_score']}</span>
 
 
-            <div class="start">
-              <div class="iconImg ">
-                <div style=" width: <?php echo round($game['game_score']/5, 2)*100 ?>%;"></div>
-              </div>
-            </div>
-
+        <div class="start">
+          <div class="iconImg ">
+            <div style=" width: <?php echo round($game['game_score']/5, 2)*100 ?>%;"></div>
+          </div>
         </div>
-        <div class="grade">14.48K个评分</div>
-      </div>
-      <div class="evaluate-box" style="display: none">
-        <span>#{$game['recommend_level']}</span>
-        <div class="grade">网络游戏</div>
-      </div>
-      <div class="evaluate-box">
-        <span>16+</span>
-        <div class="grade">年龄</div>
+
       </div>
+      <div class="grade">14.48K个评分</div>
     </div>
-    <div class="slide_list">
-      <ul class="slide-box">
-        <volist name="game['screenshot']" id="item">
-          <li class="slide-item">
-            <img src="{$item}" alt="">
-          </li>
-        </volist>
-      </ul>
+    <div class="evaluate-box" style="display: none">
+      <span>#{$game['recommend_level']}</span>
+      <div class="grade">网络游戏</div>
     </div>
-    <div class="synopsis">
-      <div>简介</div>
-      <div id="brief_introduction">{$game['introduction']}</div>
-      <div id="look_more">
-        <div class="bg-blur"></div>
-        <div class="more">查看更多</div>
-      </div>
+    <div class="evaluate-box">
+      <span>16+</span>
+      <div class="grade">年龄</div>
     </div>
-    <div class="appraisal">
-      <div class="title">评分及评论</div>
-      <div class="appraisal-box">
-        <div class="left">
-          <span>{$game['game_score']}</span>
-          <span>满分5分</span>
+  </div>
+  <div class="slide_list">
+    <ul class="slide-box">
+      <volist name="game['screenshot']" id="item">
+        <li class="slide-item">
+          <img src="{$item}" alt="">
+        </li>
+      </volist>
+    </ul>
+  </div>
+  <div class="synopsis">
+    <div>简介</div>
+    <div id="brief_introduction">{$game['introduction']}</div>
+    <div id="look_more">
+      <div class="bg-blur"></div>
+      <div class="more">查看更多</div>
+    </div>
+  </div>
+  <div class="appraisal">
+    <div class="title">评分及评论</div>
+    <div class="appraisal-box">
+      <div class="left">
+        <span>{$game['game_score']}</span>
+        <span>满分5分</span>
+      </div>
+      <div class="right">
+        <div class="start-number">
+          <div class="start">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+          </div>
+          <div class="strip">
+            <div style="width: <?php echo round($game['game_score']/5, 2) * 100 ?>%;"></div>
+          </div>
         </div>
-        <div class="right">
-          <div class="start-number">
-            <div class="start">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-            </div>
-            <div class="strip">
-              <div style="width: <?php echo round($game['game_score']/5, 2) * 100 ?>%;"></div>
-            </div>
+        <div class="start-number">
+          <div class="start">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
           </div>
-          <div class="start-number">
-            <div class="start">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-            </div>
-            <div class="strip">
-              <div style="width: 0.24rem;"></div>
-            </div>
+          <div class="strip">
+            <div style="width: 0.24rem;"></div>
           </div>
-          <div class="start-number">
-            <div class="start">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-            </div>
-            <div class="strip">
-              <div style="width: 0.06rem;"></div>
-            </div>
+        </div>
+        <div class="start-number">
+          <div class="start">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
           </div>
-          <div class="start-number">
-            <div class="start">
-              <img src="__IMG__/start1.png" alt="">
-              <img src="__IMG__/start1.png" alt="">
-            </div>
-            <div class="strip">
-              <div style="width: 0.04rem;"></div>
-            </div>
+          <div class="strip">
+            <div style="width: 0.06rem;"></div>
           </div>
-          <div class="start-number">
-            <div class="start">
-              <img src="__IMG__/start1.png" alt="">
-            </div>
-            <div class="strip">
-              <div style="width: 0;"></div>
-            </div>
+        </div>
+        <div class="start-number">
+          <div class="start">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+          </div>
+          <div class="strip">
+            <div style="width: 0.04rem;"></div>
+          </div>
+        </div>
+        <div class="start-number">
+          <div class="start">
+            <img src="__IMG__/start1.png" alt="">
+          </div>
+          <div class="strip">
+            <div style="width: 0;"></div>
           </div>
-          <div class="mark">14.48K个评分</div>
         </div>
+        <div class="mark">14.48K个评分</div>
       </div>
     </div>
-    <div class="device">
-      <div class="title">新功能</div>
-      <div class="soon-title">更新说明：</div>
-      <div class="del">1、优化用户体验</div>
+  </div>
+  <div class="device">
+    <div class="title">新功能</div>
+    <div class="soon-title">更新说明：</div>
+    <div class="del">1、优化用户体验</div>
+  </div>
+  <div class="information">
+    <div class="title">信息</div>
+    <div class="data-box">
+      <span>大小</span>
+      <div>{$game['game_size']}</div>
     </div>
-    <div class="information">
-      <div class="title">信息</div>
-      <div class="data-box">
-        <span>大小</span>
-        <div>{$game['game_size']}</div>
-      </div>
-      <div class="data-box">
-        <span>类别</span>
-        <div>游戏</div>
-      </div>
-      <div class="data-box">
-        <span>语言</span>
-        <div>英语，简体中文</div>
-      </div>
-      <div class="data-box">
-        <span>年龄分级</span>
-        <div>限16岁以上</div>
-      </div>
-      <div class="data-box">
-        <span>价格</span>
-        <div>免费</div>
-      </div>
-      <div class="privacy">隐私政策</div>
+    <div class="data-box">
+      <span>类别</span>
+      <div>游戏</div>
     </div>
-  </div>
-  <div class="foot">
-    <div>
-      <div>闽ICP备19000000号-0</div>
-      <div>闽网文{2019}1554-099号</div>
+    <div class="data-box">
+      <span>语言</span>
+      <div>英语，简体中文</div>
+    </div>
+    <div class="data-box">
+      <span>年龄分级</span>
+      <div>限16岁以上</div>
     </div>
-    <div>抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。</div>
-    <div>适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。</div>
+    <div class="data-box">
+      <span>价格</span>
+      <div>免费</div>
+    </div>
+    <div class="privacy">隐私政策</div>
+  </div>
+</div>
+<div class="foot">
+  <div>
+    <div>闽ICP备19000000号-0</div>
+    <div>闽网文{2019}1554-099号</div>
   </div>
+  <div>抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。</div>
+  <div>适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。</div>
+</div>
 </div>
 
 <div class="window" style="display: none;z-index: 1000">
@@ -254,12 +258,12 @@
 
 
       <?php if ($game['dow_status'] ==1):?>
-        <?php if ($game['supersign_status'] ==1):?>
+      <?php if ($game['supersign_status'] ==1):?>
       <div class="blue-btn" onclick="location.href='mobile.php/Ssg/pay/game_id/{$game[\'id\']}/promote_id/{$promoteId}'">￥10至尊下载</div>
-        <?php else:?>
-        <div class="blue-btn" onclick="layer.msg('该游戏已关闭超级签下载');">￥10至尊下载</div>
-        <?php endif;?>
-        <div class="gray-btn down-link"  down-link="{$downloadUrl}">普通下载</div>
+      <?php else:?>
+      <div class="blue-btn" onclick="layer.msg('该游戏已关闭超级签下载');">￥10至尊下载</div>
+      <?php endif;?>
+      <div class="gray-btn down-link"  down-link="{$downloadUrl}">普通下载</div>
       <?php else:?>
       <div class="blue-btn" onclick="layer.msg('该游戏已关闭下载');">￥10至尊下载</div>
       <div class="gray-btn down-link"  onclick="layer.msg('该游戏已关闭下载');return false;" down-link="{$downloadUrl}">普通下载</div>
@@ -350,27 +354,28 @@
 <script>
   $(window).scroll(function () {
   <?php if ($game['ios_video_top'] == 1):?>
-      var v=($(this).scrollTop())/100;
-      $(".fiexd-heardBox").show();
-      $('.home-fiexd .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
+    var v=($(this).scrollTop())/100;
+    $(".fiexd-heardBox").show();
+    $('.home-fiexd .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
 
-      var t = $(window).scrollTop();
-      if(t<10){
-        $(".home-fiexd .fiexd-heardBox").hide();
-      }
+    var t = $(window).scrollTop();
+    if(t<10){
+      $(".home-fiexd .fiexd-heardBox").hide();
+    }
   <?php else:?>
-      var t = $(window).scrollTop();
-      var h=$('.home-video').height();
-      if(t>h){
-        var v=($(this).scrollTop())/100;
-        $(".home-fiexd-two .fiexd-heard").show();
-        $('.home-fiexd-two .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
-      }else{
-        if(t<h){
-          $(".home-fiexd-two .fiexd-heard").hide();
-        }
+  <?php if (!empty($game['flooring_page_video'])):?>
+    var t = $(window).scrollTop();
+    var h=$('.home-video').height();
+    if(t>h){
+      var v=($(this).scrollTop())/100;
+      $(".home-fiexd-two .fiexd-heard").show();
+      $('.home-fiexd-two .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
+    }else{
+      if(t<h){
+        $(".home-fiexd-two .fiexd-heard").hide();
       }
-
+    }
+  <?php endif;?>
   <?php endif;?>
 
   })
@@ -381,12 +386,12 @@
 
 
   <?php if(!empty($game['flooring_page_video'])):?>
-    var video = document.getElementById("shakeVideo");
-    console.log(video)
+  var video = document.getElementById("shakeVideo");
+  console.log(video)
+  video.play();
+  document.addEventListener('WeixinJSBridgeReady',function(){
     video.play();
-    document.addEventListener('WeixinJSBridgeReady',function(){
-        video.play();
-    },false);
+  },false);
   <?php endif;?>
 
   function is_tip_safari() {
@@ -403,7 +408,7 @@
       //$('.safari').show();
     }
     return isTipSafari;
-  } 
+  }
   function  checkSafari(){
     /*var ua = navigator.userAgent.toLowerCase();
     if (ua.match(/MicroMessenger/i) == "micromessenger") {
@@ -429,20 +434,20 @@
   }
 
   $(function(){
-      $('#go_confirm').click(function () {
-        var isTipSafari = is_tip_safari();
-        if (isTipSafari) {
-          $('.safari').show();
-          return;
-        }
-        layer.confirm('请您回到手机桌面查看安装包情况，<br/>并在安装完成后点击"点我去信任"进行<br/>快速信任证书即可', {
-          title: "请确认游戏是否已安装？",
-          btn: ['已安装', '取消'], //按钮
-        }, function () {
-          $('.layui-layer-btn0').css("font-size", "18px");
-          window.location.href = "__STATIC__/ios9/images/embedded.mobileprovision";
-        });
+    $('#go_confirm').click(function () {
+      var isTipSafari = is_tip_safari();
+      if (isTipSafari) {
+        $('.safari').show();
+        return;
+      }
+      layer.confirm('请您回到手机桌面查看安装包情况，<br/>并在安装完成后点击"点我去信任"进行<br/>快速信任证书即可', {
+        title: "请确认游戏是否已安装？",
+        btn: ['已安装', '取消'], //按钮
+      }, function () {
+        $('.layui-layer-btn0').css("font-size", "18px");
+        window.location.href = "__STATIC__/ios9/images/embedded.mobileprovision";
       });
+    });
     $('.down-link').on('click', function () {
       var dow_status = parseInt($('#dow_status').val());
       if (dow_status == 0) {
@@ -454,9 +459,9 @@
         $('.safari').show();
         return;
       }
-        var downLink = $(this).attr('down-link');
+      var downLink = $(this).attr('down-link');
 
-        // if ($('.bn-rule').length > 0) {
+      // if ($('.bn-rule').length > 0) {
       //   $('.bn-rule').css('display','block')
       //   $('.bn-rule').css('z-index','12')
       //   return
@@ -467,10 +472,10 @@
           location.href = iosDownUrl;
           return
         } else {
-            layer.confirm('请先到官网注册', {title: '提示'}, function () {
-              // location.href = '{:U("User/login",array("url"=>base64_encode(base64_encode(U("Game/detail",array("id"=>$_GET["id"], "pid" => $apply.promote_id, "gid" => $apply.game_id))))))}';
-              location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + "/url/"+ cur_url + ".html"
-            });
+          layer.confirm('请先到官网注册', {title: '提示'}, function () {
+            // location.href = '{:U("User/login",array("url"=>base64_encode(base64_encode(U("Game/detail",array("id"=>$_GET["id"], "pid" => $apply.promote_id, "gid" => $apply.game_id))))))}';
+            location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + "/url/"+ cur_url + ".html"
+          });
 
           return
         }

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

@@ -216,7 +216,7 @@
                   <td>{$vo.p_p_pro_account}({$vo.p_p_pro_real_name})</td>
                   <td>{$vo.p_pro_account}({$vo.p_pro_real_name})</td>
                   <td>{$vo.pro_account}({$vo.pro_real_name})</td>
-                  <td>{$vo.pay_time|date='Y-m-d H:i:s',###}</td>
+                  <td>{$vo.pay_time}</td>
 <!--                  <td>-->
 <!--                    <a href="{:U('Query/viewSpendDetailed',array('id'=>$vo['id']))}" style="cursor: pointer"-->
 <!--                       class="chakan">查看详细</a>-->

Data/update.sql

@@ -696,5 +696,12 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0'
 ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` varchar(30) DEFAULT '0' COMMENT '玩家游戏内id';
 ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 ';
 ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号';
+
+ALTER TABLE `tab_pay_info`
+MODIFY COLUMN `game_player_id`  varchar(255) NULL DEFAULT '0' COMMENT '玩家游戏内id' AFTER `promote_id`;
+ALTER TABLE `tab_pay_info`
+ADD COLUMN `ip`  varchar(255) NOT NULL DEFAULT '0' AFTER `promote_account`,
+ADD COLUMN `pay_way`  int NOT NULL DEFAULT 0 AFTER `ip`;
+
 -- 菜单(游戏充值预下单)
 INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1);