From 1aeed2e31d640f9befa573acee6ac3058feda109 Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 18 Jul 2021 01:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 + src/assets/scss/index.scss | 6 + src/pages/home/Publish.vue | 4 +- src/pages/me/userinfo/AddSchool.vue | 15 ++- src/pages/me/userinfo/ChooseCity.vue | 131 +++++++++++++++++++++ src/pages/me/userinfo/ChooseLocation.vue | 114 ++++++++++++++++++ src/pages/me/userinfo/ChooseProvince.vue | 97 +++++++++++++++ src/pages/me/userinfo/ChooseSchool.vue | 4 +- src/pages/me/userinfo/EditUserInfo.vue | 70 ++++++++--- src/pages/me/userinfo/EditUserInfoItem.vue | 58 +++++++-- src/router/index.js | 6 + src/store/index.js | 8 +- 12 files changed, 481 insertions(+), 35 deletions(-) create mode 100644 src/pages/me/userinfo/ChooseCity.vue create mode 100644 src/pages/me/userinfo/ChooseLocation.vue create mode 100644 src/pages/me/userinfo/ChooseProvince.vue diff --git a/src/App.vue b/src/App.vue index 0297ae3..9a8b1db 100644 --- a/src/App.vue +++ b/src/App.vue @@ -30,6 +30,9 @@ export default { '/choose-department', '/declare-school', '/display-type', + '/choose-location', + '/choose-province', + '/choose-city', ]; const toDepth = routeDeep.indexOf(to.path) const fromDepth = routeDeep.indexOf(from.path) diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index 2b73243..b1a4da6 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -23,3 +23,9 @@ p { padding: 0; margin: 0; } + +.line { + height: 1px; + background: $line-color; + width: 100%; +} \ No newline at end of file diff --git a/src/pages/home/Publish.vue b/src/pages/home/Publish.vue index 81efc2c..becffad 100644 --- a/src/pages/home/Publish.vue +++ b/src/pages/home/Publish.vue @@ -20,7 +20,7 @@
- +
选择音乐 @@ -80,9 +80,7 @@ export default { console.log(PermissionDeniedError); }) }, - }, - } diff --git a/src/pages/me/userinfo/AddSchool.vue b/src/pages/me/userinfo/AddSchool.vue index 02ba98d..8e3c5d1 100644 --- a/src/pages/me/userinfo/AddSchool.vue +++ b/src/pages/me/userinfo/AddSchool.vue @@ -78,10 +78,14 @@ export default { let school = localStorage.getItem('changeSchool') let department = localStorage.getItem('changeDepartment') let displayType = localStorage.getItem('changeDisplayType') + let joinTime = localStorage.getItem('changeJoinTime') + let education = localStorage.getItem('changeEducation') if (school !== null) this.localSchool.name = school if (department !== null) this.localSchool.department = department if (displayType !== null) this.localSchool.displayType = ~~displayType - localStorage.clear() + if (joinTime !== null) this.localSchool.joinTime = ~~joinTime + if (education !== null) this.localSchool.education = education + // localStorage.clear() }, computed: { isChanged() { @@ -112,12 +116,14 @@ export default { }, ], callback: (indexArr, data) => { + localStorage.setItem('changeJoinTime', data[0]) this.localSchool.joinTime = ~~data[0] } }).show() }, showEducationDialog() { this.$showSelectDialog(this.educationList, e => { + localStorage.setItem('changeEducation', e.name) this.localSchool.education = e.name }) }, @@ -131,8 +137,12 @@ export default { }, back() { if (this.isChanged) { - this.$showConfirmDialog('学校信息30天内只允许修改一次,是否保存修改', this.save, this.$back) + this.$showConfirmDialog('学校信息30天内只允许修改一次,是否保存修改', this.save, () => { + localStorage.clear() + this.$back() + }) } else { + localStorage.clear() this.$back() } }, @@ -143,6 +153,7 @@ export default { this.$store.commit('setUserinfo', data) await this.$sleep(500) this.$hideLoading() + localStorage.clear() this.$back() this.$notice('修改成功') } diff --git a/src/pages/me/userinfo/ChooseCity.vue b/src/pages/me/userinfo/ChooseCity.vue new file mode 100644 index 0000000..a2959be --- /dev/null +++ b/src/pages/me/userinfo/ChooseCity.vue @@ -0,0 +1,131 @@ + + + + + \ No newline at end of file diff --git a/src/pages/me/userinfo/ChooseLocation.vue b/src/pages/me/userinfo/ChooseLocation.vue new file mode 100644 index 0000000..89960f6 --- /dev/null +++ b/src/pages/me/userinfo/ChooseLocation.vue @@ -0,0 +1,114 @@ + + + + + \ No newline at end of file diff --git a/src/pages/me/userinfo/ChooseProvince.vue b/src/pages/me/userinfo/ChooseProvince.vue new file mode 100644 index 0000000..5d873cf --- /dev/null +++ b/src/pages/me/userinfo/ChooseProvince.vue @@ -0,0 +1,97 @@ + + + + + \ No newline at end of file diff --git a/src/pages/me/userinfo/ChooseSchool.vue b/src/pages/me/userinfo/ChooseSchool.vue index 7776369..2559fbf 100644 --- a/src/pages/me/userinfo/ChooseSchool.vue +++ b/src/pages/me/userinfo/ChooseSchool.vue @@ -28,6 +28,7 @@
无法获取
+
名字
- B + {{ isEmpty(userinfo.name) }}
抖音号
- B + {{ isEmpty(userinfo.account) }}
简介
- B + {{ isEmpty(userinfo.desc) }}
性别
- B + {{ isEmpty(userinfo.sex) }}
-
- - +
生日
- B + {{ isEmpty(userinfo.birthday) }} +
-
+
所在地
- B + {{ isEmpty(userinfo.location) }}
学校
- B + {{ isEmpty(userinfo.school.name) }}
@@ -77,6 +72,9 @@ diff --git a/src/pages/me/userinfo/EditUserInfoItem.vue b/src/pages/me/userinfo/EditUserInfoItem.vue index d7334be..f75811b 100644 --- a/src/pages/me/userinfo/EditUserInfoItem.vue +++ b/src/pages/me/userinfo/EditUserInfoItem.vue @@ -1,6 +1,6 @@