Merge branch 'master' into release

Public/static/css/index.css

@@ -137,7 +137,7 @@ input[name=job-number] {
 .username {
 .username {
   font-size: 45px;
   font-size: 45px;
   line-height: 45px;
   line-height: 45px;
-  color: #464646;
+  color: #ffffff;
   text-align: right;
   text-align: right;
   font-weight: bolder;
   font-weight: bolder;
 }
 }
@@ -148,7 +148,7 @@ input[name=job-number] {
 }
 }
 
 
 .company {
 .company {
-  color: #464646;
+  color: #ffffff;
   text-align: right;
   text-align: right;
   font-size: 20px;
   font-size: 20px;
 }
 }

Public/static/js/common.js

@@ -323,11 +323,14 @@ function createPoster() {
         var logoObj = new Image();
         var logoObj = new Image();
         logoObj.src = '/Public/static/image2/logo.png?version=1.0.0';
         logoObj.src = '/Public/static/image2/logo.png?version=1.0.0';
         posterTopObj.onload = function () {
         posterTopObj.onload = function () {
-            txtDraw(posterCtx, username, '#464646', 215 * 2, 360 * 2, 45 * 2, 'bolder');
-            txtDraw(posterCtx, '中信保诚人寿', '#464646', 215 * 2, 390 * 2, 20 * 2);
-            txtDraw(posterCtx, company + '', '#464646', 215 * 2, 413 * 2, 20 * 2);
-            
-            
+            // txtDraw(posterCtx, username, '#464646', 215 * 2, 360 * 2, 45 * 2, 'bolder');
+            // txtDraw(posterCtx, '中信保诚人寿', '#464646', 215 * 2, 390 * 2, 20 * 2);
+            // txtDraw(posterCtx, company + '', '#464646', 215 * 2, 413 * 2, 20 * 2);
+            txtDraw(posterCtx, username, '#ffffff', 215 * 2, 360 * 2, 45 * 2, 'bolder');
+            txtDraw(posterCtx, '中信保诚人寿', '#ffffff', 215 * 2, 390 * 2, 20 * 2);
+            txtDraw(posterCtx, company + '', '#ffffff', 215 * 2, 413 * 2, 20 * 2);
+
+
             setTimeout(function () {
             setTimeout(function () {
                 posterCtx.drawImage(logoObj, 0 * 2, 40 * 2, 569 * 2, 204 * 2);
                 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, 250 * 2, 206 * 2, 65 * 2);
@@ -339,7 +342,7 @@ function createPoster() {
                     if (fyp == 0) {
                     if (fyp == 0) {
                         txtDrawLeft(posterCtx, '个人累计承保', '#b40220', 66 * 2, 837 * 2, 40 * 2, 'bolder');
                         txtDrawLeft(posterCtx, '个人累计承保', '#b40220', 66 * 2, 837 * 2, 40 * 2, 'bolder');
                         txtDrawLeft(posterCtx, perf + '件', '#b40220', 66 * 2, 888 * 2, 53 * 2, 'bolder');
                         txtDrawLeft(posterCtx, perf + '件', '#b40220', 66 * 2, 888 * 2, 53 * 2, 'bolder');
-                    } else { 
+                    } else {
                         txtDrawLeft(posterCtx, '个人累计承保', '#b40220', 66 * 2, 837 * 2, 40 * 2, 'bolder');
                         txtDrawLeft(posterCtx, '个人累计承保', '#b40220', 66 * 2, 837 * 2, 40 * 2, 'bolder');
                         txtDrawLeft(posterCtx, 'YFP' + perf + '元', '#b40220', 66 * 2, 888 * 2, 53 * 2, 'bolder');
                         txtDrawLeft(posterCtx, 'YFP' + perf + '元', '#b40220', 66 * 2, 888 * 2, 53 * 2, 'bolder');
                     }
                     }