'产品调整'

components/common/banner.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="common-banner" :style="{'height': height + 'px'}">
-    <img class="bg-img" :src="img" :style="{'height': height + 'px', 'max-height': height + 'px'}" alt="" srcset="">
+  <div class="common-banner" :style="{'height': height + 'px', backgroundImage: `url(${img})`}">
+    <!-- <img class="bg-img" :src="img" :style="{'height': height + 'px', 'max-height': height + 'px'}" alt="" srcset=""> -->
     <!-- <img class="bg-img" :src="img" alt="" srcset=""> -->
     <div class="bg-content">
       <slot></slot>
@@ -36,6 +36,7 @@ export default {
   overflow: hidden;
   text-align: center;
   max-width: 2560px;
+  background-size: cover;
   // max-width: 1920px;
   .bg-img {
     position: absolute;

components/home/footer.vue

@@ -31,7 +31,7 @@
 							<nuxt-link to="/cooperate">加盟合作</nuxt-link>
 						</li>
 					</ul>
-					<img class="footer_logo" src="~/assets/images/home/logo@2x.png" alt="" srcset="">
+					<img class="footer_logo" src="~/assets/images/home/footer_logo@2x.png" alt="" srcset="">
 				</div>
 				<div class="footer-info">
 					<div class="footer-kefu">

components/home/header.vue

@@ -4,14 +4,15 @@
 		<div id="index-header" :class="headFixed == true ? 'fixedTop' : ''">
 			<div class="index-header-box w1200">
         <div class="h-nav-logo">
-          <nuxt-link to="/">
+          <img src="~/assets/images/home/logo@2x.png" alt="" srcset="">
+          <!-- <nuxt-link to="/">
             <img src="~/assets/images/index/logo_icon.png" alt="" srcset="">
           </nuxt-link>
           <div class="name">
             <nuxt-link to="/">
               中德智慧教育
             </nuxt-link>
-          </div>
+          </div> -->
         </div>
 				<div class="i-h-nav">
 					<ul class="h-nav-list">
@@ -198,12 +199,12 @@ export default {
   display: flex;
   align-items: center;
   padding-right: 37px;
-  border-right: 1px solid #F0F1F2;
+  // border-right: 1px solid #F0F1F2;
 }
 
 .h-nav-logo img {
-  height: 40px;
-  margin: 0 16px 0 22px;
+  height: 33px;
+  // margin: 0 16px 0 22px;
 }
 
 .h-nav-logo .name {

pages/about/brand.vue

@@ -48,10 +48,10 @@
             :src="item.yearImgurl"
             :srcset="`${item.yearImgurlSet[0]} 1x, ${item.yearImgurlSet[1]} 2x`"
             alt=""> -->
-            <div 
-              class="yearNumber"
-              @mouseenter="currentEventImg(item)"
-              >{{item.id}}</div>
+            <div class="yearNumber" @mouseenter="currentEventImg(item)">{{item.id}}</div>
+            <!-- <div>{{item.eventList[0].month}}</div>
+            <div>{{item.eventList[0].thing}}</div> -->
+
             <img
               v-if="currentEventImgId === item.id"
               @mouseleave="currentEventImgId = ''"

pages/product/list.vue

@@ -12,14 +12,18 @@
             </div>
             <div class="item-right">
               <div class="title" v-scroll-reveal.reset="{ delay: 250, origin: 'top', distance: '40px', easing: 'ease-in-out', duration: 1000 }">{{item.title}}</div>
-              <div class="dec" v-scroll-reveal.reset="{ delay: 350, origin: 'bottom', distance: '30px', duration: 1000 }">{{item.desc}}</div>
+              <div class="dec" v-scroll-reveal.reset="{ delay: 350, origin: 'bottom', distance: '30px', duration: 1000 }">
+                <p>{{item.desc}}</p>
+              </div>
               <div class="btn"  v-scroll-reveal.reset="{ delay: 450, easing: 'ease-in-out', scale: 0.85 }" @click="navPage(item)">了解详情</div>
             </div>
           </div>
           <div class="item-content" v-else>
             <div class="item-left">
               <div class="title" v-scroll-reveal.reset="{ origin: 'right', distance: '80px', duration: 1000, easing: 'ease-in-out' }" data-scroll-reveal="enter right and move 80px over 1s" >{{item.title}}</div>
-              <div class="dec" v-scroll-reveal.reset="{ delay: 350, origin: 'left', distance: '40px', duration: 1000 }" data-scroll-reveal="wait 0.35s, then enter left and move 40px over 1s">{{item.desc}}</div>
+              <div class="dec" v-scroll-reveal.reset="{ delay: 350, origin: 'left', distance: '40px', duration: 1000 }" data-scroll-reveal="wait 0.35s, then enter left and move 40px over 1s">
+                <p>{{item.desc}}</p>
+              </div>
               <div class="btn"  v-scroll-reveal.reset="{ delay: 450, easing: 'ease-in-out', scale: 0.85 }" @click="navPage(item)">了解详情</div>
             </div>
             <div class="item-right">
@@ -211,8 +215,10 @@ $bg-white: #FFFFFF;
       font-size: 14px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #666666;
       line-height: 24px;
+      p {
+        color: #666666;
+      }
     }
     .btn {
       width: 100px;
@@ -233,9 +239,17 @@ $bg-white: #FFFFFF;
       font-size: 0;
       display: flex;
       flex-direction: column;
+      text-align: right;
       .title {
         text-align: right;
       }
+      .dec {
+        text-align: right;
+        p {
+          text-align: justify;
+          display: inline-block;
+        }
+      }
       .btn {
         align-self: flex-end;
       }

static/common/common.css

@@ -72,6 +72,11 @@ a:hover {
   src: url('./Archivo-Bold.ttf');
 }
 
+@font-face {
+  font-family: Nunito-Black;
+  src: url('./Nunito-Black.ttf');
+}
+
 @media only screen and (max-width: 1366px) {
   html{
      font-size: 13.66px;