From 0b395638ed5ae6ab2d7eedede065d81876aebfbc Mon Sep 17 00:00:00 2001 From: qiuyuan Date: Mon, 4 Aug 2025 10:15:46 +0800 Subject: [PATCH] 11 --- pages/activeDetail/index.vue | 1003 +++++++++++++++------------------- pages/mine/index.vue | 110 ++-- 2 files changed, 508 insertions(+), 605 deletions(-) diff --git a/pages/activeDetail/index.vue b/pages/activeDetail/index.vue index 9e0c2c5..21b3144 100644 --- a/pages/activeDetail/index.vue +++ b/pages/activeDetail/index.vue @@ -1,578 +1,451 @@ - - - - - \ No newline at end of file diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 12d8fa3..fc8bb00 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -85,12 +85,18 @@ - - - 社区电话： - {{communityPhone}} - + + + 社区电话： + {{communityPhone}} + @@ -173,6 +179,9 @@ this.initData(); }, methods: { + handleCloseModal() { + this.showPhoneDialog = false; + }, // 初始化数据 async initData() { const token = uni.getStorageSync('token'); @@ -197,15 +206,18 @@ // 更新用户信息 updateUserInfo(data) { + // 显示时拼接IMAGE_BASE_URL + const avatarUrl = data.avatar ? `${IMAGE_BASE_URL}${data.avatar}` : '/static/imgs/index/nav.png'; + this.userInfo = { nickName: data.name || data.nickName || '未命名用户', - avatarUrl: data.avatar || data.avatarUrl || '/static/imgs/index/nav.png', + avatarUrl: avatarUrl, bio: data.introduce || data.bio || '这家伙很懒，什么都没有写~', phone: data.phone || '' }; // 更新显示头像 - this.displayAvatar = this.userInfo.avatarUrl || '/static/imgs/index/nav.png'; + this.displayAvatar = this.userInfo.avatarUrl; this.formData = { name: this.userInfo.nickName, @@ -366,13 +378,14 @@ // 登录完成处理 async loginComplete(data) { try { - // 获取最新用户信息 + // 获取最新用户信息 + this.showEditModal = false; const res = await get('/api/v1/app_auth/mine'); if (res && res.success) { uni.setStorageSync('userInfo', res.data); this.updateUserInfo(res.data); this.isLogin = true; - this.showEditModal = false; + // this.showEditModal = false; this.showPhoneButton = false; uni.showToast({ title: '登录成功' @@ -413,7 +426,7 @@ }); }); - if (fileInfo.size > 2 * 1024 * 1024) { + if (fileInfo.size > 3 * 1024 * 1024) { throw new Error('图片大小不能超过2MB'); } @@ -451,7 +464,7 @@ try { const res = JSON.parse(uploadRes.data); if (res && res.success) { - resolve(`${IMAGE_BASE_URL}${res.data}`); + resolve(res.data); } else { reject(new Error(res.message || '上传失败')); } @@ -506,7 +519,12 @@ name, bio } = this.formData; - const avatarUrl = this.avatarList.length > 0 ? this.avatarList[0].url : ""; + console.log("====", this.avatarList) + let avatarUrl = this.avatarList.length > 0 ? this.avatarList[0].url : ""; + + if (avatarUrl && avatarUrl.includes(IMAGE_BASE_URL)) { + avatarUrl = avatarUrl.replace(IMAGE_BASE_URL, ''); + } if (!name) { uni.showToast({ @@ -534,12 +552,13 @@ // 3. 更新本地存储和页面数据 uni.setStorageSync('userInfo', res.data); this.updateUserInfo(res.data); + this.showEditModal = false; uni.hideLoading(); uni.showToast({ title: '修改成功' }); - this.showEditModal = false; + } else { throw new Error(res.message || '获取用户信息失败'); } @@ -559,38 +578,49 @@ }, // 跳转页面 - // 跳转页面 - goPage(item) { - if (item.key === 6) { // 联系社区的特殊处理 - this.handleContactCommunity(); - return; - } - - if (item.key === 5) { // 设置的特殊处理 - this.handleEditClick(); // 调用编辑用户信息的方法 - return; - } - - if (!this.checkLogin()) { - this.showEditModal = true; - return; - } - - if (item.pageUrl) { - uni.navigateTo({ - url: `/pages/${item.pageUrl}/index` - }); - } - }, + // 跳转页面 + goPage(item) { + if (item.key === 6) { // 联系社区的特殊处理 + this.handleContactCommunity(); + + return; + } + + if (item.key === 5) { // 设置的特殊处理 + this.handleEditClick(); // 调用编辑用户信息的方法 + return; + } - // 处理联系社区点击 - handleContactCommunity() { if (!this.checkLogin()) { this.showEditModal = true; return; } - this.showPhoneDialog = true; + if (item.pageUrl) { + uni.navigateTo({ + url: `/pages/${item.pageUrl}/index` + }); + } + }, + + // 处理联系社区点击 + handleContactCommunity() { + if (!this.checkLogin()) { + this.showEditModal = true; + return; + } + + uni.showModal({ + title: '联系社区', + content: '是否要拨打社区电话：' + this.communityPhone, + confirmText: '拨打', + cancelText: '取消', + success: (res) => { + if (res.confirm) { + this.callCommunityPhone(); + } + } + }); }, // 拨打社区电话