From f37d6fa3cdbf0ae38d7b1172102aededcb497a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=9F=E5=B1=B1?= <2479583912@QQ.COM>
Date: Wed, 15 Oct 2025 20:10:06 +0000
Subject: [PATCH] Resolve merge conflicts and  Add local avatar upload feature
 for author page

---
 client/components/covers/AuthorImage.vue       |  4 ++++
 client/components/modals/authors/EditModal.vue | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/client/components/covers/AuthorImage.vue b/client/components/covers/AuthorImage.vue
index 084492b0c..06fb88c01 100644
--- a/client/components/covers/AuthorImage.vue
+++ b/client/components/covers/AuthorImage.vue
@@ -57,6 +57,7 @@ export default {
     }
   },
   methods: {
+<<<<<<< Updated upstream
     imageLoaded() {
       if (this.$refs.img) {
         var { naturalWidth, naturalHeight } = this.$refs.img
@@ -69,6 +70,9 @@ export default {
         }
       }
     }
+=======
+    imageLoaded() {}
+>>>>>>> Stashed changes
   },
   mounted() {}
 }
diff --git a/client/components/modals/authors/EditModal.vue b/client/components/modals/authors/EditModal.vue
index a4a5a7e71..8645e5015 100644
--- a/client/components/modals/authors/EditModal.vue
+++ b/client/components/modals/authors/EditModal.vue
@@ -16,9 +16,20 @@
           </div>
         </div>
         <div class="grow">
+<<<<<<< Updated upstream
           <form @submit.prevent="submitUploadCover" class="flex grow mb-2 p-2">
             <ui-text-input v-model="imageUrl" :placeholder="$strings.LabelImageURLFromTheWeb" class="h-9 w-full" />
             <ui-btn color="bg-success" type="submit" :padding-x="4" :disabled="!imageUrl" class="ml-2 sm:ml-3 w-24 h-9">{{ $strings.ButtonSubmit }}</ui-btn>
+=======
+          <form @submit.prevent="submitUploadCover" class="flex grow mb-2 p-2 items-center">
+            <ui-text-input v-model="imageUrl" :placeholder="$strings.LabelImageURLFromTheWeb" class="h-9 w-full" @input="onUrlInput" />
+            <label class="ml-2 sm:ml-3 w-24 h-9 flex items-center justify-center bg-gray-700 text-white rounded cursor-pointer hover:bg-gray-600">
+              <input type="file" accept="image/*" class="hidden" @change="onFileChange" />
+              {{ $strings.ButtonUpload }}
+            </label>
+            <ui-btn color="bg-success" type="submit" :padding-x="4" :disabled="!imageUrl && !selectedFile" class="ml-2 sm:ml-3 w-24 h-9">{{ $strings.ButtonSubmit }}</ui-btn>
+            <ui-btn v-if="selectedFile || previewUrl" type="button" color="bg-error" class="ml-2 sm:ml-3 w-24 h-9" small @click="clearSelection">{{ $strings.ButtonCancel }}</ui-btn>
+>>>>>>> Stashed changes
           </form>
 
           <form v-if="author" @submit.prevent="submitForm">