Commit dcc7a93b by doszhang

Merge branch 'master' into release

parents 478a92ad cfe921c3
...@@ -20,15 +20,20 @@ class IndexController extends Controller ...@@ -20,15 +20,20 @@ class IndexController extends Controller
public function index() public function index()
{ {
session_start(); session_start();
$_SESSION['joinTime'] = time(); $_SESSION['joinTime'] = time();
$num = M('num')->where('id=1')->select(); $num = M('num')->where('id=1')->select();
$num = $num[0]['num']; $num = $num[0]['num'];
$this->assign('num',$num); $this->assign('num',$num);
$this->display(); $this->display();
} }
public function addNum(){ public function addNum(){
if(time() > 1584720000)
{
header("HTTP/1.0 404 Not Found");
exit;
}
$referer = $_SERVER['HTTP_REFERER']; $referer = $_SERVER['HTTP_REFERER'];
$refererInfo = parse_url( $referer ); $refererInfo = parse_url( $referer );
if( $refererInfo['host'] != $_SERVER['HTTP_HOST'] ) if( $refererInfo['host'] != $_SERVER['HTTP_HOST'] )
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// body 主题部分 // body 主题部分
{:block name="body"} {:block name="body"}
<div class="page-22 page1 page animated"><div class="res-248 bg"></div><div class="res-286 input-wrapper"><div class="res-353"></div><div class="res-354 business"><input name="business" type="text" /></div><div class="res-355"></div><div class="res-356 name"><input name="name" type="text" /></div><div class="res-357 ID"></div><div class="res-358 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div><div class="res-268 music play"></div><div class="res-269 hide music stop"></div></div><div class="res-255 bottom"></div><div class="res-256 btn-go"></div><div class="res-257"></div><div class="res-263 hide regulate-block"><div class="res-264 hd"></div><div class="res-258"></div><div class="res-259"></div><div class="res-266 upload-canvas-block"></div><div class="res-265 black"></div><div class="res-260 btn-retry"></div><div class="res-261 btn-ok"></div><div class="res-361"></div></div><div class="res-262 logo"></div><div class="res-267 num"></div></div><div class="page-23 poster-page page animated"><div class="res-270 bg"></div><div class="res-359"></div><div class="res-274 poster-canvas"></div><div class="res-275 hide music stop"></div><div class="res-276 music play"></div><div class="res-360"><div class="res-272 btn-backtohome"></div><div class="res-271 btn-change"></div></div></div><div class="page-25 loading-page page animated"><div class="res-290 bg"></div><div class="res-291 progress"><div class="res-288"></div></div><div class="res-289 plant"></div><div class="res-292 loading-text"></div></div> <div class="page-22 page1 page animated"><div class="res-248 bg"></div><div class="res-286 input-wrapper"><div class="res-353"></div><div class="res-354 business"><input name="business" type="text" /></div><div class="res-355"></div><div class="res-356 name"><input name="name" type="text" /></div><div class="res-357 ID"></div><div class="res-358 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div><div class="res-268 music play"></div><div class="res-269 hide music stop"></div></div><div class="res-255 bottom"></div><div class="res-256 btn-go"></div><div class="res-257"></div><div class="res-263 hide regulate-block"><div class="res-264 hd"></div><div class="res-258"></div><div class="res-259"></div><div class="res-266 upload-canvas-block"></div><div class="res-265 black"></div><div class="res-260 btn-retry"></div><div class="res-261 btn-ok"></div><div class="res-361"></div></div><div class="res-262 logo"></div><div class="res-267 num"></div></div><div class="page-23 poster-page page animated"><div class="res-270 bg"></div><div class="res-359"></div><div class="res-274 poster-canvas"></div><div class="res-275 hide music stop"></div><div class="res-276 music play"></div><div class="res-360"><div class="res-272 btn-backtohome"></div><div class="res-271 btn-change"></div></div></div><div class="page-25 loading-page page animated"><div class="res-290 bg"></div><div class="res-291 progress"><div class="res-288"></div></div><div class="res-289 plant"></div><div class="res-292 loading-text"></div></div><div class="page-30 end-page page animated"><div class="res-366 hd"></div><div class="res-367"></div></div>
{:/block} {:/block}
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
} }
</script> </script>
<title>{:block name='title'}责任使命,我愿许下承诺{:/block}</title> <title>{:block name='title'}责任使命,我愿许下承诺{:/block}</title>
{:if $projectId && strpos( $smarty.server.HTTP_HOST , 'dev.izhida.cn') !== false} {:if false && $projectId && strpos( $smarty.server.HTTP_HOST , 'dev.izhida.cn') !== false}
<link rel="stylesheet" type="text/css" href="http://projectx.weitoy.com/api/css/rem/{:$rem}/id/{:$projectId}?version=1.0.1" <link rel="stylesheet" type="text/css" href="http://projectx.weitoy.com/api/css/rem/{:$rem}/id/{:$projectId}?version=1.0.1"
media="all" /> media="all" />
{:else} {:else}
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<audio src="__CDN__/media/2.mp3" preload="auto" loop="loop" id="music" style="display:none"></audio> <audio src="__CDN__/media/2.mp3" preload="auto" loop="loop" id="music" style="display:none"></audio>
<div class="wrap"> <div class="wrap">
<div class="wrap-inner"> <div class="wrap-inner">
{:if $projectId && strpos( $smarty.server.HTTP_HOST , 'dev.izhida.cn') !== false} {:if false && $projectId && strpos( $smarty.server.HTTP_HOST , 'dev.izhida.cn') !== false}
{:"http://projectx.weitoy.com/api/html/id/`$projectId`"|file_get_contents} {:"http://projectx.weitoy.com/api/html/id/`$projectId`"|file_get_contents}
{:else} {:else}
{:block name='body'}{:/block} {:block name='body'}{:/block}
......
...@@ -142,7 +142,7 @@ input[name=business] { ...@@ -142,7 +142,7 @@ input[name=business] {
} }
.page1 .regulate-block { .page1 .regulate-block {
z-index: 1; z-index: 12;
} }
.poster-canvas { .poster-canvas {
...@@ -158,4 +158,14 @@ input[name=business] { ...@@ -158,4 +158,14 @@ input[name=business] {
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 1; z-index: 1;
}
.logo {
z-index: 11;
}
.end-page {
position: absolute;
top: 0;
z-index: 10;
} }
\ No newline at end of file
...@@ -69,6 +69,7 @@ let noInfo = { ...@@ -69,6 +69,7 @@ let noInfo = {
let createPosterLock = false; let createPosterLock = false;
$('.loading-page').show(); $('.loading-page').show();
preloadimages(preloadImageList, function () { preloadimages(preloadImageList, function () {
let progress = 0.3; let progress = 0.3;
let timer = setInterval(function () { let timer = setInterval(function () {
if (progress < 1) { if (progress < 1) {
...@@ -77,13 +78,20 @@ preloadimages(preloadImageList, function () { ...@@ -77,13 +78,20 @@ preloadimages(preloadImageList, function () {
$('.loading-page .progress').css('width', 368 * progress + 'px'); $('.loading-page .progress').css('width', 368 * progress + 'px');
$('.loading-page .plant').css('transform', 'translateX(' + (-368 + (368 * progress)) + 'px)'); $('.loading-page .plant').css('transform', 'translateX(' + (-368 + (368 * progress)) + 'px)');
} else { } else {
clearInterval(timer); clearInterval(timer);
const timestamp = timest();
if (browser.versions.weixin) { if (browser.versions.weixin) {
let musicTime = setInterval(function () { let musicTime = setInterval(function () {
if ($('#music')[0].currentTime > 0) { if ($('#music')[0].currentTime > 0) {
initPage(); initPage();
$('.loading-page').hide(); $('.loading-page').hide();
$('.page1').show(); $('.page1').show();
if (timestamp > 1584720000) {
$('.end-page').show();
}
clearInterval(musicTime); clearInterval(musicTime);
} }
}, 100); }, 100);
...@@ -91,6 +99,9 @@ preloadimages(preloadImageList, function () { ...@@ -91,6 +99,9 @@ preloadimages(preloadImageList, function () {
initPage(); initPage();
$('.loading-page').hide(); $('.loading-page').hide();
$('.page1').show(); $('.page1').show();
if (timestamp > 1584720000) {
$('.end-page').show();
}
} }
} }
}, 60); }, 60);
...@@ -566,4 +577,10 @@ function checkIt(bind, maxNum) { ...@@ -566,4 +577,10 @@ function checkIt(bind, maxNum) {
} }
} }
return true; return true;
}
function timest() {
var tmp = Date.parse(new Date()).toString();
tmp = tmp.substr(0, 10);
return tmp;
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com> // | Author: liu21st <liu21st@gmail.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// die();
if(version_compare(PHP_VERSION,'5.3.0','<')) die('require PHP > 5.3.0 !'); if(version_compare(PHP_VERSION,'5.3.0','<')) die('require PHP > 5.3.0 !');
define('WEB_ROOT_PATH', realpath(dirname(__FILE__))); define('WEB_ROOT_PATH', realpath(dirname(__FILE__)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment