code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2026-08-06 10:57:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(buyer): 解决 Profile.vue 合并冲突标记导致的编译错误

Browse Source 
保留 getMemberMsg 安全加载用户信息逻辑，并统一使用 buyerUrl 上传接口。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
田香琪
2026-07-16 21:12:49 +08:00
parent 843134c82a
commit 9dc4829f1f
1 changed files with 191 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
buyer/src/pages/home/memberCenter/Profile.vue
View File

@@ -47,12 +47,8 @@
<el-form-item label="生日"> <el-form-item label="生日">
<el-date-picker <el-date-picker
<<<<<<< HEAD
import { commonUrl } from '@/plugins/request.js';
=======
class="profile-field" class="profile-field"
>>>>>>> 29d5ba98ff40ecd028bcd8d89bf410f952052931
type="date" type="date"
@@ -192,3 +188,4 @@ export default {
this.formItem.birthday = this.normalizeBirthday(this.formItem.birthday); this.formItem.birthday = this.normalizeBirthday(this.formItem.birthday);
},