Skip to content

polysoft-nafmii / polysoft-h5

Go to a project
Commit 43c8f373 by fanx
Options

处理中英文切换

1 parent 13cbaa99
Expand all
Inline Side-by-side
Showing 27 changed files with 418 additions and 134 deletions
package.json
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"dependencies": { "dependencies": {
"autoprefixer": "^9.7.6", "autoprefixer": "^9.7.6",
"axios": "^0.21.1", "axios": "^0.21.1",
"better-scroll": "^1.15.2",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"cropperjs": "^1.5.11", "cropperjs": "^1.5.11",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
......
src/assets/css/search.less 0 → 100644
.common_search {
/deep/ &&.van-search {
padding: 0;
margin: 10px 0;
background: inherit;
background-color: rgba(255, 255, 255, 0.2);
color: #fff;
border-radius: 16px;
height: 33px;
}
/deep/ .van-search__content {
background-color: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #fff;
height: 33px;
}
/deep/ .van-field__left-icon .van-icon,
.van-field__right-icon .van-icon {
color: #fff;
}
/deep/ input::-webkit-input-placeholder {
color: #fff;
opacity: 0.8;
font-size: 12px;
}
/deep/ .van-field__control {
color: #fff;
// opacity: 0.8;
font-size: 12px;
}
}
\ No newline at end of file \ No newline at end of file
src/assets/css/sprite.less
...@@ -19,19 +19,20 @@ ...@@ -19,19 +19,20 @@
.icon-email { width: 36px; height: 36px; background-position: -2711px -1598px; } .icon-email { width: 36px; height: 36px; background-position: -2711px -1598px; }
.icon-empty { width: 36px; height: 36px; background-position: -2767px -1598px; } .icon-empty { width: 36px; height: 36px; background-position: -2767px -1598px; }
.icon-icon-arrow-right { width: 10px; height: 18px; background-position: -2879px -1598px; } .icon-icon-arrow-right { width: 10px; height: 18px; background-position: -2879px -1598px; }
.icon-icon-classify { width: 30px; height: 30px; background-position: -1844px -582px; } .icon-icon-classify { width: 30px; height: 30px; background-position: -1340px -670px; }
.icon-icon-clock { width: 30px; height: 30px; background-position: -1894px -582px; } .icon-icon-clock { width: 30px; height: 30px; background-position: -1390px -670px; }
.icon-join-member { width: 90px; height: 90px; background-position: -1624px -526px; } .icon-join-member { width: 90px; height: 90px; background-position: -1624px -526px; }
.icon-logo-2 { width: 118px; height: 112px; background-position: -1376px -526px; } .icon-logo-2 { width: 118px; height: 112px; background-position: -1376px -526px; }
.icon-logo { width: 224px; height: 224px; background-position: -1175px -737px; } .icon-logo { width: 224px; height: 224px; background-position: -1175px -737px; }
.icon-password { width: 36px; height: 36px; background-position: -2823px -1598px; } .icon-password { width: 36px; height: 36px; background-position: -2823px -1598px; }
.icon-pdf { width: 46px; height: 60px; background-position: -1844px -526px; }
.icon-photo-default { width: 124px; height: 124px; background-position: -1232px -526px; } .icon-photo-default { width: 124px; height: 124px; background-position: -1232px -526px; }
.icon-question-icon { width: 36px; height: 36px; background-position: -1844px -526px; } .icon-question-icon { width: 36px; height: 36px; background-position: -1910px -526px; }
.icon-quit-member { width: 90px; height: 90px; background-position: -1734px -526px; } .icon-quit-member { width: 90px; height: 90px; background-position: -1734px -526px; }
.icon-shtyxydm { width: 54px; height: 54px; background-position: -2180px -1598px; } .icon-shtyxydm { width: 54px; height: 54px; background-position: -2180px -1598px; }
.icon-tel { width: 36px; height: 36px; background-position: -1900px -526px; } .icon-tel { width: 36px; height: 36px; background-position: -1966px -526px; }
.icon-time-update { width: 45px; height: 45px; background-position: -2254px -1598px; } .icon-time-update { width: 45px; height: 45px; background-position: -2254px -1598px; }
.icon-user-question { width: 32px; height: 36px; background-position: -1232px -670px; } .icon-user-question { width: 32px; height: 36px; background-position: -1288px -670px; }
.icon-user { width: 36px; height: 36px; background-position: -1956px -526px; } .icon-user { width: 36px; height: 36px; background-position: -2022px -526px; }
.icon-verification { width: 36px; height: 36px; background-position: -2012px -526px; } .icon-verification { width: 36px; height: 36px; background-position: -1232px -670px; }
.icon-wechat { width: 80px; height: 78px; background-position: -2080px -1598px; } .icon-wechat { width: 80px; height: 78px; background-position: -2080px -1598px; }
\ No newline at end of file \ No newline at end of file
src/assets/images/sprite.png
src/assets/images/sprite.png

1.47 MB | W: | H:

src/assets/images/sprite.png

1.47 MB | W: | H:

src/assets/images/sprite.png
src/assets/images/sprite.png
src/assets/images/sprite.png
src/assets/images/sprite.png
  • 2-up
  • Swipe
  • Onion skin
src/components/SearchFirst.vue
...@@ -9,7 +9,8 @@ export default { ...@@ -9,7 +9,8 @@ export default {
name: 'SearchFirst', name: 'SearchFirst',
props: { props: {
placeholder: { placeholder: {
type: String type: String,
required: true
} }
}, },
methods: { methods: {
......
src/i18n/index.js
...@@ -5,11 +5,13 @@ import { getLocalStorage } from '@/utils/LocalStorage' ...@@ -5,11 +5,13 @@ import { getLocalStorage } from '@/utils/LocalStorage'
Vue.use(VueI18n) Vue.use(VueI18n)
const lang = getLocalStorage('lang') || 'zh' const lang = getLocalStorage('lang') || 'zh'
console.log('lang',lang)
// 通过选项创建 VueI18n 实例 // 通过选项创建 VueI18n 实例
export default new VueI18n({ export default new VueI18n({
locale: lang, // 设置地区 locale: 'zh', // 设置地区
messages, // 设置地区信息 messages, // 设置地区信息
silentTranslationWarn: true
}) })
......
src/i18n/lang/button/index.js
...@@ -12,7 +12,7 @@ const buttonEn = { ...@@ -12,7 +12,7 @@ const buttonEn = {
save: 'Save' save: 'Save'
} }
} }
const buttonZn = { const buttonZh = {
button: { button: {
ok: '确定', ok: '确定',
cancel: '取消', cancel: '取消',
...@@ -28,5 +28,5 @@ const buttonZn = { ...@@ -28,5 +28,5 @@ const buttonZn = {
} }
export default { export default {
buttonEn, buttonEn,
buttonZn buttonZh
}; };
\ No newline at end of file \ No newline at end of file
src/i18n/lang/index.js
...@@ -4,7 +4,9 @@ import toast from './toast/index' ...@@ -4,7 +4,9 @@ import toast from './toast/index'
// 单独页面模块 // 单独页面模块
import title from './title/index' import title from './title/index'
import user from './user/index' import setting from './user/setting'
import center from './user/center'
import person from './user/person'
import feedback from './feedback/index' import feedback from './feedback/index'
import question from './question/index' import question from './question/index'
import member from './member/index' import member from './member/index'
...@@ -15,18 +17,22 @@ const messages = { ...@@ -15,18 +17,22 @@ const messages = {
...toast.toastEn, ...toast.toastEn,
...title.titleEn, ...title.titleEn,
...user.userEn, ...setting.settingEn,
...center.centerEn,
...person.personEn,
...feedback.feedbackEn, ...feedback.feedbackEn,
...question.questionEn, ...question.questionEn,
...member.memberEn ...member.memberEn
}, },
zh: { zh: {
lang: "中文", lang: "中文",
...button.buttonZn, ...button.buttonZh,
...toast.toastZn, ...toast.toastZh,
...title.titleZn, ...title.titleZh,
...user.userZh, ...setting.settingZh,
...center.centerZh,
...person.personZh,
...feedback.feedbackZh, ...feedback.feedbackZh,
...question.questionZh, ...question.questionZh,
...member.memberZh ...member.memberZh
......
src/i18n/lang/member/index.js
...@@ -8,33 +8,6 @@ const memberEn = { ...@@ -8,33 +8,6 @@ const memberEn = {
FAQ: 'Membership Handling FAQ', // 户籍办理常见问题 FAQ: 'Membership Handling FAQ', // 户籍办理常见问题
memberRules: 'Member Management Rules' // 会员管理规则 memberRules: 'Member Management Rules' // 会员管理规则
}, },
person: {
photo: 'Photo',
nickName: 'NickName',
nickNamePlaceholder: 'Please input your nickname',
phoneNumber: 'PhoneNumber',
name: 'Name',
namePlaceholder: 'Please input your name',
nationality: 'Nationality',
nationalityPlaceholder: 'Please select your Nationality',
birthday: 'BirthDay',
birthdayPlaceholder: 'Please select your Nationality',
email: 'Email',
emailPlaceholder: 'Please select your Nationality',
company: 'Company',
companyPlaceholder: 'Please select your Nationality',
},
center: {
login: 'Login',
konwMore: 'Know More Information',
message: 'Message',
collect: 'Collection',
study: 'Study',
question: 'Question',
feedBack: 'FeedBack',
about: 'About',
setting: 'Setting',
}
} }
const memberZh = { const memberZh = {
...@@ -47,33 +20,6 @@ const memberZh = { ...@@ -47,33 +20,6 @@ const memberZh = {
FAQ: '会籍办理常见问题', // 户籍办理常见问题 FAQ: '会籍办理常见问题', // 户籍办理常见问题
memberRules: '会籍管理规则' // 会员管理规则 memberRules: '会籍管理规则' // 会员管理规则
}, },
person: {
photo: '头像',
nickName: '昵称',
nickNamePlaceholder: '请输入您的昵称',
phoneNumber: '手机号',
name: '姓名',
namePlaceholder: '请输入您的姓名',
nationality: '国籍',
namePlaceholder: '请选择您的国籍',
birthday: '出生日',
birthdayPlaceholder: '请选择您的出生日',
email: '邮箱',
emailPlaceholder: '请输入您的邮箱',
company: '单位',
companyPlaceholder: '请选择您的单位',
},
center: {
login: '立即登录',
konwMore: '登录后可了解更多信息',
message: '我的消息',
collect: '我的收藏',
study: '我的学习',
question: '常见问题',
feedBack: '意见反馈',
about: '关于协会',
setting: '设置',
}
} }
export default { export default {
memberEn, memberEn,
......
src/i18n/lang/title/index.js
...@@ -16,11 +16,12 @@ const titleEn = { ...@@ -16,11 +16,12 @@ const titleEn = {
photo: 'Edit Photo', photo: 'Edit Photo',
nickName: 'Edit NickName', nickName: 'Edit NickName',
name: 'Edit Name', name: 'Edit Name',
nationality: 'Edit Nationality',
email: 'Edit Email', email: 'Edit Email',
company: 'Edit Compnay', company: 'Edit Compnay',
} }
} }
const titleZn = { const titleZh = {
title: { title: {
home: '首页', home: '首页',
membershipServices: '会籍服务', membershipServices: '会籍服务',
...@@ -38,11 +39,12 @@ const titleZn = { ...@@ -38,11 +39,12 @@ const titleZn = {
photo: '设置昵称', photo: '设置昵称',
nickName: '设置昵称', nickName: '设置昵称',
name: '设置姓名', name: '设置姓名',
nationality: '设置国籍',
email: '设置邮箱', email: '设置邮箱',
company: '设置单位' company: '设置单位'
} }
} }
export default { export default {
titleEn, titleEn,
titleZn titleZh
}; };
\ No newline at end of file \ No newline at end of file
src/i18n/lang/toast/index.js
...@@ -12,7 +12,7 @@ const toastEn = { ...@@ -12,7 +12,7 @@ const toastEn = {
} }
} }
const toastZn = { const toastZh = {
toast: { toast: {
userName: '请输入用户名', userName: '请输入用户名',
phone: '请输入正确的手机格式', phone: '请输入正确的手机格式',
...@@ -27,5 +27,5 @@ const toastZn = { ...@@ -27,5 +27,5 @@ const toastZn = {
} }
export default { export default {
toastEn, toastEn,
toastZn toastZh
}; };
\ No newline at end of file \ No newline at end of file
src/i18n/lang/user/center.js 0 → 100644
const centerEn = {
center: {
login: 'Login',
konwMore: 'Know More Information',
message: 'Message',
collect: 'Collection',
study: 'Study',
question: 'Question',
feedBack: 'FeedBack',
about: 'About',
setting: 'Setting',
},
}
const centerZh = {
center: {
login: '立即登录',
konwMore: '登录后可了解更多信息',
message: '我的消息',
collect: '我的收藏',
study: '我的学习',
question: '常见问题',
feedBack: '意见反馈',
about: '关于协会',
setting: '设置',
},
}
export default {
centerEn,
centerZh
};
\ No newline at end of file \ No newline at end of file
src/i18n/lang/user/index.js → src/i18n/lang/user/person.js
const userEn = { const personEn = {
setting: {
language: 'Language', // 多语言
bindWechat: 'Binding Wechat', // 绑定微信
resetPassword: 'Reset Password', // 重置密码
privacyPolicy: 'Privacy Policy', //隐私政策
serviceAgreement: 'Service Agreement', // 服务协议
chinese: 'Chinese',
english: 'English',
},
person: { person: {
photo: 'Photo', photo: 'Photo',
nickName: 'NickName', nickName: 'NickName',
...@@ -17,6 +8,7 @@ const userEn = { ...@@ -17,6 +8,7 @@ const userEn = {
namePlaceholder: 'Please input your name', namePlaceholder: 'Please input your name',
nationality: 'Nationality', nationality: 'Nationality',
nationalityPlaceholder: 'Please select your Nationality', nationalityPlaceholder: 'Please select your Nationality',
country: 'Please input Nationality',
birthday: 'BirthDay', birthday: 'BirthDay',
birthdayPlaceholder: 'Please select your birthday', birthdayPlaceholder: 'Please select your birthday',
email: 'Email', email: 'Email',
...@@ -24,29 +16,9 @@ const userEn = { ...@@ -24,29 +16,9 @@ const userEn = {
company: 'Company', company: 'Company',
companyPlaceholder: 'Please input your company', companyPlaceholder: 'Please input your company',
}, },
center: {
login: 'Login',
konwMore: 'Know More Information',
message: 'Message',
collect: 'Collection',
study: 'Study',
question: 'Question',
feedBack: 'FeedBack',
about: 'About',
setting: 'Setting',
},
} }
const userZh = { const personZh = {
setting: {
language: '多语言',
bindWechat: '绑定微信',
resetPassword: '重置密码',
privacyPolicy: '隐私政策',
serviceAgreement: '服务协议',
chinese: '中文',
english: '英文',
},
person: { person: {
photo: '头像', photo: '头像',
nickName: '昵称', nickName: '昵称',
...@@ -56,6 +28,7 @@ const userZh = { ...@@ -56,6 +28,7 @@ const userZh = {
namePlaceholder: '请输入您的姓名', namePlaceholder: '请输入您的姓名',
nationality: '国籍', nationality: '国籍',
nationalityPlaceholder: '请选择您的国籍', nationalityPlaceholder: '请选择您的国籍',
country: '请输入国籍名称',
birthday: '出生日', birthday: '出生日',
birthdayPlaceholder: '请选择您的出生日', birthdayPlaceholder: '请选择您的出生日',
email: '邮箱', email: '邮箱',
...@@ -63,19 +36,8 @@ const userZh = { ...@@ -63,19 +36,8 @@ const userZh = {
company: '单位', company: '单位',
companyPlaceholder: '请选择您的单位', companyPlaceholder: '请选择您的单位',
}, },
center: {
login: '立即登录',
konwMore: '登录后可了解更多信息',
message: '我的消息',
collect: '我的收藏',
study: '我的学习',
question: '常见问题',
feedBack: '意见反馈',
about: '关于协会',
setting: '设置',
},
} }
export default { export default {
userEn, personEn,
userZh personZh
}; };
\ No newline at end of file \ No newline at end of file
src/i18n/lang/user/setting.js 0 → 100644
const settingEn = {
setting: {
language: 'Language', // 多语言
bindWechat: 'Binding Wechat', // 绑定微信
resetPassword: 'Reset Password', // 重置密码
privacyPolicy: 'Privacy Policy', //隐私政策
serviceAgreement: 'Service Agreement', // 服务协议
chinese: 'Chinese',
english: 'English',
},
}
const settingZh = {
setting: {
language: '多语言',
bindWechat: '绑定微信',
resetPassword: '重置密码',
privacyPolicy: '隐私政策',
serviceAgreement: '服务协议',
chinese: '中文',
english: '英文',
},
}
export default {
settingEn,
settingZh
};
\ No newline at end of file \ No newline at end of file
src/router/modules/user.js
...@@ -180,6 +180,15 @@ const userRouter = [ ...@@ -180,6 +180,15 @@ const userRouter = [
}, },
component: () => import(/* webpackChunkName: "commonEdit" */ '@/views/user/person/commonEdit.vue') // 个人信息 component: () => import(/* webpackChunkName: "commonEdit" */ '@/views/user/person/commonEdit.vue') // 个人信息
}, },
{
path: '/user/nationality',
name: 'Nationality',
meta: {
title: '',
isLogin: true
},
component: () => import(/* webpackChunkName: "nationality" */ '@/views/user/nationality/index.vue') // 设置国籍
},
] ]
export default userRouter export default userRouter
\ No newline at end of file \ No newline at end of file
src/utils/vant-ui.js
...@@ -26,7 +26,10 @@ import { ...@@ -26,7 +26,10 @@ import {
List, List,
PullRefresh, PullRefresh,
SwipeCell, SwipeCell,
DatetimePicker DatetimePicker,
Search,
IndexBar,
IndexAnchor
} from 'vant' } from 'vant'
import NafmHeader from '@/components/NafmHeader' import NafmHeader from '@/components/NafmHeader'
...@@ -63,7 +66,10 @@ import FooterBottom from '@/components/FooterBottom' ...@@ -63,7 +66,10 @@ import FooterBottom from '@/components/FooterBottom'
List, List,
PullRefresh, PullRefresh,
SwipeCell, SwipeCell,
DatetimePicker DatetimePicker,
Search,
IndexBar,
IndexAnchor
].forEach(item => Vue.use(item)) ].forEach(item => Vue.use(item))
// 先预制，后期做统一调整 // 先预制，后期做统一调整
......
src/views/catalog/data.json
...@@ -6,6 +6,11 @@ ...@@ -6,6 +6,11 @@
"name": "范鑫", "name": "范鑫",
"myselfList": [ "myselfList": [
{ {
"url": "/user/register",
"title": "注册",
"class": "block red"
},
{
"url": "/user/login/phone", "url": "/user/login/phone",
"title": "手机号登录", "title": "手机号登录",
"class": "block red" "class": "block red"
......
src/views/user/collect/index.vue
...@@ -7,12 +7,14 @@ ...@@ -7,12 +7,14 @@
</NafmHeader> </NafmHeader>
<div class="collect_content"> <div class="collect_content">
<van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad"> <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
<div class=""> <van-swipe-cell>
<div class="list">
</div> </div>
<template #right> <template #right>
<van-button square text="删除" type="danger" class="delete-button" /> <van-button square text="删除" type="danger" class="delete-button" />
</template> </template>
</van-swipe-cell>
</van-list> </van-list>
</div> </div>
......
src/views/user/feedback/index.vue
...@@ -7,8 +7,16 @@ ...@@ -7,8 +7,16 @@
<h3>{{$t('feedback.images')}}</h3> <h3>{{$t('feedback.images')}}</h3>
<div class="upload_content"> <div class="upload_content">
<van-uploader v-model="fileList" multiple :max-count="4" accept="image/*" :max-size="1024 * 1024" @oversize="onOversize" /> <van-uploader v-model="fileList" multiple :max-count="4" accept="image/*" :max-size="1024 * 1024" @oversize="onOversize" />
</div>
<div class="tip">{{$t('feedback.tip')}}</div> <div class="tip">{{$t('feedback.tip')}}</div>
</div>
<h3>单位全称</h3>
<van-field v-model="unit" placeholder="请输入单位全称" />
<h3>联系人</h3>
<van-field v-model="unit" placeholder="请输入联系人名称" />
<h3>联系方式</h3>
<van-field v-model="unit" type="tel" placeholder="请输入联系方式" />
<div class="tip">注：请您务必准确填写单位全称、联系人及联系方式，以便协会工作人员与您核实相关信息。</div>
<div class="login_btn" :class="{loginActive:isBothValue}" @click="handleSubmit">提交</div> <div class="login_btn" :class="{loginActive:isBothValue}" @click="handleSubmit">提交</div>
</div> </div>
</div> </div>
...@@ -24,6 +32,7 @@ export default { ...@@ -24,6 +32,7 @@ export default {
{ url: 'https://img01.yzcdn.cn/vant/leaf.jpg' }, { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
{ url: 'https://img01.yzcdn.cn/vant/leaf.jpg' }, { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
], ],
unit: ''
} }
}, },
computed: { computed: {
...@@ -72,7 +81,7 @@ export default { ...@@ -72,7 +81,7 @@ export default {
} }
.tip { .tip {
color: #999; color: #999;
font-size: 12px; font-size: 11px;
margin-top: 10px; margin-top: 10px;
} }
/deep/ .van-uploader__preview-image { /deep/ .van-uploader__preview-image {
......
src/views/user/login/less/login.less
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
.form_second { .form_second {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
justify-content: space-between; justify-content: flex-end;
color: #999; color: #999;
.checkbox { .checkbox {
......
src/views/user/login/loginUserName.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<van-field v-model.trim="userName" clearable type="tel" maxlength="11" :left-icon="userNameIcon" placeholder="请输入手机号" /> <van-field v-model.trim="userName" clearable type="tel" maxlength="11" :left-icon="userNameIcon" placeholder="请输入手机号" />
<van-field v-model.trim="password" clearable type="password" label="" maxlength="16" :left-icon="passwordIcon" placeholder="请输入6-16位密码" /> <van-field v-model.trim="password" clearable type="password" label="" maxlength="16" :left-icon="passwordIcon" placeholder="请输入6-16位密码" />
<div class="form_second"> <div class="form_second">
<van-checkbox v-model="checked" checked-color="#106abc" class="checkbox" shape="square" icon-size="12px">记住密码</van-checkbox> <!-- <van-checkbox v-model="checked" checked-color="#106abc" class="checkbox" shape="square" icon-size="12px">记住密码</van-checkbox> -->
<span class="forget" @click="controllForgetBox(true)">忘记密码</span> <span class="forget" @click="controllForgetBox(true)">忘记密码</span>
</div> </div>
<div class="login_btn" :class="{loginActive:isBothValue}" @click="handleLogin">登 录</div> <div class="login_btn" :class="{loginActive:isBothValue}" @click="handleLogin">登 录</div>
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
type: 'phone' type: 'phone'
}, },
type: 'phone', type: 'phone',
checked: false, // checked: false,
userNameIcon: require('@/assets/icon/user.png'), userNameIcon: require('@/assets/icon/user.png'),
passwordIcon: require('@/assets/icon/password.png'), passwordIcon: require('@/assets/icon/password.png'),
actionsForget: [{ name: '手机号找回', key: 'phone' }, { name: '邮箱找回', key: 'email' }], actionsForget: [{ name: '手机号找回', key: 'phone' }, { name: '邮箱找回', key: 'email' }],
......
src/views/user/login/register.vue
...@@ -20,6 +20,14 @@ ...@@ -20,6 +20,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="register_agreement">
<div class="agreement_content">
<van-checkbox v-model="checked" checked-color="#106abc" class="checkbox" shape="square" icon-size="12px">
用户注册即代表同意
</van-checkbox>
<router-link to="">《用户协议及隐私政策》</router-link>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -44,11 +52,12 @@ export default { ...@@ -44,11 +52,12 @@ export default {
VerificationIcon: require('@/assets/icon/verification.png'), VerificationIcon: require('@/assets/icon/verification.png'),
passwordIcon: require('@/assets/icon/password.png'), passwordIcon: require('@/assets/icon/password.png'),
emptyIcon: require('@/assets/icon/empty.png'), emptyIcon: require('@/assets/icon/empty.png'),
checked: false
} }
}, },
computed: { computed: {
isBothValue() { isBothValue() {
if (this.phone && this.verification && this.password && this.aginPassword) { if (this.phone && this.verification && this.password && this.aginPassword && this.checked) {
return true return true
} else { } else {
return false return false
...@@ -86,8 +95,20 @@ export default { ...@@ -86,8 +95,20 @@ export default {
return return
} }
// todo 请求接口 if (!this.checked) {
Toast('选勾选用户协议及隐私政策')
return
}
// todo 请求接口 注册成功 查询用户信息 并且完成登录操作
console.log(1) console.log(1)
this.$router.push({
path: '/user/person',
query: {
status: 'first'
}
})
}, },
// 跳转到登录页面 // 跳转到登录页面
jumpLoginPage() { jumpLoginPage() {
...@@ -115,8 +136,25 @@ export default { ...@@ -115,8 +136,25 @@ export default {
.go_login_btn { .go_login_btn {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
justify-content:center ; justify-content: center;
color: #106ABC; color: #106abc;
font-size: 13px; font-size: 13px;
} }
.register_agreement {
width: 384px;
display: flex;
flex: 1;
flex-direction: row;
align-items: flex-end;
margin-bottom: 30px;
justify-content: center;
a {
color: #106abc;
}
}
.agreement_content {
display: flex;
flex-direction: row;
align-items: center;
}
</style> </style>
\ No newline at end of file \ No newline at end of file
src/views/user/nationality/index.vue 0 → 100644
<template>
<div class="nationality_container">
{{$t('person.nickName')}}
<NafmHeader :title="$t('title.nationality')" navClass="nafmii-head-bg3">
<template #bottom>
<van-search v-model="keyword" class="common_search" :placeholder="$t('person.country')" />
</template>
</NafmHeader>
<div class="search_content" ref="searchContent" v-show="keyword">
<ul>
<li class="search_item" v-for="(item,index) of list" :key="index" @click="handleCountryClick(item.cityName)">{{item.cityName}}</li>
<li class="search_item" v-show="hasNoData">没有搜索到匹配内容</li>
</ul>
</div>
<div class="city-area" ref="cityarea">
<van-index-bar :sticky="false" @select="handleSelect">
<div class="city-area-list" v-for="(item,key) in countryList" :key="key">
<van-index-anchor :index="key">{{key}}</van-index-anchor>
<van-cell v-for="(innerItem,Index) in item " :key="Index" :title="innerItem.cityName" @click="handleCountryClick(innerItem.cityName)"></van-cell>
</div>
</van-index-bar>
</div>
</div>
</template>
<script>
import BScroll from 'better-scroll'
import SearchFirst from '@/components/SearchFirst.vue'
import data from './city.json'
export default {
name: 'Nationality',
components: {
SearchFirst
},
data() {
return {
keyword: '',
list: [],
countryList: {},
}
},
computed: {
hasNoData() {
return !this.list.length
}
},
watch: {
keyword() {
// console.log('keyword', this.keyword)
if (!this.keyword) {
this.list = []
return false
}
const result = []
for (const i in this.countryList) {
this.countryList[i].forEach(value => {
if (value.cityName.indexOf(this.keyword) > -1 || value.cityPinyin.indexOf(this.keyword) > -1) {
result.push(value)
}
})
}
this.list = result
},
countryList() {
setTimeout(() => {
this.$refs.cityarea.style.height = document.documentElement.clientHeight - this.$refs.cityarea.getBoundingClientRect().top - 10 + "px";
this.InsertElementBuildIos();
}, 1000)
}
},
mounted() {
this.scroll = new BScroll(this.$refs.searchContent, {
click: true
})
this.countryList = data.list[0]
},
methods: {
//修改a-z列表在ios中fixed未脱离文档流bug
InsertElementBuildIos() {
let li = document.querySelector(".nationality_container");
let el = document.querySelector(".van-index-bar__sidebar");
li.insertBefore(el, li.firstChild);
},
jumpPage() {
},
// 字母选择
handleSelect(value) {
let cityDom = document.querySelector(".city-area");
cityDom.scrollTop += 5;
},
//
handleCountryClick(value) {
console.log('value', value)
// 接口请求 返回上页
this.$router.back()
}
}
}
</script>
<style lang="less" scoped>
@import "~@/assets/css/search.less";
.nationality_container {
height: 100vh;
}
.search_content {
overflow: hidden;
position: absolute;
top: 94px;
left: 0;
right: 0;
bottom: 0;
background: #f7f7f7;
z-index: 9;
.search_item {
line-height: 35px;
padding-left: 35px;
border-bottom: 1px solid #efefef;
background: #fff;
color: #666;
}
}
.city-area {
overflow: hidden;
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
}
/deep/ .van-index-bar__sidebar {
top: 55%;
right: 10px;
}
/deep/ .van-index-bar__index {
font-size: 10px;
width: 15px;
height: 15px;
text-align: center;
margin-bottom: 2px;
padding: 0;
}
/deep/ .van-index-bar__index--active {
color: #fff;
background: #5594e5;
padding: 2px;
border-radius: 50%;
}
</style>
\ No newline at end of file \ No newline at end of file
src/views/user/person/index.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<span v-else>{{$t('person.namePlaceholder')}}</span> <span v-else>{{$t('person.namePlaceholder')}}</span>
</template> </template>
</van-cell> </van-cell>
<van-cell :title="$t('person.nationality')" center is-link value-class="right_content"> <van-cell :title="$t('person.nationality')" center is-link value-class="right_content" @click="jumpNationality">
<template #default> <template #default>
<span v-if="nationality">{{nationality}}</span> <span v-if="nationality">{{nationality}}</span>
<span v-else>{{$t('person.nationalityPlaceholder')}}</span> <span v-else>{{$t('person.nationalityPlaceholder')}}</span>
...@@ -54,8 +54,9 @@ ...@@ -54,8 +54,9 @@
<van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="selectBirthday" @cancel="showPicker = false" /> <van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="selectBirthday" @cancel="showPicker = false" />
</van-popup> </van-popup>
<van-popup v-model="showPhoto" position="bottom" style="height:100%"> <van-popup v-model="showPhoto" position="bottom" style="height:100%">
<UpdatePhoto v-if="showPhoto" :file="previewImg" @close="showPhoto=false" @upDataPhoto="headerIcon=$event" /> <UpdatePhoto v-if="showPhoto" :file="previewImg" @close="showPhoto = false" @upDataPhoto="headerIcon=$event" />
</van-popup> </van-popup>
<div class="finish" v-if="showFinish" @click="jumpPageIndex">完成</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -76,13 +77,22 @@ export default { ...@@ -76,13 +77,22 @@ export default {
maxDate: new Date(2220, 11, 1), maxDate: new Date(2220, 11, 1),
currentDate: new Date(), currentDate: new Date(),
showPhoto: false, showPhoto: false,
previewImg: null previewImg: null,
showFinish: false
} }
}, },
components: { components: {
UpdatePhoto UpdatePhoto
}, },
mounted() {
// 如果从注册跳转过来到 那么要显示 “完成” 按钮
const { status } = this.$route.query
if (status) {
this.showFinish = true
}
},
methods: { methods: {
// 跳转 昵称、姓名、邮箱 设置页面
editCommon(title, value) { editCommon(title, value) {
this.$router.push({ this.$router.push({
path: '/user/commonEdit', path: '/user/commonEdit',
...@@ -92,6 +102,7 @@ export default { ...@@ -92,6 +102,7 @@ export default {
} }
}) })
}, },
// 控制生日弹出框到展示和隐藏
openBirthday(value) { openBirthday(value) {
this.showPicker = value this.showPicker = value
}, },
...@@ -113,6 +124,18 @@ export default { ...@@ -113,6 +124,18 @@ export default {
// 为了解决相同图片 不触发 change事件 所以要清空file的value值 // 为了解决相同图片 不触发 change事件 所以要清空file的value值
this.$refs.file.value = '' this.$refs.file.value = ''
},
// 点击完成 跳转到 我的
jumpPageIndex() {
this.$router.push({
path: '/user/center'
})
},
// 跳转到 国籍列表页面
jumpNationality() {
this.$router.push({
path: '/user/nationality'
})
} }
} }
} }
...@@ -132,4 +155,15 @@ export default { ...@@ -132,4 +155,15 @@ export default {
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
} }
.finish {
margin-top: 33px;
width: 100%;
height: 45px;
display: flex;
justify-content: center;
align-items: center;
font-size: 18px;
color: #1170bf;
background: #fff;
}
</style> </style>
\ No newline at end of file \ No newline at end of file
yarn.lock
...@@ -1928,6 +1928,14 @@ babel-plugin-polyfill-regenerator@^0.2.0: ...@@ -1928,6 +1928,14 @@ babel-plugin-polyfill-regenerator@^0.2.0:
dependencies: dependencies:
"@babel/helper-define-polyfill-provider" "^0.2.0" "@babel/helper-define-polyfill-provider" "^0.2.0"
babel-runtime@^6.0.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.11.0"
balanced-match@^1.0.0: balanced-match@^1.0.0:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
...@@ -1963,6 +1971,13 @@ bcrypt-pbkdf@^1.0.0: ...@@ -1963,6 +1971,13 @@ bcrypt-pbkdf@^1.0.0:
dependencies: dependencies:
tweetnacl "^0.14.3" tweetnacl "^0.14.3"
better-scroll@^1.15.2:
version "1.15.2"
resolved "https://registry.yarnpkg.com/better-scroll/-/better-scroll-1.15.2.tgz#65ffc6058b8b4ff337b8dfad4bcb334d7699ceb6"
integrity sha512-sSY2N8I9/B+YX/9JpIz6pMQYnmBuvspBqZG4UxYaQEfz/ZWrnxwdyKLL4t6IKpFmxqtZadVypXw7vSSHxBZpBQ==
dependencies:
babel-runtime "^6.0.0"
bfj@^6.1.1: bfj@^6.1.1:
version "6.1.2" version "6.1.2"
resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f" resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f"
...@@ -2813,6 +2828,11 @@ core-js-compat@^3.6.5, core-js-compat@^3.9.0, core-js-compat@^3.9.1: ...@@ -2813,6 +2828,11 @@ core-js-compat@^3.6.5, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
browserslist "^4.16.4" browserslist "^4.16.4"
semver "7.0.0" semver "7.0.0"
core-js@^2.4.0:
version "2.6.12"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.6.5, core-js@^3.8.3: core-js@^3.6.5, core-js@^3.8.3:
version "3.11.0" version "3.11.0"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.0.tgz#05dac6aa70c0a4ad842261f8957b961d36eb8926" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.0.tgz#05dac6aa70c0a4ad842261f8957b961d36eb8926"
...@@ -7379,6 +7399,11 @@ regenerate@^1.4.0: ...@@ -7379,6 +7399,11 @@ regenerate@^1.4.0:
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
regenerator-runtime@^0.11.0:
version "0.11.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
regenerator-runtime@^0.13.4: regenerator-runtime@^0.13.4:
version "0.13.7" version "0.13.7"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!