Merge branch 'master' into 'release'

five week

See merge request !4

Application/Home/View/default/Index_index.tpl

@@ -12,7 +12,7 @@
 //  body 主题部分
 {:block name="body"}
 
-<div class="page-2336 page1 page"><div class="res-34116"></div><div class="res-34122 top"><div class="res-34121"></div></div><div class="res-34117 name"><input name="name" type="text" /></div><div class="res-34118 job-number"><input name="job-number" type="text" /></div><div class="res-34119"></div><div class="res-34120 btn-next"></div></div><div class="page-2337 upload-page page"><div class="res-34130 cat1"><div class="res-34124 hide-block"></div><div class="res-34135 top"><div class="res-34129"></div></div><div class="res-34222 tip4 tip"></div><div class="res-34220 hide tip3 tip"></div><div class="res-34223 hide tip2 tip"></div><div class="res-34224 hide tip1 tip"></div><div class="res-34131 bottom"><div class="res-34127"></div><div class="res-34203 perf"></div><div class="res-34132 btn-upload-block"><div class="res-34125 upload-before"></div><div class="res-34128 hide upload-after"></div><div class="res-34133 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div></div><div class="res-34134 btn-createposter"><div class="res-34126"></div></div></div></div><div class="res-34136 upload-canvas-block"></div><div class="res-34137 username"></div><div class="res-34138 company"></div></div><div class="page-2338 poster-page page"><div class="res-34151 poster-canvas"></div><div class="res-34152 show-img"></div><div class="res-34153 poster-1"><div class="res-34154 top"><div class="res-34140"></div></div><div class="res-34139 bottom"><div class="res-34218 perf"></div></div><div class="res-34225 tip4 tip"></div><div class="res-34221 hide tip3 tip"></div><div class="res-34226 hide tip2 tip"></div><div class="res-34227 hide tip1 tip"></div></div><div class="res-34155"></div><div class="res-34156 poster-img"></div><div class="res-34157 username"></div><div class="res-34158 company"></div></div>
+<div class="page-2336 page1 page"><div class="res-34116"></div><div class="res-34122 top"><div class="res-34121"></div></div><div class="res-34117 name"><input name="name" type="text" /></div><div class="res-34118 job-number"><input name="job-number" type="text" /></div><div class="res-34119"></div><div class="res-34120 btn-next"></div></div><div class="page-2337 upload-page page"><div class="res-34130 cat1"><div class="res-34124 hide-block"></div><div class="res-34135 top"><div class="res-34129"></div></div><div class="res-34228 tip5 tip"></div><div class="res-34222 hide tip4 tip"></div><div class="res-34220 hide tip3 tip"></div><div class="res-34223 hide tip2 tip"></div><div class="res-34224 hide tip1 tip"></div><div class="res-34131 bottom"><div class="res-34127"></div><div class="res-34203 perf"></div><div class="res-34132 btn-upload-block"><div class="res-34125 upload-before"></div><div class="res-34128 hide upload-after"></div><div class="res-34133 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div></div><div class="res-34134 btn-createposter"><div class="res-34126"></div></div></div></div><div class="res-34136 upload-canvas-block"></div><div class="res-34137 username"></div><div class="res-34138 company"></div></div><div class="page-2338 poster-page page"><div class="res-34151 poster-canvas"></div><div class="res-34152 show-img"></div><div class="res-34153 poster-1"><div class="res-34154 top"><div class="res-34140"></div></div><div class="res-34139 bottom"><div class="res-34218 perf"></div></div><div class="res-34229 tip5 tip"></div><div class="res-34225 hide tip4 tip"></div><div class="res-34221 hide tip3 tip"></div><div class="res-34226 hide tip2 tip"></div><div class="res-34227 hide tip1 tip"></div></div><div class="res-34155"></div><div class="res-34156 poster-img"></div><div class="res-34157 username"></div><div class="res-34158 company"></div></div>
 
 {:/block}
 //js 文件导入

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-2336{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-34156{position:absolute;top:-1px;width:640px;height:1240px;}.res-34157{position:absolute;left:57px;top:319px;width:160px;height:44px;}.res-34158{position:absolute;left:38px;top:373px;width:180px;height:60px;}.res-34122{position:absolute;width:640px;height:100px;}.res-34119{position:absolute;opacity:1;left:232px;top:424px;width:190px;height:37px;background: url(../images/5084_1619494012.png)left top no-repeat;}.res-34118{position:absolute;opacity:1;left:128px;top:605px;width:402px;height:85px;background: url(../images/1968_1619494012.png)left top no-repeat;}.res-34120{position:absolute;opacity:1;left:150px;top:747px;width:344px;height:72px;background: url(../images/7396_1619494012.png)left top no-repeat;}.res-34121{position:absolute;opacity:1;left:41px;top:42px;width:149px;height:53px;background: url(../images/2770_1619494013.png)left top no-repeat;}.res-34116{position:absolute;opacity:1;width:640px;height:1239px;background: url(../images/9797_1619494166.jpg)left top no-repeat;}.res-34117{position:absolute;opacity:1;left:127px;top:495px;width:402px;height:85px;background: url(../images/6162_1619494011.png)left top no-repeat;}.res-34153{position:absolute;width:640px;height:1239px;}.res-34151{position:absolute;width:640px;height:1239px;}.res-34152{position:absolute;width:640px;height:1239px;}.res-34138{position:absolute;left:38px;top:373px;width:180px;height:60px;}.res-34137{position:absolute;left:57px;top:319px;width:160px;height:44px;}.res-34135{position:absolute;width:640px;height:100px;}.res-34136{position:absolute;width:640px;height:1239px;}.res-34134{position:absolute;left:175px;top:-118px;width:312px;height:75px;}.res-34131{position:absolute;top:868px;width:640px;height:371px;}.res-34132{position:absolute;left:174px;top:-212px;width:311px;height:75px;}.res-34130{position:absolute;width:640px;height:1239px;}.res-34129{position:absolute;opacity:1;top:39px;width:596px;height:204px;background: url(../images/1576_1619494341.png)left top no-repeat;}.res-34133{position:absolute;width:311px;height:75px;}.res-34128{position:absolute;opacity:1;width:311px;height:74px;background: url(../images/409_1619494341.png)left top no-repeat;}.res-34127{position:absolute;opacity:1;width:640px;height:371px;background: url(../images/4552_1619494341.png)left top no-repeat;}.res-34126{position:absolute;opacity:1;width:311px;height:75px;background: url(../images/8384_1619494339.png)left top no-repeat;}.res-34125{position:absolute;opacity:1;width:311px;height:75px;background: url(../images/9404_1619494339.png)left top no-repeat;}.res-34124{position:absolute;opacity:1;width:640px;height:1239px;background: url(../images/5095_1619494338.png)left top no-repeat;}.res-34154{position:absolute;width:640px;height:100px;}.res-34140{position:absolute;opacity:1;top:39px;width:596px;height:204px;background: url(../images/1576_1619494341.png)left top no-repeat;}.res-34155{position:absolute;left:136px;top:626px;width:344px;height:116px;background: url(../images/8963_1619575765.png)left top no-repeat;}.res-34139{position:absolute;opacity:1;top:868px;width:640px;height:371px;background: url(../images/4552_1619494341.png)left top no-repeat;}.res-34203{position:absolute;left:66px;top:-32px;width:469px;height:100px;}.res-34220{position:absolute;left:35px;top:168px;width:206px;height:141px;background: url(../images/6688_1621482777.png)left top no-repeat;}.res-34218{position:absolute;left:66px;top:-32px;width:468px;height:100px;}.res-34221{position:absolute;left:35px;top:168px;width:207px;height:141px;background: url(../images/6688_1621482777.png)left top no-repeat;}.res-34222{position:absolute;left:35px;top:168px;width:205px;height:141px;background: url(../images/4753_1621488320.png)left top no-repeat;}.res-34223{position:absolute;left:35px;top:168px;width:206px;height:141px;background: url(../images/6295_1621488319.png)left top no-repeat;}.res-34224{position:absolute;left:35px;top:168px;width:206px;height:141px;background: url(../images/5129_1621488319.png)left top no-repeat;}.res-34225{position:absolute;left:35px;top:168px;width:205px;height:141px;background: url(../images/4753_1621488320.png)left top no-repeat;}.res-34226{position:absolute;left:35px;top:168px;width:207px;height:141px;background: url(../images/6295_1621488319.png)left top no-repeat;}.res-34227{position:absolute;left:35px;top:168px;width:205px;height:141px;background: url(../images/5129_1621488319.png)left top no-repeat;}
\ 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-2336{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-34156{position:absolute;top:-1px;width:640px;height:1240px;}.res-34157{position:absolute;left:57px;top:319px;width:160px;height:44px;}.res-34158{position:absolute;left:38px;top:373px;width:180px;height:60px;}.res-34122{position:absolute;width:640px;height:100px;}.res-34119{position:absolute;opacity:1;left:232px;top:424px;width:190px;height:37px;background: url(../images/5084_1619494012.png)left top no-repeat;}.res-34118{position:absolute;opacity:1;left:128px;top:605px;width:402px;height:85px;background: url(../images/1968_1619494012.png)left top no-repeat;}.res-34120{position:absolute;opacity:1;left:150px;top:747px;width:344px;height:72px;background: url(../images/7396_1619494012.png)left top no-repeat;}.res-34121{position:absolute;opacity:1;left:41px;top:42px;width:149px;height:53px;background: url(../images/2770_1619494013.png)left top no-repeat;}.res-34116{position:absolute;opacity:1;width:640px;height:1239px;background: url(../images/9797_1619494166.jpg)left top no-repeat;}.res-34117{position:absolute;opacity:1;left:127px;top:495px;width:402px;height:85px;background: url(../images/6162_1619494011.png)left top no-repeat;}.res-34153{position:absolute;width:640px;height:1239px;}.res-34151{position:absolute;width:640px;height:1239px;}.res-34152{position:absolute;width:640px;height:1239px;}.res-34138{position:absolute;left:38px;top:373px;width:180px;height:60px;}.res-34137{position:absolute;left:57px;top:319px;width:160px;height:44px;}.res-34135{position:absolute;width:640px;height:100px;}.res-34136{position:absolute;width:640px;height:1239px;}.res-34134{position:absolute;left:175px;top:-118px;width:312px;height:75px;}.res-34131{position:absolute;top:868px;width:640px;height:371px;}.res-34132{position:absolute;left:174px;top:-212px;width:311px;height:75px;}.res-34130{position:absolute;width:640px;height:1239px;}.res-34129{position:absolute;opacity:1;top:39px;width:596px;height:204px;background: url(../images/1576_1619494341.png)left top no-repeat;}.res-34133{position:absolute;width:311px;height:75px;}.res-34128{position:absolute;opacity:1;width:311px;height:74px;background: url(../images/409_1619494341.png)left top no-repeat;}.res-34127{position:absolute;opacity:1;width:640px;height:371px;background: url(../images/4552_1619494341.png)left top no-repeat;}.res-34126{position:absolute;opacity:1;width:311px;height:75px;background: url(../images/8384_1619494339.png)left top no-repeat;}.res-34125{position:absolute;opacity:1;width:311px;height:75px;background: url(../images/9404_1619494339.png)left top no-repeat;}.res-34124{position:absolute;opacity:1;width:640px;height:1239px;background: url(../images/5095_1619494338.png)left top no-repeat;}.res-34154{position:absolute;width:640px;height:100px;}.res-34140{position:absolute;opacity:1;top:39px;width:596px;height:204px;background: url(../images/1576_1619494341.png)left top no-repeat;}.res-34155{position:absolute;left:136px;top:626px;width:344px;height:116px;background: url(../images/8963_1619575765.png)left top no-repeat;}.res-34139{position:absolute;opacity:1;top:868px;width:640px;height:371px;background: url(../images/4552_1619494341.png)left top no-repeat;}.res-34203{position:absolute;left:66px;top:-32px;width:469px;height:100px;}.res-34220{position:absolute;left:35px;top:168px;width:206px;height:141px;background: url(../images/6688_1621482777.png)left top no-repeat;}.res-34218{position:absolute;left:66px;top:-32px;width:468px;height:100px;}.res-34221{position:absolute;left:35px;top:168px;width:207px;height:141px;background: url(../images/6688_1621482777.png)left top no-repeat;}.res-34222{position:absolute;left:35px;top:168px;width:205px;height:141px;background: url(../images/4753_1621488320.png)left top no-repeat;}.res-34223{position:absolute;left:35px;top:168px;width:206px;height:141px;background: url(../images/6295_1621488319.png)left top no-repeat;}.res-34224{position:absolute;left:35px;top:168px;width:206px;height:141px;background: url(../images/5129_1621488319.png)left top no-repeat;}.res-34225{position:absolute;left:35px;top:168px;width:205px;height:141px;background: url(../images/4753_1621488320.png)left top no-repeat;}.res-34226{position:absolute;left:35px;top:168px;width:207px;height:141px;background: url(../images/6295_1621488319.png)left top no-repeat;}.res-34227{position:absolute;left:35px;top:168px;width:205px;height:141px;background: url(../images/5129_1621488319.png)left top no-repeat;}.res-34228{position:absolute;left:35px;top:168px;width:206px;height:141px;background: url(../images/4319_1622549951.png)left top no-repeat;}.res-34229{position:absolute;left:35px;top:168px;width:206px;height:141px;background: url(../images/4319_1622549951.png)left top no-repeat;}
\ No newline at end of file