Merge branch 'master' into 'release'

update

See merge request !1

Application/Home/View/default/Index_index.tpl

@@ -12,7 +12,7 @@
 //  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-30 end-page page animated"><div class="res-366 hd"></div><div class="res-367"></div></div>
+<div class="page-2077 page1 page"><div class="res-28603 bg"></div><div class="res-28563 bottom"><div class="res-28560"></div><div class="res-28561"></div></div><div class="res-28648 top"><div class="res-28649"></div><div class="res-28650 home-logo"></div></div><div class="res-28604"></div><div class="res-28647"></div><div class="res-28547"></div><div class="res-28548 job-number"><input name="job-number" type="text" /></div><div class="res-28549 name"><input name="name" type="text" /></div><div class="res-28551 btn-next"></div><div class="res-28550 hide"></div></div><div class="page-2078 upload-page page"><div class="res-28605"></div><div class="res-28606 cat1 cat"><div class="res-28607 top"><div class="res-28608"></div><div class="res-28609"></div></div><div class="res-28558 bottom"><div class="res-28555"></div><div class="res-28569 btn-upload-block"><div class="res-28610 upload-before"></div><div class="res-28611 hide upload-after"></div><div class="res-28637 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div></div><div class="res-28567 btn-createposter"><div class="res-28612"></div></div><div class="res-28553 hide-block"></div><div class="res-28657 hide show-block"></div></div></div><div class="res-28613 hide cat2 cat"><div class="res-28614 top"><div class="res-28615"></div><div class="res-28616"></div></div><div class="res-28617 bottom"><div class="res-28618 btn-upload-block"><div class="res-28619 upload-before"></div><div class="res-28620 hide upload-after"></div><div class="res-28638 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div></div><div class="res-28621 btn-createposter"><div class="res-28622"></div></div><div class="res-28623 hide-block"></div><div class="res-28656 hide show-block"></div><div class="res-28624"></div></div></div><div class="res-28625 hide cat3 cat"><div class="res-28633 top"><div class="res-28626"></div><div class="res-28627"></div></div><div class="res-28634 bottom"><div class="res-28629"></div><div class="res-28635 btn-createposter"><div class="res-28632"></div></div><div class="res-28636 btn-upload-block"><div class="res-28630 upload-before"></div><div class="res-28631 hide upload-after"></div><div class="res-28639 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div></div><div class="res-28658 hide show-block"></div><div class="res-28628 hide-block"></div></div></div><div class="res-28564 upload-canvas-block"></div><div class="res-28651 username"></div><div class="res-28652 company"></div></div><div class="page-2080 poster-page page"><div class="res-28582 poster-canvas"></div><div class="res-28586 show-img"></div><div class="res-28588 poster1 poster"><div class="res-28583 bottom"><div class="res-28577"></div><div class="res-28578"></div><div class="res-28653"></div></div><div class="res-28584 top"><div class="res-28640"></div><div class="res-28641"></div></div></div><div class="res-28596 hide poster2 poster"><div class="res-28597 top"><div class="res-28643"></div><div class="res-28644"></div></div><div class="res-28600 bottom"><div class="res-28601"></div><div class="res-28602"></div><div class="res-28654"></div></div></div><div class="res-28589 hide poster3 poster"><div class="res-28590 top"><div class="res-28645"></div><div class="res-28646"></div></div><div class="res-28593 bottom"><div class="res-28594"></div><div class="res-28595"></div><div class="res-28655"></div></div></div><div class="res-28642 company"></div><div class="res-28585 poster-img"></div><div class="res-28587 username"></div></div>
 
 
 {:/block}

Public/static/css/main.min.css

-body{margin:0;padding:0;-webkit-text-size-adjust:none;}.hide{display:none;}.page{width:640px;height:1238px;position:relative;display:none;overflow:hidden;margin:0 auto;}.page-22{display:block}input,textarea,img{border:0;top:0;left:0;width:100%;height:100%;margin:0;padding:0;}input,textarea{background:transparent;}input[type=file]{opacity:0;}.res-248{position:absolute;opacity:1;width:640px;height:1238px;background: url(../images/999_1583913010.jpg)left top no-repeat;}.res-263{position:absolute;width:640px;height:1238px;}.res-353{position:absolute;opacity:1;left:23px;top:4px;width:365px;height:49px;background: url(../images/4782_1583994647.png)left top no-repeat;}.res-354{position:absolute;opacity:1;left:307px;top:57px;width:178px;height:38px;background: url(../images/1067_1583994644.png)left top no-repeat;}.res-355{position:absolute;opacity:1;left:251px;top:63px;width:46px;height:23px;background: url(../images/7182_1583994644.png)left top no-repeat;}.res-356{position:absolute;opacity:1;left:59px;top:57px;width:179px;height:38px;background: url(../images/1067_1583994644.png)left top no-repeat;}.res-357{position:absolute;opacity:1;left:23px;top:63px;width:28px;height:26px;background: url(../images/8733_1583994643.png)left top no-repeat;}.res-358{position:absolute;opacity:1;left:498px;top:1px;width:94px;height:95px;background: url(../images/6962_1583994643.png)left top no-repeat;}.res-255{position:absolute;opacity:1;left:113px;top:954px;width:412px;height:135px;background: url(../images/601_1583913017.png)left top no-repeat;}.res-256{position:absolute;opacity:1;left:205px;top:878px;width:226px;height:58px;background: url(../images/9225_1583913017.png)left top no-repeat;}.res-257{position:absolute;opacity:1;left:433px;top:349px;width:134px;height:134px;background: url(../images/7169_1583913018.png)left top no-repeat;}.res-258{position:absolute;opacity:1;left:79px;top:345px;width:487px;height:485px;background: url(../images/4642_1583913022.png)left top no-repeat;}.res-259{position:absolute;opacity:1;left:190px;top:454px;width:259px;height:259px;background: url(../images/3272_1583913023.png)left top no-repeat;}.res-260{position:absolute;opacity:1;left:120px;top:808px;width:194px;height:51px;background: url(../images/6301_1583913024.png)left top no-repeat;}.res-261{position:absolute;opacity:1;left:322px;top:808px;width:194px;height:51px;background: url(../images/4553_1583913024.png)left top no-repeat;}.res-262{position:absolute;opacity:1;left:18px;top:148px;width:599px;height:36px;background: url(../images/7295_1583913025.png)left top no-repeat;}.res-264{position:absolute;width:640px;height:1238px;}.res-265{position:absolute;left:190px;top:455px;width:259px;height:258px;background: url(../images/7700_1583913432.png)left top no-repeat;}.res-266{position:absolute;left:190px;top:454px;width:259px;height:259px;}.res-267{position:absolute;top:821px;width:640px;height:40px;}.res-268{position:absolute;left:594px;top:-23px;width:41px;height:41px;background: url(../images/9939_1583913431.png)left top no-repeat;}.res-269{position:absolute;left:594px;top:-23px;width:41px;height:41px;background: url(../images/4395_1583913430.png)left top no-repeat;}.res-270{position:absolute;opacity:1;width:640px;height:1238px;background: url(../images/9470_1583913460.jpg)left top no-repeat;}.res-271{position:absolute;opacity:1;left:44px;top:7px;width:181px;height:51px;background: url(../images/7536_1583913461.png)left top no-repeat;}.res-272{position:absolute;opacity:1;left:262px;top:7px;width:181px;height:51px;background: url(../images/7785_1583913463.png)left top no-repeat;}.res-359{position:absolute;opacity:1;left:66px;top:995px;width:514px;height:26px;background: url(../images/6143_1583995174.png)left top no-repeat;}.animated .res-359{-webkit-animation-name:fadeInUp;-webkit-animation-duration:1.5s;-webkit-animation-delay:0s;-webkit-animation-timing-function:ease-out;-webkit-animation-iteration-count:infinite;-webkit-animation-fill-mode:backwards;}.res-274{position:absolute;left:107px;top:152px;width:426px;height:820px;}.res-275{position:absolute;left:569px;top:110px;width:41px;height:41px;background: url(../images/4395_1583913430.png)left top no-repeat;}.res-276{position:absolute;left:569px;top:110px;width:41px;height:41px;background: url(../images/9939_1583913431.png)left top no-repeat;}.res-286{position:absolute;left:NaNpx;top:209px;width:641px;height:97px;}.res-288{position:absolute;opacity:1;width:410px;height:83px;background: url(../images/4772_1583929624.png)left top no-repeat;}.res-289{position:absolute;opacity:1;left:418px;top:533px;width:115px;height:89px;background: url(../images/5142_1583929625.png)left top no-repeat;}.res-290{position:absolute;width:640px;height:1238px;}.res-291{position:absolute;left:109px;top:557px;width:368px;height:80px;}.res-292{position:absolute;top:652px;width:640px;height:20px;}.res-360{position:absolute;left:78px;top:1038px;width:486px;height:88px;}.res-361{position:absolute;left:91px;top:915px;width:486px;height:55px;background: url(../images/1427_1584072728.png)left top no-repeat;}.animated .res-361{-webkit-animation-name:fadeInUp;-webkit-animation-duration:3s;-webkit-animation-delay:0s;-webkit-animation-timing-function:ease-out;-webkit-animation-iteration-count:infinite;-webkit-animation-fill-mode:backwards;}.res-366{position:absolute;width:640px;height:1238px;}.res-367{position:absolute;left:79px;top:344px;width:489px;height:485px;background: url(../images/724_1584670876.png)left top no-repeat;}@-webkit-keyframes fadeInUp{from{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}100%{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInUp{from{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}100%{opacity:1;-webkit-transform:none;transform:none}}
\ No newline at end of file
+body{margin:0;padding:0;-webkit-text-size-adjust:none;}.hide{display:none;}.page{width:640px;height:1238px;position:relative;display:none;overflow:hidden;margin:0 auto;}.page-2077{display:block}input,textarea,img{border:0;top:0;left:0;width:100%;height:100%;margin:0;padding:0;}input,textarea{background:transparent;}input[type=file]{opacity:0;}.res-28603{position:absolute;opacity:1;left:NaNpx;top:NaNpx;width:640px;height:1238px;background: url(../images/7774_1587620186.jpg)left top no-repeat;}.res-28604{position:absolute;opacity:0.7019607843137254;left:NaNpx;top:NaNpx;width:640px;height:1238px;background: url(../images/2813_1587620185.png)left top no-repeat;}.res-28647{position:absolute;opacity:1;left:74px;top:342px;width:491px;height:446px;background: url(../images/4586_1587689445.png)left top no-repeat;}.res-28547{position:absolute;opacity:1;left:230px;top:418px;width:190px;height:38px;background: url(../images/8162_1587367888.png)left top no-repeat;}.res-28548{position:absolute;opacity:1;left:121px;top:645px;width:402px;height:86px;background: url(../images/4450_1587367888.png)left top no-repeat;}.res-28549{position:absolute;opacity:1;left:124px;top:516px;width:400px;height:87px;background: url(../images/3857_1587367888.png)left top no-repeat;}.res-28550{position:absolute;opacity:1;left:175px;top:233px;width:292px;height:49px;background: url(../images/7036_1587367889.png)left top no-repeat;}.res-28551{position:absolute;opacity:1;left:142px;top:855px;width:342px;height:72px;background: url(../images/4528_1587367889.png)left top no-repeat;}.res-28605{position:absolute;opacity:1;width:640px;height:1238px;background: url(../images/8512_1587626436.jpg)left top no-repeat;}.res-28553{position:absolute;opacity:1;left:168px;width:422px;height:54px;background: url(../images/565_1587368739.png)left top no-repeat;}.res-28637{position:absolute;width:240px;height:51px;}.res-28638{position:absolute;width:240px;height:51px;}.res-28569{position:absolute;left:53px;top:-170px;width:240px;height:51px;}.res-28555{position:absolute;opacity:1;top:50px;width:640px;height:141px;background: url(../images/6542_1587368739.png)left top no-repeat;}.res-28636{position:absolute;left:53px;top:-170px;width:240px;height:51px;}.res-28634{position:absolute;top:1047px;width:640px;height:192px;}.res-28635{position:absolute;left:351px;top:-170px;width:238px;height:49px;}.res-28558{position:absolute;top:1047px;width:640px;height:192px;}.res-28560{position:absolute;opacity:1;top:51px;width:640px;height:141px;background: url(../images/6542_1587368739.png)left top no-repeat;}.res-28561{position:absolute;opacity:1;left:168px;width:422px;height:53px;background: url(../images/565_1587368739.png)left top no-repeat;}.res-28651{position:absolute;left:435px;top:394px;width:160px;height:43px;}.res-28563{position:absolute;top:1047px;width:640px;height:193px;}.res-28564{position:absolute;top:-1px;width:640px;height:1238px;}.res-28567{position:absolute;left:351px;top:-170px;width:238px;height:49px;}.res-28633{position:absolute;left:38px;top:-3px;width:566px;height:159px;}.res-28612{position:absolute;left:-8px;top:-6px;width:262px;height:68px;background: url(../images/6200_1587626435.png)left top no-repeat;}.res-28610{position:absolute;left:-8px;top:-5px;width:262px;height:68px;background: url(../images/7933_1587626435.png)left top no-repeat;}.res-28640{position:absolute;opacity:1;left:40px;top:114px;width:563px;height:39px;background: url(../images/157_1587626433.png)left top no-repeat;}.res-28648{position:absolute;left:38px;top:-3px;width:567px;height:159px;}.res-28578{position:absolute;opacity:1;left:46px;width:550px;height:113px;background: url(../images/298_1587452775.png)left top no-repeat;}.res-28577{position:absolute;opacity:1;top:143px;width:640px;height:141px;background: url(../images/6542_1587368739.png)left top no-repeat;}.res-28641{position:absolute;opacity:1;left:40px;width:556px;height:91px;background: url(../images/3622_1587626436.png)left top no-repeat;}.res-28582{position:absolute;width:640px;height:1238px;}.res-28583{position:absolute;top:954px;width:640px;height:286px;}.res-28584{position:absolute;width:640px;height:154px;}.res-28585{position:absolute;width:640px;height:1238px;}.res-28586{position:absolute;width:640px;height:1238px;}.res-28587{position:absolute;left:435px;top:394px;width:160px;height:43px;}.res-28588{position:absolute;left:-1px;width:640px;height:1238px;}.res-28589{position:absolute;width:640px;height:1238px;}.res-28590{position:absolute;left:NaNpx;top:NaNpx;width:640px;height:153px;}.res-28645{position:absolute;left:40px;width:555px;height:91px;background: url(../images/2850_1587626433.png)left top no-repeat;}.res-28646{position:absolute;left:40px;top:114px;width:563px;height:39px;background: url(../images/157_1587626433.png)left top no-repeat;}.res-28593{position:absolute;top:954px;width:640px;height:286px;}.res-28594{position:absolute;left:42px;top:1px;width:556px;height:110px;background: url(../images/2740_1587460282.png)left top no-repeat;}.res-28595{position:absolute;top:143px;width:640px;height:141px;background: url(../images/4142_1587460281.png)left top no-repeat;}.res-28596{position:absolute;width:640px;height:1238px;}.res-28597{position:absolute;left:NaNpx;top:NaNpx;width:640px;height:153px;}.res-28643{position:absolute;left:40px;top:NaNpx;width:558px;height:91px;background: url(../images/8198_1587626435.png)left top no-repeat;}.res-28644{position:absolute;opacity:1;left:40px;top:114px;width:563px;height:39px;background: url(../images/157_1587626433.png)left top no-repeat;}.res-28600{position:absolute;top:954px;width:640px;height:286px;}.res-28601{position:absolute;left:49px;top:-1px;width:542px;height:112px;background: url(../images/336_1587460711.png)left top no-repeat;}.res-28602{position:absolute;top:143px;width:640px;height:141px;background: url(../images/9311_1587460711.png)left top no-repeat;}.res-28606{position:absolute;width:640px;height:1238px;}.res-28607{position:absolute;left:38px;top:-3px;width:566px;height:159px;}.res-28608{position:absolute;left:2px;top:3px;width:553px;height:91px;background: url(../images/3622_1587626436.png)left top no-repeat;}.res-28609{position:absolute;left:2px;top:118px;width:562px;height:39px;background: url(../images/157_1587626433.png)left top no-repeat;}.res-28611{position:absolute;left:-8px;top:-5px;width:263px;height:68px;background: url(../images/2480_1587626435.png)left top no-repeat;}.res-28613{position:absolute;width:640px;height:1238px;}.res-28614{position:absolute;left:38px;top:-3px;width:566px;height:159px;}.res-28615{position:absolute;left:2px;top:3px;width:558px;height:91px;background: url(../images/8198_1587626435.png)left top no-repeat;}.res-28616{position:absolute;left:2px;top:117px;width:563px;height:39px;background: url(../images/157_1587626433.png)left top no-repeat;}.res-28617{position:absolute;top:1047px;width:640px;height:192px;}.res-28618{position:absolute;left:53px;top:-170px;width:240px;height:51px;}.res-28619{position:absolute;left:-8px;top:-5px;width:263px;height:68px;background: url(../images/9439_1587626435.png)left top no-repeat;}.res-28620{position:absolute;left:-8px;top:-5px;width:263px;height:68px;background: url(../images/8540_1587626434.png)left top no-repeat;}.res-28621{position:absolute;left:350px;top:-170px;width:238px;height:49px;}.res-28622{position:absolute;left:-8px;top:-6px;width:263px;height:68px;background: url(../images/1418_1587626434.png)left top no-repeat;}.res-28623{position:absolute;left:168px;width:422px;height:54px;background: url(../images/6560_1587626434.png)left top no-repeat;}.res-28624{position:absolute;top:50px;width:640px;height:141px;background: url(../images/9311_1587460711.png)left top no-repeat;}.res-28625{position:absolute;width:640px;height:1238px;}.res-28626{position:absolute;left:2px;top:3px;width:554px;height:91px;background: url(../images/2850_1587626433.png)left top no-repeat;}.res-28627{position:absolute;left:2px;top:117px;width:563px;height:39px;background: url(../images/157_1587626433.png)left top no-repeat;}.res-28628{position:absolute;left:168px;width:422px;height:53px;background: url(../images/5358_1587626433.png)left top no-repeat;}.res-28629{position:absolute;top:50px;width:640px;height:141px;background: url(../images/8619_1587626432.jpg)left top no-repeat;}.res-28630{position:absolute;left:-8px;top:-5px;width:263px;height:68px;background: url(../images/1974_1587626432.png)left top no-repeat;}.res-28631{position:absolute;left:-8px;top:-5px;width:263px;height:68px;background: url(../images/6087_1587626432.png)left top no-repeat;}.res-28632{position:absolute;left:-8px;top:-6px;width:263px;height:68px;background: url(../images/3714_1587626432.png)left top no-repeat;}.res-28639{position:absolute;width:240px;height:51px;}.res-28642{position:absolute;left:435px;top:454px;width:160px;height:60px;}.res-28649{position:absolute;left:2px;top:117px;width:562px;height:39px;background: url(../images/157_1587626433.png)left top no-repeat;}.res-28650{position:absolute;left:2px;top:3px;width:552px;height:91px;background: url(../images/3622_1587626436.png)left top no-repeat;}.res-28653{position:absolute;left:149px;top:-118px;width:344px;height:116px;background: url(../images/9943_1587714153.png)left top no-repeat;}.res-28652{position:absolute;left:435px;top:454px;width:160px;height:60px;}.res-28654{position:absolute;left:149px;top:-118px;width:344px;height:116px;background: url(../images/9943_1587714153.png)left top no-repeat;}.res-28655{position:absolute;left:149px;top:-118px;width:344px;height:116px;background: url(../images/9943_1587714153.png)left top no-repeat;}.res-28656{position:absolute;left:44px;top:-94px;width:541px;height:111px;background: url(../images/336_1587460711.png)left top no-repeat;}.res-28657{position:absolute;opacity:1;left:44px;top:-94px;width:550px;height:113px;background: url(../images/298_1587452775.png)left top no-repeat;}.res-28658{position:absolute;left:44px;top:-94px;width:556px;height:110px;background: url(../images/2740_1587460282.png)left top no-repeat;}
\ No newline at end of file