diff --git a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue index 5f174e2..de4e53e 100644 --- a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue +++ b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue @@ -41,7 +41,7 @@
*身份证号
-
*地区
+
*地区(本地人员填户籍所在地,外地人员填常住地)
@@ -324,6 +324,10 @@ export default { .red { color: #FF4466; } + .mini-text { + color: #999; + font-size: 24px; + } } .input { diff --git a/src/project/qujing/AppMine/userInfo.vue b/src/project/qujing/AppMine/userInfo.vue index 1fe9368..6f3e219 100644 --- a/src/project/qujing/AppMine/userInfo.vue +++ b/src/project/qujing/AppMine/userInfo.vue @@ -4,46 +4,66 @@

头像

- +
+ + +

用户昵称

-
-
{{ user.nickName }}
+
+

{{ user.nickName }}

- +

手机号

-
-

{{ user.phone || '' }}

+
+

{{ user.phone || ''}}

- +
-
+ +

姓名

-
{{ user.realName || '' }}
+
+

{{ user.realName || '' }}

+
+

身份证号

-
{{ user.idNumber || '' }}
+
+

{{ user.idNumber || '' }}

+
+

地区

-
{{ user.areaName || '' }}
+
+

{{ user.areaName || '' }}

+
+ +
+ {{ userAreaName }} + 请选择 + +
+
+
-
-
- -
+
+ {{ btnText? '提交': '修改' }}
@@ -53,64 +73,106 @@ import {mapActions, mapState} from 'vuex' export default { name: "userInfo", - appName: "个人中心", computed: { - ...mapState(['token']), - nickName: { - set(v) { - this.userName = v - }, - get() { - const {nickName} = this.user - return nickName - } - }, - phone: { - set(v) { - this.userPhone = v - }, - get() { - const { phone } = this.user - return phone - } - } + ...mapState(['user', 'token']), }, - onLoad() { - uni.setNavigationBarTitle({ + onLoad(o) { + this.isFromTabbar = o.isFromTabbar + this.path = o.path + this.getUserInfo('qujing') + uni.setNavigationBarTitle({ title: '个人中心' }) - uni.setNavigationBarColor({ - frontColor: "#000000", - backgroundColor: "#F4F6FA", - }) - this.getUserInfo() }, data() { return { + editAvatarUrl: false, editNickName: false, - user: {}, editPhone: false, + editRealName: false, + editIdNumber: false, + editArea: false, avatar: '', userName: '', - userPhone: '' + userPhone: '', + userRealName: '', + userIdNumber: '', + userAreaId: '', + userAreaName: '', + btnText: false, + isFromTabbar: '', + path: '', } }, methods: { - ...mapActions(['autoLogin']), - updateInfo() { - this.$instance.post(`/app/appwechatuser/update-nickName`, null, { - params: { - id: this.user.id, - nickName: this.userName ? this.userName : this.user.nickName, - avatarUrl: this.avatar ? this.avatar : this.user.avatarUrl, - phone: this.userPhone ? this.userPhone : this.user.phone, - areaId: this.userAreaId? this.userAreaId : this.user.areaId, - areaName: this.userAreaName ? this.userAreaName : this.user.areaName, - } - }).then(res => { - if (res?.code == 0) { + ...mapActions(['getUserInfo', 'autoLogin']), + editBtn() { + this.btnText = true + this.editAvatarUrl = true; + this.avatar = this.user.avatarUrl + this.editNickName = true; + this.userName = this.user.nickName + this.editPhone = true; + this.userPhone = this.user.phone + this.editRealName = true; + this.userRealName = this.user.realName + this.editIdNumber = true; + this.userIdNumber = this.user.idNumber + this.editArea = true + this.userAreaId = this.user.areaId + this.userAreaName = this.user.areaName + }, + submit() { + if(this.flag) return + // if(!this.avatar) { + // return this.$u.toast('请上传头像') + // } + // if (!this.userName) { + // return this.$u.toast('请输入用户昵称') + // } + // if (this.userName == '微信用户') { + // return this.$u.toast('请修改用户昵称') + // } + // if (!this.userPhone) { + // return this.$u.toast('请输入手机号') + // } + if (!this.userRealName) { + return this.$u.toast('请输入姓名') + } + if (!this.userIdNumber) { + return this.$u.toast('请输入身份证号') + } + if (!this.$idCardNoUtil.checkIdCardNo(this.userIdNumber)) { + return this.$u.toast('请输入正确的身份证号码') + } + if (!this.userAreaId) { + return this.$u.toast('请选择地区') + } + + this.flag = true + this.$instance.post(`/app/appwechatuserqujing/idNumberEdit`, { + avatarUrl: this.avatar, + nickName: this.userName, + phone: this.userPhone, + name: this.userRealName, + idNumber: this.userIdNumber, + areaId: this.userAreaId, + areaName: this.userAreaName + }).then(res=> { + if(res?.code==0) { this.$u.toast('提交成功') + this.autoLogin({ loginWay:'qujing'}) + uni.$emit('auth') + setTimeout(() => { + if (this.isFromTabbar == 1) { + uni.switchTab({ url: this.path }) + } else { + uni.navigateBack() + } + }, 600); } + }).catch(err=> { + this.$u.toast(err.msg) }) }, upLoad(img) { @@ -133,54 +195,31 @@ export default { }) }) }, - onLogout() { - uni.showModal({ - title: '提示', - content: "是否要退出登录", - success: res => { - if (res.confirm) { - this.$store.commit('logout') - this.$toast('退出成功'); - setTimeout(() => { - uni.switchTab({ - url: '/pages/AppMine/AppMine' - }) - }, 500) - } - } - }) - }, - handleWeixin({ detail }) { - if (detail.value) { - this.phone = detail.value - this.updateInfo() - } - setTimeout(() => { - this.getUserInfo() - }, 500) - }, handleWeixinSync({detail}) { - const {value: nickName, avatarUrl} = detail - this.autoLogin({nickName, avatarUrl}) - if (avatarUrl?.length) { - this.upLoad(avatarUrl).then(() => { - this.updateInfo() - }) + const { avatarUrl } = detail + if(avatarUrl?.length) { + this.upLoad(avatarUrl) } - if (nickName) { - this.updateInfo() - } - setTimeout(()=> { - this.getUserInfo() - }, 500) }, - getUserInfo() { - this.$instance.post(`/app/appwechatuserqujing/check`).then(res=> { - if(res?.data) { - this.user = res.data + handleSelectArea(v) { + this.userAreaName = v.areaName + this.userAreaId = v.id + }, + idNumberInput() { + if(this.userIdNumber.length == 18 && this.userRealName) { + if(!this.userAreaId) { + this.$instance.post(`/app/appresidentapplet/queryDetailByIdNumberAndName`,{ + name: this.userRealName, + idNumber: this.userIdNumber + }).then(res=> { + if(res.data && res.data.id) { + this.userAreaId = res.data.id + this.userAreaName = res.data.areaName + } + }) } - }) - }, + } + } } } @@ -189,7 +228,7 @@ export default { .page { width: 100%; - background-color: #F4F5FA; + background-color: #F5F5F5; .info-list { padding: 50px 32px 0 32px; @@ -227,6 +266,31 @@ export default { p { width: 100%; } + + .ai-area__wrapper { + display: flex; + align-items: center; + padding-left: 100px; + + span { + color: #333; + font-size: 30px; + } + + i { + color: #999; + font-size: 30px; + } + + image { + width: 16px; + height: 8px; + } + } + } + + ::v-deep .AiAreaPicker { + float: right; } .user-img-div { @@ -251,14 +315,13 @@ export default { .mar-t22 { margin-top: 44px; } + } - .login-out { - width: 100%; - font-size: 34px; - text-align: center; - font-family: PingFangSC-Regular; - color: #4181FF; - } + .login-out { + width: 100%; + font-size: 30px; + text-align: center; + color: #4181FF; } } @@ -311,12 +374,8 @@ export default { color: #197DF0; } - .editNickName { - text-align: right; - font-size: 28px; - } - .solid { - border-bottom: 1px solid #eee; + .btn-edit { + background: #FFF; } }