Skip to content

P
project-www-h5
提交 9d8f7639 authored 作者: matian's avatar matian
浏览文件
操作

Auto stash before merge of "master" and "origin/master"

上级 b09958f3
隐藏空白字符变更
内嵌 并排
正在显示 包含 183 行增加 和 0 行删除
components/Menu.vue
浏览文件 @ 9d8f7639
...@@ -97,6 +97,10 @@ export default { ...@@ -97,6 +97,10 @@ export default {
children: [ children: [
{ name: this.$t('menu.alumniChild.alumni'), path: '/alumnus' }, { name: this.$t('menu.alumniChild.alumni'), path: '/alumnus' },
{ name: this.$t('menu.alumniChild.alumniStory'), path: '/alumnus/story' } { name: this.$t('menu.alumniChild.alumniStory'), path: '/alumnus/story' }
{ name: this.$t('menu.alumniChild.alumni'), path: '/alumnus' },
{ name: this.$t('menu.alumniChild.flower'), path: '/alumnus/flower' }
// { name: '校友风采', path: '/alumnus/style' }
] ]
}, },
{ {
......
components/alumnus/TabNav.vue
浏览文件 @ 9d8f7639
...@@ -11,6 +11,9 @@ export default { ...@@ -11,6 +11,9 @@ export default {
list: [ list: [
{ name: this.$t('alumni.title'), path: '/alumnus', value: '1' }, { name: this.$t('alumni.title'), path: '/alumnus', value: '1' },
{ name: this.$t('menu.alumniChild.alumniStory'), path: '/alumnus/story', value: '2' } { name: this.$t('menu.alumniChild.alumniStory'), path: '/alumnus/story', value: '2' }
{ name: this.$t('alumni.title'), path: '/alumnus', value: '1' },
{ name: this.$t('flower.title'), path: '/alumnus/flower', value: '2' }
] ]
} }
} }
......
langs/en-US.js
浏览文件 @ 9d8f7639
...@@ -57,6 +57,8 @@ export default { ...@@ -57,6 +57,8 @@ export default {
alumniChild: { alumniChild: {
alumni: 'ALUMNI', alumni: 'ALUMNI',
alumniStory: 'ALUMNI SPOTLIGHT' alumniStory: 'ALUMNI SPOTLIGHT'
alumni: 'ALUMNI',
flower: 'Zijinghua'
} }
}, },
home: { home: {
...@@ -222,5 +224,42 @@ export default { ...@@ -222,5 +224,42 @@ export default {
time: 'The data is as of June 2020', time: 'The data is as of June 2020',
followTit: '', followTit: '',
followDes: 'i Zijing Alumni Platform' followDes: 'i Zijing Alumni Platform'
},
flower: {
title: 'Zijinghua',
contentTit1: 'Zijinghua project',
contentP1:
'Thanks to the alumni for their support for Zijing Education over the years. With the establishment of local alumni associations in 2021, how to ensure the long-term and healthy development is a problem that the Zijing Alumni Association has been thinking about and it is also the long cherished wish of each alumni. Therefore, the Zijinghua reward system is specially designed for Zijing alumni, hoping to provide long-term and stable financial support for the Alumni Association and alumni activities, and sincerely hope to promote the healthy and sustainable development of the Alumni Association.',
contentTit2: 'Zijinghua acquisition',
contentP21:
'Alumni who have graduated from the Zijing Education degree program will automatically receive 100 Zijinghua.',
contentP22:
'2.Zijing Alumni Associations select outstanding alumni awards at the end of each year. Each winning alumni will receive 1000-10000 Zijinghua according to different awards. The specific rules will be promulgated later.',
contentP23: 'Alumni who successfully recommend student to join Zijing degree programs will obtain 5000 Zijinghua.',
contentP24:
'When individual alumni receive Zijinghua award, Zijing Education will match another 20% as development funds for their alumni branch. For example, if an individual obtains 1000, the alumni branch can obtain another 200.',
contentTit3: 'Zijinghua usage',
contentP31: ' Zijinghua= 1 yuan, which shall be cashed by Zijing Education.',
contentP32: 'Pay tuition fees for Zijing Education.',
contentP33: 'Pay the expenses to be borne by individuals in the official activities of Zijing Education.',
contentP34: 'Pay for attending graduation ceremonies and study tours overseas.',
contentP35: 'Donate to local alumni associations as funds for alumni association activities.',
contentP36:
'If there are more than 1000 Zijinghua in the account, it can be withdrawn (income tax shall be borne by yourself).',
contentTit4: 'How to check Zijinghua account',
contentP4: 'Log in ‘i zijing’applet and click "my" to view Zijinghua balance.',
contentTit5: 'Other instructions',
contentP5: 'The project will be gradually improved according to the feedback and opinions of all alumni.',
contentP61: 'Zijing Alumni Association',
contentP62: 'Zijing Alumni Association in Beijing',
contentP63: 'Zijing Alumni Association in Shanghai',
contentP64: 'Zijing Alumni Association in Shenzhen',
contentP65: 'Zijing Alumni Association in Zhejiang',
contentP66: 'Zijing Alumni Association in Jiangsu',
contentP67: 'Zijing Alumni Association in Guangdong',
contentP68: 'Zijing Education',
contentP7: 'Sept.16, 2021',
contentP8: 'Log in ‘i zijing’applet'
} }
} }
langs/zh-CN.js
浏览文件 @ 9d8f7639
...@@ -57,6 +57,8 @@ export default { ...@@ -57,6 +57,8 @@ export default {
alumniChild: { alumniChild: {
alumni: '校友会', alumni: '校友会',
alumniStory: '校友故事' alumniStory: '校友故事'
alumni: '校友会',
flower: '紫荆花'
} }
}, },
home: { home: {
...@@ -210,16 +212,61 @@ export default { ...@@ -210,16 +212,61 @@ export default {
alumni: { alumni: {
title: '校友会', title: '校友会',
contentTit: '校友会简介', contentTit: '校友会简介',
<<<<<<<
contentP1: contentP1:
'紫荆教育拥有阵容强大、组织活跃、遍布全球的校友网络。截至2020年12月，紫荆校友人数已经超过6000位，校友们通过地区分会、行业协会/俱乐部、班级这个三维立体网络与紫荆紧密相连。同时，通过“i紫荆”在线信息平台，促进校友间的相互学习和交流。', '紫荆教育拥有阵容强大、组织活跃、遍布全球的校友网络。截至2020年12月，紫荆校友人数已经超过6000位，校友们通过地区分会、行业协会/俱乐部、班级这个三维立体网络与紫荆紧密相连。同时，通过“i紫荆”在线信息平台，促进校友间的相互学习和交流。',
contentP2: contentP2:
'至今，在广大校友的热情支持下，紫荆校友会已经先后成立了北京、上海、深圳等地校友分会，并将陆续成立其他省份和海外等多地校友分会。紫荆各地校友分会的成立将有效整合跨界资源的精英网络，为紫荆校友蓄势未来、取得更大成功奠定坚实的基础。', '至今，在广大校友的热情支持下，紫荆校友会已经先后成立了北京、上海、深圳等地校友分会，并将陆续成立其他省份和海外等多地校友分会。紫荆各地校友分会的成立将有效整合跨界资源的精英网络，为紫荆校友蓄势未来、取得更大成功奠定坚实的基础。',
contentP3: contentP3:
'紫荆校友会不是简单意义上的校友联谊机构，她是紫荆教学活动的延续，是培养新生代企业家的一个重要环节。紫荆校友会秉持“紫荆花开，向美而行”的美好愿景，倡导培养终身学习的习惯，积极奉献爱心、回馈社会，并保持“健康可持续”的生活方式。在紫荆大家庭里，校友们生活上彼此关心、事业上相互支持、精神上相互激励，结交真心朋友、分享精彩人生。', '紫荆校友会不是简单意义上的校友联谊机构，她是紫荆教学活动的延续，是培养新生代企业家的一个重要环节。紫荆校友会秉持“紫荆花开，向美而行”的美好愿景，倡导培养终身学习的习惯，积极奉献爱心、回馈社会，并保持“健康可持续”的生活方式。在紫荆大家庭里，校友们生活上彼此关心、事业上相互支持、精神上相互激励，结交真心朋友、分享精彩人生。',
=======
contentP1:
'紫荆教育拥有阵容强大、组织活跃、遍布全球的校友网络。截至2020年12月，紫荆校友人数已经超过5000位，校友们通过地区分会、行业协会/俱乐部、班级这个三维立体网络与紫荆紧密相连。同时，通过“i紫荆”在线信息平台，促进校友间的相互学习和交流。',
contentP2:
'至今，在广大校友的热情支持下，紫荆校友会已经先后成立了北京、上海、深圳等地校友分会，并将陆续成立其他省份和海外等多地校友分会。紫荆各地校友分会的成立将有效整合跨界资源的精英网络，为紫荆校友蓄势未来、取得更大成功奠定坚实的基础。',
contentP3:
'紫荆校友会不是简单意义上的校友联谊机构，她是紫荆教学活动的延续，是培养新生代企业家的一个重要环节。紫荆校友会秉持“紫荆花开，向美而行”的美好愿景，倡导培养终身学习的习惯，积极奉献爱心、回馈社会，并保持“健康可持续”的生活方式。在紫荆大家庭里，校友们生活上彼此关心、事业上相互支持、精神上相互激励，结交真心朋友、分享精彩人生。',
>>>>>>>
fbTit: '校友分布', fbTit: '校友分布',
fbDes: '国内学员已百分百覆盖中国34个省级行政区、380+城市及全球多个国家和地区', fbDes: '国内学员已百分百覆盖中国34个省级行政区、380+城市及全球多个国家和地区',
time: '数据截止2020年6月', time: '数据截止2020年6月',
followTit: '关注校友会', followTit: '关注校友会',
followDes: 'i紫荆校友平台' followDes: 'i紫荆校友平台'
},
flower: {
title: '紫荆花',
contentTit1: '紫荆花计划',
contentP1:
'感谢校友多年来对紫荆教育的支持，2021年随着各地校友会相继成立，如何保证校友会能够长期健康的发展，做大做强，这是紫荆校友会一直在思考的问题，相信也是每位校友的夙愿。由此，为紫荆校友特别设计了紫荆花奖励和使用系统，期望能为校友会和校友活动提供长期稳定的经费支持，真心实意的希望能够促进校友会健康的可持续发展。',
contentTit2: '紫荆花获取',
contentP21: '紫荆教育学位项目已毕业校友将自动获得100朵奖励紫荆花。',
contentP22:
'各地校友会每年年底评选出杰出校友工作奖，每位获奖的校友根据奖项不同将获得1000-10000朵不等的紫荆花，具体细则随后颁布。',
contentP23: '校友每推荐成功一名学员，获得5000朵紫荆花。',
contentP24:
'校友个人获得紫荆花奖励，紫荆教育将为其所属校友分会另外匹配20%做为发展经费，如：个人获得1000朵，校友分会即可另外获得200朵。',
contentTit3: '紫荆花使用',
contentP31: '1朵紫荆花=1元人民币，由紫荆教育负责兑现。',
contentP32: '支付本人在紫荆教育的各项学费。',
contentP33: '支付紫荆教育官方举办的活动中需个人负担的费用。',
contentP34: '支付赴海外参加毕业典礼和游学的费用。',
contentP35: '捐赠给各地校友会，作为校友会活动经费。',
contentP36: '账户累计超过1000朵紫荆花，可提现（所得税自负）。',
contentTit4: '如何查看',
contentP4: '登录i紫荆小程序，点击“我的”查看紫荆花余额。',
contentTit5: '其它说明',
contentP5:
'本项活动由紫荆校友总会、紫荆校友会北京分会、紫荆校友会上海分会、紫荆校友会深圳分会，紫荆校友会浙江分会、紫荆校友会江苏分会、紫荆校友会广东分会携手紫荆教育发起，后续会根据各位校友的反馈和意见逐步完善。',
contentP61: '紫荆校友总会',
contentP62: '紫荆校友会北京分会',
contentP63: '紫荆校友会上海分会',
contentP64: '紫荆校友会深圳分会',
contentP65: '紫荆校友会浙江分会',
contentP66: '紫荆校友会江苏分会',
contentP67: '紫荆校友会广东分会',
contentP68: '紫荆教育',
contentP7: '2021年9月16日',
contentP8: '登入i 紫荆小程序查看'
} }
} }
pages/alumnus/flower.vue 0 → 100644
浏览文件 @ 9d8f7639
<template>
<div>
<tab-nav active="2"></tab-nav>
<img src="https://webapp-pub.ezijing.com/pages/ciis/pc20210913/Banner.jpg" class="main-banner" />
<div class="main-content" style="margin-top:.2rem">
<h1>{{ $t('flower.contentTit1') }}</h1>
<div class="main-content">
<p>{{ $t('flower.contentP1') }}</p>
</div>
<h1>{{ $t('flower.contentTit2') }}</h1>
<ul class="main-content">
<li>{{ $t('flower.contentP21') }}</li>
<li>{{ $t('flower.contentP22') }}</li>
<li>{{ $t('flower.contentP23') }}</li>
<li>{{ $t('flower.contentP24') }}</li>
</ul>
<h1>{{ $t('flower.contentTit3') }}</h1>
<ul class="main-content">
<li>{{ $t('flower.contentP31') }}</li>
<li>{{ $t('flower.contentP32') }}</li>
<li>{{ $t('flower.contentP33') }}</li>
<li>{{ $t('flower.contentP34') }}</li>
<li>{{ $t('flower.contentP35') }}</li>
<li>{{ $t('flower.contentP36') }}</li>
</ul>
<h1>{{ $t('flower.contentTit4') }}</h1>
<div class="main-content">
<p>{{ $t('flower.contentP4') }}</p>
</div>
<h1>{{ $t('flower.contentTit5') }}</h1>
<div class="main-content">
<p>{{ $t('flower.contentP5') }}</p>
</div>
<div class="main-content" style="text-align:right">
<p>{{ $t('flower.contentP61') }}</p>
<p>{{ $t('flower.contentP62') }}</p>
<p>{{ $t('flower.contentP63') }}</p>
<p>{{ $t('flower.contentP64') }}</p>
<p>{{ $t('flower.contentP65') }}</p>
<p>{{ $t('flower.contentP66') }}</p>
<p>{{ $t('flower.contentP67') }}</p>
<p>{{ $t('flower.contentP68') }}</p>
</div>
<div class="main-content" style="text-align:right">
<p>{{ $t('flower.contentP7') }}</p>
</div>
<div class="alumnus-code" style="text-align: center">
<h4 style="font-weight: normal; margin-bottom: 10px">{{ $t('flower.contentP8') }}</h4>
<img
src="https://webapp-pub.ezijing.com/pages/ciis/pc20210913/%E4%BA%8C%E7%BB%B4%E7%A0%81.jpg"
style="width: 200px"
/>
</div>
</div>
</div>
</template>
<script>
import TabNav from '@/components/alumnus/TabNav'
export default {
components: { TabNav }
}
</script>
<style lang="scss" scoped>
.main-content {
margin-bottom: 0.3rem;
h1 {
margin-left: 0.2rem;
margin-bottom: 0.1rem;
}
p {
margin-left: 0.2rem;
margin-right: 0.2rem;
}
img {
width: 100%;
margin-bottom: 0.18rem;
}
li {
font-size: 0.12rem;
font-weight: 400;
list-style-type: decimal;
text-indent: 1em;
margin-left: 0.3rem;
line-height: 0.24rem;
margin-right: 0.2rem;
}
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论