Merge branch 'marywood-h5' of https://gitlab.ezijing.com/webapp/project-pc into marywood-h5

.env.test

+projectId=1012
+
+newProjectId=6805762100502200320
+
+baseURL=https://project-api2.ezijing.com
+
+loginURL=https://login2.ezijing.com/auth
\ No newline at end of file

components/base/h5/Menu.vue

@@ -54,9 +54,7 @@ export default {
         {
           name: '我要报名',
           onClick: () => {
-            !_this.user.id
-              ? window.location.href = 'https://login.ezijing.com/auth/login/index?redirect_uri=https://marywood-bm.ezijing.com/my/account'
-              : window.location.href = 'https://marywood-bm.ezijing.com/my/account'
+            window.open('/my/account')
           }
         }
       ]

components/base/h5/RightAside.vue

@@ -2,9 +2,15 @@
   <div>
     <div class="rigth-aside">
       <ul class="right-aside-btns">
-        <li @click="showApplyForm">
-          <img src="https://zws-imgs-pub.ezijing.com/static/public/d434fa0ffd77892273e63e6d694cff0a.png" />
-          <p>我要报名</p>
+        <a href="/my">
+          <li>
+            <img src="https://zws-imgs-pub.ezijing.com/static/public/d434fa0ffd77892273e63e6d694cff0a.png" />
+            <p>报名申请</p>
+          </li>
+        </a>
+        <li @click="showApplyForm" style="border-top: 1px solid #999;">
+          <img src="https://webapp-pub.ezijing.com/project/kelley/h5-icon_service.png" />
+          <p>我要咨询</p>
         </li>
         <li @click="showFollow">
           <img src="https://zws-imgs-pub.ezijing.com/static/public/5526b83d7526b2742f6eba7151c367db.png" />

components/home/presence.vue

@@ -115,7 +115,7 @@ export default {
     }
   },
   async fetch() {
-    const params = { project_id: process.env.newProjectId, type_tag: 'kelley_alumni_share' }
+    const params = { project_id: process.env.newProjectId, type_tag: 'kelley_alumni_share', limit: 1 }
     this.listData = await this.$axios.get('/api/cms/api/v1/articles', { params }).then(res => res.data.data)
   },
   computed: {
@@ -324,4 +324,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

components/layout/pc/Index.vue

@@ -62,4 +62,7 @@ html {
   color: #fff;
   background-color: #35495e;
 }
+.main-layout.is-pc {
+  min-width: 1200px;
+}
 </style>

components/layout/pc/Menu.vue

@@ -91,11 +91,7 @@ export default {
         },
         {
           name: this.$t('menu.enroll'),
-          onClick() {
-            !_this.user.id
-              ? window.open('https://login.ezijing.com/auth/login/index?redirect_uri=https://marywood-bm.ezijing.com/my/account')
-              : window.open('https://marywood-bm.ezijing.com/my/account')
-          }
+          path: '/my/account'
         }
       ],
       time: null

components/rightAside.vue

 <template>
   <div class="right_bar">
     <ul class="tab_btns">
+      <a href="/my/account">
+        <li
+          class="service"
+        >
+          <p>{{ $t('aside.apply') }}</p>
+        </li>
+      </a>
       <li
         :class="{ enroll: true, active: tabBtnActive && tabBtnTarget === 'enroll' }"
         @mouseenter="handleMsOver('enroll')"
         @mouseleave="handleMsOut"
       >
-        <p>{{ $t('aside.apply') }}</p>
+        <p>{{ $t('aside.apply2') }}</p>
       </li>
       <li
         :class="{ wx: true, active: tabBtnActive && tabBtnTarget === 'wx' }"
@@ -25,8 +32,8 @@
         id="show-enroll"
         v-show="tabBtnActive"
         class="tab_cont"
-        @mouseenter="handleMsOver('')"
-        @mouseleave="handleMsOut"
+        @mouseover="handleMsOver('')"
+        @mouseout="handleMsOut"
       >
         <div class="enroll_cont" id="show-enroll-content" v-show="tabBtnTarget === 'enroll'">
           <h5>{{ $t('aside.apply') }}</h5>
@@ -242,7 +249,7 @@ export default {
     }
     li.enroll {
       position: relative;
-      background-image: url(https://zws-imgs-pub.ezijing.com/static/public/d434fa0ffd77892273e63e6d694cff0a.png);
+      background-image: url(https://webapp-pub.ezijing.com/project/kelley/kefu22.png);
     }
     li.enroll:after {
       content: '';
@@ -255,6 +262,23 @@ export default {
       // transform: translateX(-50%) scale(0.5);
     }
     li.enroll.active {
+      background-image: url(https://webapp-pub.ezijing.com/project/kelley/kefu11.png);
+    }
+    li.service{
+      background-image: url(https://zws-imgs-pub.ezijing.com/static/public/d434fa0ffd77892273e63e6d694cff0a.png);
+    }
+    li.service{
+      border-bottom: 1px solid #b8bcbf;
+      cursor: pointer;
+      &:hover{
+        background-color: #af1b40;
+        p{
+          color: #fff;
+        }
+        background-image: url(https://zws-imgs-pub.ezijing.com/static/public/4cbef518113d24b392be80148e921abd.png);
+      }
+    }
+    li.service.acitve{
       background-image: url(https://zws-imgs-pub.ezijing.com/static/public/4cbef518113d24b392be80148e921abd.png);
     }
     li.wx {

langs/zh-CN.js

@@ -133,7 +133,7 @@ export default {
     item3Tit: '国际视野结合中国本土的实践课程',
     item3Txt1: '必修课程+美国访学',
     item3Txt2: '全球排名顶尖师资+中国金融业界权威专家',
-    item3Txt3: '多次被 U.S. News & World Report最佳大学排名多年上榜',
+    item3Txt3: '多次被 U.S. News & World Report最佳大学排名多年上榜'
   },
   // 证书授予
   cert: {
@@ -202,7 +202,7 @@ export default {
     tea11Name: '王勇',
     tea11Txt: '加拿大达尔豪斯大学博士<br />国家千人计划专家<br />天风证券首席风险官',
     tea12Name: '王鹤菲',
-    tea12Txt: '斯坦福大学商学院金融学博士<br />中国人民大学国际学院金融学教授',
+    tea12Txt: '斯坦福大学商学院金融学博士<br />中国人民大学国际学院金融学教授'
   },
   // 有关申请
   apply: {
@@ -228,11 +228,13 @@ export default {
   problem: {
     item1Tit: '申请和面试相关问题',
     item1problem1: 'Q:如何申请美国印第安纳大学Kelley商学院金融学硕士？大概流程是什么？',
-    item1answer1: 'A: 本项目为申请面试制；申请流程为：在线填写申请资料—初审通过—面试安排—综合评审—录取offer—学费缴纳及入学手续办理',
+    item1answer1:
+      'A: 本项目为申请面试制；申请流程为：在线填写申请资料—初审通过—面试安排—综合评审—录取offer—学费缴纳及入学手续办理',
     item1problem2: 'Q:面试多少人？录取多少人？率取比率是多少？',
     item1answer2: 'A: 本项目采取现场/视频面试的方式，面试人数和录取人数视申请人数和申请资质而定。',
     item1problem3: 'Q:是否要求考生的工作经验必须属于金融行业？',
-    item1answer3: 'A: 本项目对考生的行业背景无特殊要求。欢迎有志于从事金融行业或相关工作的考生报考。录取为综合考评，工作背景是综合考评时需要参考的一部分信息。',
+    item1answer3:
+      'A: 本项目对考生的行业背景无特殊要求。欢迎有志于从事金融行业或相关工作的考生报考。录取为综合考评，工作背景是综合考评时需要参考的一部分信息。',
     item2Tit: '报考资格相关问题',
     item2problem1: 'Q:大专毕业后，又通过自考获得本科毕业证和学士学位，能否报考？',
     item2answer1: 'A: 可以报考，只要获得本科学位证书，按照本科毕业生身份报考即可。',
@@ -240,7 +242,7 @@ export default {
     item2answer2: 'A: 不可以。需要获得本科学位证书才能符合相应报考条件。',
     item3Tit: '',
     item3problem1: 'Q:美国印第安纳大学Kelley商学院金融学硕士项目学费是多少？ 可以分期吗？',
-    item3answer1: 'A: 目前本项目的学费为24.98万元人民币，由学生在入学前向紫荆教育缴清（不可选择分期）。',
+    item3answer1: 'A: 目前本项目的学费为24.98万元人民币，由学生在入学前向紫荆教育缴清（不可选择分期）。'
   },
   // 杰出校友
   outstanding: {
@@ -250,7 +252,8 @@ export default {
   viewMore: '查看更多+',
   // 右侧弹窗
   aside: {
-    apply: '报名咨询',
+    apply: '报名申请',
+    apply2: '我要咨询',
     follow: '关注我们',
     name: '请输入您的名字',
     phone: '请输入您的电话',

middleware/device.js

 export default function(context) {
   const UA = process.server ? context.req.headers['user-agent'] : navigator.userAgent
-  const isMobile = /iphone/i.test(UA) || (/android/i.test(UA) && /mobile/i.test(UA))
+  let isMobile = /iphone/i.test(UA) || (/android/i.test(UA) && /mobile/i.test(UA))
+  if (context.route.path.includes('/my')) {
+    isMobile = false
+  }
   context.store.commit('setIsMobile', isMobile)
 }

modules/my/account/home.vue

@@ -29,7 +29,7 @@
           <img src="https://webapp-pub.ezijing.com/project/application/images/welcome.png" width="350" />
           <div class="welcome-content">
             <h1>欢迎您报考</h1>
-            <h2>美国印第安纳大学</h2>
+            <h2>美国玛丽伍德大学</h2>
             <div class="welcome-button" @click="handleStart">马上开始</div>
           </div>
         </div>

modules/my/account/index.vue

@@ -9,6 +9,7 @@
       @back="$router.push('/my/account')"
     >
       <template #aside-append>
+        <div class="aside-payment"><a href="https://accounts.ezijing.com/payment" target="_blank">查看缴费记录</a></div>
         <div class="aside-logout" @click="$store.dispatch('logout')"><span>退出登录</span></div>
       </template>
       <!-- 首页 -->

modules/my/admission/index.vue

@@ -10,9 +10,11 @@
       @prev="handlePrev"
       @next="handleNext"
       @uploaded="getApplication"
+      v-if="detail"
     >
       <template #aside-append>
-        <!-- <div class="aside-logout" @click="$store.dispatch('logout')"><span>退出登录</span></div> -->
+        <div class="aside-payment"><a href="https://accounts.ezijing.com/payment" target="_blank">查看缴费记录</a></div>
+        <div class="aside-logout" @click="$store.dispatch('logout')"><span>退出登录</span></div>
       </template>
       <!-- 入学协议 -->
       <!-- <template #content v-if="currentActive === 'admission_xy'">

modules/my/application/index.vue

@@ -14,6 +14,7 @@
     >
       <template #aside-append>
         <div class="aside-preview" @click="dialogVisible = true" v-if="visible">预览全部</div>
+        <div class="aside-payment"><a href="https://accounts.ezijing.com/payment" target="_blank">查看缴费记录</a></div>
         <div class="aside-logout" @click="$store.dispatch('logout')"><span>退出登录</span></div>
       </template>
       <!-- 报名缴费 -->

modules/my/application/preview.vue

@@ -398,18 +398,19 @@ export default {
         this.$message({ type: 'warning', message: '无法查看' })
         return
       }
-      url = url.includes('?') ? url.split('?').shift() : url
+      url = url.replace(/^http:\/\//, 'https://')
+      const tempUrl = url.includes('?') ? url.split('?').shift() : url
       const names = ['jpg', 'jpeg', 'png', 'gif']
-      const name = url.split('.').pop() || ''
+      const name = tempUrl.split('.').pop() || ''
       if (names.includes(name.toLocaleLowerCase())) {
-        this.previewImageUrl = file.oss_sign_url
+        this.previewImageUrl = url
         this.previewImageTitle = file.file_type_label
         this.$nextTick(() => {
           this.viewer.update()
           this.viewer.show(true)
         })
       } else {
-        this.newWindowPreview(file.oss_sign_url)
+        this.newWindowPreview(url)
       }
     },
     // 新窗口预览

modules/my/interview/index.vue

@@ -11,6 +11,7 @@
       @next="handleNext"
     >
       <template #aside-append>
+        <div class="aside-payment"><a href="https://accounts.ezijing.com/payment" target="_blank">查看缴费记录</a></div>
         <div class="aside-logout" @click="$store.dispatch('logout')"><span>退出登录</span></div>
       </template>
     </vue-form>

modules/my/layout.vue

@@ -12,7 +12,13 @@
     </div>
   </div>
 </template>
-
+<script>
+export default {
+  head: {
+    meta: [{ hid: 'viewport', name: 'viewport', content: '' }]
+  }
+}
+</script>
 <style lang="scss" scoped>
 .layout {
   max-width: 1200px;
@@ -56,5 +62,16 @@
     border-top: 1px solid #eee;
     cursor: pointer;
   }
+  .aside-payment {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 50px;
+    margin: 0 10px;
+    padding: 12px;
+    font-size: 12px;
+    color: #57acff;
+    text-align: center;
+  }
 }
 </style>

nuxt.config.js

@@ -17,14 +17,13 @@ export default {
   }),
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
-    title: '玛丽伍德大学-在线MBA-综合管理方向MBA-清华控股旗下在线教育品牌',
+    title: '紫荆教育-玛丽伍德大学数字领导力方向MBA',
     htmlAttrs: {
       lang: 'en'
     },
     meta: [
       { charset: 'utf-8' },
-      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'description', name: 'description', content: '' },
+      { hid: 'viewport', name: 'viewport', content: 'width=device-width, initial-scale=1' },
       {
         name: 'keywords',
         content:

package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "nuxt --open --dotenv .env.dev",
     "build": "nuxt build",
+    "build:test": "nuxt build --dotenv .env.test",
     "start": "nuxt start",
     "generate": "nuxt generate"
   },