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

Application/Admin/Controller/GameController.class.php

@@ -347,6 +347,7 @@ class GameController extends ThinkController
             $phone['dow_icon'] = $sibling['dow_icon'];
             $phone['back_map'] = $sibling['back_map'];
             $phone['flooring_page_video'] = $sibling['flooring_page_video'];
+            $phone['supersign_status'] = $sibling['supersign_status'];
             M('Game', 'tab_')->data($phone)->where(array('id' => $another['id']))->save();
             //同时修改代充游戏折扣
             $set_fidel['status'] = 1;

Application/Admin/View/Game/edit.html

@@ -380,7 +380,7 @@
                           </div>
                       <input type="hidden" id="video_url"  name="flooring_page_video"  value="{$data['flooring_page_video']}"/>
 											</span>
-                        <span class="notice-text">视频大小不能超过20M</span>
+                        <span class="notice-text">视频大小不能超过20M，支持格式：mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,qlv</span>
                     </td>
                 </tr>
 
@@ -427,6 +427,7 @@
                             </volist></span>
                                 </td>
                             </tr>
+
                             <tr>
                                 <td class="l">下载状态：</td>
 
@@ -453,6 +454,7 @@
                                     </td>
                                 </if>
                             </tr>
+
                             <tr>
                                 <td class="l">下载端口：</td>
                                 <td class="r" >
@@ -497,6 +499,32 @@
 		                            <input type="text" class="txt " name="supersign_url" value="{$data['supersign_url']}" placeholder="请输入超级签URL" >
 		                        </td>
 		                    </tr>
+
+                            <tr>
+                                <td class="l">超级签状态：</td>
+                                <if condition="$data['supersign_status'] eq 1">
+                                    <td class="r" >
+                        <span class="form_radio table_btn">
+                            <label>
+                                <input type="radio" class="inp_radio" value="0" name="supersign_status" > 关闭
+                            </label>
+                            <label>
+                                <input type="radio" class="inp_radio" value="1" name="supersign_status" 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="supersign_status" checked="checked"> 关闭
+                            </label>
+                            <label>
+                                <input type="radio" class="inp_radio" value="1" name="supersign_status" > 开启
+                            </label></span>
+                                    </td>
+                                </if>
+                            </tr>
+
                             </tbody>
                         </table>
                     </div>
@@ -757,7 +785,6 @@
             </table>
         </div>
 
-
         <div class="form-item cf">
             <input type="hidden" name='id' value="{$data['id']}" />
             <input type="hidden" name='type' value="{$_GET['type']}" />
@@ -1139,8 +1166,8 @@
             paste: document.body,
             accept: {
                 title: '视频',
-                extensions: 'mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,',
-                mimeTypes: '.mp4,.3gp,.wmv,.asf,.asx,.mov,.m4v,.avi,.flv',
+                extensions: 'mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,qlv',
+                mimeTypes: '.mp4,.3gp,.wmv,.asf,.asx,.mov,.m4v,.avi,.flv,.qlv',
             },
             // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
             resize: false,

Application/Home/Controller/HomeController.class.php

@@ -179,6 +179,7 @@ class HomeController extends Controller
             'game_size',
             'introduction',
             'flooring_page_video',
+            'supersign_status'
         ];
         $map = ['id' => intval($gameId)];
         $game = M('game', 'tab_')->field($columns)->where($map)->find();

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

@@ -32,6 +32,8 @@
 <input type="hidden" name="desc" value="{$game['features']}">
 <input type="hidden" name="isIOS13" value="<?php if($isIOS13):?>1<?php else:?>0<?php endif;?>">
 <input type="hidden" name="isNewIos" value="<?php if($isNewIos):?>1<?php else:?>0<?php endif;?>">
+<input type="hidden" name="supersign_status" value="{$game['supersign_status']}" id="supersign_status">
+
 <?php if ($isWechat):?>
 <?php if ($isAndroid):?>
 <div class="bn-rule" style="display: none;"><img id="rule-img" src="__STATIC__/ios9/images/android-rule.png"></div>
@@ -42,11 +44,31 @@
 
 
 <div class="home">
-  <?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 class="home-fiexd" <?php if (empty($game['flooring_page_video'])):?> style="height: 0" <?php endif;?> >
+    <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;?>
+
+      <div class="fiexd-heard">
+        <div class="fiexd-heardBox" style="display: none;">
+<!--          <div>完成</div>-->
+          <img src="{$game['icon']}" alt="" style="ma">
+          <div class="fiexd-pay">
+<!--            <span>App购买</span>-->
+            <div class="download">下载</div>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
-  <?php endif;?>
+
+
+
   <div class="home-box">
     <div class="heard">
       <div style="height: 2.5rem;width: 2.5rem">
@@ -208,25 +230,33 @@
   </div>
 </div>
 
-<div class="window" style="display: none;">
+<div class="window" style="display: none;z-index: 1000">
   <div class="containner">
     <div class="containner-box">
       <div class="text"> 购买至尊下载，赠送限量至尊超级礼包（价值100元）</div>
       <div class="text">• 至尊下载：永不闪退、不丢数据稳定有保障</div>
       <div class="text"> • 同一设备安装一次可在一年内无限次下载重装</div>
 
+
+
       <?php if ($game['dow_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>
-      <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>
       <?php endif;?>
 
+
+
     </div>
   </div>
 </div>
-<div class="second" style="display: none;">
+<div class="second" style="display: none;z-index: 1000">
   <div class="second-box">
     <div class="title">升级IOS9后，游戏打不开怎么办</div>
     <div class="carousel">
@@ -287,7 +317,7 @@
 <input type="hidden" id="dow_status" name="dow_status" value="{$game['dow_status']}">
 <input type="hidden" id="cur_url" name="cur_url" value="{$cur_url}">
 <input type="hidden" id="is_new_sdk" name="is_new_sdk" value="{$is_new_sdk}">
-<div class="safari" style="display: none">
+<div class="safari" style="display: none;z-index: 1000">
   <div class="safari-heard">
     <div>请选择在“Safari”中打开</div>
     <img src="__IMG__/arror.png" alt="">
@@ -304,7 +334,26 @@
 </html>
 <script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
 <script>
-  <?php if (!empty($game['flooring_page_video'])):?>
+  $(window).scroll(function () {
+    var v = ($(this).scrollTop()) / 100;
+    //为什么除以100是因为我希望当$(this).scrollTop()为100的过程中，
+    //透明度由0变为1，$(this).scrollTop()/100得到的值正好与opacity的范围[0,1]相符合。
+    $(".fiexd-heardBox").show();
+    $('.fiexd-heard').css('backgroundColor', 'rgba(255, 255, 255,' + v + ')');
+
+    var t = $(window).scrollTop();
+    if (t < 10) {
+      console.log(111)
+      $(".fiexd-heardBox").hide();
+    }
+  })
+
+</script>
+
+<script>
+
+
+  <?php if(!empty($game['flooring_page_video'])):?>
     var video = document.getElementById("shakeVideo");
     video.play();
     document.addEventListener('WeixinJSBridgeReady',function(){
@@ -567,3 +616,4 @@
 
 
 </script>
+

Application/Mobile/Controller/SsgController.class.php

@@ -308,9 +308,9 @@ class SsgController extends BaseController {
         $this->assign("app_qq", $appqq);
         $this->display();
     }
+
     public function getGamaList()
     {
-
         $user = session("user_auth");
         $game_name = I("game_name", false);
         $type = I("type",false);
@@ -318,8 +318,9 @@ class SsgController extends BaseController {
         if($game_name){
             $map["game_name"] = array("like","%{$game_name}%");
         }
-        $map["sdk_version"]=2;
-        $map["game_status"]=1;
+        $map["sdk_version"] = 2;
+        $map["game_status"] = 1;
+        $map["supersign_status"] = 1;
         $game_list = M("game", "tab_")->field("*, id as game_id")->where($map)->select();
         for ($i=0; $i < count($game_list); $i++) {
             $game_list[$i]["game_icon"] = get_cover($game_list[$i]["icon"], 'path');

Data/update.sql

@@ -655,3 +655,4 @@ 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-关闭';

Public/Home/css/index2.css

@@ -1,17 +1,71 @@
+
+.home{
+    width: 100%;
+    font-family:PingFang SC;
+}
+.home-box{
+    padding: 0.5rem 0.37rem 0 0.31rem;
+}
+.home-fiexd{
+    height: 4.22rem;
+    width: 100%;
+    background-color: #fff;
+}
+.home-fiexdBox{
+    position: fixed;
+    width: 100%;
+    top: 0;
+    left: 0;
+    z-index: 999;
+}
 .home-video{
     width: 100%;
     height: 4.22rem;
+    background-color: #fff;
 }
 .home-video video{
     width: 100%;
     height: 100%;
 }
-.home{
+.fiexd-heard{
     width: 100%;
-    font-family:PingFang SC;
+    height: 1.2rem;
+    background: rgba(255, 255, 255, 0);
 }
-.home-box{
-    padding: 0.5rem 0.37rem 0 0.31rem;
+.fiexd-heardBox{
+    padding: 0 0.3rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 0.32rem;
+    color: #007AFF;
+    line-height: 1.2rem;
+}
+.fiexd-heardBox>img{
+    width: 0.6rem;
+    height: 0.6rem;
+    border-radius: 0.1rem;
+}
+.fiexd-pay{
+    display: flex;
+    align-items: center;
+}
+.fiexd-pay>span{
+    color: #A9A9A9;
+    font-size: 0.2rem;
+    margin-right: 0.14rem;
+}
+.fiexd-pay>div{
+    width: 1.5rem;
+    height: 0.6rem;
+    background-color: #007AFF;
+    border-radius: 0.3rem;
+    color: 0.32rem;
+    text-align: center;
+    line-height: 0.6rem;
+    color: #fff;
+    font-weight: 500;
+    margin-top: 0.3rem;
 }
 .heard{
     width: 100%;
@@ -519,3 +573,5 @@
     font-weight: 500;
 }
 
+
+