+
+
style="height: 0" >
+
+
+
@@ -57,17 +59,29 @@
+
+
+
+
+
+
+
@@ -335,17 +349,30 @@
@@ -355,6 +382,7 @@
var video = document.getElementById("shakeVideo");
+ console.log(video)
video.play();
document.addEventListener('WeixinJSBridgeReady',function(){
video.play();
diff --git a/Data/update.sql b/Data/update.sql
index 21e61074f..c4b7e0a93 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -656,3 +656,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-关闭';
+ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落地页视频是否置顶：1-置顶；0-不置顶';
diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css
index 9cef35936..3a43af57a 100644
--- a/Public/Home/css/index2.css
+++ b/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%;
From 48ae252b4e072452d85dd72722fc225df0b79d21 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Tue, 10 Dec 2019 18:27:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=A1=A8=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E8=A7=86=E9=A2=91=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E7=BD=AE=E9=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Data/update.sql | 1 +
1 file changed, 1 insertion(+)
diff --git a/Data/update.sql b/Data/update.sql
index c365cc758..93eda7d90 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -653,6 +653,7 @@ 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)';
From 46dda0848f4b364a8ba34b4aef4cacc4ede15a29 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Wed, 11 Dec 2019 09:24:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E6=9C=8D=20=20=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E8=A1=8C=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Data/update.sql | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/Data/update.sql b/Data/update.sql
index 93eda7d90..68d6fd901 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -657,3 +657,41 @@ ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落
-- 新旧IOS打包标识
ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)';
+
+-- 合服游戏区服表 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 '推广员账号';
\ No newline at end of file