梁彦春 6 jaren geleden
bovenliggende
commit
d551101e24

+ 27
- 13
src/components/commonComponents/icon.vue Bestand weergeven

@@ -51,17 +51,35 @@ export default {
51 51
   name: "to-top",
52 52
   data () {
53 53
     return {
54
+      scrollTop: '',
54 55
       toTopIsShow: false,
55 56
       mask: false,
56 57
     }
57 58
   }
58 59
   ,
59 60
   methods: {
60
-    toTop () {
61
-      if (document.documentElement.scrollTop > 0 || window.pageYOffset > 0 || document.body.scrollTop > 0) {
62
-        window.pageYOffset = document.documentElement.scrollTop = document.body.scrollTop = 0;
63
-      }
64
-    },
61
+     handleScroll () {
62
+          this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
63
+          if(this.scrollTop>500){
64
+            this.toTopIsShow=true
65
+          }else{
66
+              this.toTopIsShow= false
67
+          }
68
+        },
69
+        toTop(){
70
+          let timer=null,_that=this;
71
+          cancelAnimationFrame(timer)
72
+          timer=requestAnimationFrame(function fn(){
73
+            if(_that.scrollTop>0){
74
+              _that.scrollTop-=50;
75
+              document.body.scrollTop = document.documentElement.scrollTop = _that.scrollTop;
76
+              timer=requestAnimationFrame(fn)
77
+            }else {
78
+              cancelAnimationFrame(timer);
79
+              _that.toTopIsShow=false;
80
+            }
81
+          })
82
+        },
65 83
     news () {
66 84
       this.mask = true
67 85
     },
@@ -73,15 +91,11 @@ export default {
73 91
     }
74 92
   },
75 93
   mounted () {
76
-    var _this = this;
77
-    window.onscroll = function () {
78
-      if (window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop > 10) {
79
-        _this.toTopIsShow = true;
80
-      } else {
81
-        _this.toTopIsShow = false;
94
+    window.addEventListener('scroll', this.handleScroll);
95
+  },
96
+  destroyed(){
97
+        window.removeEventListener('scroll', this.handleScroll)
82 98
       }
83
-    }
84
-  }
85 99
 }
86 100
 </script>
87 101
 

+ 14
- 14
src/components/pages/index.vue Bestand weergeven

@@ -109,12 +109,12 @@
109 109
         </div>
110 110
         <div class="page-3 fp-auto-height">
111 111
           <div class="page-3_con">
112
-            <p class="title">产品简介</p>
113 112
             <div class="produce">
113
+              <p class="title">产品简介</p>
114 114
               <div class="peoduce_top">
115 115
                 <div class="list first" :class="page3 == true ? 'animation fadeIn1' :''">
116 116
                   <p class="list-name">AI迎宾判客系统</p>
117
-                  <img src="../../assets/image/home/produce/Group45.png" alt style="margin-top: 42px;">
117
+                  <img src="../../assets/image/home/produce/Group45.png" alt style="margin-top: 10.5%;">
118 118
                   <p class="list-desc">智慧人脸风控应用于案场、地铁、银行等</p>
119 119
                 </div>
120 120
                 <div class="list" :class="page3 == true ? 'animation fadeIn2' :''">
@@ -126,7 +126,7 @@
126 126
               <div class="produce_bottom">
127 127
                 <div class="list" :class="page3 == true ? 'animation fadeIn3' :''" >
128 128
                   <p class="list-name">银城慧家APP</p>
129
-                  <img src="../../assets/image/home/produce/Group47.png" alt style="margin-top: 42px;">
129
+                  <img src="../../assets/image/home/produce/Group47.png" alt style="margin-top: 10.5%;">
130 130
                   <p class="list-desc">智慧社区管理软件,一键开启智慧社区美好生活</p>
131 131
                 </div>
132 132
                 <div class="list" :class="page3 == true ? 'animation fadeIn4' :''">
@@ -453,19 +453,18 @@ export default {
453 453
     height: 100%;
454 454
     background-size: 100% 100%;
455 455
     overflow: hidden;
456
-    // display: flex;
457
-    // justify-content: center;
458
-    // align-items: center;
459
-    // position: relative;
456
+    position: relative;
460 457
     .page-3_con {
461 458
       width: 100%;
462 459
       margin-top: 8.5%;
463
-    margin-bottom: 3%;
464
-    margin: auto;
460
+      margin-bottom: 3%;
461
+      margin: auto;
462
+      position: absolute;
463
+      bottom: 5%;
465 464
       // padding: 8.5% 0 3% 0;
466 465
       .title {
467 466
         font-size: 56px;
468
-        margin-top: 7%;
467
+        // margin-top: 7%;
469 468
         // padding-top: 5%;
470 469
         color: #fff;
471 470
       }
@@ -491,7 +490,7 @@ export default {
491 490
     background-color: #fff;
492 491
     border-radius: 4px;
493 492
     padding: 0 4%;
494
-    margin: 10px;
493
+    margin: 0.5%;
495 494
           .list-name {
496 495
             color: #03033f;
497 496
             border-bottom: 1.5px dashed #040445;
@@ -501,11 +500,11 @@ export default {
501 500
           img {
502 501
             // height: 143px;
503 502
             width: 80%;
504
-            margin-top: 16px;
503
+            margin-top: 5%;
505 504
           }
506 505
           .list-desc {
507 506
             font-size: 18px;
508
-            margin: 15px 0;
507
+            margin: 5% 0;
509 508
             color: #000;
510 509
           }
511 510
         }
@@ -591,6 +590,7 @@ export default {
591 590
         -ms-transform: scale(1);
592 591
         -o-transform: scale(1);
593 592
         transform: scale(1);
593
+        z-index: 1000;
594 594
       }
595 595
 
596 596
       // .blue-slide {
@@ -658,7 +658,7 @@ export default {
658 658
     .page-5-con{
659 659
       // margin: 13%;
660 660
       position: absolute;
661
-    bottom: 40%;
661
+    bottom: 37%;
662 662
       .title {
663 663
       font-size: 56px;
664 664
       color: #fff;

+ 11
- 9
src/components/pages/productCenter/AIwelcome.vue Bestand weergeven

@@ -20,7 +20,7 @@
20 20
           </div>
21 21
         </div>
22 22
       </div>
23
-      <prod-navi class="nav" default="case-1"></prod-navi>
23
+      
24 24
       <!-- <div class="product_bar">
25 25
         <el-menu :default-active="activeIndex2" class="el-menu-demo"  @select="handleSelect" background-color="rgba(0,0,0,0)" text-color="#999999" active-text-color="#000000">
26 26
           <el-menu-item index="1" class="item1"  background-color="#fff">
@@ -50,7 +50,7 @@
50 50
         </el-menu>
51 51
       </div>-->
52 52
     </div>
53
-
53
+    <prod-navi class="nav" default="case-1"></prod-navi>
54 54
     <div class="secondHouse-middle">
55 55
       <div class="secondHouse_content">
56 56
         <div class="Features1">
@@ -229,7 +229,7 @@ export default {
229 229
 .nav {
230 230
   width: 1280px;
231 231
   position: relative;
232
-  top: -8%;
232
+  top: -64px;
233 233
   // margin-top: -207px;
234 234
   margin: auto;
235 235
   display: flex;
@@ -256,12 +256,13 @@ export default {
256 256
   }
257 257
 }
258 258
 .product_box {
259
-  width: 1260px;
260
-  height: 90%;
259
+  width: 65.625%;
260
+  min-width: 1090px;
261
+  height: 100%;
261 262
   margin: 0 auto;
262 263
 }
263 264
 .product_top {
264
-  width: 1260px;
265
+  width: 100%;
265 266
   height: 110%;
266 267
   display: flex;
267 268
   justify-content: center;
@@ -296,15 +297,17 @@ export default {
296 297
   }
297 298
 }
298 299
 .product_top_con_right {
300
+  width: 51.59%;
299 301
   display: inline-block;
300 302
   color: #fff;
301 303
   img {
302
-    width: 650px;
304
+    width: 100%;
303 305
   }
304 306
 }
305 307
 .product_top_con {
306 308
   width: 100%;
307 309
   margin: 0 60px;
310
+  
308 311
   display: flex;
309 312
   justify-content: space-between;
310 313
   align-items: center;
@@ -385,8 +388,7 @@ export default {
385 388
   }
386 389
 }
387 390
 .Features1 {
388
-  margin: 80px auto 70px auto;
389
-  padding: 80px 0;
391
+  margin: 0 auto 70px auto;
390 392
 }
391 393
 .Features2 {
392 394
   margin: 70px auto 0 auto;

+ 5
- 2
src/components/pages/productCenter/bigscreen.vue Bestand weergeven

@@ -307,17 +307,20 @@ export default {
307 307
 .product_top_con_right {
308 308
   display: inline-block;
309 309
   color: #fff;
310
+  width: 39%;
311
+    min-width: 367px;
310 312
   img:first-child {
311 313
     margin-right: 32px;
312 314
   }
313 315
   img {
314
-    width: 197px;
315
-    height: 569px;
316
+    width: 35%;
317
+    height: 80%;
316 318
   }
317 319
 }
318 320
 .product_top_con {
319 321
   width: 100%;
320 322
   margin: 0 60px;
323
+  padding-top: 3%;
321 324
   display: flex;
322 325
   justify-content: space-between;
323 326
   align-items: center;

+ 1
- 1
src/components/pages/productCenter/micro.vue Bestand weergeven

@@ -382,7 +382,7 @@ export default {
382 382
   .secondHouse_content {
383 383
     // width: 1260px;
384 384
     margin: 0 auto;
385
-    padding: 80px 0;
385
+    padding: 110px 0;
386 386
     .Features {
387 387
       margin: 80px auto;
388 388
     }

+ 2
- 2
src/components/pages/productCenter/release.vue Bestand weergeven

@@ -361,7 +361,7 @@ export default {
361 361
     margin: 0 auto;
362 362
     .Features {
363 363
       margin: 0 auto;
364
-      padding-top: 80px;
364
+      padding-top: 110px;
365 365
     }
366 366
   }
367 367
 }
@@ -448,7 +448,7 @@ export default {
448 448
 .img_L {
449 449
   width: 370px;
450 450
   height: 276px;
451
-  border-radius: 0 6px 6px;
451
+  border-radius: 0 6px 6px 0;
452 452
 }
453 453
 
454 454
 .boxes_img {