Merge branch 'master' into 'release'

Master

See merge request !10

Application/Common/Conf/db.php

 <?php
 <?php
-return array(
-    'DB_TYPE' => 'mysqli',
-    'DB_HOST' => 'mysql-sh',
-    'DB_PORT' => '3306',
-    'DB_NAME' => 'project_citic_20240626_fighting', // <--- 修改这里
-    'DB_USER' => 'zhida', // <--- 修改这里
-    'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
-    'DB_PREFIX' => '',
-    'DB_CHARSET' => 'utf8mb4',
-   
-);
-
 // return array(
 // return array(
 //     'DB_TYPE' => 'mysqli',
 //     'DB_TYPE' => 'mysqli',
-//     'DB_HOST' => 'mariadb',
+//     'DB_HOST' => 'mysql-sh',
 //     'DB_PORT' => '3306',
 //     'DB_PORT' => '3306',
-//     'DB_NAME' => 'dev_citic_20240626_fighting', // <--- 修改这里
-//     'DB_USER' => 'dev', // <--- 修改这里
-//     'DB_PWD' => '1q2w3e', // <--- 修改这里
+//     'DB_NAME' => 'project_citic_20240626_fighting', // <--- 修改这里
+//     'DB_USER' => 'zhida', // <--- 修改这里
+//     'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
 //     'DB_PREFIX' => '',
 //     'DB_PREFIX' => '',
 //     'DB_CHARSET' => 'utf8mb4',
 //     'DB_CHARSET' => 'utf8mb4',
-
+   
 // );
 // );
+
+return array(
+    'DB_TYPE' => 'mysqli',
+    'DB_HOST' => 'mariadb',
+    'DB_PORT' => '3306',
+    'DB_NAME' => 'dev_citic_20240626_fighting', // <--- 修改这里
+    'DB_USER' => 'dev', // <--- 修改这里
+    'DB_PWD' => '1q2w3e', // <--- 修改这里
+    'DB_PREFIX' => '',
+    'DB_CHARSET' => 'utf8mb4',
+
+);

Application/Home/View/default/Index_index.tpl

@@ -28,8 +28,8 @@
       <div class="res-42595 LOGO"></div>
       <div class="res-42595 LOGO"></div>
     </div>
     </div>
     <div class="res-42598 bottom">
     <div class="res-42598 bottom">
-      <div class="res-42612 hide identity-1"></div>
-      <div class="res-42613 hide identity-2"></div>
+      <div class="res-42614 hide identity-1"></div>
+      <div class="res-42615 hide identity-2"></div>
       <div class="res-42599 touch"></div>
       <div class="res-42599 touch"></div>
       <div class="res-42600 btn-upload-block">
       <div class="res-42600 btn-upload-block">
         <div class="res-42592 upload-before"></div>
         <div class="res-42592 upload-before"></div>

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-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;}
+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-42614{position:absolute;opacity:1;left:NaNpx;top:0;width:640px;height:1238px;background: url(../images/3446_1719809013.png)left top no-repeat;}.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-42611{position:absolute;opacity:1;top:0;width:640px;height:1238px;background: url(../images/5477_1719755514.jpg)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;}.res-42615{position:absolute;opacity:1;left:NaNpx;top:0;width:640px;height:1238px;background: url(../images/1640_1719809011.png)left top no-repeat;}
\ No newline at end of file

Public/static/js/common.js

@@ -114,8 +114,8 @@ $(document).ready(function () {
             $('.username,.company').show();
             $('.username,.company').show();
             var mc = new Hammer($('.touch').get(0));
             var mc = new Hammer($('.touch').get(0));
             bindMc(mc, uploadCtx, uploadCanvas, img, imgInfo);
             bindMc(mc, uploadCtx, uploadCanvas, img, imgInfo);
-            drawVerticalText(uploadCtx, username, '#595857',32 * 2, 95 * 2, 345 * 2, true, 5 * 2);
-            drawVerticalText(uploadCtx, company, '#595857',32 * 2, 95 * 2, 505 * 2, true, 5 * 2);
+            drawVerticalText(uploadCtx, username, '#595857',25 * 2, 82 * 2, 300 * 2, true, 5 * 2);
+            drawVerticalText(uploadCtx, company, '#595857',25 * 2, 82 * 2, 440 * 2, true, 5 * 2);
         }, imgInfo);
         }, imgInfo);
         return false;
         return false;
     });
     });
@@ -336,8 +336,8 @@ function createPoster() {
 
 
             setTimeout(function () {
             setTimeout(function () {
                 posterCtx.drawImage(posterMask, 0, 0, 640 * 2, 1238 * 2);
                 posterCtx.drawImage(posterMask, 0, 0, 640 * 2, 1238 * 2);
-                    drawVerticalText(posterCtx, username, '#595857',32 * 2, 95 * 2, 345 * 2, true, 5 * 2);
-                    drawVerticalText(posterCtx, company, '#595857',32 * 2, 95 * 2, 505 * 2, true, 5 * 2);
+                    drawVerticalText(uploadCtx, username, '#595857',25 * 2, 82 * 2, 300 * 2, true, 5 * 2);
+                    drawVerticalText(uploadCtx, company, '#595857',25 * 2, 82 * 2, 440 * 2, true, 5 * 2);
 
 
                     $('#notification_area').remove();
                     $('#notification_area').remove();
                     $('.upload-page').hide();
                     $('.upload-page').hide();
@@ -419,8 +419,8 @@ function bindMc(mc, ctx, myCanvas, img, imgInfo) {
             imgInfo.y += movedY * 2;
             imgInfo.y += movedY * 2;
 
 
             drawImage(ctx, myCanvas, img, imgInfo);
             drawImage(ctx, myCanvas, img, imgInfo);
-            drawVerticalText(ctx, username, '#595857',32 * 2, 95 * 2, 345 * 2, true, 5 * 2);
-            drawVerticalText(ctx, company, '#595857',32 * 2, 95 * 2, 505 * 2, true, 5 * 2);
+            drawVerticalText(uploadCtx, username, '#595857',25 * 2, 82 * 2, 300 * 2, true, 5 * 2);
+            drawVerticalText(uploadCtx, company, '#595857',25 * 2, 82 * 2, 440 * 2, true, 5 * 2);
         }
         }
     });
     });
     var oldScale = 1;
     var oldScale = 1;
@@ -436,8 +436,8 @@ function bindMc(mc, ctx, myCanvas, img, imgInfo) {
             oldScale = event.scale;
             oldScale = event.scale;
             imgInfo.scale *= nowScale;
             imgInfo.scale *= nowScale;
             drawImage(ctx, myCanvas, img, imgInfo);
             drawImage(ctx, myCanvas, img, imgInfo);
-            drawVerticalText(ctx, username, '#595857',32 * 2, 95 * 2, 345 * 2, true, 5 * 2);
-            drawVerticalText(ctx, company, '#595857',32 * 2, 95 * 2, 505 * 2, true, 5 * 2);
+            drawVerticalText(uploadCtx, username, '#595857',25 * 2, 82 * 2, 300 * 2, true, 5 * 2);
+            drawVerticalText(uploadCtx, company, '#595857',25 * 2, 82 * 2, 440 * 2, true, 5 * 2);
         }
         }
     });
     });
     var oldRotation = 0;
     var oldRotation = 0;
@@ -453,8 +453,8 @@ function bindMc(mc, ctx, myCanvas, img, imgInfo) {
             oldRotation = event.rotation;
             oldRotation = event.rotation;
             imgInfo.rotation += nowRotation;
             imgInfo.rotation += nowRotation;
             drawImage(ctx, myCanvas, img, imgInfo);
             drawImage(ctx, myCanvas, img, imgInfo);
-            drawVerticalText(ctx, username, '#595857',32 * 2, 95 * 2, 345 * 2, true, 5 * 2);
-            drawVerticalText(ctx, company, '#595857',32 * 2, 95 * 2, 505 * 2, true, 5 * 2);
+            drawVerticalText(uploadCtx, username, '#595857',25 * 2, 82 * 2, 300 * 2, true, 5 * 2);
+            drawVerticalText(uploadCtx, company, '#595857',25 * 2, 82 * 2, 440 * 2, true, 5 * 2);
         }
         }
     });
     });
 }
 }