From 1e4244b92d6ff1a56b637da707da813ce1a40e98 Mon Sep 17 00:00:00 2001 From: yixu Date: Tue, 23 Sep 2025 13:10:15 +0800 Subject: [PATCH] update --- src/assets/images/no-btn.webp | Bin 0 -> 11120 bytes src/components/MyPhoto.vue | 111 ++++++++++++++++++++-------------- 2 files changed, 66 insertions(+), 45 deletions(-) create mode 100644 src/assets/images/no-btn.webp diff --git a/src/assets/images/no-btn.webp b/src/assets/images/no-btn.webp new file mode 100644 index 0000000000000000000000000000000000000000..adc9f32d3b40224394c1f404dbe937c1a46fb18d GIT binary patch literal 11120 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 z zXQbCzzCxa6&~yI;`| zs`7v#G~r9X@5rBDQ}RzMmp8Etae>lNmm5vV%W85UY3O8@meSF#8f`=@k>ip82}tWZ zo*usR!l7$#5d+M&ie94paf}2!X@%G9r&(yreH*EVmRiV=nz>G&w5M^wQVj;T>b9#blGByawvf$bdO*P^tp=8}idr^4DW_ zbG(zy@7H+B)uo1r^5x^h?1ikWW}O#7HCkr*`Nu~OWxAg4Sd(Mxs#^VUf^d0~iP#J? z4Jp*SXdcmzXB=wv(On}<2Aq_@Q$g7-G8R%o zo?K~SO5adfnH&^T7n@a5TsFr;t*-Hd4}(~i<`WUfprre_e>vKWgD)tuQUcy=c}dd_ zVl{?3NGC%@D-)EWrpePqlPI6aNrX=0mWq?mH$=eM?19QO){kgKCa#j_yiZ&Ep@NH$ zls0;1UQWy?hI0liZA@ZcW_E=fmB>-A&lQBuM-VxqArDBP9;H&q$}2sHiphZoZTvQa z<1(sc0cmldj>s7SkmTi-kT^`Gse;4l;eefg?d;T*7#WLbutQ9dP@{sx>U*^b!bYmo zWTK?X@$$r}w!tzWI5?`>UXY|m8@3#(1|Bw594P~`jxkDtIki|lgubAR0hNfBmH`e9 zS)NM8>Q-K*NDPaX%ZG+;G#JZ8Y+vLmOSP)w-|4viZni&%nl z>dX!z;N@K@6$b$Tpppd0hGVLRlL3m@^QFlY(bD8oFH{HwVMLibY`UL_J;OCrhKTf( zz&gNO49AVBJFxucC13T`z!8}3CEV_<@qP7WE|l_kJ%dsVw)F7%apD#UssOb(BHn%V z@b;GS(Qr?ASM;|}5sdy24odpS{@kN0YHD}}yM~7Km_qqPw_u;4um^$XmggE6`+ZH2 z;qLmp=*4p&?CJpk8$5(N#D01;*Ham|1j80pgjzgbLmvmoH^^q&zXt|hXJ3rv0`yO3 zB_HZOh4#Z5esillr@j)0ZJaeiPbcL!E$Qui=^|55~55ac~(u$GABc!CSlcN3Okx%(cuN8tk7U8D; z?OexOPRRdJuc*$X;$J8iPh>%d{^aMBHBjB6%p#NTD*I*Yms%=CP$O$%w|?r~H!9y# zrF8N?kn|-c)@F>=AZcLrFP8f(gerDQ#R}8jdj5s1!VtL0{O?|ezdQbHG*D=`%;u?% z<97T-QHd$7Zhf>?Q62wZwTF{VJX4$X48u;;KW;zOI1|6=NLBvS&iY3#z%rcrv2h>I zW#FIk2aFjb3snX42P}&J$iEVpj#cZrp}sTuYv$>eGGS(`scLhT_U0e?6dLD_7VCQi zvO2-PZtZdwT)dSGO+NCt|Hv&7GA=69vVn2h+5foFa}$%yr|5RkNBvW~A!Nc^V_Yd% znnmd!xBtHfPyO*a$1Dr>-&=j@cjeDU4pae?ELZCb;@t0ovjTUdi{808SL=V8e+g)7 zrM89=UqU{{j4LrluPGN}I9Lj**&5N-u=I&2eld&@OmOYS*Z3FIeOXk106gN5qg7Ug zauAoBLvVXY=<4pO8=x!gYw|>7PbT`cmhoczgtH>`JcLqZ!Ph4TlI|R+oTn!j!-Hn6 z`YG6+iDQPf7)*lDSoU44IhDwYfXpA`EG22yR~B)pj$@MhmG*dWzBDQQQ9eEigza(X z?R+YxhxGO1n{?*l!IKJx{{(4rbjeq{KEpM@Hi90Y$j8QRz?a}7CPooXF*L#Sv=8JJ5rcc(Jn&6(BjFk@3+OqKy_4u1dVWEGO(Sdz(rS{>eOud%KWUx^Rn8N%6t0vm0Af zueBn!L$X=0){~fMpD+X#$-jereVd-AvdsN&mZP_H$nBZw%rQVfp#1ve5&i^(SUxRZz04f!!J}82JH=o{qke+eT|W5VgdD)yyx1-C!ESKtXS9M<(RO z?3Lo$t;$pSwe&|B`a2mn2wuk{?AREi_Z^14t-x%@fzwH@_e3%)W$xPq zu0z||D}5sVG}XE~CArE*pvD!(`Zb`U5TJQImS1yayCmcpMRQ+_J+&J}zwRHdafZ(%c722)DeQRVn$^;$7v4 zS}32ob+);7i&58@vD%8rb+|-&SB&)`+zpoRvEKfB&l1;3Ug_8@BgX$G=yKdQvy>|l zTzb2FH>jBH*tTl8oHUmw>f8`+fREt5cTm+F{$sxH3!0GVj*sy#OsJr+4VYb=84rf| z2a`R7>cA(<9m4IDWtZ5)D(QdG@WT6sXDT& zXH#c@NL|3VVNY-u9hX`WPWNn5)+lS@yxP#!x)gqLhl(6GwZW>P!<-baibV&RV!*xj zdo7J{phYxOH`k;cVJpEKk>2LU_D_>eleGWkY(@n?Pb151Fn`2zkhfe=KFGsTentx3j)=DfOIOJH<9^*@Y`@3Q4FI4u_eqO z5`#dUOH+o17m9C1HW@w>CL1-|EuroR+hPYYEAQ${^lDDjRwmsU;Crrg^J#xti69y; zHs<=^jH;nkYK+rS>_NpsqSMXMuE@UgE^qYB4jdKR^3Mpykn4O_-R3KC^Nu>}_%)}K zO%|d%s>8Rh#@xd$l`XHfYYA$(#s54vt&L2jFu&m<>K*h30_^fb4`M4vQBPp~A^3cwr%9%qBbTHuoq!j;QkWjDaAV?wzx1P z<=qW>!-^>$$~R)_De?CgGjZ(o8F%vJrqMzk+<kb#;z(XP0VGBPWQ8R;D#tfEdLEI?9aT_Q^weZPv5~!VJ9Eiqm>sH`s2>?kxk;Yo7 zh=2*Y8^IttlU^KURdl9{yk6q4oM9*U7;T{JA$9owZ3~T6M|CPO(b|`u46|kg-xYgy z8TAR+YDgOXq>~0@gNzW&P*F_T+JZF@#_Tjm$DRSU9NIPA(h>G;rxFNS*STd+W2o{= ze=v-~_r#sGkbZ6=_Yo6!q6Ii~(7+Y%O}~5n5T|IS4o`$>E#IaPX;%%A;D+Zuq!7}JIIQ|Z=Ch21aTT^Lh+%e9QBFmB-r)T~ zdXo!#@~bFBKemmwZdq^li;Yg*g-YkZ>Bl6!(f3lWTPq5m$i<=BanA1V?EaL458C+8 zENmxiX){SHBbm$V%0=HV0fUGrU+1v)jiSbzYA6gNf?B(nBwA51A6R-(+3Qf4iLLFw zPVRkNn7*(HXklSa1Q}?WSfFt4*dhnDTA2S{7LK=qG9x%y4Q2K&>mchmXbKbI;;dXn zRJ2_<1)ZM^Ea-CPWbukanv~-?u@~; zK4p)ZdgL00(Qa1B5_T$%bc`@m=xdgTo{gqd)HT z2dTkq>~B_f<^VT`AMMjg*R?^urB9hp)$J;DncbE;auZ+hi&)b+-U%rs&Fju_3{aSs z%cvxl%{+=zGk-3H@}Y$-HwRHa3vJN|pD2R?F>*x7haQNGMjBdIN#Xn&N=F!NwBZs>HIY_5B0>ImIu}plv59gX3XQ5Kd zEES(PvB#7@Jy>h4uho%hQ?gg}^W+}r&8nW)vPsKRQ1zDWUBlAHk3e~GpHzQZlhbEm zU3!-<#NTFi&o-S*;4`=RnjwRQegc4UO05Dfz5+vhS28O5@2Ia7l2OZQ-ztWGGOj+(}3r+)h-%I}3Au zT+TpCmA8}T|3LYq%_z7IEogzz>ym^A}j8fnqR5ZAB{%wS3V*>aepZ+gaCo%Jl=>px^P@ zZ@@z7Q{Q~$EeZ0;FqoA1ES_t&P!UGbz%L+!GB9OlJ0_<0?mHzSj~;%+9#!chL0WXV zdXe;0mUIP=L=iSv<)SQ<%C)nweF(42z^i5an+HjhLITgq*s)29`g>I*aIHtg2M%_W z2Izh@gPSgIHo55M+5NuQxsrsh0ySUde% z5&Pw;9ZQmglUA>0_Zrj9U6i?!`noS(m#j30YUBE;k=t1$yKNcpiS_k6pKn?`-nBFs zLSJ>kh(Dr0+})~t8k>0}+7rb^hv>!Gq?xyJMaN30?-xqMoPr3@zfN1IO;!w1VRyN& z7XB!d=qJK>dx!Ns<>1=b@e)Jzp%B1+js(qPyR_1T^BBV{xxz1IfzzY64mDyn`^Mgi zxYneN5dVpX56){Es9AU&wd`-OJ58K%rkn)$7yiOM&ZpmG8sa$c4m|IX# z@l5r^H!Tm5de)d$B7@M_JKhV{;$t7}ivN)+Th)SeYEx679hUy|JJKq@8FYzCsRTno z^6?>Vm#32stP`X#n2*pJvUEQNX{P4jCF}_WK^vUzCd;zZgq(-Y_$A8A_2OZu9Gm+j z>T8RX{Wqv*h$`n#B14GbP5(7rRi#-LC1*<> z9m`9zUNL`pHT#|LxKGjy+owN^2ywljQ3AG$jZmt(HfSZ?h4*0XafT^e87alcyn@_9 z2O { if (response.status == 200 || response.status == 201) { // 只保留result_url存在的记录 images.value = data.data.filter(item => item.result_url); - images.value = [ - { - "id": 186, - "status": "success", - "error_message": null, - "is_public": false, - "result_url": "https:\/\/lzlj123.oss-cn-shanghai.aliyuncs.com\/face-merged\/20250919\/face-merge-717b50c3-9c38-4713-929a-49d072b90ab6.jpg", - "likes_count": 0, - "created_at": "2025-09-19T04:30:26.000000Z", - "user_name": "\u4f9d\u65ed" - }, - { - "id": 155, - "status": "success", - "error_message": null, - "is_public": false, - "result_url": "https:\/\/lzlj123.oss-cn-shanghai.aliyuncs.com\/face-merged\/20250917\/face-merge-1d2ddf63-b029-48f8-b0b7-de7643dbd184.jpg", - "likes_count": 0, - "created_at": "2025-09-17T13:37:08.000000Z", - "user_name": "\u4f9d\u65ed" - }, - { - "id": 156, - "status": "success", - "error_message": null, - "is_public": false, - "result_url": "https:\/\/lzlj123.oss-cn-shanghai.aliyuncs.com\/face-merged\/20250917\/face-merge-eda32a25-4244-4041-8db8-25aeb41f5a2f.jpg", - "likes_count": 2, - "created_at": "2025-09-17T13:40:49.000000Z", - "user_name": "\u4f9d\u65ed" - } - ] + // 测试数据 + // images.value = [ + // { + // "id": 186, + // "status": "success", + // "error_message": null, + // "is_public": false, + // "result_url": "https:\/\/lzlj123.oss-cn-shanghai.aliyuncs.com\/face-merged\/20250919\/face-merge-717b50c3-9c38-4713-929a-49d072b90ab6.jpg", + // "likes_count": 0, + // "created_at": "2025-09-19T04:30:26.000000Z", + // "user_name": "\u4f9d\u65ed" + // }, + // { + // "id": 155, + // "status": "success", + // "error_message": null, + // "is_public": false, + // "result_url": "https:\/\/lzlj123.oss-cn-shanghai.aliyuncs.com\/face-merged\/20250917\/face-merge-1d2ddf63-b029-48f8-b0b7-de7643dbd184.jpg", + // "likes_count": 0, + // "created_at": "2025-09-17T13:37:08.000000Z", + // "user_name": "\u4f9d\u65ed" + // }, + // { + // "id": 156, + // "status": "success", + // "error_message": null, + // "is_public": false, + // "result_url": "https:\/\/lzlj123.oss-cn-shanghai.aliyuncs.com\/face-merged\/20250917\/face-merge-eda32a25-4244-4041-8db8-25aeb41f5a2f.jpg", + // "likes_count": 2, + // "created_at": "2025-09-17T13:40:49.000000Z", + // "user_name": "\u4f9d\u65ed" + // } + // ] const foundItem = images.value.find(item => item.is_public === true); if (foundItem) { globalStore.result_url = foundItem.result_url; @@ -108,18 +109,16 @@ const images = ref([]); import defaultBorderImage from '../assets/images/my-photo-border.webp'; import activeBorderImage from '../assets/images/my-photo-selected-border.webp'; +import inActiveBorderImage from '../assets/images/no-btn.webp'; const activeBorders = ref(images.value.map(() => false)); // 切换边框状态 const toggleBorder = (item, index) => { - openHaibao(item); - if (!globalStore.chartsBattle && item.result_url !== failedImg) { - activeBorders.value = activeBorders.value.map(() => false); - // 如果没有打榜,点击切换图片时,把当前背景图赋值给globalStore.result_url做为最新的背景图 - globalStore.result_url = item.result_url; - activeBorders.value[index] = true; - globalStore.mergeId = item.id; - } + activeBorders.value = activeBorders.value.map(() => false); + // 如果没有打榜,点击切换图片时,把当前背景图赋值给globalStore.result_url做为最新的背景图 + globalStore.result_url = item.result_url; + activeBorders.value[index] = true; + globalStore.mergeId = item.id; }; const handleDabangClick = () => { @@ -316,6 +315,18 @@ markers.value = [ { x: 0, y: 32, width: 50, height: 14 } ]; +const getBorder = (item, index) => { + if (globalStore.chartsBattle && index !== 0) { + return inActiveBorderImage; + } else { + if ((activeBorders.value[index] || (globalStore.chartsBattle && item.is_public))) { + return activeBorderImage; + } else { + return defaultBorderImage; + } + } +} + @@ -364,11 +375,11 @@ markers.value = [ 刷新 - border - + border +
@@ -388,6 +399,16 @@ markers.value = [