Skip to content

P
project-online-pc
提交 08e94418 authored 作者: 王鹏飞's avatar 王鹏飞
浏览文件
操作

chore: update

上级 5bb67770
隐藏空白字符变更
内嵌 并排
正在显示 包含 45 行增加 和 64 行删除
components/home/banners.vue
浏览文件 @ 08e94418
...@@ -72,7 +72,7 @@ export default { ...@@ -72,7 +72,7 @@ export default {
this.$router.push('/my/account') this.$router.push('/my/account')
} else if (item.tag === '2') { } else if (item.tag === '2') {
window.open( window.open(
'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/park/%E6%96%AF%E8%92%82%E6%96%87%E6%96%AF%E7%90%86%E5%B7%A5%E5%AD%A6%E9%99%A2%E5%B7%A5%E7%A8%8B%E7%AE%A1%E7%90%86%E7%A1%95%E5%A3%AB%E4%BF%9D%E7%A0%94%E9%A1%B9%E7%9B%AE%E6%8B%9B%E7%94%9F%E7%AE%80%E7%AB%A0.pdf?v=1' 'https://webapp-pub.ezijing.com/project/park/%E6%96%AF%E8%92%82%E6%96%87%E6%96%AF%E7%90%86%E5%B7%A5%E5%AD%A6%E9%99%A2%E5%B7%A5%E7%A8%8B%E7%AE%A1%E7%90%86%E7%A1%95%E5%A3%AB%E4%BF%9D%E7%A0%94%E9%A1%B9%E7%9B%AE%E6%8B%9B%E7%94%9F%E7%AE%80%E7%AB%A0.pdf?v=1'
) )
} else if (item.tag === '3') { } else if (item.tag === '3') {
this.$router.push('/about/school') this.$router.push('/about/school')
......
components/layout/h5/Header.vue
浏览文件 @ 08e94418
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="line"></div> <div class="line"></div>
<nuxt-link to="/" class="logo"> <nuxt-link to="/" class="logo">
<div class="title">美国帕克大学专升硕项目</div> <div class="title">美国帕克大学专升硕项目</div>
<!-- <img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/marywood_logo.svg" /> --> <!-- <img src="https://webapp-pub.ezijing.com/project/marywood/marywood_logo.svg" /> -->
</nuxt-link> </nuxt-link>
</div> </div>
<!-- <nuxt-link to="/" class="logo"></nuxt-link> --> <!-- <nuxt-link to="/" class="logo"></nuxt-link> -->
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
display: flex; display: flex;
} }
.logo-box { .logo-box {
// padding: 15px 0; // padding: 15px 0;
flex: 1; flex: 1;
display: flex; display: flex;
img { img {
......
components/layout/pc/Head.vue
浏览文件 @ 08e94418
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<nuxt-link to="/"> <nuxt-link to="/">
<div class="title">美国帕克大学专升硕项目</div> <div class="title">美国帕克大学专升硕项目</div>
</nuxt-link> </nuxt-link>
<!-- <img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/marywood_logo.svg" /> --> <!-- <img src="https://webapp-pub.ezijing.com/project/marywood/marywood_logo.svg" /> -->
</div> </div>
<div class="user" v-if="user.id"> <div class="user" v-if="user.id">
...@@ -67,16 +67,10 @@ export default { ...@@ -67,16 +67,10 @@ export default {
return this.$store.state.user || {} return this.$store.state.user || {}
}, },
loginURL() { loginURL() {
return process.client return process.client ? `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(location.origin + this.$route.fullPath)}` : ''
? `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(
location.origin + this.$route.fullPath
)}`
: ''
}, },
registerURL() { registerURL() {
return process.client return process.client ? `${process.env.loginURL}/register?redirect_uri=${encodeURIComponent(location.origin + this.$route.fullPath)}` : ''
? `${process.env.loginURL}/register?redirect_uri=${encodeURIComponent(location.origin + this.$route.fullPath)}`
: ''
} }
} }
} }
......
components/layout/pc/Menu.vue
浏览文件 @ 08e94418
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
:class="$route.path === level2Item.path || level2Item.isShow ? 'li active' : 'li'" :class="$route.path === level2Item.path || level2Item.isShow ? 'li active' : 'li'"
:key="level2Index + 'level2'" :key="level2Index + 'level2'"
@mouseenter="levelShow(level2Item)" @mouseenter="levelShow(level2Item)"
@mouseleave="levelShow(level2Item, 'out')" @mouseleave="levelShow(level2Item, 'out')">
>
<app-link :to="level2Item.path"> <app-link :to="level2Item.path">
<div class="name"> <div class="name">
{{ level2Item.name }} {{ level2Item.name }}
...@@ -54,13 +53,13 @@ export default { ...@@ -54,13 +53,13 @@ export default {
// 项目介绍 // 项目介绍
{ {
name: this.$t('menu.project'), name: this.$t('menu.project'),
path: '/about/school', path: '/about/school'
children: [ // children: [
{ name: this.$t('menu.schoolChild.school3'), path: '/about/school' } // { name: this.$t('menu.schoolChild.school3'), path: '/about/school' }
// { name: this.$t('menu.newsChild.hot'), path: '/news/hot' } // // { name: this.$t('menu.newsChild.hot'), path: '/news/hot' }
// { name: this.$t('menu.projectChild.feature'), path: '/project-intro/charac' }, // // { name: this.$t('menu.projectChild.feature'), path: '/project-intro/charac' },
// { name: this.$t('menu.projectChild.cert'), path: '/project-intro/certificate' } // // { name: this.$t('menu.projectChild.cert'), path: '/project-intro/certificate' }
] // ]
}, },
// 项目优势 // 项目优势
// { // {
...@@ -107,7 +106,7 @@ export default { ...@@ -107,7 +106,7 @@ export default {
name: '就业福利', name: '就业福利',
path: '/returnPolicy/returnPolicy', path: '/returnPolicy/returnPolicy',
children: [ children: [
{ name: '高薪就业', path: '/returnPolicy/salary' }, // { name: '高薪就业', path: '/returnPolicy/salary' },
// { name: this.$t('menu.enrollChild.brochure'), path: '/enroll/brochure' }, // { name: this.$t('menu.enrollChild.brochure'), path: '/enroll/brochure' },
{ name: '归国政策', path: '/returnPolicy/returnPolicy' } { name: '归国政策', path: '/returnPolicy/returnPolicy' }
] ]
......
modules/my/interview/form/index.js
浏览文件 @ 08e94418
...@@ -9,18 +9,18 @@ import grcs from './grcs' ...@@ -9,18 +9,18 @@ import grcs from './grcs'
import byzs from './byzs' import byzs from './byzs'
import form from './form' import form from './form'
export default function(_this) { export default function (_this) {
return { return {
id: 'interview', id: 'interview',
title: '申请面试', title: '申请面试',
children: [ children: [
ywjl(_this), ywjl(_this),
cjd(_this), cjd(_this),
yynl(_this), // yynl(_this),
tjx(_this), tjx(_this),
grcs(_this), grcs(_this),
byzs(_this), byzs(_this),
form(_this), // form(_this),
{ {
required: true, required: true,
id: 'application_pay', id: 'application_pay',
......
modules/my/review/pay.vue
浏览文件 @ 08e94418
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<h5-pay @update="handleUpdateOrder" v-if="isWechat"></h5-pay> <h5-pay @update="handleUpdateOrder" v-if="isWechat"></h5-pay>
<qrcode-pay @update="handleUpdateOrder" v-else></qrcode-pay> <qrcode-pay @update="handleUpdateOrder" v-else></qrcode-pay>
<div class="pay-ft"> <div class="pay-ft">
<p class="t2">注：20,000元人民币的留位费将在您完成入学流程后作为学费扣除。因此，缴纳留位费后，您只需交纳第一年学费的剩余部分即可选修第一年的课程。</p> <p class="t2">注：10,000元人民币的留位费将在您完成入学流程后作为学费扣除。因此，缴纳留位费后，您只需交纳第一年学费的剩余部分即可选修第一年的课程。</p>
</div> </div>
<el-dialog title="缴费成功" :visible.sync="dialogVisible" :center="true" :close-on-click-modal="false" width="400px"> <el-dialog title="缴费成功" :visible.sync="dialogVisible" :center="true" :close-on-click-modal="false" width="400px">
<div class="dialog-pay"> <div class="dialog-pay">
......
pages/dataDownload/dataDownload.vue
浏览文件 @ 08e94418
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<app-frame :data="frameParams" :class="isMobile ? 'is-h5' : 'is-pc'"> <app-frame :data="frameParams" :class="isMobile ? 'is-h5' : 'is-pc'">
<div class="dataList"> <div class="dataList">
<a target="_blank" :href="item.url" v-for="(item, index) in fileList" :key="index"> <a target="_blank" :href="item.url" v-for="(item, index) in fileList" :key="index">
<div class="item"> <div class="item" @click="download($event, item)">
<div class="item_left"> <div class="item_left">
<img class="item_left_img" src="https://webapp-pub.ezijing.com/project/sbu-plus/icon_download.png" alt="" /> <img class="item_left_img" src="https://webapp-pub.ezijing.com/project/sbu-plus/icon_download.png" alt="" />
<div class="item_left_line"></div> <div class="item_left_line"></div>
<div class="item_left_doc">{{ item.name }}</div> <div class="item_left_doc">{{ item.name }}</div>
</div> </div>
<div class="item_right"> <div class="item_right">
<div class="btn" @click="download($event, item)">立即下载</div> <div class="btn" :class="{ 'is-disabled': item.disabled }">立即下载</div>
</div> </div>
</div> </div>
</a> </a>
...@@ -26,12 +26,7 @@ export default { ...@@ -26,12 +26,7 @@ export default {
data() { data() {
return { return {
frameParams: { frameParams: {
slider: [ slider: [{ name: this.$t('menu.dataDownload'), path: '/dataDownload/dataDownload' }]
{
name: this.$t('menu.dataDownload'),
path: '/dataDownload/dataDownload'
}
]
}, },
fileList: [ fileList: [
{ {
...@@ -40,11 +35,12 @@ export default { ...@@ -40,11 +35,12 @@ export default {
}, },
{ {
name: '硕士学分模块介绍', name: '硕士学分模块介绍',
url: 'https://webapp-pub.ezijing.com/project/park/SIT%E7%A1%95%E5%A3%AB%E5%AD%A6%E5%88%86%E6%A8%A1%E5%9D%97%E4%BB%8B%E7%BB%8D.pdf' url: 'https://webapp-pub.ezijing.com/project/park/硕士学分模块介绍.pdf',
disabled: true
}, },
{ {
name: '语言强化模块介绍', name: '语言强化模块介绍',
url: 'https://webapp-pub.ezijing.com/project/sbu-plus/%E8%AF%AD%E8%A8%80%E5%BC%BA%E5%8C%96%E6%A8%A1%E5%9D%97%E4%BB%8B%E7%BB%8D.pdf' url: 'https://webapp-pub.ezijing.com/project/park/语言强化模块介绍.pdf'
} }
] ]
} }
...@@ -58,6 +54,7 @@ export default { ...@@ -58,6 +54,7 @@ export default {
download(event, item) { download(event, item) {
if (!this.isMobile) { if (!this.isMobile) {
event.preventDefault() event.preventDefault()
if (item.disabled) return
saveAs(item.url, item.name) saveAs(item.url, item.name)
} }
} }
...@@ -67,18 +64,10 @@ export default { ...@@ -67,18 +64,10 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.is-pc { .is-pc {
.dataList { .dataList {
width: 900px; margin: 80px;
display: flex;
justify-content: center;
align-items: flex-start;
flex-wrap: wrap;
margin-left: 50px;
padding: 96px 0 108px 0;
.item { .item {
width: 790px;
height: 110px; height: 110px;
opacity: 1;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
...@@ -120,6 +109,9 @@ export default { ...@@ -120,6 +109,9 @@ export default {
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
color: #ffffff; color: #ffffff;
&.is-disabled {
background: #999;
}
} }
} }
} }
...@@ -127,25 +119,18 @@ export default { ...@@ -127,25 +119,18 @@ export default {
} }
.is-h5 { .is-h5 {
.dataList { .dataList {
width: 3.3rem; padding: 0.3rem;
display: flex;
justify-content: center;
align-items: flex-start;
flex-wrap: wrap;
margin-left: 0.15rem;
padding: 0.48rem 0.61rem 0.3rem;
.item { .item {
width: 3.3rem; margin-bottom: 0.2rem;
height: 0.5rem; height: 0.5rem;
opacity: 1;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
border-top: 1px solid #dedede; border-top: 1px solid #dedede;
border-bottom: 1px solid #dedede; border-bottom: 1px solid #dedede;
padding: 0 0.23rem 0 0.1rem; padding: 0 0.1rem;
.item_left { .item_left {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -179,6 +164,9 @@ export default { ...@@ -179,6 +164,9 @@ export default {
text-align: center; text-align: center;
font-size: 0.08rem; font-size: 0.08rem;
color: #ffffff; color: #ffffff;
&.is-disabled {
background: #999;
}
} }
} }
} }
......
pages/enroll/apply.vue
浏览文件 @ 08e94418
<template> <template>
<app-frame :data="frameParams" :class="isMobile ? 'is-h5' : 'is-pc'"> <app-frame :data="frameParams" :class="isMobile ? 'is-h5' : 'is-pc'">
<img src="https://webapp-pub.ezijing.com/project/park/enroll-process-apply-banner.png" /> <img src="https://webapp-pub.ezijing.com/project/marywood-plus/academic-banner.png" />
<div class="content-mian"> <div class="content-mian">
<ul class="content-mian_con"> <ul class="content-mian_con">
......
pages/enroll/process.vue
浏览文件 @ 08e94418
<template> <template>
<app-frame :data="frameParams" :class="isMobile ? 'is-h5' : 'is-pc'"> <app-frame :data="frameParams" :class="isMobile ? 'is-h5' : 'is-pc'">
<img src="https://webapp-pub.ezijing.com/project/park/enroll-process-banner.png" /> <img src="https://webapp-pub.ezijing.com/project/marywood-plus/academic-banner.png" />
<div class="apply"> <div class="apply">
<div class="apply-line"></div> <div class="apply-line"></div>
<div class="apply-item"> <div class="apply-item">
......
pages/returnPolicy/returnPolicy.vue
浏览文件 @ 08e94418
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<!-- <img <!-- <img
class="bottom" class="bottom"
v-else v-else
src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/h5/return_con.png" src="https://webapp-pub.ezijing.com/project/marywood/h5/return_con.png"
/> --> /> -->
</app-frame> </app-frame>
</template> </template>
......
pages/school/school.vue
浏览文件 @ 08e94418
...@@ -128,17 +128,17 @@ export default { ...@@ -128,17 +128,17 @@ export default {
{ {
img: 'https://webapp-pub.ezijing.com/project/park/video_sit1.png', img: 'https://webapp-pub.ezijing.com/project/park/video_sit1.png',
web_img_uri: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%991.mp4' web_img_uri: 'https://webapp-pub.ezijing.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%991.mp4'
}, },
{ {
img: 'https://webapp-pub.ezijing.com/project/park/video_sit2.png', img: 'https://webapp-pub.ezijing.com/project/park/video_sit2.png',
web_img_uri: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%992.mp4' web_img_uri: 'https://webapp-pub.ezijing.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%992.mp4'
}, },
{ {
img: 'https://webapp-pub.ezijing.com/project/park/video_sit3.png', img: 'https://webapp-pub.ezijing.com/project/park/video_sit3.png',
web_img_uri: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%993.mp4' web_img_uri: 'https://webapp-pub.ezijing.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%993.mp4'
} }
], ],
listData: [ listData: [
......
pages/school/swiper1.vue
浏览文件 @ 08e94418
...@@ -128,17 +128,17 @@ export default { ...@@ -128,17 +128,17 @@ export default {
{ {
img: 'https://webapp-pub.ezijing.com/project/park/video_sit1.png', img: 'https://webapp-pub.ezijing.com/project/park/video_sit1.png',
web_img_uri: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%991.mp4' web_img_uri: 'https://webapp-pub.ezijing.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%991.mp4'
}, },
{ {
img: 'https://webapp-pub.ezijing.com/project/park/video_sit2.png', img: 'https://webapp-pub.ezijing.com/project/park/video_sit2.png',
web_img_uri: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%992.mp4' web_img_uri: 'https://webapp-pub.ezijing.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%992.mp4'
}, },
{ {
img: 'https://webapp-pub.ezijing.com/project/park/video_sit3.png', img: 'https://webapp-pub.ezijing.com/project/park/video_sit3.png',
web_img_uri: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%993.mp4' web_img_uri: 'https://webapp-pub.ezijing.com/project/park/SIT%E9%A1%B9%E7%9B%AE%E7%AB%993.mp4'
} }
], ],
listData: [ listData: [
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论