Merge branch 'master' into 'release'

init

See merge request !1

Application/Home/View/default/Index_index.tpl

@@ -12,7 +12,7 @@
 //  body 主题部分
 //  body 主题部分
 {:block name="body"}
 {:block name="body"}
 
 
-<div class="page-2349 page1 page"><div class="res-34407"></div><div class="res-34349 top"><div class="res-34350"></div></div><div class="res-34351 name"><input name="name" type="text" /></div><div class="res-34352 job-number"><input name="job-number" type="text" /></div><div class="res-34393"></div><div class="res-34354 btn-next"></div></div><div class="page-2351 upload-page page"><div class="res-34371 cat1"><div class="res-34409 hide-block"></div><div class="res-34373 top"><div class="res-34395 logo"></div></div><div class="res-34380 bottom"><div class="res-34408"></div><div class="res-34404 touch"></div><div class="res-34383 btn-upload-block"><div class="res-34397 upload-before"></div><div class="res-34398 upload-after"></div><div class="res-34386 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div></div><div class="res-34387 btn-createposter"><div class="res-34399"></div></div></div></div><div class="res-34389 upload-canvas-block"></div><div class="res-34390 hide username"></div><div class="res-34391 hide company"></div></div><div class="page-2350 poster-page page"><div class="res-34355 poster-canvas"></div><div class="res-34356 show-img"></div><div class="res-34357 poster-1"><div class="res-34358 top"><div class="res-34400"></div></div><div class="res-34405 bottom1 bottom"></div><div class="res-34406 bottom2 bottom"></div></div><div class="res-34367"></div><div class="res-34368 poster-img"></div><div class="res-34369 username"></div><div class="res-34370 company"></div></div>
+<div class="page-2349 page1 page"><div class="res-34407"></div><div class="res-34349 top"><div class="res-34350"></div></div><div class="res-34351 name"><input name="name" type="text" /></div><div class="res-34352 job-number"><input name="job-number" type="text" /></div><div class="res-34393"></div><div class="res-34354 btn-next"></div></div><div class="page-2351 upload-page page"><div class="res-34371 cat1"><div class="res-34409 hide-block"></div><div class="res-34373 top"><div class="res-34395 logo"></div></div><div class="res-34380 bottom"><div class="res-34408"></div><div class="res-34404 touch"></div><div class="res-34383 btn-upload-block"><div class="res-34397 upload-before"></div><div class="res-34398 hide upload-after"></div><div class="res-34386 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div></div><div class="res-34387 btn-createposter"><div class="res-34399"></div></div></div></div><div class="res-34389 upload-canvas-block"></div><div class="res-34390 hide username"></div><div class="res-34391 hide company"></div></div><div class="page-2350 poster-page page"><div class="res-34355 poster-canvas"></div><div class="res-34356 show-img"></div><div class="res-34357 poster-1"><div class="res-34358 top"><div class="res-34400"></div></div><div class="res-34405 bottom1 bottom"></div><div class="res-34406 bottom2 bottom"></div></div><div class="res-34367"></div><div class="res-34368 poster-img"></div><div class="res-34369 username"></div><div class="res-34370 company"></div></div>
 
 
 {:/block}
 {:/block}
 //js 文件导入
 //js 文件导入