diff --git a/src/assets/images/download.webp b/src/assets/images/download.webp new file mode 100644 index 0000000..cb34aae Binary files /dev/null and b/src/assets/images/download.webp differ diff --git a/src/assets/images/home-bg.webp b/src/assets/images/home-bg.webp index 1302d10..b1c7d5a 100644 Binary files a/src/assets/images/home-bg.webp and b/src/assets/images/home-bg.webp differ diff --git a/src/assets/images/join.webp b/src/assets/images/join.webp index c09559a..e9d4cdd 100644 Binary files a/src/assets/images/join.webp and b/src/assets/images/join.webp differ diff --git a/src/components/GenerateImg.vue b/src/components/GenerateImg.vue index d59712f..1b5b03f 100644 --- a/src/components/GenerateImg.vue +++ b/src/components/GenerateImg.vue @@ -233,9 +233,6 @@ const generateImage = async (options) => { mergeFetch(index) } }, 1000) - router.push({ - name: 'synthesizedResults' - }) const mergeFetch = async (index)=> { const statusRes = await Request(`face/merge/${mergeData.merge_id}/status`, {}, 'GET', true) @@ -535,6 +532,7 @@ import generateImg from '../assets/images/generate-img-bg.webp' height: 100%; border-radius: 50%; object-fit: cover; + object-position: top; } .main { height: 100%; diff --git a/src/components/HomePage.vue b/src/components/HomePage.vue index 5c8d47b..315eaa2 100644 --- a/src/components/HomePage.vue +++ b/src/components/HomePage.vue @@ -365,7 +365,7 @@ watch(() => mergeId, async (newVal) => { :class="{ 'disabled': globalStore.game_chances <= 0 }"> 立即参与
-

X{{ globalStore.game_chances }}

+

{{ globalStore.game_chances }}

@@ -510,8 +510,8 @@ watch(() => mergeId, async (newVal) => { .join-main { position: absolute; - top: 3.4vw; - right: -0.4vw; + top: 2.6vw; + right: -3.5vw; width: 13vw; } @@ -524,10 +524,6 @@ watch(() => mergeId, async (newVal) => { font-weight: 900; } -.join-main .join-value span { - padding-right: 0.2vw; -} - .item-3 { width: 21vw; bottom: 5vw; diff --git a/src/components/MyPhoto.vue b/src/components/MyPhoto.vue index dc4cc39..2a378ca 100644 --- a/src/components/MyPhoto.vue +++ b/src/components/MyPhoto.vue @@ -221,6 +221,26 @@ markers.value = [ { x: 0, y: 32, width: 50, height: 14 } ]; +// 从URL中提取文件名 +const getFileNameFromUrl = (url) => { + if (!url) return null; + return url.substring(url.lastIndexOf('/') + 1); +}; + +const downloadGenerateImg = (item)=> { + try { + const link = document.createElement('a'); + link.href = item.result_url; + link.download = getFileNameFromUrl(item.result_url) || 'downloaded-image.jpg'; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + ElMessage.success('下载成功!'); + } catch (error) { + ElMessage.success('下载失败!'); + } +} +