From c084e7b4a80ad121857995759b91253b78652be3 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Thu, 24 Aug 2023 14:06:22 +0800 Subject: [PATCH] conflect --- issus.txt | 4 +--- src/pages/login/index.vue | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/issus.txt b/issus.txt index d2ee631..ed28374 100644 --- a/issus.txt +++ b/issus.txt @@ -1,10 +1,8 @@ 1、小程序登录与H5登录差异化 2、H5支付实现问题 3、生成照片失败时的错误处理(包括退换积分、页面展示、生成历史列表的展现形式) -<<<<<<< HEAD 4、生成照片失败是否从草稿恢复 -======= (1)自动重试 (2)错误时的友好提示 (3)重试直到成功,通知用户 ->>>>>>> dev +5、百度图片审核API失效问题 \ No newline at end of file diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 0a3838b..1af2289 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -48,7 +48,7 @@