From 6618757af39d34081bc94b8f4ccae22bb3d1bd98 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 22 Nov 2024 17:29:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=B5=84=E6=96=99=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/modules/user.js | 24 + components/notAuth/notAuth.vue | 26 -- components/realName/realName.vue | 60 +++ libs/Oss/upload.js | 8 +- pages.json | 17 +- pages/achievement/achievement.vue | 41 +- pages/index/index.vue | 38 +- pages/orders/orders.vue | 360 --------------- pages/person/person.vue | 116 +++-- styles/common.scss | 144 ++---- user/article/article.vue | 354 +++++++------- user/info/info.vue | 735 ++++++++++++++++++++---------- 12 files changed, 915 insertions(+), 1008 deletions(-) delete mode 100644 components/notAuth/notAuth.vue create mode 100644 components/realName/realName.vue delete mode 100644 pages/orders/orders.vue diff --git a/apis/modules/user.js b/apis/modules/user.js index 4e038d4..434d646 100644 --- a/apis/modules/user.js +++ b/apis/modules/user.js @@ -18,6 +18,10 @@ export const checkUserNameOrWorkNumber = (data) => { return post('users/users/batchProcessing/checkUserNameOrWorkNumber', data) } +export const updateUserNameOrWorkNumber = (data) => { + return post(`users/users/batchProcessing/updateUserNameOrWorkNumber?userName=${data.userName}&workNumber=${data.workNumber}`) +} + export const captcha = Config.baseURL + `users/users/user/captcha` export const queryProvince = () => { @@ -28,6 +32,22 @@ export const queryCity = (data) => { return get('nakadai/nakadai/city/queryCity', data) } +export const querySchool = () => { + return get('nakadai/nakadai/school/querySchool') +} + +export const courseDiscipline = () => { + return get('nakadai/nakadai/subject/courseDiscipline') +} + +export const courseProfessionalClass = data => { + return get('nakadai/nakadai/subject/courseProfessionalClass', data) +} + +export const courseProfessional = data => { + return get('nakadai/nakadai/subject/courseProfessional', data) +} + export const updateAvatars = url => { return post(`users/users/user/updateAvatars?url=` + url) } @@ -55,6 +75,10 @@ export const queryUserInfoDetails = () => { return get('users/users/userAccount/queryUserInfoDetails') } +export const deleteProfile = id => { + return post(`users/users/userInfo/deleteProfile?personalFileIds=` + id) +} + export const searchAllAccountsByPhone = data => { return get('users/users/user/searchAllAccountsByPhone', data) } diff --git a/components/notAuth/notAuth.vue b/components/notAuth/notAuth.vue deleted file mode 100644 index 52f9d08..0000000 --- a/components/notAuth/notAuth.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/components/realName/realName.vue b/components/realName/realName.vue new file mode 100644 index 0000000..d5ad8e5 --- /dev/null +++ b/components/realName/realName.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/libs/Oss/upload.js b/libs/Oss/upload.js index a673826..085739c 100644 --- a/libs/Oss/upload.js +++ b/libs/Oss/upload.js @@ -15,8 +15,8 @@ var policyText = { ] }; var config={ - accessid:'LTAI4FzqQHnk4rozqLZ8jCNj', - accesskey:'mveW7B1OyFoKUkHm8WsxmrjHmkJWHq', + accessid:'LTAI5tAyVqtz2ZTQwVBmGgfW', + accesskey:'S744EFNUPpcCcXM6ivGRz5qquKYHrF', osshost:'https://huoran.oss-cn-shenzhen.aliyuncs.com', policyBase64:Base64.encode(JSON.stringify(policyText)) } @@ -45,8 +45,8 @@ export default function(tempFilePaths, callback) { const ext = Util.getFileExt(tempFilePaths) const fileName = Date.now() + '.' + ext uni.uploadFile({ -　　 url: OSS.host, -　　 filePath: tempFilePaths, +　　 url: OSS.host, +　　 filePath: tempFilePaths, fileType: '', name: 'file', formData: { diff --git a/pages.json b/pages.json index 87574a1..79d6e8e 100644 --- a/pages.json +++ b/pages.json @@ -82,6 +82,15 @@ "enablePullDownRefresh": false } }, + { + "path" : "info/info", + "style" : + { + "navigationBarTitleText": "我的资料", + "enablePullDownRefresh": false + } + }, + { "path" : "setting/setting", "style" : @@ -148,14 +157,6 @@ "enablePullDownRefresh": false } } - ,{ - "path" : "scheme/scheme", - "style" : - { - "navigationBarTitleText": "方案详情", - "enablePullDownRefresh": false - } - } ] } ], diff --git a/pages/achievement/achievement.vue b/pages/achievement/achievement.vue index e97ebec..6cbf113 100644 --- a/pages/achievement/achievement.vue +++ b/pages/achievement/achievement.vue @@ -2,7 +2,7 @@ - 成绩概览 + 成绩概览 @@ -30,7 +30,7 @@ - 成绩记录明细 + 成绩记录明细 @@ -62,6 +62,8 @@ + + @@ -155,10 +157,10 @@ this.curTab = id this.initList() }, - // 提示暂未开放 - toPanel(i) { - this.$util.errMsg('功能暂未开放！') - } + // 练习跳转 + toPrac(row) { + this.$util.to(`../practiceDetail/practiceDetail?cid=${this.cid}&projectId=${row.projectId || ''}&paperId=${row.paperId || ''}`) + }, } } @@ -170,17 +172,6 @@ margin-bottom: 30rpx; background-color: #fff; } - .p-title { - display: flex; - align-items: center; - margin-bottom: 20rpx; - font-size: 28rpx; - color: #333; - .icon { - width: 44rpx; - margin-right: 8rpx; - } - } .tab-wrap { display: flex; justify-content: space-between; @@ -224,24 +215,24 @@ gap: 32rpx; .item:nth-child(1) { - background: url(https://izhixinyun.com/images/record1.png) (88% 25px) / auto no-repeat, - url(https://izhixinyun.com/images/record1.png) 0 0/100% 100% no-repeat; + background: url(https://eduvessel.com/images/occupationlab/record1.png) (88% 25px) / auto no-repeat, + url(https://eduvessel.com/images/occupationlab/record1.png) 0 0/100% 100% no-repeat; } .item:nth-child(2) { - background: url(https://izhixinyun.com/images/record2-1.png) (88% 15px) / auto no-repeat, - url(https://izhixinyun.com/images/record2.png) 0 0/100% 100% no-repeat; + background: url(https://eduvessel.com/images/occupationlab/record2-1.png) (88% 15px) / auto no-repeat, + url(https://eduvessel.com/images/occupationlab/record2.png) 0 0/100% 100% no-repeat; } .item:nth-child(3) { - background: url(https://izhixinyun.com/images/record3-1.png) (88% 20px) / auto no-repeat, - url(https://izhixinyun.com/images/record3.png) 0 0/100% 100% no-repeat; + background: url(https://eduvessel.com/images/occupationlab/record3-1.png) (88% 20px) / auto no-repeat, + url(https://eduvessel.com/images/occupationlab/record3.png) 0 0/100% 100% no-repeat; } .item:nth-child(4) { margin-right: 0; - background: url(https://izhixinyun.com/images/record4-1.png) (88% 18px) / auto no-repeat, - url(https://izhixinyun.com/images/record4.png) 0 0/100% 100% no-repeat; + background: url(https://eduvessel.com/images/occupationlab/record4-1.png) (88% 18px) / auto no-repeat, + url(https://eduvessel.com/images/occupationlab/record4.png) 0 0/100% 100% no-repeat; } .item { diff --git a/pages/index/index.vue b/pages/index/index.vue index 29999f5..a59bda7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -18,24 +18,15 @@ - - - - - - - - - - - + - - diff --git a/pages/person/person.vue b/pages/person/person.vue index b507162..bd4b697 100644 --- a/pages/person/person.vue +++ b/pages/person/person.vue @@ -4,9 +4,7 @@ - + {{ info.userName }} @@ -16,7 +14,7 @@ - + 我的资料 @@ -38,6 +36,25 @@ + + + + 退出当前账号？ + + + + {{ info.userName }} + {{ info.schoolName }} + + + + 取消 + 确认 + + + + + @@ -70,38 +87,27 @@ schoolName: r.schoolName || '' } }, - // 上传头像回调 - onChooseAvatar(e) { - OSS(e.detail.avatarUrl, ({ url }) => { - updateAvatars(url).then(res => { - this.getInfo() - }).catch(e => {}) - }) - }, - // 创建自己的团队 - createTeam() { - this.$util.to(`../reg/reg?openid=${uni.getStorageSync('openid')}&phone=${this.my.info.phone}&my=1`) - }, - // 进入设置 - toSet() { - this.$util.to(`/team/setting/setting`) - }, // 退出登录 logout() { + this.$refs.logout.open() + return const that = this uni.showModal({ title: '提示', content: '确定要退出账号吗？', success(res) { if (res.confirm) { - uni.clearStorageSync() - uni.reLaunch({ - url: '/pages/login/login' - }) + that.logoutSubmit() } } }) }, + logoutSubmit() { + uni.clearStorageSync() + uni.reLaunch({ + url: '/pages/login/login' + }) + }, } } @@ -129,19 +135,12 @@ padding: 26rpx 34rpx; background-color: #fff; border-radius: 16rpx; - .avatar-btn { - padding: 0; - margin: 0 28rpx 0 0; - line-height: 0; - border: 0 !important; - background-color: transparent; - outline: none; - border-radius: 50%; - } .avatar { width: 120rpx; height: 120rpx; + margin-right: 30rpx; border: 0; + border-radius: 50%; } .text { margin-right: 20rpx; @@ -195,13 +194,48 @@ color: #333; } } -.location { - margin-top: 30rpx; -} -.picker-wrap { - margin-top: 4px; -} -.name { - font-size: 24rpx; + +.logout-wrap { + width: 520rpx; + padding-top: 30rpx; + background-color: #fff; + border-radius: 20rpx; + .user { + display: flex; + justify-content: center; + align-items: center; + padding: 30rpx 20rpx; + .avatar { + width: 60rpx; + height: 60rpx; + margin-right: 20rpx; + } + .name { + font-size: 24rpx; + } + .dep { + max-width: 500rpx; + font-size: 24rpx; + } + } + .tips { + font-size: 32rpx; + text-align: center; + } + + .btns { + display: flex; + text-align: center; + border-top: 1px solid #eee; + .btn { + flex: 1; + padding: 16rpx; + font-size: 24rpx; + color: #007EFF; + &:first-child { + border-right: 1px solid #eee; + } + } + } } diff --git a/styles/common.scss b/styles/common.scss index 8a817e6..a3c82cb 100644 --- a/styles/common.scss +++ b/styles/common.scss @@ -15,9 +15,8 @@ ul { } } .block { - padding: 0 24rpx; - margin: 20rpx 24rpx; - border-radius: 16rpx; + padding: 24rpx 24rpx 0; + margin-bottom: 20rpx; background-color: #fff; } .ell { @@ -40,6 +39,17 @@ ul { background-color: #4876F9; } } +.p-title { + display: flex; + align-items: center; + margin-bottom: 20rpx; + font-size: 28rpx; + color: #333; + .icon { + width: 44rpx; + margin-right: 8rpx; + } +} @mixin sort { margin: 0 20rpx 0 10rpx; &:before { @@ -78,10 +88,9 @@ ul { } } .form-list { - border-top: 1px solid #E6E8ED; .line { + position: relative; display: flex; - justify-content: space-between; align-items: center; padding: 28rpx 0; border-bottom: 1px solid #E6E8ED; @@ -93,14 +102,17 @@ ul { font-size: 28rpx; color: #999; } - .name, .val, input { + .name { + width: 200rpx; + font-size: 26rpx; + color: #616161; + } + .val, input { font-size: 28rpx; color: #333; } input { flex: 1; - margin-left: 20rpx; - text-align: right; } .req { .name:after { @@ -123,9 +135,30 @@ ul { margin-right: 10rpx; } } + .arrow { + position: absolute; + top: 24rpx; + right: 20rpx; + } + .action { + position: absolute; + top: 24rpx; + right: 20rpx; + font-size: 26rpx; + color: #3394f7; + } } -.picker-input .input-value-border { - line-height: 1; +.picker-input { + .input-value-border { + padding-left: 0; + line-height: 1; + border: 0; + } + .selected-list { + padding-left: 0; + } +} +.picker-date .uni-date-x--border { border: 0; } .tab { @@ -148,11 +181,6 @@ ul { @include sort; } } -.plus { - position: fixed; - bottom: 40rpx; - right: 40rpx; -} .popup-mask { z-index: 9; @@ -194,49 +222,6 @@ ul { } } } -.type-popup { - z-index: 10; - position: fixed; - top: 100%; - left: 0; - width: 100%; - height: 100%; - padding: 10rpx; - background-color: #fff; - transition: .3s; - overflow: auto; - &.active { - top: 0; - } - .close { - position: absolute; - top: 50rpx; - right: 50rpx; - } - .title { - margin: 150rpx 20rpx 30rpx; - font-size: 30rpx; - color: #333; - } - .types { - display: flex; - flex-wrap: wrap; - } - .item { - width: calc((100% - 80rpx) / 3); - margin: 10rpx; - font-size: 28rpx; - line-height: 3; - text-align: center; - color: #1f1f1f; - background-color: #dbebff; - border-radius: 2px; - &.active { - color: #fff; - background-color: #007EFF; - } - } -} .btn-wrap { z-index: 10; position: fixed; @@ -259,47 +244,4 @@ ul { border-radius: 10rpx; background-color: #007EFF; } -} -.per-mask { - z-index: 1000; - position: fixed; - top: 0; - left: 0; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - width: 100%; - height: 100%; - -webkit-user-drag: none; - -webkit-user-select: none; - user-select: none; - .mask { - position: relative; - width: 100%; - height: 100%; - filter: blur(10px); - } - .texts { - position: absolute; - top: 50%; - transform: translateY(-50%); - width: 100%; - text-align: center; - } - .text { - margin-bottom: 40rpx; - font-size: 28rpx; - color: #333; - } - .qrcode { - width: 78%; - } -} - -.not-auth { - height: 100vh; - padding-bottom: 0 !important; - overflow: hidden; - filter: blur(10px); } \ No newline at end of file diff --git a/user/article/article.vue b/user/article/article.vue index 4df5fff..b5acd2b 100644 --- a/user/article/article.vue +++ b/user/article/article.vue @@ -1,212 +1,222 @@ diff --git a/user/info/info.vue b/user/info/info.vue index 1674629..a6898dd 100644 --- a/user/info/info.vue +++ b/user/info/info.vue @@ -1,285 +1,546 @@