Skip to content

polysoft-nafmii / polysoft-h5

Go to a project
Commit 563e9af2 by amateur
Options

Merge branch 'dev' of http://gitlab.polyhome.net/polysoft-nafmii/polysoft-h5 into dev

2 parents cb50f0e7 13cbaa99
Inline Side-by-side
Showing 12 changed files with 161 additions and 130 deletions
src/i18n/lang/index.js
......@@ -7,7 +7,7 @@ import title from './title/index'
import user from './user/index'
import feedback from './feedback/index'
import question from './question/index'
import member from './member/index'
const messages = {
en: {
lang: 'English',
......@@ -18,6 +18,7 @@ const messages = {
...user.userEn,
...feedback.feedbackEn,
...question.questionEn,
...member.memberEn
},
zh: {
lang: "中文",
......@@ -28,6 +29,7 @@ const messages = {
...user.userZh,
...feedback.feedbackZh,
...question.questionZh,
...member.memberZh
}
}
export default messages
src/i18n/lang/member/index.js
const memberEn = {
login: {
language: 'Language', // 多语言
bindWechat: 'Binding Wechat', // 绑定微信
resetPassword: 'Reset Password', // 重置密码
privacyPolicy: 'Privacy Policy', //隐私政策
serviceAgreement: 'Service Agreement', // 服务协议
chinese: 'Chinese',
english: 'English',
mlogin: {
code: 'Please input the social credit or the organization code', // 社会信用代码或组织机构代码
password: 'Please input the password', // 密码
verificationCode: 'Please input the verification code', // 验证码
warningTip: "Tip: Please input your unit's login name and password for the membership system(unit member)", // 提示
membershipGuide: 'Membership Guide', // 会员指南
FAQ: 'Membership Handling FAQ', // 户籍办理常见问题
memberRules: 'Member Management Rules' // 会员管理规则
},
person: {
photo: 'Photo',
......@@ -38,14 +38,14 @@ const memberEn = {
}
const memberZh = {
setting: {
language: '多语言',
bindWechat: '绑定微信',
resetPassword: '重置密码',
privacyPolicy: '隐私政策',
serviceAgreement: '服务协议',
chinese: '中文',
english: '英文',
mlogin: {
code: '请输入社会信用代码或组织机构代码', // 社会信用代码或组织机构代码
password: '请输入密码', // 密码
verificationCode: '请输入验证码', // 验证码
warningTip: "提示：请输入贵单位会员系统的登录名及密码登录（单位会员）",
membershipGuide: '入会指南', // 会员指南
FAQ: '会籍办理常见问题', // 户籍办理常见问题
memberRules: '会籍管理规则' // 会员管理规则
},
person: {
photo: '头像',
......
src/views/member/business/index.vue
<template>
<div class="business_cpntainer">
<div class="business_container">
<NafmHeader navClass="nafmii-head-bg3" title="业务开展列表" />
<main class="business_content">
<van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
<van-cell v-for="item in businessList" :key="item">
<van-cell v-for="(item, index) in businessList" :key="index">
<div slot="title" class="title">{{item.title}}</div>
<p slot="label" class="info">
<span class="update_time">
......@@ -39,13 +38,15 @@ export default {
},
methods: {
onLoad() {
setTimeout(() => {
this.finished = true
}, 3000)
}
}
}
</script>
<style lang="less" scoped>
.business_cpntainer {
.business_container {
.title {
color: #222222;
font-size: 16px;
......
src/views/member/contact/contactItem.vue
......@@ -29,11 +29,6 @@
<script>
export default {
name: "ContanctItem",
data() {
return {
}
},
props: {
contact: {
type: Object,
......@@ -41,6 +36,11 @@ export default {
return {}
}
}
},
data() {
return {
}
}
}
</script>
......
src/views/member/memberLogin.vue
......@@ -4,21 +4,19 @@
<div class="login_box">
<NafmHeader navClass="nafmii-head-bg1" title=" " />
</div>
<!-- <img src="@/assets/icon/bg_login_2.png" />
<NafmHeader navClass="nafmii-head-bg1" title=" " /> -->
<main class="login_content">
<van-form class="login_form">
<van-field v-model="code" :left-icon="shtyxydmIcon" placeholder="请输入社会信用代码或组织机构代码">
<van-field v-model="code" :left-icon="shtyxydmIcon" :placeholder="$t('mlogin.code')">
</van-field>
<van-field v-model="password" :left-icon="passwordIcon" type="password" placeholder="请输入密码">
<van-field v-model="password" :left-icon="passwordIcon" type="password" :placeholder="$t('mlogin.password')">
</van-field>
<van-field v-model="checkCode" :left-icon="verificationIcon" placeholder="请输入验证码">
<van-field v-model="checkCode" :left-icon="verificationIcon" :placeholder="$t('mlogin.verificationCode')">
<template #button>
<span class="verfication_code">111111</span>
</template>
</van-field>
<p class="wraning_tip">
<span v-show="isLogin">提示：请输入贵单位会员系统的登录名及密码登录（单位会员）</span>
<span v-show="isLogin">{{$t('mlogin.warningTip')}}</span>
</p>
<div>
<van-button :class="isLogin ? 'login_btn' : 'act_btn login_btn'" block type="info" native-type="submit" @click="loginSubmit">登录</van-button>
......@@ -26,9 +24,9 @@
</van-form>
</main>
<div class="membership_about">
<van-cell title="入会指南" is-link to="/member/memberGuide" />
<van-cell title="会籍办理常见问题" is-link to="/member/membershipGuide" />
<van-cell title="会员管理规则" is-link to="/member/membershipGuide" />
<van-cell :title="$t('mlogin.membershipGuide')" is-link to="/member/memberGuide" />
<van-cell :title="$t('mlogin.FAQ')" is-link to="/member/membershipGuide" />
<van-cell :title="$t('mlogin.memberRules')" is-link to="/member/membershipGuide" />
</div>
</div>
</template>
......
src/views/member/progress/change/index.vue
<template>
<div class="change_progress">
<div class="change_container">
<NafmHeader navClass="nafmii-head-bg3" title="变更进度" />
<section class="pgrogress_step">
<h3 class="wrap_title">变更进度</h3>
<progress-component :steps-info="steps"></progress-component>
</section>
<section class="flow_chart">
</section>
<main class="change_content">
<progress-component :steps-info="steps" progress-title="变更进度">
<template slot="title">单位名称</template>
</progress-component>
</main>
</div>
</template>
<script>
export default {
name: "ChangeProgress",
components: {
progressComponent: ()=>import('../progress.vue')
},
data() {
return {
steps: [{
......@@ -24,22 +27,7 @@ export default {
time: '2021.01.01'
}]
}
},
components: {
progressComponent: ()=>import('../progress.vue')
}
}
</script>
<style lang="less" scoped>
.change_progress {
padding: 20px;
}
.wrap_title {
font-size: 16px;
padding-left: 6px;
color: #222222;
font-family: PingFangSC-Semibold;
border-left: 2.5px solid #135faa;
}
</style>
src/views/member/progress/change/list.vue
<template>
<div class="change_list">
<div class="change_list_container">
<NafmHeader navClass="nafmii-head-bg3" title="变更" />
<section class="name list_item">
<div class="item_info">
......@@ -23,6 +23,7 @@
</template>
<script>
export default {
name: "ChangeList",
data() {
return {
......@@ -31,8 +32,8 @@ export default {
}
</script>
<style lang="less" scoped>
.change_list {
padding: 20px;
.change_list_container {
padding: 15px;
.list_item {
display: flex;
width: 100%;
......
src/views/member/progress/join.vue
<template>
<div class="join_progress">
<div class="join_container">
<NafmHeader navClass="nafmii-head-bg3" title="进会进度" />
<section class="pgrogress_step">
<h3 class="wrap_title">入会进度</h3>
<progress-component :steps-info="steps"></progress-component>
</section>
<section class="flow_chart">
<h3 class="wrap_title">会员系统内流程图</h3>
</section>
<main class="join_content">
<progress-component :steps-info="steps" progress-title="进会进度"></progress-component>
</main>
</div>
</template>
<script>
export default {
name: "JoinProgress",
components: {
progressComponent: ()=>import('./progress.vue')
},
data() {
return {
steps: [{
......@@ -25,22 +25,7 @@ export default {
time: '2021.01.01'
}]
}
},
components: {
progressComponent: ()=>import('./progress.vue')
}
}
</script>
<style lang="less" scoped>
.join_progress {
padding: 20px;
}
.wrap_title {
font-size: 16px;
padding-left: 6px;
color: #222222;
font-family: PingFangSC-Semibold;
border-left: 2.5px solid #135faa;
}
</style>
src/views/member/progress/progress.vue
<template>
<div>
<van-steps direction="vertical" active-icon="circle" inactive-color="#106ABC" :active="0">
<!-- <template > -->
<van-icon slot="active-icon" name="circle" />
<!-- </template> -->
<div class="progress_container">
<main class="progress_content">
<section class="progress_own">
<h3 class="section_title">{{progressTitle}}</h3>
<van-steps direction="vertical" :active="1">
<van-step v-for="stepItem in stepsInfo" :key="stepItem.id">
<div slot="active-icon" class="circle_outer">
<div class="circle_inner"></div>
</div>
<div class="step_content">
<span class="step_left">
<h3 class="step_title">{{stepItem.title}}</h3>
......@@ -15,42 +18,90 @@
</div>
</van-step>
</van-steps>
</section>
<section class="progress_expand">
<h3 class="section_title">
<slot name="title">
</slot>
</h3>
<main>
<slot name="content">
</slot>
</main>
</section>
</main>
</div>
</template>
<script>
export default {
data() {
return {
}
},
name: "ProgressComponent",
props: {
stepsInfo: {
type: Object,
type: Object|Object,
default: ()=> {
return {}
}
},
progressTitle: {
type: String,
default: ()=> {
return ''
}
}
},
data() {
return {
}
},
}
</script>
<style lang="less" scoped>
::v-deep .van-step:last-child .van-step__line {
border: none;
}
::v-deep .van-step__line {
border-left: 0.5px dotted #106abc;
background-color: transparent;
.progress_container {
padding: 15px;
.section_title {
font-size: 16px;
line-height: 16px;
padding-left: 6px;
color: #222222;
font-family: PingFangSC-Semibold;
border-left: 2.5px solid #135faa;
}
}
::v-deep .van-step__circle {
::v-deep .van-step--vertical {
opacity: 0.3;
.van-step__circle {
width: 6px;
height: 6px;
background-color: #106abc;
}
.van-step__line {
opacity: 0.3;
}
}
::v-deep .van-step--finish,
::v-deep .van-step--process {
opacity: 1;
}
::v-deep .van-step--finish {
.van-step__line {
opacity: 1;
}
}
::v-deep .van-step__line {
background: linear-gradient(
to bottom,
#106abc,
#106abc 2px,
transparent 2px,
transparent
);
background-size: 100% 4px;
}
::v-deep .van-hairline::after {
border: none;
}
::v-deep .van-step__icon--active {
color: #106abc;
}
.step_content {
display: flex;
justify-content: space-between;
......@@ -73,5 +124,17 @@ export default {
line-height: 17px;
}
}
.circle_outer {
padding: 3px;
border-radius: 50%;
background-color: #cbe3f9;
.circle_inner {
width: 6px;
height: 6px;
border-radius: 50%;
background-color: #106abc;
}
}
</style>
src/views/member/progress/quit.vue
<template>
<div class="quit_progress">
<div class="quit_container">
<NafmHeader navClass="nafmii-head-bg3" title="退会进度" />
<section class="pgrogress_step">
<h3 class="wrap_title">退会进度</h3>
<progress-component :steps-info="steps"></progress-component>
</section>
<main class="quit content">
<progress-component :steps-info="steps" progress-title="退会进度"></progress-component>
</main>
</div>
</template>
<script>
export default {
name: "QuitProgress",
components: {
progressComponent: ()=>import('./progress.vue')
},
data() {
return {
steps: [{
......@@ -22,22 +25,7 @@ export default {
time: '2021.01.01'
}]
}
},
components: {
progressComponent: ()=>import('./progress.vue')
}
}
</script>
<style lang="less" scoped>
.quit_progress {
padding: 20px;
}
.wrap_title {
font-size: 16px;
padding-left: 6px;
color: #222222;
font-family: PingFangSC-Semibold;
border-left: 2.5px solid #135faa;
}
</style>
src/views/member/result/index.vue
......@@ -50,7 +50,7 @@
</van-cell>
</div>
<div class="change">
<van-cell is-link :icon="changeIcon" @click="toOtherRouter('ChangeProgress')">
<van-cell is-link :icon="changeIcon" @click="toOtherRouter('ChangeList')">
<template #title>
<span class="oper_title">变更</span>
</template>
......
src/views/user/login/components/LoginTabs.vue
<template>
<div class="login_tabs">
<router-link to="/user/login/phone" :class="{active:type==1}">手机号登录</router-link>
<router-link to="/user/login/username" :class="{active:type==2}">账号密码登录</router-link>
<router-link to="/user/login/phone" :class="{active:type==1}">
手机号登录
<div class="bottom-border-1" v-show="type==1"></div>
</router-link>
<router-link to="/user/login/username" :class="{active:type==2}">
账号密码登录
<div class="bottom-border-2" v-show="type==2"></div>
</router-link>
</div>
</template>
<script>
......@@ -39,14 +44,14 @@ export default {
width: 80px;
border-bottom: 3px solid #106abc;
top: 26px;
left: 107px;
left: 20px;
}
.bottom-border-2 {
position: absolute;
width: 80px;
border-bottom: 3px solid #106abc;
top: 26px;
right: 107px;
right: 20px;
}
}
</style>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!