代码提交

63fa4b73 · matian · 412c5a33 · 63fa4b73 · 63fa4b73 · 63fa4b73
--- a/components/home/news.vue
+++ b/components/home/news.vue
@@ -76,8 +76,6 @@ export default {
 <style lang="scss" scoped>
 .is-pc {
  .news-content-box {
-    position: relative;
-    transform: scale(0.78);
    width: 1200px;
    margin: 0 auto;
    padding-top: 65px;

--- a/components/home/projectFeatures.vue
+++ b/components/home/projectFeatures.vue
 <template>
  <div class="service-content max-width-center">
-    <div class="is-pc">
+    <div :class="isMobile ? 'is-h5' : 'is-pc'">
      <card :title="$t('home.project.title')">
        <ul class="nav-content">
          <li v-for="(item, index) in data" :key="index">
@@ -11,6 +11,11 @@
        </ul>
      </card>
    </div>
+    <!-- <img
+      style="padding:56px 0 30px;position: relative;width: 1200px;margin: 0 auto;"
+      src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/school.png"
+      alt=""
+    /> -->
  </div>
 </template>
 <script>
@@ -43,6 +48,26 @@ export default {
          iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img31.png',
          text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT1') : this.$t('home.project.pc.itemT7')
        }
+        // {
+        //   icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon2.png',
+        //   iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon2_a.png',
+        //   text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT2') : this.$t('home.project.pc.itemT2')
+        // },
+        // {
+        //   icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon3.png',
+        //   iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon3_a.png',
+        //   text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT3') : this.$t('home.project.pc.itemT3')
+        // },
+        // {
+        //   icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon4.png',
+        //   iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon4_a.png',
+        //   text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT4') : this.$t('home.project.pc.itemT4')
+        // },
+        // {
+        //   icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon5.png',
+        //   iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon5_a.png',
+        //   text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT5') : this.$t('home.project.pc.itemT5')
+        // }
      ]
    }
  },
@@ -67,23 +92,12 @@ export default {
 </script>

 <style lang="scss" scoped>
-::v-deep .card-hd__title {
-  position: relative;
-  transform: scale(0.78);
-  left: -80px;
-}
 .is-pc {
-  display: flex;
-  justify-content: center;
-  margin-left: -80px;
-  margin-top: 81px;
-
  .service-content {
-    padding-top: 68px;
-    width: 1200px;
+    padding-top: 168px;
    .nav-content {
      display: flex;
-      justify-content: center;
+      justify-content: flex-start;
      padding-top: 15px;
      li {
        width: 224px;
@@ -134,4 +148,33 @@ export default {
    margin: 0 auto;
  }
 }
+.is-h5 {
+  .service-content {
+    ul {
+      display: flex;
+      overflow-x: scroll;
+      -webkit-overflow-scrolling: touch;
+    }
+    li {
+      min-width: 0.78rem;
+      background: #ffffff;
+      margin-right: 0.1rem;
+      padding-top: 0.11rem;
+      img {
+        width: 0.4rem;
+        height: 0.4rem;
+        display: block;
+        margin: 0 auto;
+      }
+      .text {
+        font-size: 0.1rem;
+        line-height: 0.16rem;
+        color: #666666;
+        padding-top: 0.05rem;
+        text-align: center;
+        padding-bottom: 0.1rem;
+      }
+    }
+  }
+}
 </style>
--- a/components/home/schoolSenery.vue
+++ b/components/home/schoolSenery.vue
@@ -53,7 +53,7 @@ export default {}
    .line1 {
      width: 369px;
      height: 1px;
-      border: 3px solid #ffffff;
+      border: 1px solid #ffffff;
    }
    .name {
      width: 144px;
@@ -64,7 +64,7 @@ export default {}
    .line2 {
      width: 369px;
      height: 1px;
-      border: 3px solid #ffffff;
+      border: 1px solid #ffffff;
    }
  }
  .part {

--- a/components/rightAside.vue
+++ b/components/rightAside.vue
@@ -34,7 +34,7 @@
        @mouseout="handleMsOut"
      >
        <div class="enroll_cont" id="show-enroll-content" v-show="tabBtnTarget === 'enroll'">
-          <h5>{{ $t('aside.apply') }}</h5>
+          <h5>{{ $t('aside.apply1') }}</h5>
          <p><el-input v-model="formInfo.name" :placeholder="$t('aside.name')" size="small"></el-input></p>
          <p><el-input v-model="formInfo.phone" :placeholder="$t('aside.phone')" size="small"></el-input></p>
          <!-- <p><el-input v-model="projectName" size="small" :readonly="true"></el-input></p> -->

--- a/langs/zh-CN.js
+++ b/langs/zh-CN.js
@@ -269,7 +269,8 @@ export default {
  viewMore: '查看更多+',
  // 右侧弹窗
  aside: {
-    apply: '报名咨询',
+    apply: '报名申请',
+    apply1: '报名咨询',
    apply2: '我要咨询',
    follow: '关注我们',
    name: '请输入您的名字',

--- a/pages/index.vue
+++ b/pages/index.vue
@@ -92,7 +92,6 @@ export default {
      justify-content: center;
      position: absolute;
      bottom: 109px;
-      // top: 461px;
      left: 50%;
      transform: translateX(-50%);
    }
@@ -115,14 +114,11 @@ export default {
    width: 1200px;
    font-size: 16px;
    font-weight: 400;
-    line-height: 32px;
    color: #666666;
    position: absolute;
    left: 50%;
    transform: translateX(-50%);
    margin-top: 79px;
-    padding-left: 150px;
-    padding-right: 100px;
  }
 }
 </style>
--- a/pages/school/school1.vue
+++ b/pages/school/school1.vue
 <template>
  <div>
    <div class="banner">
-      <img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/school11.png" />
+      <img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/school111.png" />
      <div class="btn">
-        <el-button class="btn1" @click="showApplyForm">报名咨询</el-button>
-      </div>
-      <div class="content">
-        <img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/school12.png" />
+        <el-button class="btn1" @click="$router.push('/my/account')">报名申请</el-button>
      </div>
    </div>
+
+    <div class="content">
+      <img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/school12.png" />
+    </div>
    <img
      style="width:1200px;height:100%;margin-top:68px"
      class="img2"
@@ -32,9 +33,7 @@
    <div class="content">
      <img src="https://webapp-pub.ezijing.com/project/marywood/school17.png" />
    </div>
-    <div
-      style="margin:auto;text-align:center;width:1200px;display:flex;justify-content:flex-start;margin-top:64px;margin-left:30px"
-    >
+    <div style="width:1200px;margin:auto;text-align:center;display:flex;justify-content:flex-start;margin-top:64px;">
      <div style="width: 6px;height: 34px;background: #AA1941;margin-right:9px;margin-top:6px"></div>
      <h1 style="color: #333333; font-size: 34px;font-weight: bold;">校园风光</h1>
    </div>
@@ -47,15 +46,11 @@
        </div>
      </div>
    </div>
-    <consultingForm :visible.sync="popupVisible" @success="hideApplyForm" @close="close" />
  </div>
 </template>
 <script>
-import consultingForm from '../../components/consultingForm.vue'
-
 export default {
  layout: 'normal',
-  components: { consultingForm },
  data() {
    const _this = this

@@ -100,47 +95,36 @@ export default {
    },
    swiperStart() {
      this.swiper.autoplay.start()
-    },
-    showApplyForm() {
-      this.popupVisible = true
-      document.getElementsByTagName('body')[0].style.height = '100%'
-      document.getElementsByTagName('body')[0].style.overflow = 'hidden'
-    },
-    close() {
-      this.popupVisible = false
-      document.getElementsByTagName('body')[0].style.height = ''
-      document.getElementsByTagName('body')[0].style.overflow = ''
-    },
-    hideApplyForm() {
-      this.popupVisible = false
-      document.getElementsByTagName('body')[0].style.height = ''
-      document.getElementsByTagName('body')[0].style.overflow = ''
    }
  }
 }
 </script>
 <style lang="scss" scoped>
-.btn {
-  display: flex;
-  justify-content: center;
-  position: absolute;
-  bottom: 109px;
-  left: 50%;
-  transform: translateX(-50%);
-}
-.btn1 {
-  width: 104px;
-  height: 32px;
-  border: 1px solid #ffffff;
-  font-size: 14px;
-  font-weight: 400;
-  line-height: 8px;
-  background: none;
-  color: #fff;
-}
-.btn1:hover {
-  background-color: #aa1941;
-  opacity: 1;
+.banner {
+  position: relative;
+  .btn {
+    display: flex;
+    justify-content: center;
+    position: absolute;
+    bottom: 109px;
+    left: 50%;
+    // top: 661px;
+    transform: translateX(-50%);
+  }
+  .btn1 {
+    width: 104px;
+    height: 32px;
+    border: 1px solid #ffffff;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 8px;
+    background: none;
+    color: #fff;
+  }
+  .btn1:hover {
+    background-color: #aa1941;
+    opacity: 1;
+  }
 }

 .content {

--- a/pages/school/school2.vue
+++ b/pages/school/school2.vue
 <template>
  <div>
    <div class="banner">
-      <img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/school21.png" />
+      <img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/school211.png" />
      <div class="btn">
-        <el-button class="btn1" @click="showApplyForm">报名咨询</el-button>
-      </div>
-      <div class="content">
-        <img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/school12.png" />
+        <el-button class="btn1" @click="$router.push('/my/account')">报名申请</el-button>
      </div>
    </div>
+
+    <div class="content">
+      <img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/school12.png" />
+    </div>
    <img
      style="width:1200px;height:100%;margin-top:68px"
      class="img2"
@@ -32,9 +33,7 @@
    <div class="content">
      <img src="https://webapp-pub.ezijing.com/project/marywood/school27.png" />
    </div>
-    <div
-      style="margin:auto;text-align:center;width:1200px;display:flex;justify-content:flex-start;margin-top:64px;margin-left:30px"
-    >
+    <div style="width:1200px;margin:auto;text-align:center;display:flex;justify-content:flex-start;margin-top:64px;">
      <div style="width: 6px;height: 34px;background: #AA1941;margin-right:9px;margin-top:6px"></div>
      <h1 style="color: #333333; font-size: 34px;font-weight: bold;">校园风光</h1>
    </div>
@@ -47,15 +46,11 @@
        </div>
      </div>
    </div>
-    <consultingForm :visible.sync="popupVisible" @success="hideApplyForm" @close="close" />
  </div>
 </template>
 <script>
-import consultingForm from '../../components/consultingForm.vue'
-
 export default {
  layout: 'normal',
-  components: { consultingForm },

  data() {
    const _this = this
@@ -101,27 +96,13 @@ export default {
    },
    swiperStart() {
      this.swiper.autoplay.start()
-    },
-    showApplyForm() {
-      this.popupVisible = true
-      document.getElementsByTagName('body')[0].style.height = '100%'
-      document.getElementsByTagName('body')[0].style.overflow = 'hidden'
-    },
-    close() {
-      this.popupVisible = false
-      document.getElementsByTagName('body')[0].style.height = ''
-      document.getElementsByTagName('body')[0].style.overflow = ''
-    },
-    hideApplyForm() {
-      this.popupVisible = false
-      document.getElementsByTagName('body')[0].style.height = ''
-      document.getElementsByTagName('body')[0].style.overflow = ''
    }
  }
 }
 </script>
 <style lang="scss" scoped>
 .banner {
+  position: relative;
  .btn {
    display: flex;
    justify-content: center;

--- a/pages/school/school3.vue
+++ b/pages/school/school3.vue
@@ -3,12 +3,12 @@
    <div class="banner">
      <img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/marywoo_banner.png" />
      <div class="btn">
-        <el-button class="btn1" @click="showApplyForm">报名咨询</el-button>
-      </div>
-      <div class="content">
-        <img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/marywood31.png" />
+        <el-button class="btn1" @click="$router.push('/my/account')">报名申请</el-button>
      </div>
    </div>
+    <div class="content">
+      <img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/marywood31.png" />
+    </div>
    <img
      style="width:1200px;height:100%;margin-top:68px"
      class="img2"
@@ -46,15 +46,11 @@
        </div>
      </div>
    </div>
-    <consultingForm :visible.sync="popupVisible" @success="hideApplyForm" @close="close" />
  </div>
 </template>
 <script>
-import consultingForm from '../../components/consultingForm.vue'
-
 export default {
  layout: 'normal',
-  components: { consultingForm },

  data() {
    const _this = this
@@ -100,27 +96,13 @@ export default {
    },
    swiperStart() {
      this.swiper.autoplay.start()
-    },
-    showApplyForm() {
-      this.popupVisible = true
-      document.getElementsByTagName('body')[0].style.height = '100%'
-      document.getElementsByTagName('body')[0].style.overflow = 'hidden'
-    },
-    close() {
-      this.popupVisible = false
-      document.getElementsByTagName('body')[0].style.height = ''
-      document.getElementsByTagName('body')[0].style.overflow = ''
-    },
-    hideApplyForm() {
-      this.popupVisible = false
-      document.getElementsByTagName('body')[0].style.height = ''
-      document.getElementsByTagName('body')[0].style.overflow = ''
    }
  }
 }
 </script>
 <style lang="scss" scoped>
 .banner {
+  position: relative;
  .btn {
    display: flex;
    justify-content: center;