diff --git a/src/assets/images/no-btn.webp b/src/assets/images/no-btn.webp new file mode 100644 index 0000000..adc9f32 Binary files /dev/null and b/src/assets/images/no-btn.webp differ diff --git a/src/components/MyPhoto.vue b/src/components/MyPhoto.vue index 900768a..b228927 100644 --- a/src/components/MyPhoto.vue +++ b/src/components/MyPhoto.vue @@ -37,38 +37,39 @@ const fetchImages = async () => { 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 = [