chending1994 5 سال پیش
والد
کامیت
3ea27b9194

BIN
assets/images/contact/award_img.png


BIN
assets/images/contact/award_img@2x.png


BIN
assets/images/contact/campus_01.png


BIN
assets/images/contact/campus_02.png


BIN
assets/images/contact/campus_03.png


BIN
assets/images/contact/campus_04.png


BIN
assets/images/contact/campus_05.png


BIN
assets/images/contact/campus_06.png


BIN
assets/images/cooperate/tab_content_01.png


BIN
assets/images/cooperate/tab_content_02.png


BIN
assets/images/home/omo_content_01.png


BIN
assets/images/home/omo_content_02.png


BIN
assets/images/products/parent_img_first.png


BIN
assets/images/products/teach_img_first.png


BIN
assets/images/products/teach_img_second.png


+ 2 - 2
components/home/banner.vue

@@ -19,7 +19,7 @@
         <div class="el-icon-arrow-right"></div>
       </div>
     </div>
-    <div class="banner-swiper-pagination" slot="pagination"></div>
+    <!-- <div class="banner-swiper-pagination" slot="pagination"></div> -->
   </div>
 </template>
 
@@ -132,7 +132,7 @@ export default {
   width: 100%;
   // height: 540px;
   // height: 595px;
-  height: 850px;
+  min-height: 850px;
   .swiperBox {
     height: 100%;
     &:hover {

+ 6 - 3
components/home/header.vue

@@ -4,7 +4,7 @@
 		<div id="index-header" :class="[headFixed == true ? 'fixedTop' : '', headWhite ? 'head-white' : '' ]">
 			<div class="index-header-box w1200" >
         <div class="h-nav-logo">
-          <h1>中德智慧教育</h1>
+          <nuxt-link to="/"><h1>中德智慧教育</h1></nuxt-link>
           <!-- <img src="~/assets/images/home/logo@2x.png" alt="" srcset=""> -->
         </div>
 				<div class="i-h-nav">
@@ -172,7 +172,7 @@ export default {
         &:first-child {
           // padding-left: 40px;
           .nuxt-link-active {
-            color: #333;
+            color: $theme_gray333;
             // border-bottom: 2px solid transparent;
             &.nuxt-link-exact-active {
               color: $theme_color;
@@ -186,9 +186,12 @@ export default {
         a {
           color: $theme_gray333;
           transition: color 0.3s ease-in-out;
+          &.nuxt-link-exact-active { 
+            color: $theme_color;
+          }
         }
         .expand {
-          color: #333333;
+          color: $theme_gray333;
         }
       }
       .h-nav-list-child {

+ 26 - 13
pages/about/contact.vue

@@ -139,33 +139,39 @@ import TitleContent from '@/components/common/titleContent';
 export default {
   data() {
     return {
-      bgImg: require('@/assets/images/contact/contact_bg.png'),
+      // bgImg: require('@/assets/images/contact/contact_bg.png'),
+      bgImg: 'https://app-resources-luojigou.luojigou.vip/ltdTPjI8Ism4HfpcPbABoB8iwePg?imageView2/0/q/40|imageslim',
       currentId: 1,
       campusList: [
         {
           id: 1,
-          imgUrl: require('~/assets/images/about/interest_02.png'),
-          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上'
+          imgUrl: require('~/assets/images/contact/campus_01.png'),
+          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上...'
         },
         {
           id: 2,
-          imgUrl: require('~/assets/images/about/interest_02.png'),
-          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上'
+          imgUrl: require('~/assets/images/contact/campus_02.png'),
+          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上...'
         },
         {
           id: 3,
-          imgUrl: require('~/assets/images/about/interest_02.png'),
-          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上'
+          imgUrl: require('~/assets/images/contact/campus_03.png'),
+          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上...'
         },
         {
           id: 4,
-          imgUrl: require('~/assets/images/about/interest_02.png'),
-          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上'
+          imgUrl: require('~/assets/images/contact/campus_04.png'),
+          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上...'
         },
         {
           id: 5,
-          imgUrl: require('~/assets/images/about/interest_02.png'),
-          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上'
+          imgUrl: require('~/assets/images/contact/campus_05.png'),
+          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上...'
+        },
+        {
+          id: 6,
+          imgUrl: require('~/assets/images/contact/campus_06.png'),
+          title: '武商亚贸广场的小小夏令营来啦,参加小小夏令营的小朋友,从此就爱上...'
         }
       ]
     }
@@ -431,7 +437,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
     .campus-item {
-      max-width:360px;
+      max-width:396px;
       // margin: 0 38px 126px 0;
       padding: 18px 18px 32px 18px;
       border-radius: 20px;
@@ -445,7 +451,7 @@ export default {
         background:#ffffff;
         border-bottom: 2px solid rgba(35,106,250,1);
         box-shadow:0px 4px 20px 0px rgba(150,150,150,0.22);
-        transition: 0.5;
+        transition: all 0.5s;
         // border-radius: 20px;
         // margin-bottom: 52px;
         .desc {
@@ -473,6 +479,13 @@ export default {
         font-weight: 400;
         color: #333333;
         line-height: 28px;
+        text-overflow: -o-ellipsis-lastline;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        line-clamp: 2;
+        -webkit-box-orient: vertical;
       }
     }
   }

+ 4 - 4
pages/cooperate/index.vue

@@ -304,7 +304,8 @@ export default {
       loading: false,
       disabled: false,
       bgImg: require("~/assets/images/cooperate/cooperateBg.png"),
-      projectImg: require("~/assets/images/cooperate/project_img.png"),
+      // projectImg: require("~/assets/images/cooperate/project_img.png"),
+      projectImg: 'https://app-resources-luojigou.luojigou.vip/Fr5m-_f0ah6Jdkw6kh4QsjM8a9fy',
       tabContent01: require('~/assets/images/cooperate/tab_content_01@2x.png'),
       tabContent02: require('~/assets/images/cooperate/tab_content_02@2x.png'),
       tabContent03: require('~/assets/images/cooperate/tab_content_03@2x.png'),
@@ -529,15 +530,14 @@ export default {
           width: 579px;
           border-radius: 30px;
           text-align: center;
-          opacity: 0.8;
           .content-info {
             padding: 0 53px;
             position: absolute;
             z-index: 1;
             top: 0;
-            opacity: 0.79;
             height: 100%;
             border-radius: 30px;
+            opacity: 0.79;
             &.content-info-left {
               background: #0D5CFA;
             }
@@ -546,7 +546,7 @@ export default {
             }
           }
           img {
-            width: 523px;
+            width: 579px;
             height: 351px;
           }
         }

+ 42 - 28
pages/index.vue

@@ -120,6 +120,7 @@
           <div class="t-conent-box">
             <div
               v-for="(item, index) in productCate" 
+              @click="navPage(item.path)"
               :style="{ backgroundImage: `url('${item.imgUrl}')` }"
               :key="index"
               :class="['t-conent-bg', currentTabId == item.id ? 'active' : '']">
@@ -141,7 +142,7 @@
         </div>
         <template v-for="(item, index) in channelList">
           <div class="channel-content" v-if="currentChannel == index" :key="index" >
-            <div class="left">
+            <div class="left cp" @click="navPage('/merchants')">
               <img :src="item.itemList[currentTabImg].imgUrl" alt="" srcset="">
             </div>
             <div class="right">
@@ -194,6 +195,7 @@
             <div 
               :class="['omo-con', 'omo-con' + item.id]" 
               v-for="(item, index) in omoList"
+              @click="navPage('/product/course')"
               :style="{display: currentOMOTabIndex == index ? 'block' :  'none', backgroundImage: `url('${item.imgUrl}')` }" 
               :key="index">
             </div>
@@ -229,7 +231,7 @@
             </div>
           </div>
         </div>
-        <div class="student-pagination" slot="pagination"></div>
+        <!-- <div class="student-pagination" slot="pagination"></div> -->
       </div>
     </div>
 
@@ -556,7 +558,6 @@
       </div>
     </div> -->
 
-
     <!-- 新闻资讯 -->
     <!-- <div class="index-article">
       <div class="i-article-content w1200">
@@ -698,20 +699,21 @@ export default {
   data() {
     return {
       bannerData: [
-        {
-          bannerId: "1",
-          href: "http://zaojiao.net",
-          // bannerSrc: "https://app-resources-luojigou.luojigou.vip/img1.acbb14a.jpg?imageView2/0/q/40|imageslim",
-          bannerSrc: "https://app-resources-luojigou.luojigou.vip/FmzrfkdGNl2nBACpLYpZkK8_-0dJ?imageView2/0/q/40|imageslim",
-          // bannerSrc: require('~/assets/images/index/img1.jpg'),
-          bannerAlt: "中德智慧",
-        },
         // {
-        //   bannerId: "2",
+        //   bannerId: "1",
         //   href: "http://zaojiao.net",
+        //   // bannerSrc: "https://app-resources-luojigou.luojigou.vip/img1.acbb14a.jpg?imageView2/0/q/40|imageslim",
         //   bannerSrc: "https://app-resources-luojigou.luojigou.vip/FmzrfkdGNl2nBACpLYpZkK8_-0dJ?imageView2/0/q/40|imageslim",
+        //   // bannerSrc: require('~/assets/images/index/img1.jpg'),
         //   bannerAlt: "中德智慧",
         // },
+        {
+          bannerId: "2",
+          href: "http://zaojiao.net",
+          // bannerSrc: "https://app-resources-luojigou.luojigou.vip/FmzrfkdGNl2nBACpLYpZkK8_-0dJ?imageView2/0/q/40|imageslim",
+          bannerSrc: "https://app-resources-luojigou.luojigou.vip/Fm9omhC2XAr0RMRSLQub5RmKdYhU?imageView2/0/q/40|imageslim",
+          bannerAlt: "中德智慧",
+        },
       ],
       num: 0,
       clickProdIndex: 0,
@@ -727,47 +729,56 @@ export default {
         {
           id: 0,
           label: '逻辑狗3-7岁',
-          imgUrl: require('~/assets/images/home/cate_img_01@2x.png')
+          imgUrl: require('~/assets/images/home/cate_img_01@2x.png'),
+          path: '/product/detail?id=1'
         },
         {
           id: 1,
           label: '逻辑狗3-12岁',
-          imgUrl: require('~/assets/images/home/cate_img_02@2x.png')
+          imgUrl: require('~/assets/images/home/cate_img_02@2x.png'),
+          path: '/product/detail?id=2'
         },
         {
           id: 2,
           label: '逻辑狗7-12岁',
-          imgUrl: require('~/assets/images/home/cate_img_03@2x.png')
+          imgUrl: require('~/assets/images/home/cate_img_03@2x.png'),
+          path: '/product/detail?id=3'
         },
         {
           id: 3,
           label: '克鲁德',
-          imgUrl: require('~/assets/images/home/cate_img_04@2x.png')
+          imgUrl: require('~/assets/images/home/cate_img_04@2x.png'),
+          path: '/product/detail?id=4'
         },
         {
           id: 4,
           label: '春夏秋冬',
-          imgUrl: require('~/assets/images/home/cate_img_05@2x.png')
+          imgUrl: require('~/assets/images/home/cate_img_05@2x.png'),
+          path: '/product/detail?id=5'
         },
         {
           id: 5,
           label: '蚂蚁沙丘',
-          imgUrl: require('~/assets/images/home/cate_img_06@2x.png')
+          imgUrl: require('~/assets/images/home/cate_img_06@2x.png'),
+          path: '/product/detail?id=6'
         },
         {
           id: 6,
           label: '中华小熊猫',
-          imgUrl: require('~/assets/images/home/cate_img_07@2x.png')
+          imgUrl: require('~/assets/images/home/cate_img_07@2x.png'),
+          path: '/product/detail?id=7'
         },
         {
           id: 7,
           label: '思维魔法',
-          imgUrl: require('~/assets/images/home/cate_img_08@2x.png')
+          imgUrl: require('~/assets/images/home/cate_img_08@2x.png'),
+          path: '/product/detail?id=8'
         },
         {
           id: 8,
           label: '聪明书',
-          imgUrl: require('~/assets/images/home/cate_img_09@2x.png')
+          imgUrl: require('~/assets/images/home/cate_img_09@2x.png'),
+          path: '/product/detail?id=9'
         }
       ],
       productList: [
@@ -1402,13 +1413,13 @@ export default {
           activeName: '玉溪实验中学德语班',
           desc: '他从四岁就开始跟着我学习思维课程,整整六年多的坚持,学完全套思维课程,让他的思维变得超强,不断在人群中脱颖而出。'
         },
-        {
-          avatarUrl: require("../assets/images/home/student_05.png"),
-          title: '我和逻辑狗',
-          name: '张济瀚',
-          activeName: '公安部幼儿园',
-          desc: '逻辑狗是济瀚的数学启蒙,通过学习,济瀚掌握了学习方法,树立了学习自信心,收货了学习的乐趣,尤其是通过比赛,开拓了眼界,增长了见识。'
-        }
+        // {
+        //   avatarUrl: require("../assets/images/home/student_05.png"),
+        //   title: '我和逻辑狗',
+        //   name: '张济瀚',
+        //   activeName: '公安部幼儿园',
+        //   desc: '逻辑狗是济瀚的数学启蒙,通过学习,济瀚掌握了学习方法,树立了学习自信心,收货了学习的乐趣,尤其是通过比赛,开拓了眼界,增长了见识。'
+        // }
       ],
       swiperOption: {
         // 配置说明直接看官网
@@ -1712,6 +1723,9 @@ export default {
         document.body.appendChild(a);  
       }      
       a.click();
+    },
+    navPage(path) {
+      this.$router.push({ path: path});
     }
   },
 };

+ 3 - 3
pages/merchants/campus/index.vue

@@ -60,8 +60,8 @@ export default {
   data() {
     return {
       bgImg: require('@/assets/images/merchants/bg.png'),
-      iconAddr: require('~/assets/images/campus/icon_address.png'),
-      iconAddrSet: [require('~/assets/images/campus/icon_address.png'), require('~/assets/images/campus/icon_adderss@2x.png')],
+      iconAddr: require('~/assets/images/campus/icon_adderss_new.png'),
+      iconAddrSet: [require('~/assets/images/campus/icon_adderss_new.png'), require('~/assets/images/campus/icon_adderss_new@2x.png')],
       iconPhone: require('~/assets/images/campus/icon_phone.png'),
       iconPhoneSet: [require('~/assets/images/campus/icon_phone.png'), require('~/assets/images/campus/icon_phone@2x.png')],
       campusList: [
@@ -220,7 +220,7 @@ export default {
           text-align: center;
           margin: 17px auto 0;
           border-radius: 16px;
-          border: 1px solid #004DE7;
+          border: 1px solid rgba(0, 77, 231, 0.5);
           height: 28px;
           display: flex;
           align-items: center;