Merge branch 'master' into 'release'

Master

See merge request !3

Application/Common/Conf/config.php

@@ -13,8 +13,8 @@ return array(
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
-    '__CDN__' => 'https://static.iacode.cn/cdn/citic-fighting/tag/dc668d2753/Public/static',
-    // '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
+    // '__CDN__' => 'https://static.iacode.cn/cdn/citic-fighting/tag/dc668d2753/Public/static',
+    '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     'URL_MODEL' => 3,
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',
     'DEFAULT_FILTER' => '', // 默认参数过滤方法 用于I函数...。注意这块不能修改！！！！

Application/Home/View/default/Index_index.tpl

@@ -12,7 +12,7 @@
 // body 主题部分
 {:block name="body"}
 <div class="page-2767 page1 page">
-  <div class="res-42572"></div>
+  <div class="res-42610"></div>
   <div class="res-42578 top">
     <div class="res-42576"></div>
   </div>
@@ -23,13 +23,13 @@
 </div>
 <div class="page-2770 upload-page page">
   <div class="res-42596 cat1">
-    <div class="res-42589 hide-block"></div>
+    <div class="res-42611 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-42612 hide identity-1"></div>
+      <div class="res-42613 hide identity-2"></div>
       <div class="res-42599 touch"></div>
       <div class="res-42600 btn-upload-block">
         <div class="res-42592 upload-before"></div>
@@ -52,6 +52,7 @@
   <div class="res-42606"></div>
 </div>
 
+
 {:/block}
 //js 文件导入
 {:block name="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-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
+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-42613{position:absolute;opacity:1;left:NaNpx;top:0;width:640px;height:1238px;background: url(../images/2091_1719756569.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-42611{position:absolute;opacity:1;left:-1px;top:0;width:640px;height:1238px;background: url(../images/5477_1719755514.jpg)left top no-repeat;}.res-42612{position:absolute;opacity:1;top:0;width:640px;height:1238px;background: url(../images/4532_1719756571.png)left top no-repeat;}.res-42597{position:absolute;top:0;width:640px;height:100px;}.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-42610{position:absolute;opacity:1;left:NaNpx;top:0;width:640px;height:1238px;background: url(../images/2381_1719755293.jpg)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

Public/static/js/common.js

@@ -331,7 +331,7 @@ function createPoster() {
     photo.onload = function () {
         posterCtx.drawImage(photo, 0, 0, posterCanvas.width, posterCanvas.height);
         var posterMask = new Image();
-        posterMask.src = '/Public/static/image2/poster-' + level + '.png?version=2'
+        posterMask.src = '/Public/static/image2/poster-' + level + '.png?version=3'
         posterMask.onload = function () {
 
             setTimeout(function () {