Merge branch 'dev4.6.3.2' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.2

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

@@ -178,7 +178,9 @@
                     <div class="report-page page-5">
                         <div class="item">
                             <div class="this" animate-name="up" animate-delay="200" >近一年</div>
-                            <div class="gongsi" animate-name="up" animate-delay="400" >郑州大学第一附属医院<br>LED显示屏系统</div>
+                            <div class="gongsi" animate-name="up" animate-delay="400" >
+                                <div v-for="(item, index) in pageInfo.focus_project">${item}</div>
+                            </div>
                             <div class="guanzhu" animate-name="up" animate-delay="600" >是你最关注的项目</div>
                             <div class="yun-five">
                                 <img class="swiper-lazy" data-src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/P5/yun-five.png" alt="">
@@ -349,16 +351,12 @@
                             <p class="year" animate-name="up" animate-delay="200" >近一年</p>
                             <div class="you" animate-name="up" animate-delay="400" >慧眼识珠的你,体验了剑鱼</div>
                             <div class="gn" animate-name="up" animate-delay="600" >
-                                <span class="num">17个</span>
+                                <span class="num">${pageInfo.exp_list.length}个</span>
                                 <p class="new">新功能</p>
                             </div>
                             <div class="list" animate-name="up" animate-delay="800" >
-                                <p>免费标讯搜索</p>
-                                <p>超级订阅</p>
-                                <p>大会员</p>
-                                <p>数据导出</p>
-                                <p>行业解决方案</p>
-                                <p>......</p>
+                                <p v-for="item in pageInfo.exp_list.slice(0,5)">${item}</p>
+                                <p v-if="pageInfo.exp_list.length > 5">......</p>
                             </div>
                             <div class="text-bottom">
                                 <div class="text" animate-name="up" animate-delay="1000" >从未枯竭的好奇心</div>

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

@@ -156,10 +156,26 @@ body {
 }
 @keyframes InitMeteorBgIn {
   0% {
+    transform: translate3d(0, 100%, 0)
+  }
+  20% {
     transform: scale(4) translate3d(0, 80%, 0) rotate3d(1, 1, 1, 30deg);
   }
   100% {
-    transform: scale(1);
+    transform: scale(1) translate3d(0, 0, 0);
+  }
+}
+@keyframes MeteorRotate {
+  0% {
+    transform: unset;
+  }
+  100% {
+    transform: scale(3) rotate3d(1, 1, 1, -18deg);
+  }
+}
+@keyframes InLeft {
+  100% {
+    transform: translateX(0.3rem);
   }
 }
 @keyframes RightIn {
@@ -220,10 +236,10 @@ body {
 }
 @keyframes Scale {
   from {
-    transform: scale(1);
+    transform: scale(1) translate3d(0, 0, 0);
   }
   to {
-    transform: scale(1.5);
+    transform: scale(1.5) translate3d(0, 0, 0);
   }
 }
 @keyframes FadeBottomIn {
@@ -351,10 +367,11 @@ body {
 }
 
 .page-1 .meteor-bg.show {
-  animation: InitMeteorBgIn 4s ease-out 1, Scale 10s 5s ease infinite alternate;
+  animation: InitMeteorBgIn 4s ease-out 1 forwards, Scale 10s 5s ease infinite alternate;
 }
 .page-1 .meteor-bg {
   position: absolute;
+  transform: translate3d(0, 100%, 0);
   bottom: 0;
   width: 100%;
 }
@@ -728,6 +745,9 @@ letter-spacing: 4px;
     align-items: center;
     justify-content: center;
 }
+.page-5 .yun-five.show {
+  animation: InLeft 7s infinite alternate linear;
+}
 .page-5 .yun-five{
   position: absolute;
   bottom: 4.88rem;
@@ -735,6 +755,7 @@ letter-spacing: 4px;
   z-index: -1;
 }
 .page-5 .yun-five img{
+  transform: scale(1.1);
   width: 100%;
 }
 .page-5 .ball-five{
@@ -975,9 +996,12 @@ position: absolute;
 .page-7 .xd-seven{
   position: absolute;
   right: 0;
-  bottom: 1.9rem;
+  bottom: 4.7rem;
   z-index: -1;
 }
+.page-7 .xd-seven img.show {
+  animation: MeteorRotate 22s ease infinite alternate;
+}
 .page-7 .xd-seven img{
   width: 100%;
 }
@@ -1839,3 +1863,9 @@ margin-top: 2.56rem;
 }
 
 /* E第十一页 */
+.jy-report .report-page .text-bottom {
+  left: unset;
+  right: unset;
+  width: 100%;
+  text-align: center;
+}

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

@@ -178,9 +178,11 @@
                     <div class="report-page page-5">
                         <div class="item">
                             <div class="this" animate-name="up" animate-delay="200" >近一年</div>
-                            <div class="gongsi" animate-name="up" animate-delay="400" >郑州大学第一附属医院<br>LED显示屏系统</div>
+                            <div class="gongsi" animate-name="up" animate-delay="400" >
+                                <div v-for="(item, index) in pageInfo.focus_project">${item}</div>
+                            </div>
                             <div class="guanzhu" animate-name="up" animate-delay="600" >是你最关注的项目</div>
-                            <div class="yun-five">
+                            <div class="yun-five" animate-name="show" >
                                 <img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P5/yun-five.png" alt="">
                             </div>
                             <div class="ball-five">
@@ -246,7 +248,7 @@
                             <div class="year" animate-name="up" animate-delay="200" >近一年</div>
                             <div class="you" animate-name="up" animate-delay="400" >你搜索了</div>
                             <div class="num" animate-name="up" animate-delay="600" >${pageInfo.search_total}次</div>
-                            <div class="xd-seven"><img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P7/xd-seven.png" alt=""></div>
+                            <div class="xd-seven"><img animate-name="show"  class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P7/xd-seven.png" alt=""></div>
                             <div class="text-bottom" animate-name="up" animate-delay="800" >求索力让你的成功触手可及</div>
                             <div class="btn-next">
                                 <div class="next-page"></div>
@@ -347,16 +349,12 @@
                             <p class="year" animate-name="up" animate-delay="200" >近一年</p>
                             <div class="you" animate-name="up" animate-delay="400" >慧眼识珠的你,体验了剑鱼</div>
                             <div class="gn" animate-name="up" animate-delay="600" >
-                                <span class="num">17个</span>
+                                <span class="num">${pageInfo.exp_list.length}个</span>
                                 <p class="new">新功能</p>
                             </div>
                             <div class="list" animate-name="up" animate-delay="800" >
-                                <p>免费标讯搜索</p>
-                                <p>超级订阅</p>
-                                <p>大会员</p>
-                                <p>数据导出</p>
-                                <p>行业解决方案</p>
-                                <p>......</p>
+                                <p v-for="item in pageInfo.exp_list.slice(0,5)">${item}</p>
+                                <p v-if="pageInfo.exp_list.length > 5">......</p>
                             </div>
                             <div class="text-bottom">
                                 <div class="text" animate-name="up" animate-delay="1000" >从未枯竭的好奇心</div>