diff --git a/public/index.html b/public/index.html index ae4844b..0418178 100644 --- a/public/index.html +++ b/public/index.html @@ -9,10 +9,12 @@ + - + + + @@ -27,4 +29,8 @@
- \ No newline at end of file + + + + + \ No newline at end of file diff --git a/src/api/login.js b/src/api/login.js index 6f41cac..c4a4551 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -123,7 +123,7 @@ export function doLoginOut() { * @description 获取图形验证码 * @returns data */ -// export const doCodeImg = -// 'https://smapitest.malls.iformall.com/C/api/user/captcha.jpg' - export const doCodeImg = - 'http://m.metavatar.cc/C/api/user/captcha.jpg' \ No newline at end of file +export const doCodeImg = + 'https://smapitest.malls.iformall.com/C/api/user/captcha.jpg' + // export const doCodeImg = + // 'http://m.metavatar.cc/C/api/user/captcha.jpg' \ No newline at end of file diff --git a/src/assets/fonts/Alimama_ShuHeiTi_Bold.ttf b/src/assets/fonts/Alimama_ShuHeiTi_Bold.ttf new file mode 100644 index 0000000..854c844 Binary files /dev/null and b/src/assets/fonts/Alimama_ShuHeiTi_Bold.ttf differ diff --git a/src/assets/fonts/Alimama_ShuHeiTi_Bold.woff b/src/assets/fonts/Alimama_ShuHeiTi_Bold.woff new file mode 100644 index 0000000..d18d91c Binary files /dev/null and b/src/assets/fonts/Alimama_ShuHeiTi_Bold.woff differ diff --git a/src/assets/fonts/Alimama_ShuHeiTi_Bold.woff2 b/src/assets/fonts/Alimama_ShuHeiTi_Bold.woff2 new file mode 100644 index 0000000..95209cc Binary files /dev/null and b/src/assets/fonts/Alimama_ShuHeiTi_Bold.woff2 differ diff --git a/src/assets/fonts/DingTalk_JinBuTi_Regular.ttf b/src/assets/fonts/DingTalk_JinBuTi_Regular.ttf new file mode 100644 index 0000000..c4efa55 Binary files /dev/null and b/src/assets/fonts/DingTalk_JinBuTi_Regular.ttf differ diff --git a/src/assets/fonts/DingTalk_JinBuTi_Regular.woff b/src/assets/fonts/DingTalk_JinBuTi_Regular.woff new file mode 100644 index 0000000..5a8efa8 Binary files /dev/null and b/src/assets/fonts/DingTalk_JinBuTi_Regular.woff differ diff --git a/src/assets/fonts/DingTalk_JinBuTi_Regular.woff2 b/src/assets/fonts/DingTalk_JinBuTi_Regular.woff2 new file mode 100644 index 0000000..c8d272a Binary files /dev/null and b/src/assets/fonts/DingTalk_JinBuTi_Regular.woff2 differ diff --git a/src/assets/fonts/Smiley_Sans_Oblique_斜体.otf b/src/assets/fonts/Smiley_Sans_Oblique_斜体.otf new file mode 100644 index 0000000..ee08095 Binary files /dev/null and b/src/assets/fonts/Smiley_Sans_Oblique_斜体.otf differ diff --git a/src/assets/fonts/Smiley_Sans_Oblique_斜体.ttf b/src/assets/fonts/Smiley_Sans_Oblique_斜体.ttf new file mode 100644 index 0000000..052a2f7 Binary files /dev/null and b/src/assets/fonts/Smiley_Sans_Oblique_斜体.ttf differ diff --git a/src/assets/fonts/Smiley_Sans_Oblique_斜体.woff b/src/assets/fonts/Smiley_Sans_Oblique_斜体.woff new file mode 100644 index 0000000..f6c6717 Binary files /dev/null and b/src/assets/fonts/Smiley_Sans_Oblique_斜体.woff differ diff --git a/src/assets/fonts/Smiley_Sans_Oblique_斜体.woff2 b/src/assets/fonts/Smiley_Sans_Oblique_斜体.woff2 new file mode 100644 index 0000000..401c93f Binary files /dev/null and b/src/assets/fonts/Smiley_Sans_Oblique_斜体.woff2 differ diff --git a/src/assets/icon/icon-loading.png b/src/assets/icon/icon-loading.png new file mode 100644 index 0000000..ba4090e Binary files /dev/null and b/src/assets/icon/icon-loading.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503..0000000 Binary files a/src/assets/logo.png and /dev/null differ diff --git a/src/components/CutImg.vue b/src/components/CutImg.vue index 21935d6..ae26933 100644 --- a/src/components/CutImg.vue +++ b/src/components/CutImg.vue @@ -173,8 +173,8 @@ export default { that .$axios({ method: 'post', - // url: `https://smapitest.malls.iformall.com/C/api/upload/awsImgUpload`, - url: `http://m.metavatar.cc/C/api/upload/awsImgUpload`, + url: `https://smapitest.malls.iformall.com/C/api/upload/awsImgUpload`, + // url: `http://m.metavatar.cc/C/api/upload/awsImgUpload`, headers: { 'content-type': 'multipart/form-data', token: AccessToken, diff --git a/src/components/editPosition.vue b/src/components/editPosition.vue index 0d49164..dce68c5 100644 --- a/src/components/editPosition.vue +++ b/src/components/editPosition.vue @@ -1,10 +1,5 @@ @@ -194,7 +195,7 @@ Vue.use(Toast); export default { data() { return { - showToast: true, + showToast: false, showDialog: false, //弹出层状态 countNum: 60, // 倒计时 countdownState: false, //倒计时状态 @@ -424,24 +425,30 @@ export default { // 忘记密码第一步,根据图片验证码和手机号获取短信 async sendPhoneCode(data) { try { + this.showToast = true; const res = await doSendPhoneCode(data); console.log(res); this.loginType = 4; + this.showToast = false; } catch (error) { console.log(error, 'error'); Toast.fail(error.message); + this.showToast = false; } }, // 忘记密码第二部,提交验证码和新密码 async updPass(data) { try { + this.showToast = true; const res = await doUpdPass(data); console.log(res); Toast.success('修改密码成功'); this.loginType = 1; + this.showToast = false; } catch (error) { console.log(error, 'error'); Toast.fail(error.message); + this.showToast = false; } }, // 提交邀请码 @@ -481,27 +488,32 @@ export default { try { //密码登录 if (this.loginType == 1) { + this.showToast = true; const res = await doLogin(loginParams); console.log(res.data.token, '登录数据'); const token = res.data.token; // 将token置入本地存储 localStorage.setItem('AccessToken', token); // 查询有无邀请码 - this.checkInviteCode(); + await this.checkInviteCode(); + this.showToast = false; } // 短信登录 if (this.loginType == 2) { + this.showToast = true; const res = await doLoginByPhone(loginParams); console.log(res, '登录数据'); const token = res.data.token; // 将token置入本地存储 localStorage.setItem('AccessToken', token); // 查询有无邀请码 - this.checkInviteCode(); + await this.checkInviteCode(); + this.showToast = false; } } catch (error) { console.log(error, 'error'); Toast.fail(error.message); + this.showToast = false; } }, @@ -561,6 +573,37 @@ export default {