diff --git a/.gitignore b/.gitignore index 403adbc..967a032 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ pnpm-debug.log* # Editor directories and files .idea .vscode +.zip *.suo *.ntvs* *.njsproj diff --git a/src/api/generateVideo.js b/src/api/generateVideo.js index d73b545..484f52d 100644 --- a/src/api/generateVideo.js +++ b/src/api/generateVideo.js @@ -43,7 +43,7 @@ export function doFindInviteCode() { */ export function getVoiceList(data) { return request({ - url: `/api/mouldPatch/voiceList?pageNum=1&pageSize=10`, + url: `/api/mouldPatch/voiceList?pageNum=1&pageSize=20`, method: 'post', data }) @@ -58,4 +58,17 @@ export function getBackGroundList() { url: `/api/mouldPatch/list?type=4&pageNum=1&pageSize=10`, method: 'get', }) +} + +/** + * @description:保存或修改用户作品 + * @param {object} data + * @return data + */ +export function saveOrUpdateUserVideo(data) { + return request({ + url: `/api/userVideo/saveOrUpdate`, + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/src/api/login.js b/src/api/login.js index 4e89463..e177707 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -47,4 +47,15 @@ export function doUpdateInviteCode(inviteCodeData) { method: 'post', data: inviteCodeData }) +} + +/** + * @description 退出登录 + * @returns data + */ +export function doLoginOut() { + return request({ + url: `/api/user/loginOut`, + method: 'get', + }) } \ No newline at end of file diff --git a/src/assets/img/loginOut.png b/src/assets/img/loginOut.png new file mode 100644 index 0000000..310cff6 Binary files /dev/null and b/src/assets/img/loginOut.png differ diff --git a/src/components/aboutUe/aboutUe.vue b/src/components/aboutUs/aboutUs.vue similarity index 100% rename from src/components/aboutUe/aboutUe.vue rename to src/components/aboutUs/aboutUs.vue diff --git a/src/components/common/tail.vue b/src/components/common/tail.vue index 8b32fff..80df4a7 100644 --- a/src/components/common/tail.vue +++ b/src/components/common/tail.vue @@ -1,14 +1,13 @@ - - diff --git a/src/components/common/top.vue b/src/components/common/top.vue index 2d36b26..10eef31 100644 --- a/src/components/common/top.vue +++ b/src/components/common/top.vue @@ -9,7 +9,7 @@
{{characters==1?'创新技术':'technology'}}
{{characters==1?'解决方案':'Solutions'}}
{{characters==1?'精选案例':'Cases'}}
-
{{characters==1?'关于我们':'About us'}}
+
{{characters==1?'关于我们':'About us'}}
-->
@@ -59,7 +59,7 @@
{{ characters == 1 ? "解决方案" : "Solutions" }}
-
+
{{ characters == 1 ? "关于我们" : "About us" }}
diff --git a/src/components/home/home.vue b/src/components/home/home.vue index b73c2b1..1cc35a4 100644 --- a/src/components/home/home.vue +++ b/src/components/home/home.vue @@ -23,7 +23,7 @@ muted="muted" loop="loop" /> -
+
打造自主数字人IP
沉淀数字资产
@@ -67,7 +67,7 @@ : "supporting multiple languages and inputs, generating digital content, bring new intelligence experience far more exciting than before ." }}
-
+
{{ characters == 1 ? "立刻体验" : "Try it now" }}
@@ -99,7 +99,7 @@ : "Provide extremely expenses saving & extendable user experience in digital content producing process." }}
-
+
{{ characters == 1 ? "立刻体验" : "Try it now" }}
@@ -149,7 +149,7 @@ : "MetaGene provides digital human with the interactive ability, the character will have intelligent interactive functions, help to deal with real world problems in the business and assistance in completing tasks." }}
-
+
{{ characters == 1 ? "了解详情" : "Read more" }}
@@ -231,7 +231,7 @@ }}
-
+
{{ characters == 1 ? "立刻体验" : "Try it now" }}
@@ -379,7 +379,7 @@ {{ characters == 1 ? "解决方案" : "Solutions" }} - +
{{ characters == 1 ? "关于我们" : "About us" }}
diff --git a/src/router/index.js b/src/router/index.js index e592dd2..c07014e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -17,9 +17,9 @@ const routes = [ component: () => import("../components/home/home"), }, { - path: '/aboutUe', - name: 'aboutUe', - component: () => import("../components/aboutUe/aboutUe"), + path: '/aboutUs', + name: 'aboutUs', + component: () => import("../components/aboutUs/aboutUs"), }, { path: '/styleAdd', diff --git a/src/utils/deepCopy.js b/src/utils/deepCopy.js new file mode 100644 index 0000000..4cc9287 --- /dev/null +++ b/src/utils/deepCopy.js @@ -0,0 +1,8 @@ +/** +* @description:使用JSON进行深度拷贝 +*/ +const deepCopy = data => { + const copyData = JSON.stringify(data) + return JSON.parse(copyData) +} +export default deepCopy \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index ce8f558..c3b6921 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -37,19 +37,22 @@ request.interceptors.response.use( router.push("/login"); Toast.fail("登录过期,请重新登录!"); return - // 其他错误 + + } else if (response.data.code == 404) { + Toast.fail("网络异常,请稍后再试"); + return Promise.reject(response.data) + } else if (response.data.code == 500) { Toast.fail("系统异常,请稍后再试"); - return Promise.reject() + return Promise.reject(response.data) + + // 其他错误 } else { - Toast.fail(response.data.message); - return Promise.reject() + return Promise.reject(response.data) } } else { // 正常返回 return response.data - // 抛出错误 - // return Promise.reject() } }, function (error) { diff --git a/src/views/login/login.vue b/src/views/login/login.vue index f67df52..97acd9c 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -247,7 +247,7 @@ export default { } }, 1000); } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } }, @@ -264,7 +264,7 @@ export default { localStorage.setItem("AccessToken", token); this.checkInviteCode(); } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } }, @@ -286,7 +286,7 @@ export default { this.$router.push("/myPage"); } } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } }, @@ -301,7 +301,7 @@ export default { Toast.success("登录成功!"); this.$router.push("/myPage"); } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } }, diff --git a/src/views/model/chooseModel.vue b/src/views/model/chooseModel.vue index d777f94..7eca870 100644 --- a/src/views/model/chooseModel.vue +++ b/src/views/model/chooseModel.vue @@ -110,7 +110,7 @@ export default { console.log(res, "获取模板列表"); this.modeList = res.data.list; } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } }, @@ -122,7 +122,7 @@ export default { const modelDetail = res.data; this.goSetPaperWork(modelDetail); } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } }, @@ -138,7 +138,7 @@ export default { }, }); } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } }, diff --git a/src/views/model/generateVideo.vue b/src/views/model/generateVideo.vue index c69fd20..335033e 100644 --- a/src/views/model/generateVideo.vue +++ b/src/views/model/generateVideo.vue @@ -14,18 +14,16 @@ v-if="soundList.length" v-for="(item, index) in soundList" :key="index" - @click="setIn('sound', item.id)" + @click="setParams('sound', item)" :class="soundIndex == item.id ? 'active' : ''" > -
+
+ +
{{ item.title }}
-
暂无可用声音
+
{{ voiceAlert }}
@@ -37,14 +35,15 @@ v-if="backGroundList.length" v-for="(item, index) in backGroundList" :key="index" - @click="setIn('backGround', item.id)" + @click="setParams('backGround', item.id)" :class="backGroundIndex == item.id ? 'active' : ''" >
+ > + +
{{ item.title }}
@@ -86,10 +85,10 @@ @@ -388,9 +401,13 @@ export default { flex-shrink: 0; border: 1px solid #00000036; border-radius: 50% 50%; + overflow: hidden; transition: all 0.5s; opacity: 0.9; - + img { + width: 100%; + height: 100%; + } &.active { border: 1px solid #000; width: 35px; @@ -453,9 +470,13 @@ export default { flex-shrink: 0; border: 1px solid #00000036; border-radius: 50% 50%; + overflow: hidden; transition: all 0.5s; opacity: 0.9; - + img { + width: 100%; + height: 100%; + } &.active { border: 1px solid #000; width: 35px; diff --git a/src/views/model/getPaper.vue b/src/views/model/getPaper.vue index 6bd4713..fa3b4fd 100644 --- a/src/views/model/getPaper.vue +++ b/src/views/model/getPaper.vue @@ -89,7 +89,7 @@ export default { const res = await getModelDetailById(id); this.modelDetail = res.data.personMould; } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } }, @@ -107,10 +107,11 @@ export default { id: res.data.id, coverImg: this.modelDetail.coverImg, paperwork: this.paperwork, + saveData: data, }, }); } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } }, diff --git a/src/views/myPage/myPage.vue b/src/views/myPage/myPage.vue index 8a149a4..9b1e999 100644 --- a/src/views/myPage/myPage.vue +++ b/src/views/myPage/myPage.vue @@ -121,7 +121,7 @@ export default { this.videoList = res.data.list; this.total = res.data.total; } catch (error) { - console.log(error); + console.log(error, "error"); Toast.fail(error.message); } },