From 04e3add98249ce6be65f92eafcd12e1465097218 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Tue, 7 Feb 2023 16:26:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/login.vue | 93 ++++++++++++++++++++-- src/views/model/chooseModel.vue | 8 +- src/views/model/generateVideo.vue | 127 +++++++++++++++++++++++++++++- vue.config.js | 28 +++---- 4 files changed, 228 insertions(+), 28 deletions(-) diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 8d4ee42..aa9d693 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -7,7 +7,7 @@ -
+
登录邃芒
@@ -33,7 +33,7 @@
-
+
登录邃芒
@@ -72,6 +72,27 @@
+ + +
+
登录邃芒
+ + + +
请输入您的邀请码
+
+ + + 跳过 + 确定 + +
+
@@ -87,7 +108,7 @@ export default { data() { return { codeInfo: "获取验证码", - isCodeLogin: true, + loginType: 1, // 短信验证码登录 form: { phone: "", @@ -97,7 +118,7 @@ export default { phone: [ { required: true, - trigger: "change", + trigger: "blur", message: "请先输手机号", }, { @@ -123,7 +144,7 @@ export default { phone: [ { required: true, - trigger: "change", + trigger: "blur", message: "请先输手机号", }, { @@ -139,6 +160,10 @@ export default { }, ], }, + // 邀请码 + formIII: { + inviteCode: "", + }, }; }, @@ -219,13 +244,14 @@ export default { const token = res.data.data.token; localStorage.setItem("AccessToken", token); this.doFindInviteCode(); - this.$router.push("/myPage"); } }) .catch((err) => { Toast.fail(err.message); }); }, + + // 查询用户邀请码状态 doFindInviteCode() { const AccessToken = localStorage.getItem("AccessToken"); this.$axios({ @@ -238,6 +264,42 @@ export default { }) .then((res) => { console.log(res); + const status = res.data.data.status; + // 当没有邀请码时 + if (status == 0) { + this.loginType = 3; + // 有邀请码直接前往我的页面 + } else if (status == 1) { + this.$router.push("/myPage"); + } + }) + .catch((err) => { + Toast.fail(err.message); + }); + }, + // 跳过填写邀请码 + skip() { + this.$router.push("/myPage"); + }, + + // 携带邀请码跳转至我的页面 + goMyPage() { + const AccessToken = localStorage.getItem("AccessToken"); + const data = { + inviteCode: this.formIII.inviteCode, + }; + this.$axios({ + method: "post", + url: `${baseUrl}/api/inviteCode/update`, + headers: { + "Content-Type": "application/json;charset=UTF-8", + token: AccessToken, + }, + data, + }) + .then((res) => { + console.log(res); + this.$router.push("/myPage"); }) .catch((err) => { Toast.fail(err.message); @@ -335,6 +397,25 @@ export default { top: 10px; } } + .skipBtn { + position: relative; + top: 10px; + left: 70px; + right: 10px; + width: 78px; + height: 30px; + color: #fff; + font-size: 15px; + line-height: 15px; + border: none; + padding: 9px; + background-color: #0068b7; + border-radius: 3px; + margin-top: 160px; + &.skip { + background-color: #a0a0a0; + } + } .forgetPwd { position: relative; top: -10px; diff --git a/src/views/model/chooseModel.vue b/src/views/model/chooseModel.vue index d2c4aa8..a6649cb 100644 --- a/src/views/model/chooseModel.vue +++ b/src/views/model/chooseModel.vue @@ -14,10 +14,10 @@
全部模板
-
+
女性模板
-
+
男性模板
@@ -374,7 +374,7 @@ export default { border: 1px solid #00000028; padding: 8px; border-radius: 8px; - transition: all 0.5s; + transition: all 0.3s; opacity: 0.9; img { width: 150px; @@ -399,7 +399,7 @@ export default { opacity: 0; } &.active { - transform: translateY(-5px); + transform: translateY(-3px); box-shadow: #60606082 0px 2px 2px 1px; opacity: 1; .setPaper { diff --git a/src/views/model/generateVideo.vue b/src/views/model/generateVideo.vue index 044c3a2..698c58d 100644 --- a/src/views/model/generateVideo.vue +++ b/src/views/model/generateVideo.vue @@ -45,16 +45,35 @@
+
上一步
- +
+
- -
视频合成中,请稍等
+ +
视频生成中……
+
+ 请耐心等待或稍后再来,视频会保存到您的视频作品中 +
+ +
+
+
请添加微信与我们联系
+
+
或致电137******91
+ +
+
点击空白处关闭
+
@@ -74,6 +93,7 @@ export default { data() { return { isShowCover: false, + isShowMessageCover: false, show: false, soundIndex: "", backGroundIndex: "", @@ -290,7 +310,40 @@ export default { Toast.fail(err.message); }); }, + + // 查询用户邀请码状态 + doFindInviteCode() { + const AccessToken = localStorage.getItem("AccessToken"); + this.$axios({ + method: "get", + url: `${baseUrl}/api/inviteCode/find`, + headers: { + "Content-Type": "application/json;charset=UTF-8", + token: AccessToken, + }, + }) + .then((res) => { + console.log(res); + const status = res.data.data.status; + // 当没有邀请码时 + if (status == 1) { + this.submit(); + } else if (status == 0) { + this.isShowMessageCover = true; + return; + } + }) + .catch((err) => { + Toast.fail(err.message); + }); + }, + exitCover(e) { + if (e.srcElement.id != "message") { + this.isShowMessageCover = false; + } + }, }, + created() { this.coverImg = this.$route.query.coverImg; this.id = this.$route.query.id; @@ -483,6 +536,7 @@ export default { position: absolute; top: 50%; left: 50%; + width: 80%; transform: translate(-50%, -50%); img { @@ -490,9 +544,14 @@ export default { height: 80px; animation: rotation 2s linear infinite; } - .text { + .generating { font-size: 18px; color: #fff; + margin-bottom: 53px; + } + .alert { + font-size: 11.5px; + color: #fff; } } &.active { @@ -503,4 +562,64 @@ export default { opacity: 1; } } +.messageCover { + position: fixed; + top: 0; + width: 100%; + height: 100%; + background-color: #00000091; + transition: all 0.3s; + opacity: 0; + z-index: -1; + .message { + position: fixed; + top: 53%; + left: 50%; + transform: translate(-50%, -50%); + width: 272px; + height: 290px; + border-radius: 5px; + background-color: #fff; + text-align: center; + transition: all 0.3s; + + .connect { + font-size: 12px; + margin: 19px 0 10px 0; + } + .qrCode { + width: 203px; + height: 213px; + background-color: #ffffff; + border-radius: 5px; + border: solid 1px #595959; + margin: auto; + } + .phoneNum { + float: left; + font-size: 11px; + margin-top: 3px; + margin-left: 34px; + } + .close { + position: absolute; + top: 8px; + right: 15px; + font-size: 18px; + color: #000; + } + } + .clickToClose { + position: absolute; + font-size: 14px; + color: #fff; + left: 50%; + transform: translateX(-50%); + bottom: 16%; + } + &.active { + z-index: 999; + opacity: 1; + } +} diff --git a/vue.config.js b/vue.config.js index fe808c9..011312f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -47,19 +47,19 @@ module.exports = { lintOnSave: false, publicPath: './', // 打包后引用的资源路径 - configureWebpack: { - plugins: [ - //打包环境去掉console.log - new UglifyJsPlugin({ - uglifyOptions: { - compress: { - drop_console: true, //注释console - drop_debugger: true, //注释debugger - pure_funcs: ['console.log'], //移除console.log - }, - }, - }), - ], - } + // configureWebpack: { + // plugins: [ + // //打包环境去掉console.log + // new UglifyJsPlugin({ + // uglifyOptions: { + // compress: { + // drop_console: true, //注释console + // drop_debugger: true, //注释debugger + // pure_funcs: ['console.log'], //移除console.log + // }, + // }, + // }), + // ], + // } } \ No newline at end of file