mirror of
https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
synced 2026-08-06 10:57:26 +08:00
fix(buyer): 解决 Profile.vue 合并冲突标记导致的编译错误
保留 getMemberMsg 安全加载用户信息逻辑,并统一使用 buyerUrl 上传接口。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -47,12 +47,8 @@
|
||||
<el-form-item label="生日">
|
||||
|
||||
<el-date-picker
|
||||
<<<<<<< HEAD
|
||||
|
||||
import { commonUrl } from '@/plugins/request.js';
|
||||
=======
|
||||
class="profile-field"
|
||||
>>>>>>> 29d5ba98ff40ecd028bcd8d89bf410f952052931
|
||||
|
||||
type="date"
|
||||
|
||||
@@ -192,3 +188,4 @@ export default {
|
||||
|
||||
this.formItem.birthday = this.normalizeBirthday(this.formItem.birthday);
|
||||
|
||||
},
|
||||
Reference in New Issue
Block a user