Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Admin/View/SuperStatistical/lists.html

@@ -127,12 +127,7 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
             charset="UTF-8"></script>
     <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
-    <script>
+
-        <volist  name = ":I('get.')" id = "vo">
-                Think.setValue('{$key}', "{$vo}");
-        </volist>
-        $(".select_gallery").select2();
-    </script>
 <script type="text/javascript">
     $(function(){
         $(".select_gallery").select2();

Application/Admin/View/SuperStatistical/superDetail.html

@@ -158,12 +158,7 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
             charset="UTF-8"></script>
     <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
-    <script>
+
-        <volist  name = ":I('get.')" id = "vo">
-                Think.setValue('{$key}', "{$vo}");
-        </volist>
-        $(".select_gallery").select2();
-    </script>
 <script type="text/javascript">
 	$(function(){
 		$(".select_gallery").select2();

Application/Home/Controller/HomeController.class.php

@@ -223,6 +223,9 @@ class HomeController extends Controller
         if ($gameSource['is_new_sdk'] == 1) {
             $isNewIos = true;
         }
+        
+        // 调试
+        $isIOS = true;
 
         $downloadUrl = '';
         if (!$isNewIos && $isIOS13) {
@@ -243,7 +246,7 @@ class HomeController extends Controller
         $this->assign('promoteId', $promoteId);
         $cur_url = base64_encode(base64_encode("http://" . $_SERVER['HTTP_HOST'] . __SELF__));
         $this->assign('cur_url', $cur_url);
-        if ($this->get_device_type() == 'ios') {
+        if ($isIOS) {
             $this->display('landingPage');
         } else {
             $this->display('landingPage2');

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

@@ -269,20 +269,26 @@
 
 
       <?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>
       <?php else:?>
       <div class="blue-btn" onclick="layer.msg('已售空，我们正在努力上货中~');">￥10至尊下载</div>
       <?php endif;?>
+
+      <?php if ($game['stable_status'] == 1):?>
+      <div class="blue-btn stabilization" data-url="{$game['stable_url']}">稳定版下载</div>
+      <?php else:?>
+      <div class="blue-btn" onclick="layer.msg('已售空，我们正在努力上货中~');">稳定版下载</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="blue-btn stabilization" onclick="layer.msg('该游戏已关闭下载');">稳定版下载</div>
       <div class="gray-btn down-link"  onclick="layer.msg('该游戏已关闭下载');return false;" down-link="{$downloadUrl}">普通下载</div>
       <?php endif;?>
-
-
-
-
     </div>
   </div>
 </div>