1

src/components/banner/banner.vue

@@ -4,7 +4,7 @@
       v-model="slide"
       swipeable
       animated
-      :navigation="swiperList.length>1"
+      :navigation="swiperList.length > 1"
       height="100%"
       autoplay
       infinite
@@ -15,20 +15,20 @@
         <div v-else @click="onClick" class="parmaryBtn"></div>
       </template>
       <q-carousel-slide
-        v-for="item in swiperList"
+        v-for="(item,index) in swiperList"
         :key="item.Id"
-        :name="item.NavTypeName"
+        :name="index"
         :img-src="item.BgImg"
       >
         <div class="conbox">
-          <div class="con1"><span class="jh">{{item.NavTitle}}<!--甲鹤---></span><!--特色教室--></div>
+          <div class="con1">
+            <span class="jh">甲鹤</span>-{{ item.NavTitle }}
+          </div>
           <div class="con2">
-            {{item.SubTitle}}
-            <!-- 这里给一点小文字介绍什么的最好，这里给一点小文字介绍什么的最好，这里给一点
-            小文字介绍什么的最好。 -->
+            {{ item.SubTitle }}
           </div>
           <div class="con3"></div>
-          <div class="btn">查看更多</div>
+          <div class="btn" @click="seeMore(item.LinkUrl)">查看更多</div>
         </div>
       </q-carousel-slide>
     </q-carousel>
@@ -36,17 +36,22 @@
 </template>
 <script>
 export default {
-  props:{
-    swiperList:{
-      type:Array,
-      default:[]
+  props: {
+    swiperList: {
+      type: Array,
+      default: [],
     },
   },
   data() {
     return {
-      slide: this.swiperList.NavTitle,
+      slide: 0,
     };
   },
+  methods:{
+    seeMore(url){
+      this.$router.push(url)
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -63,8 +68,8 @@ export default {
 .con1 {
   width: calc(845 / 1920 * 100%);
   white-space: nowrap;
-  // font-size: 100px;
   font-size: 5.208vw;
+  line-height: 5.208vw;
   color: #111111;
   margin-bottom: 3.125vw;
   .jh {
@@ -73,8 +78,9 @@ export default {
 }
 .con2 {
   width: 38.489vw;
-  font-size: 20px !important;
   font-size: 1.041vw;
+  line-height: 1.51vw;
+  font-weight: 500;
   color: #111111;
   padding-bottom: 3.593vw;
 }

src/components/teacherTeam/teacherTeam.vue

@@ -172,7 +172,7 @@ export default {
       justify-content: center;
       align-items: center;
       font-size: 12px;
-      font-family: Microsoft YaHei;
+      font-family: Microsoft YaHei !important;
       color: #ffffff;
     }
   }

src/pages/JapaneseTrain/JapaneseTrain.vue

@@ -2,23 +2,7 @@
   <div class="jiahe">
     <Header :menuList="menuList" :curMenu="menuList[1].Name" :type="2" />
     <!-- bannner部分 -->
-    <div
-      class="JapaneseTrainBannerBox"
-      :style="{ backgroundImage: 'url(' + swiperData[0].BgImg + ')' }"
-    >
-      <div class="conbox">
-        <div class="con1">
-          <span class="jh">甲鹤</span>-{{ swiperData[0].NavTitle }}
-        </div>
-        <div class="con2">
-          {{ swiperData[0].SubTitle }}
-          <!-- 这里给一点小文字介绍什么的最好，这里给一点小文字介绍什么的最好，这里给一点
-            小文字介绍什么的最好。 -->
-        </div>
-        <div class="con3"></div>
-        <div class="btn" @click="seeMore(swiperData[0].LinkUrl)">查看更多</div>
-      </div>
-    </div>
+    <Banner :swiperList="swiperData"/>
     <!-- 教育产品 -->
     <div class="edu_con">
       <div class="edu_name">教育产品</div>
@@ -239,7 +223,7 @@
 <script>
 import Header from "../../components/header/header";
 import Footer from "../../components/footer/footerType2";
-// import Banner from "../../components/banner/banner";
+import Banner from "../../components/banner/banner";
 import TeacherTeam from "../../components/teacherTeam/teacherTeam";
 import NoData from "../../components/noData/noData";
 import { getWebNavList } from "../../api/indexApi.js";
@@ -255,7 +239,7 @@ export default {
   components: {
     Header,
     Footer,
-    // Banner,
+    Banner,
     TeacherTeam,
     NoData,
   },
@@ -452,58 +436,6 @@ export default {
   height: 100%;
   background-color: #f6f6f6;
 }
-.JapaneseTrainBannerBox {
-  width: 100%;
-  height: 39.0625vw;
-  // background-image: url("../../assets/images/aboutUs/aboutUsBanner.png");
-  background-repeat: no-repeat;
-  background-size: contain;
-  position: relative;
-  .conbox {
-    position: absolute;
-    top: 9.635vw;
-    left: 10.208vw;
-  }
-  .con1 {
-    width: calc(845 / 1920 * 100%);
-    white-space: nowrap;
-    // font-size: 100px;
-    font-size: 5.208vw;
-    line-height: 5.208vw;
-    color: #111111;
-    margin-bottom: 3.125vw;
-    .jh {
-      font-family: "pingfang-b" !important;
-    }
-  }
-  .con2 {
-    width: 38.489vw;
-    font-size: 1.041vw;
-    line-height: 1.51vw;
-    font-weight: 500;
-    color: #111111;
-    padding-bottom: 3.593vw;
-  }
-  .con3 {
-    width: 31.041vw;
-    height: 1px;
-    background-color: #111111;
-    margin-bottom: 4.01vw;
-  }
-  .btn {
-    width: 9.375vw;
-    height: 2.916vw;
-    background-color: #45766dff;
-    // font-size: 24px !important;
-    font-size: 1.249vw;
-    color: #ffffff;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    white-space: nowrap;
-    cursor: pointer;
-  }
-}
 .edu_con {
   width: 62.5vw;
   margin: 5.516vw auto 0;

src/pages/aboutUs/aboutUs.vue

@@ -104,11 +104,8 @@ export default {
 .aboutUsBannerBox {
   width: 100%;
   height: 52.08vw;
-  // background-image: url("../../assets/images/aboutUs/aboutUsBanner.png");
   background-repeat: no-repeat;
   background-size: contain;
-  // display: flex;
-  // align-items: center;
   padding-left: 10.208vw;
   .aboutUs_conbox {
     .banner_title {

src/pages/index.vue

@@ -540,8 +540,7 @@
         class="class_icon5"
       />
       <q-img
-        src="../assets/images/index/chairman_img.png"
-        spinner-color="white"
+        src="../assets/images/index/chairman_index_img.png"
         class="chairman_img"
       />
       <div class="chairman_desc">
@@ -1157,7 +1156,6 @@ export default {
 .fourbox {
   width: 100%;
   padding-top: calc(2377 / 1920 * 100%);
-
   position: relative;
   .subFourBox {
     width: 100vw;
@@ -1227,11 +1225,10 @@ export default {
   width: 100vw;
   height: 56.25vw;
   position: relative;
-  width: 100%;
-  height: 100%;
   background-image: url("../assets/images/index/chairman_bg.png");
   background-repeat: no-repeat;
   background-size: cover;
+  background-position: center;
   display: flex;
   .class_icon5 {
     width: calc(350 / 1920 * 100%);
@@ -1241,8 +1238,8 @@ export default {
     left: 41.354vw;
   }
   .chairman_img {
-    width: calc(700 / 1920 * 100%);
-    height: 100%;
+    width: 36.458vw;
+    height: auto;
     background-color: #eee;
   }
   .chairman_desc {

src/pages/joinUs/joinUs.vue

@@ -8,8 +8,8 @@
       <div class="joinUs_imgBox">
         <div v-for="item in recruitmentTypeList" :key="item.Id" class="imgItem" @click="checkType(item)">
           <div class="main_title">{{ item.TypeName }}</div>
-          <img :src="item.ImgCover" alt="" class="imgItem" v-if="!item.check"/>
-          <img :src="item.CheckImg" alt="" class="imgItem" v-if="item.check"/>
+          <img :src="item.CheckImg" alt="" class="imgItem" v-if="item.Id==currentId"/>
+          <img :src="item.ImgCover" alt="" class="imgItem" v-else />
         </div>
       </div>
       <div class="conBox" v-if="jobList.length>0">
@@ -131,6 +131,7 @@ export default {
           Name: "",
         },
       ],
+      currentId:"",
       msg: {
         pageIndex: 1,
         pageSize: 10,
@@ -161,12 +162,8 @@ export default {
     },
     // 切换职位类型
     checkType(item){
-      item.check=!item.check
-      if(item.check){
-        this.msg.TypeId=item.Id
-      }else{
-        this.msg.TypeId=""
-      }
+      this.currentId=item.Id
+      this.msg.TypeId=item.Id
       this.getWebRecruitmentPage()
     },
     //跳转职位详情
@@ -176,10 +173,7 @@ export default {
     //获取招聘信息分页列表
     async getWebRecruitmentTypeList() {
       let res = await getWebRecruitmentTypeList();
-      this.recruitmentTypeList = res.Data.map(item=>{
-        item.check=false
-        return item
-      });
+      this.recruitmentTypeList = res.Data
     },
     //获取招聘信息分页列表
     async getWebRecruitmentPage() {
@@ -258,7 +252,6 @@ export default {
 .bannerBox {
   width: 100%;
   height: 16.666vw;
-  // background-image: url("../../assets/images/joinUs/joinUsBanner.png");
   background-repeat: no-repeat;
   background-size: contain;
   display: flex;
@@ -289,6 +282,7 @@ export default {
       .main_title {
         font-size: 1.354vw;
         font-family: Microsoft YaHei;
+        line-height: 1.354vw;
         color: #000000;
         position: absolute;
         top: 1.5vw;

src/pages/mediaCenter/mediaCenter.vue

@@ -653,6 +653,7 @@ export default {
     background-color: #fff;
     margin-right: 1.25vw;
     box-shadow: 0px 1px 6px 0px rgba(104, 104, 104, 0.1);
+    cursor: pointer;
     .itemImg {
       width: 20vw;
       height: 13.229vw;

src/pages/studyServe/studyServe.vue

 <template>
   <div class="jiahe">
     <Header :menuList="menuList" :curMenu="menuList[2].Name" :type="2" />
-    <!-- <Banner :swiperList="swiperData" /> -->
+    
     <!-- bannner部分 -->
-    <div
-      class="studyServeBannerBox"
-      :style="{ backgroundImage: 'url(' + swiperData[0].BgImg + ')' }"
-    >
-      <div class="conbox">
-        <div class="con1">
-          <span class="jh">甲鹤</span>-{{ swiperData[0].NavTitle }}
-        </div>
-        <div class="con2">
-          {{ swiperData[0].SubTitle }}
-          <!-- 这里给一点小文字介绍什么的最好，这里给一点小文字介绍什么的最好，这里给一点
-            小文字介绍什么的最好。 -->
-        </div>
-        <div class="con3"></div>
-        <div class="btn" @click="seeMore(swiperData[0].LinkUrl)">查看更多</div>
-      </div>
-    </div>
+    <Banner :swiperList="swiperData" />
     <!-- 留学产品 -->
     <div class="studyProduct">
       <div class="title">留学产品</div>
@@ -78,7 +62,7 @@
 </template>
 <script>
 import Header from "../../components/header/header";
-// import Banner from "../../components/banner/banner";
+import Banner from "../../components/banner/banner";
 import TeacherTeam from "../../components/teacherTeam/teacherTeam";
 import Footer from "../../components/footer/footerType2";
 import { getWebNavList } from "../../api/indexApi.js";
@@ -87,7 +71,7 @@ import { getWebTeacherList } from "../../api/JapaneseTrainApi";
 import NoData from "../../components/noData/noData";
 export default {
   components: {
-    // Banner,
+    Banner,
     Header,
     TeacherTeam,
     Footer,
@@ -142,58 +126,7 @@ export default {
 .jiahe {
   background-color: #f6f6f6;
 }
-.studyServeBannerBox {
-  width: 100%;
-  height: 39.0625vw;
-  // background-image: url("../../assets/images/aboutUs/aboutUsBanner.png");
-  background-repeat: no-repeat;
-  background-size: contain;
-  background-color: #fff;
-  position: relative;
-  .conbox {
-    position: absolute;
-    top: 9.635vw;
-    left: 10.208vw;
-  }
-  .con1 {
-    width: calc(845 / 1920 * 100%);
-    white-space: nowrap;
-    // font-size: 100px;
-    font-size: 5.208vw;
-    line-height: 5.208vw;
-    color: #111111;
-    margin-bottom: 3.125vw;
-    .jh {
-      font-family: "pingfang-b" !important;
-    }
-  }
-  .con2 {
-    width: 38.489vw;
-    font-size: 1.041vw;
-    line-height: 1.51vw;
-    font-weight: 500;
-    color: #111111;
-    padding-bottom: 3.541vw;
-  }
-  .con3 {
-    width: 31.041vw;
-    height: 1px;
-    background-color: #111111;
-    margin-bottom: 4.01vw;
-  }
-  .btn {
-    width: 9.375vw;
-    height: 2.916vw;
-    background-color: #45766dff;
-    font-size: 1.249vw;
-    color: #ffffff;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    white-space: nowrap;
-    cursor: pointer;
-  }
-}
+
 .studyProduct {
   width: 62.5vw;
   margin: 0 auto;