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

Application/Admin/View/Game/edit.html

@@ -333,7 +333,7 @@
                                                    </div>
                                                </div>
                                            </span>
-                                <span class="notice-text">横版游戏建议尺寸：16：9，1280*720px及以上；竖版游戏建议尺寸：9：16，720*1280px及以上，用于游戏详情页内展示</span>
+                                <span class="notice-text">建议尺寸：750*1334，图片大小不超过3M</span>
                             </td>
                         </tr>
 
@@ -384,6 +384,31 @@
                     </td>
                 </tr>
 
+                <tr>
+                    <td class="l">ios视频是否置顶：</td>
+                    <if condition="$data['ios_video_top'] eq 1">
+                        <td class="r" >
+                        <span class="form_radio table_btn">
+                            <label>
+                                <input type="radio" class="inp_radio" value="0" name="ios_video_top" > 不置顶
+                            </label>
+                            <label>
+                                <input type="radio" class="inp_radio" value="1" name="ios_video_top" checked="checked"> 置顶
+                            </label></span>
+                        </td>
+                        <else/>
+                        <td class="r" >
+                        <span class="form_radio table_btn">
+                            <label>
+                                <input type="radio" class="inp_radio" value="0" name="ios_video_top" checked="checked"> 不置顶
+                            </label>
+                            <label>
+                                <input type="radio" class="inp_radio" value="1" name="ios_video_top" > 置顶
+                            </label></span>
+                        </td>
+                    </if>
+                </tr>
+
 
 
                         <notempty name="data.accredit_img">
@@ -1562,6 +1587,7 @@
                 id:'#screenshot',
                 multiple:true
             },
+           fileSingleSizeLimit:3*1024*1024,   //设定单个文件大小
             // dnd: false,
             paste: document.body,
             accept: {
@@ -1655,6 +1681,15 @@
             $percent.text( (percentage * 100).toFixed(0) + '%' );
         });
 
+       /**
+        * 验证文件格式以及文件大小
+        */
+       uploaderVideo.on("error",function (type){
+         if(type=="F_EXCEED_SIZE"){
+               layer.msg("视频大小不能超过3M");
+           }
+       });
+
         uploaderImgScreen.on( 'uploadSuccess', function( file , response) {
             imgListScreenData.push(Number(response.id));
             console.log(imgListScreenData)

Application/Base/Service/PromoteService.class.php

@@ -330,12 +330,20 @@ class PromoteService {
 
         $map = [];
         $map['promote_id'] = $fromPromote['id'];
+        $spendMap = $map;
         if (count($shiftIds) > 0) {
-            $map['id'] = ['in', $shiftIds];
+            $spendMap['user_id'] = $map['id'] = ['in', $shiftIds];
         }
 
         $users = M('user', 'tab_')->field(['id', 'account', 'nickname'])->where($map)->select();
 
+        $spendMap['pay_time'] = ['egt', $orderTime];
+        $payAmountRows = M('spend', 'tab_')
+            ->field(['user_id', 'sum(pay_amount) payAmount'])
+            ->where($spendMap)
+            ->select();
+        $payAmountRows = index_by_column('user_id', $payAmountRows);
+
         $mends = [];
         foreach ($users as $item) {
             $mends[] = [
@@ -349,6 +357,7 @@ class PromoteService {
                 'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark,
                 'order_time' => $orderTime,
                 'create_time' => time(),
+                'pay_amount' => isset($payAmountRows[$item['id']]) ? $payAmountRows[$item['id']]['payAmount'] : 0,
                 'op_id' => $creator ? $creator['id'] : 0,
                 'op_account' => $opAccount,
                 'op_type' => $task['creator_type'],

Application/Home/Controller/DownloadController.class.php

@@ -36,6 +36,11 @@ class DownloadController extends BaseController {
         1 => '汇款中',
         2 => '已汇款',
     ];
+
+    public static $payStatus = [
+        0 => '下单未支付',
+        1 => '充值成功',
+    ];
     
     /**
     * excel
@@ -1204,9 +1209,15 @@ class DownloadController extends BaseController {
         empty(I('game_player_name')) || $map['tab_spend.game_player_name'] = ['like', '%' . I('game_player_name') . '%'];
         empty(I('user_account')) || $map['tab_spend.user_account'] = ['like', '%' . I('user_account') . '%'];
         empty(I('pay_order_number')) || $map['tab_spend.pay_order_number'] = I('pay_order_number');
-        $map['tab_spend.pay_status'] = 1;
+        // $map['tab_spend.pay_status'] = 1;
         $map['tab_spend.is_check'] = ['neq', 2];
-        
+        if (isset($_REQUEST['pay_status']) && $_REQUEST['pay_status'] !== '') {
+            $payStatus = intval(I('pay_status'));
+
+            if (in_array($payStatus, array_keys(self::$payStatus))) {
+                $map['tab_spend.pay_status'] = $payStatus;
+            }
+        }
         $conditions = json_encode($map,TRUE);           
          $addtime = time();
          $data = [
@@ -3114,7 +3125,9 @@ class DownloadController extends BaseController {
             '游戏订单',
             '订单金额',
             '支付方式',
+            '充值状态',
             '游戏名称',
+            '设备类型',
             '区服',
             '角色名',
             '部门长',
@@ -3184,6 +3197,8 @@ class DownloadController extends BaseController {
                  // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12);
                  $value1['user_account'] = $this->encryption($value1['user_account']);
                  $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']);
+                 $value1['pay_status'] = isset(self::$payStatus[$value1['pay_status']]) ? self::$payStatus[$value1['pay_status']] : "未知状态";
+                 $value1['sdk_version'] = getSDKTypeName($value1['sdk_version']);
                  switch ($value1['level']) {
                      case 3:
                          $value1['p_p_pro_account'] = $promoteData[$value1['parent_id']]['account'];
@@ -3212,7 +3227,9 @@ class DownloadController extends BaseController {
                  $csvData["pay_order_number"] = $value1["pay_order_number"];
                  $csvData["pay_amount"] = $value1["pay_amount"];
                  $csvData["pay_way"] = $value1["pay_way"];
+                 $csvData['pay_status'] = $value1['pay_status'];
                  $csvData["game_name"] = $value1["game_name"];
+                 $csvData["sdk_version"] = $value1['sdk_version'];
                  $csvData["server_name"] = $value1["server_name"];
                  $csvData["game_player_name"] = $value1["game_player_name"];
                  $csvData["p_p_proinfo"] = $value1["p_p_proinfo"];
@@ -3239,7 +3256,9 @@ class DownloadController extends BaseController {
          $csvData1["pay_order_number"] = "--";
          $csvData1["pay_amount"] = $income;
          $csvData1["pay_way"] = "--";
+         $csvData1['pay_status'] = "--";
          $csvData1["game_name"] = "--";
+         $csvData1["sdk_version"] = "--";
          $csvData1["server_name"] = "--";
          $csvData1["game_player_name"] = "--";
          $csvData1["p_p_proinfo"] = "--";

Application/Home/Controller/HomeController.class.php

@@ -179,7 +179,8 @@ class HomeController extends Controller
             'game_size',
             'introduction',
             'flooring_page_video',
-            'supersign_status'
+            'supersign_status',
+            'ios_video_top'
         ];
         $map = ['id' => intval($gameId)];
         $game = M('game', 'tab_')->field($columns)->where($map)->find();
@@ -209,8 +210,15 @@ class HomeController extends Controller
         }
         $game['flooring_page_imgs'] = $imageUrls;
 
+        $screenshotIds = explode(',', $game['screenshot']) ?? [];
+        $screenshotUrls = [];
+        foreach ($screenshotIds as $screenshotId) {
+            $screenshotUrls[] = get_cover($screenshotId, 'path');
+        }
+        $game['screenshot'] = $screenshotUrls;
+
         $isNewIos = false;
-         if ($gameSource['is_new_sdk'] == 1) {
+        if ($gameSource['is_new_sdk'] == 1) {
             $isNewIos = true;
         }
 

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

@@ -45,6 +45,8 @@
 
 <div class="home">
 
+  <!--落地页视频置顶-->
+  <?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">
 
@@ -57,17 +59,29 @@
       <div class="fiexd-heard">
         <div class="fiexd-heardBox" style="display: none;">
 <!--          <div>完成</div>-->
-          <img src="{$game['icon']}" alt="" style="ma">
+          <img src="{$game['icon']}" alt="" style="">
-          <div class="fiexd-pay">
+          <div class="download">下载</div>
-<!--            <span>App购买</span>-->
-            <div class="download">下载</div>
-          </div>
         </div>
       </div>
     </div>
   </div>
 
+<!--落地页视频不置顶-->
+<?php else:?>
 
+<div class="home-fiexd-two" style="background: #fff;width: 100%;height: 4.22rem;">
+  <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;">
+    <div class="fiexd-heardBox">
+      <img src="{$game['icon']}" alt="" style="">
+      <div class="download">下载</div>
+    </div>
+  </div>
+</div>
+
+<?php endif;?>
 
   <div class="home-box">
     <div class="heard">
@@ -113,7 +127,7 @@
     </div>
     <div class="slide_list">
       <ul class="slide-box">
-        <volist name="game['flooring_page_imgs']" id="item">
+        <volist name="game['screenshot']" id="item">
           <li class="slide-item">
             <img src="{$item}" alt="">
           </li>
@@ -335,17 +349,30 @@
 <script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
 <script>
   $(window).scroll(function () {
-    var v = ($(this).scrollTop()) / 100;
+  <?php if ($game['ios_video_top'] == 1):?>
-    //为什么除以100是因为我希望当$(this).scrollTop()为100的过程中，
+      var v=($(this).scrollTop())/100;
-    //透明度由0变为1，$(this).scrollTop()/100得到的值正好与opacity的范围[0,1]相符合。
+      $(".fiexd-heardBox").show();
-    $(".fiexd-heardBox").show();
+      $('.home-fiexd .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
-    $('.fiexd-heard').css('backgroundColor', 'rgba(255, 255, 255,' + v + ')');
+
-
+      var t = $(window).scrollTop();
-    var t = $(window).scrollTop();
+      if(t<10){
-    if (t < 10) {
+        $(".home-fiexd .fiexd-heardBox").hide();
-      console.log(111)
+      }
-      $(".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 endif;?>
+
   })
 
 </script>
@@ -355,6 +382,7 @@
 
   <?php if(!empty($game['flooring_page_video'])):?>
     var video = document.getElementById("shakeVideo");
+    console.log(video)
     video.play();
     document.addEventListener('WeixinJSBridgeReady',function(){
         video.play();

Application/Home/View/default/Home/landingPage2.html

@@ -17,6 +17,27 @@
   <link rel="stylesheet" href="__CSS__/landing_page.css">
 </head>
 <body class="main_bg" style="background-color: #0a0a0a;height: auto;">
+<style>
+  .home-video {
+    position: absolute;
+    text-align: center;
+    top: 23.28%;
+  }
+  .home-video video {
+    margin-left: 0.45%;
+    width: 84.75%;
+  }
+  @media(min-width:580px){
+    .home-video {
+      max-width:580px;
+    }
+  }
+  @media(min-height:580px){
+    .home-video {
+      max-width:580px;
+    }
+  }
+</style>
 <input type="hidden" name="title" value="{$game['relation_game_name']}">
 <input type="hidden" name="icon" value="{$game['icon']}">
 <input type="hidden" name="desc" value="{$game['features']}">
@@ -33,12 +54,21 @@
 
 <div class="h_wrap">
   <div id="data-2">
-    <volist name="game['flooring_page_imgs']" id="item">
+    <volist name="game['flooring_page_imgs']" id="item" key="k">
+      <div style="position: relative;">
+      <?php if ($k == 1) :?>
+      <?php if (!empty($game['flooring_page_video'])):?>
+      <div class="home-video">
+        <video id="shakeVideo" src="{$game['flooring_page_video']}" controls muted webkit-playsinline="true" playsinline="true"></video>
+      </div>
+      <?php endif;?>
+      <?php endif ;?>
       <?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
       <a href="#" class="no-package"><img src="{$item}" style="width: 100%;"/></a>
       <?php else :?>
       <a href="javascript:;" class="down-link" down-link="{$downloadUrl}"><img src="{$item}" style="width: 100%;"/></a>
       <?php endif ;?>
+      </div>
     </volist>
   </div>
 </div>

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

@@ -227,6 +227,7 @@
                 <td>合计</td>
                 <td>--</td>
                 <td>--</td>
+                <td>--</td>
                 <td>{$income}</td>
                 <td>--</td>
                 <td>--</td>

Data/update.sql

@@ -617,9 +617,6 @@ MODIFY COLUMN `type`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '类型 0
 -- user表注册类型添加7虚拟
 ALTER TABLE `tab_user` MODIFY COLUMN `register_type` tinyint(2) DEFAULT '1' COMMENT '注册方式 0游客1账号 2 手机 3微信 4QQ 5百度 6微博 7虚拟';
 
-ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)';
-
-
 --游戏评分字段改为保留小数1位  2019-12-03 郑昌隆---
 ALTER TABLE tab_game MODIFY COLUMN `game_score` double(3,1) DEFAULT '0' COMMENT '游戏评分';
 
@@ -656,3 +653,46 @@ VALUES ('ServerNotice', '游戏区服预告', '0', '', '1', '{\"1\":[\"289\",\"2
 --游戏表新增字段-落地页视频  liuweiwen 2019-12-09
 ALTER TABLE tab_game ADD `flooring_page_video` varchar(150) NOT NULL DEFAULT '' COMMENT '落地页视频';
 ALTER TABLE tab_game ADD `supersign_status` tinyint(1) DEFAULT '1' COMMENT '超级签开关：1-开启；0-关闭';
+ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落地页视频是否置顶：1-置顶；0-不置顶';
+
+-- 新旧IOS打包标识
+ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)';
+ALTER TABLE `tab_mend` ADD COLUMN `pay_amount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '换绑时归属前推广员的充值金额' AFTER `promote_account_to`;
+
+-- 合服游戏区服表  tping
+CREATE TABLE `tab_server_union` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键自增',
+  `game_id` int(11) NOT NULL COMMENT '游戏id',
+  `game_name` varchar(30) NOT NULL COMMENT '游戏名称',
+  `server_name` varchar(30) NOT NULL COMMENT '区服名称',
+  `server_num` int(11) DEFAULT NULL COMMENT '对接区服id',
+  `recommend_status` tinyint(2) DEFAULT '1' COMMENT '推荐状态(0:否,1:是)',
+  `show_status` tinyint(2) DEFAULT '1' COMMENT '显示状态(0:否,1:是)',
+  `stop_status` tinyint(2) DEFAULT '0' COMMENT '是否停服(0:否,1:是)',
+  `server_status` tinyint(2) DEFAULT '0' COMMENT '区服状态(0:正常,1拥挤,2爆满)',
+  `icon` int(11) DEFAULT NULL COMMENT '区服图标',
+  `start_time` int(11) DEFAULT NULL COMMENT '开始时间',
+  `desride` varchar(300) DEFAULT NULL COMMENT '描述',
+  `prompt` varchar(300) DEFAULT NULL COMMENT '停服提示',
+  `parent_id` int(11) DEFAULT NULL COMMENT '父类id',
+  `create_time` int(11) DEFAULT NULL COMMENT '创建时间',
+  `server_version` tinyint(2) DEFAULT NULL COMMENT '运营平台 1and 2ios 0双平台',
+  `developers` int(11) DEFAULT '0' COMMENT '开发商',
+  `server_id` varchar(50) NOT NULL DEFAULT '' COMMENT '对接区服id',
+  PRIMARY KEY (`id`),
+  KEY `game_id` (`game_id`),
+  KEY `show_status` (`show_status`),
+  KEY `start_time` (`start_time`),
+  KEY `create_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='合服游戏区服表';
+
+-- 用户行为
+ALTER TABLE `tab_pay_info` ADD COLUMN `user_account` varchar(30) DEFAULT NULL COMMENT '用户账号';
+ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_name` varchar(30) DEFAULT '' COMMENT '游戏玩家昵称';
+ALTER TABLE `tab_pay_info` ADD COLUMN `game_name` varchar(30) DEFAULT '' COMMENT '游戏名称';
+ALTER TABLE `tab_pay_info` ADD COLUMN `server_id` int(11) DEFAULT '0' COMMENT '区服id';
+ALTER TABLE `tab_pay_info` ADD COLUMN `server_name` varchar(30) DEFAULT '' COMMENT '区服名称';
+ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id';
+ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` int(11) 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 '推广员账号';

Public/Home/css/index2.css

@@ -40,6 +40,7 @@
     font-size: 0.32rem;
     color: #007AFF;
     line-height: 1.2rem;
+    height: 100%;
 }
 .fiexd-heardBox>img{
     width: 0.6rem;
@@ -55,7 +56,7 @@
     font-size: 0.2rem;
     margin-right: 0.14rem;
 }
-.fiexd-pay>div{
+.download{
     width: 1.5rem;
     height: 0.6rem;
     background-color: #007AFF;
@@ -65,7 +66,6 @@
     line-height: 0.6rem;
     color: #fff;
     font-weight: 500;
-    margin-top: 0.3rem;
 }
 .heard{
     width: 100%;