diff --git a/miniprogram/pages/register/register.js b/miniprogram/pages/register/register.js index 00ecd92..36fc27f 100644 --- a/miniprogram/pages/register/register.js +++ b/miniprogram/pages/register/register.js @@ -28,10 +28,18 @@ Page({ }) }, - onChooseAvatar: function (e) { - if (e.detail && e.detail.avatarUrl) { - this.setData({ avatarUrl: e.detail.avatarUrl }) - } + onPickAvatar: function () { + var self = this + wx.chooseMedia({ + count: 1, + mediaType: ['image'], + sourceType: ['album', 'camera'], + success: function (res) { + if (res.tempFiles && res.tempFiles[0]) { + self.setData({ avatarUrl: res.tempFiles[0].tempFilePath }) + } + } + }) }, onNicknameInput: function (e) { diff --git a/miniprogram/pages/register/register.wxml b/miniprogram/pages/register/register.wxml index 08513c0..e740df5 100644 --- a/miniprogram/pages/register/register.wxml +++ b/miniprogram/pages/register/register.wxml @@ -7,10 +7,10 @@ 设置头像 - + 设置昵称 diff --git a/miniprogram/pages/register/register.wxss b/miniprogram/pages/register/register.wxss index 89b297f..9f7a906 100644 --- a/miniprogram/pages/register/register.wxss +++ b/miniprogram/pages/register/register.wxss @@ -21,21 +21,12 @@ margin-bottom: 12rpx; } -.avatar-btn { - background: none; - border: none; - padding: 0; - margin: 0; - line-height: normal; +.avatar-wrap { display: flex; flex-direction: column; align-items: center; } -.avatar-btn::after { - border: none; -} - .avatar-img { width: 160rpx; height: 160rpx; diff --git a/server/src/routes/user.js b/server/src/routes/user.js index 0163a58..f46fd40 100644 --- a/server/src/routes/user.js +++ b/server/src/routes/user.js @@ -50,7 +50,7 @@ router.post('/user/avatar', requireUser, upload.single('file'), wrap(async (req, ContentType: req.file.mimetype }, (err, data) => err ? reject(err) : resolve(data)) }) - const avatarUrl = 'https://' + config.cos.bucket + '.cos.' + config.cos.region + '.myqcloud.com/' + key + const avatarUrl = 'https://tx.vsai.net.cn/' + key await userDao.updateProfile(req.user.user_id, { nickname: null, avatar: avatarUrl, gender: null }) res.json(ok({ avatar: avatarUrl })) }))