Merge branch 'master' into 'release'

to release

See merge request !1

Application/Common/Conf/config.php

@@ -13,7 +13,7 @@ return array(
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
-//    '__CDN__' => 'http://cdn.iacode.cn/citic-mdrt4/v1.0.8/Public/static',
+//    '__CDN__' => 'http://cdn.iacode.cn/citic-fighting/v1.0.0/Public/static',
     '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     'URL_MODEL' => 3,
     'URL_MODEL' => 3,
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',
@@ -23,7 +23,7 @@ return array(
     'ERROR_PAGE' =>'/50x.html',
     'ERROR_PAGE' =>'/50x.html',
 
 
     'SITE_URL' => 'https://' . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'moli.gnhj.izhida.cn'),
     'SITE_URL' => 'https://' . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'moli.gnhj.izhida.cn'),
-    'PUBLISH_MODE' => 'development', // development,test,production
+    'PUBLISH_MODE' => 'production', // development,test,production
 
 
 
 
 
 

Application/Home/View/default/Index_index.tpl

@@ -11,6 +11,46 @@
 {:/block}
 {:/block}
 // body 主题部分
 // body 主题部分
 {:block name="body"}
 {:block name="body"}
+<div class="page-2767 page1 page">
+  <div class="res-42572"></div>
+  <div class="res-42578 top">
+    <div class="res-42576"></div>
+  </div>
+  <div class="res-42573 job-number"><input name="job-number" type="text" /></div>
+  <div class="res-42574 name"><input name="name" type="text" /></div>
+  <div class="res-42575"></div>
+  <div class="res-42577 btn-next"></div>
+</div>
+<div class="page-2770 upload-page page">
+  <div class="res-42596 cat1">
+    <div class="res-42589 hide-block"></div>
+    <div class="res-42597 top">
+      <div class="res-42595 LOGO"></div>
+    </div>
+    <div class="res-42598 bottom">
+      <div class="res-42590 hide identity-1"></div>
+      <div class="res-42591 hide identity-2"></div>
+      <div class="res-42599 touch"></div>
+      <div class="res-42600 btn-upload-block">
+        <div class="res-42592 upload-before"></div>
+        <div class="res-42593 hide upload-after"></div>
+        <div class="res-42601 btn-upload"><input name="btn-upload" type="file" accept="image/*" /></div>
+      </div>
+      <div class="res-42602 btn-createposter">
+        <div class="res-42594"></div>
+      </div>
+    </div>
+  </div>
+  <div class="res-42603 upload-canvas-block"></div>
+  <div class="res-42604 hide username"></div>
+  <div class="res-42605 hide company"></div>
+</div>
+<div class="page-2771 poster-page page">
+  <div class="res-42607 poster-canvas"></div>
+  <div class="res-42608 show-img"></div>
+  <div class="res-42609 poster-img"></div>
+  <div class="res-42606"></div>
+</div>
 
 
 {:/block}
 {:/block}
 //js 文件导入
 //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-2349{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-34352{position:absolute;opacity:1;left:128px;top:999px;width:402px;height:85px;background: url(../images/1968_1619494012.png)left top no-repeat;}.res-34393{position:absolute;opacity:1;left:232px;top:846px;width:190px;height:37px;background: url(../images/9154_1603444128.png)left top no-repeat;}.res-34354{position:absolute;opacity:1;left:150px;top:1096px;width:344px;height:72px;background: url(../images/7396_1619494012.png)left top no-repeat;}.res-34355{position:absolute;width:640px;height:1239px;}.res-34356{position:absolute;width:640px;height:1239px;}.res-34357{position:absolute;width:640px;height:1239px;}.res-34358{position:absolute;width:640px;height:100px;}.res-34400{position:absolute;opacity:1;left:49px;top:44px;width:143px;height:55px;background: url(../images/174_1626864920.png)left top no-repeat;}.res-34405{position:absolute;opacity:1;top:703px;width:640px;height:536px;background: url(../images/4625_1627453999.png)left top no-repeat;}.res-34406{position:absolute;top:703px;width:640px;height:536px;background: url(../images/6382_1627453997.png)left top no-repeat;}.res-34367{position:absolute;left:136px;top:606px;width:344px;height:116px;background: url(../images/8963_1619575765.png)left top no-repeat;}.res-34368{position:absolute;top:-1px;width:640px;height:1240px;}.res-34369{position:absolute;left:210px;top:838px;width:220px;height:45px;}.res-34370{position:absolute;left:210px;top:912px;width:220px;height:20px;}.res-34371{position:absolute;width:640px;height:1239px;}.res-34409{position:absolute;opacity:1;width:640px;height:1238px;background: url(../images/3081_1627526928.jpg)left top no-repeat;}.res-34373{position:absolute;width:640px;height:100px;}.res-34380{position:absolute;top:702px;width:640px;height:536px;}.res-34408{position:absolute;opacity:1;width:640px;height:536px;background: url(../images/9263_1627526863.png)left top no-repeat;}.res-34404{position:absolute;top:-623px;width:640px;height:1238px;}.res-34383{position:absolute;left:135px;top:201px;width:370px;height:85px;}.res-34397{position:absolute;opacity:1;left:NaNpx;top:NaNpx;width:370px;height:85px;background: url(../images/7445_1626920968.png)left top no-repeat;}.res-34398{position:absolute;opacity:1;left:NaNpx;top:NaNpx;width:370px;height:85px;background: url(../images/7880_1626920968.png)left top no-repeat;}.res-34386{position:absolute;left:NaNpx;top:NaNpx;width:370px;height:85px;}.res-34387{position:absolute;left:135px;top:318px;width:370px;height:85px;}.res-34399{position:absolute;opacity:1;left:NaNpx;top:NaNpx;width:370px;height:85px;background: url(../images/1405_1626920967.png)left top no-repeat;}.res-34389{position:absolute;width:640px;height:1239px;}.res-34390{position:absolute;left:57px;top:192px;width:160px;height:44px;}.res-34391{position:absolute;left:38px;top:258px;width:180px;height:60px;}.res-34407{position:absolute;opacity:1;left:NaNpx;top:NaNpx;width:640px;height:1238px;background: url(../images/9708_1627526593.jpg)left top no-repeat;}.res-34395{position:absolute;left:49px;top:44px;width:143px;height:55px;background: url(../images/174_1626864920.png)left top no-repeat;}.res-34351{position:absolute;opacity:1;left:127px;top:902px;width:402px;height:85px;background: url(../images/6162_1619494011.png)left top no-repeat;}.res-34350{position:absolute;opacity:1;left:41px;top:42px;width:149px;height:53px;background: url(../images/2770_1619494013.png)left top no-repeat;}.res-34349{position:absolute;width:640px;height:100px;}
+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-2767{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-42608{position:absolute;top:0;width:640px;height:1238px;}.res-42609{position:absolute;top:0;width:640px;height:1238px;}.res-42605{position:absolute;left:73px;top:447px;width:46px;height:143px;}.res-42602{position:absolute;left:151px;top:976px;width:330px;height:64px;}.res-42603{position:absolute;top:0;width:640px;height:1238px;}.res-42604{position:absolute;left:73px;top:272px;width:46px;height:143px;}.res-42607{position:absolute;top:0;width:640px;height:1238px;}.res-42600{position:absolute;left:151px;top:891px;width:330px;height:64px;}.res-42598{position:absolute;top:0;width:640px;height:1238px;}.res-42599{position:absolute;top:0;width:640px;height:1238px;}.res-42596{position:absolute;top:0;width:640px;height:1238px;}.res-42595{position:absolute;opacity:1;left:55px;top:58px;width:173px;height:63px;background: url(../images/7824_1719382011.png)left top no-repeat;}.res-42601{position:absolute;top:0;width:330px;height:64px;}.res-42594{position:absolute;opacity:1;top:0;width:330px;height:64px;background: url(../images/7912_1719382010.png)left top no-repeat;}.res-42593{position:absolute;opacity:1;top:-1px;width:330px;height:64px;background: url(../images/9374_1719382009.png)left top no-repeat;}.res-42592{position:absolute;opacity:1;top:-1px;width:330px;height:64px;background: url(../images/4998_1719382008.png)left top no-repeat;}.res-42589{position:absolute;opacity:1;left:-1px;top:0;width:640px;height:1238px;background: url(../images/5754_1719382002.png)left top no-repeat;}.res-42591{position:absolute;opacity:1;top:0;width:640px;height:1238px;background: url(../images/7392_1719382007.png)left top no-repeat;}.res-42597{position:absolute;top:0;width:640px;height:100px;}.res-42590{position:absolute;opacity:1;top:0;width:640px;height:1238px;background: url(../images/9534_1719382005.png)left top no-repeat;}.res-42578{position:absolute;top:0;width:640px;height:100px;}.res-42574{position:absolute;opacity:1;left:125px;top:736px;width:390px;height:72px;background: url(../images/1266_1719370601.png)left top no-repeat;}.res-42575{position:absolute;opacity:1;left:215px;top:674px;width:190px;height:39px;background: url(../images/5546_1719370602.png)left top no-repeat;}.res-42576{position:absolute;opacity:1;left:55px;top:49px;width:173px;height:63px;background: url(../images/2139_1719370603.png)left top no-repeat;}.res-42577{position:absolute;opacity:1;left:146px;top:931px;width:334px;height:62px;background: url(../images/5151_1719370604.png)left top no-repeat;}.res-42573{position:absolute;opacity:1;left:125px;top:831px;width:391px;height:72px;background: url(../images/5545_1719370600.png)left top no-repeat;}.res-42572{position:absolute;opacity:1;top:0;width:640px;height:1238px;background: url(../images/9691_1719370599.png)left top no-repeat;}.res-42606{position:absolute;opacity:1;left:136px;top:700px;width:344px;height:116px;background: url(../images/394_1719454565.png)left top no-repeat;}
\ No newline at end of file