best_yunwei
/
ai_images
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 解决合并冲突

This commit is contained in:
yys 2026-04-15 14:06:01 +08:00
parent a26021dc1c
commit b93dd9470c
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin-ui/src/views/ai/order/index.vue
View File

@ -340,8 +340,6 @@ export default {
const value = String(str || "").trim(); const value = String(str || "").trim();
return /^https?:\/\//i.test(value); return /^https?:\/\//i.test(value);
}, },
<<<<<<< HEAD
=======
/** 已知错误码对应中文说明（与门户 VideoGen 一致） */ /** 已知错误码对应中文说明（与门户 VideoGen 一致） */
volcTaskErrorHintForCode(code) { volcTaskErrorHintForCode(code) {
const c = String(code || "").trim(); const c = String(code || "").trim();
@ -390,7 +388,6 @@ export default {
} }
return null; return null;
}, },
>>>>>>> seedance_score
// 判断是否为图片结果（与 portal-ui GeneratedAssets 一致） // 判断是否为图片结果（与 portal-ui GeneratedAssets 一致）
isImage(url) { isImage(url) {
const value = String(url || "").trim(); const value = String(url || "").trim();