Merge branch 'release' into dev4.6.3.3

src/jfw/modules/app/src/web/templates/active/yearEndReport/result.html

@@ -126,6 +126,7 @@
               <p style="line-height: .3rem;">看看你的年度角色</p>
             </div>
             <div class="code-img" id="qrcode">
+              <img class="logo-icon" src="{{Msg "seo" "cdn"}}/common-module/public/image/logo_new.png" alt="">
 <!--              <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/result/jy-qcode.png' alt="">-->
             </div>
           </div>

src/web/staticres/common-module/yearEndReport/css/result.css

@@ -227,9 +227,18 @@ html,body{
   text-align: right;
 }
 .r-bottom .code-img{
+  position: relative;
   width: 1.75rem;
   height: 1.75rem;
 }
+.r-bottom .code-img img.logo-icon {
+  width: 0.56rem;
+  height: 0.56rem;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
 .r-bottom .code-img > img,
 .r-bottom .code-img > canvas {
   display: block;
@@ -264,8 +273,9 @@ html,body{
   top: 50%;
   left: 50%;
   display: block;
-  width: 7.5rem;
-  height: 14.48rem;
+  width: 80%;
+  height: auto;
+  object-fit: contain;
   transform: translate(-50%, -50%);
   z-index: 1001;
   /* width: 100%;

src/web/templates/active/yearEndReport/result.html

@@ -126,6 +126,7 @@
           <p style="line-height: .3rem;">看看你的年度角色</p>
          </div>
          <div class="code-img" id="qrcode">
+           <img class="logo-icon" src="{{Msg "seo" "cdn"}}/common-module/public/image/logo_new.png" alt="">
 <!--           <img src='{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/result/jy-qcode.png' alt="">-->
          </div>
        </div>