diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index c77d8e563..e78b40125 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/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; diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 3315c28b0..a49fa8538 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -380,7 +380,7 @@ - 视频大小不能超过20M + 视频大小不能超过20M,支持格式:mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,qlv @@ -427,6 +427,7 @@ + 下载状态: @@ -453,6 +454,7 @@ + 下载端口: @@ -497,6 +499,32 @@ + + + 超级签状态: + + + + + + + + + + + + + + + @@ -757,7 +785,6 @@ -
@@ -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, diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 7a99c684a..ff6301680 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/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(); diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 824d2a508..bdca5ba6e 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -32,6 +32,8 @@ + + @@ -42,11 +44,31 @@
- -
- + +
style="height: 0" > +
+ + +
+ +
+ + +
+ +
+
- + + +
@@ -208,25 +230,33 @@
-