Merge branch 'master' into 'release'

Master

See merge request !2

Application/Home/Controller/IndexController.class.php

@@ -54,6 +54,7 @@ class IndexController extends Controller
               'branch'=> $job_number['branch'],
               'fyp' => $job_number['fyp'],
               'perf' => $job_number['perf'],
+              'phase' => $job_number['phase'],
               'step' => 1
           ));
           return;

Public/static/js/common.js

@@ -68,6 +68,7 @@ let username = '';
 let company = '';
 let perf = '';
 let fyp = '';
+let phase = '';
 
 
 
@@ -158,7 +159,7 @@ function checkInfo() {
         success: function (resp) {
             let dtop = parseInt($('.upload-page .top').css('top'))
 
-            $('.tip').css('top', 249 + dtop + 'px')
+            $('.tip').css('top', 173 + dtop + 'px')
             $('.username').css('top', 319 + dtop + 'px')
             $('.company').css('top', 373 + dtop + 'px')
             if (resp.status == 1) {
@@ -167,8 +168,11 @@ function checkInfo() {
                 company = resp.branch;
                 fyp = resp.fyp;
                 perf = resp.perf;
+                phase = resp.phase;
                 toUploadPage();
                 $('.username').text(username);
+                $('.tip').hide();
+                $('.tip' + phase).show()
                 $('.company').html('中信保诚人寿<br/>' + company + '');
                 if (fyp == 0) {
                     $('.perf').html('<span>个人累计承保</span><br/>' + perf + '件')
@@ -319,7 +323,7 @@ function createPoster() {
         posterCtx.drawImage(photo, 0, 0, posterCanvas.width, posterCanvas.height);
 
         var posterTopObj = new Image();
-        posterTopObj.src = '/Public/static/image2/poster' + level + '-1.png?version=1.0.0';
+        posterTopObj.src = `/Public/static/image2/poster${level}-1-${phase}.png?version=1.0.0`;
         var logoObj = new Image();
         logoObj.src = '/Public/static/image2/logo.png?version=1.0.0';
         posterTopObj.onload = function () {
@@ -333,7 +337,7 @@ function createPoster() {
 
             setTimeout(function () {
                 posterCtx.drawImage(logoObj, 0 * 2, 40 * 2, 569 * 2, 204 * 2);
-                posterCtx.drawImage(posterTopObj, 35 * 2, 250 * 2, 206 * 2, 65 * 2);
+                posterCtx.drawImage(posterTopObj, 35 * 2, 173 * 2, 206 * 2, 141 * 2);
                 var posterBottomObj = new Image();
                 posterBottomObj.src = '/Public/static/image2/poster' + level + '-2.png?version=1.0.0';
                 posterBottomObj.onload = function () {

Runtime/Cache/a8175b67d5aa9cac954251197f9ffb6c6442a1c9.file.Index_index.tpl.php

-<?php /* Smarty version Smarty-3.1.6, created on 2021-04-30 11:26:25
+<?php /* Smarty version Smarty-3.1.6, created on 2021-05-20 12:04:27
          compiled from "Application/Home/View/default/Index_index.tpl" */ ?>
 <?php /*%%SmartyHeaderCode:4876646036088c82d758e93-18897134%%*/if(!defined('SMARTY_DIR')) exit('no direct access allowed');
 $_valid = $_smarty_tpl->decodeProperties(array (
@@ -13,7 +13,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
     '526b6e8e6609f50ea93c8658e68e6ae8c9981bc5' => 
     array (
       0 => 'Application/Home/View/default/layout.tpl',
-      1 => 1619751162,
+      1 => 1620656572,
       2 => 'file',
     ),
   ),
@@ -129,7 +129,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
         var _hmt = _hmt || [];
         (function() {
         var hm = document.createElement("script");
-        hm.src = "https://hm.baidu.com/hm.js?24f55c033cb4f0f53569de145e3336c4";
+        hm.src = "https://hm.baidu.com/hm.js?c8a41b65154301a2d05315d3000bf95a";
         var s = document.getElementsByTagName("script")[0]; 
         s.parentNode.insertBefore(hm, s);
         })();

index.php

@@ -8,6 +8,8 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+// die();
+
 if(version_compare(PHP_VERSION,'5.3.0','<'))  die('require PHP > 5.3.0 !');
 
 define('WEB_ROOT_PATH', realpath(dirname(__FILE__)));