From 3c894c5c1b0579142450302f6830fef65bb86f6c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 22 Sep 2021 10:55:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/parser/Parser.vue | 16 ++++++++-------- src/router/index.js | 11 +++++++---- src/utils/constants.js | 3 ++- src/views/account/ForgetPwd.vue | 8 ++++---- src/views/account/login.vue | 3 ++- src/views/account/login/index.vue | 7 ++++--- src/views/account/member.vue | 18 +++++++++--------- src/views/account/register/index.vue | 8 ++++---- src/views/form/editor/DraggableItem.vue | 3 +++ src/views/form/editor/IconsDialog.vue | 2 ++ src/views/form/editor/index.vue | 16 ++++++++-------- src/views/form/index.vue | 2 +- src/views/form/logic/index.vue | 8 ++++---- src/views/form/preview/ProjectForm.vue | 7 ++++--- src/views/form/preview/index.vue | 10 +++++----- src/views/form/publish/index.vue | 6 +++--- src/views/form/setting/index.vue | 10 +++++----- src/views/form/statistics/analysis.vue | 8 ++++---- src/views/form/statistics/index.vue | 2 +- src/views/form/statistics/item.vue | 6 +++--- src/views/form/theme/index.vue | 6 +++--- src/views/form/write/index.vue | 14 +++++++------- src/views/home/index.vue | 20 +++++++++----------- src/views/project/my/index.vue | 6 +++--- src/views/project/recycle/index.vue | 6 +++--- src/views/project/template/index.vue | 6 +++--- src/views/project/template/preview.vue | 2 +- src/views/redirect.vue | 4 ++-- 28 files changed, 114 insertions(+), 104 deletions(-) diff --git a/src/components/parser/Parser.vue b/src/components/parser/Parser.vue index baf2d2c..c3818b1 100644 --- a/src/components/parser/Parser.vue +++ b/src/components/parser/Parser.vue @@ -260,11 +260,11 @@ function setValueLabel(event, config, scheme) { if (event instanceof Array) { // 多选 其他自定义输入 let labelArr = new Array() - if(!event.includes(0)){ - // 如果多选里没有选择其他，就清掉other - this.$set(this[this.formConf.labelFormModel], `${scheme.__vModel__}other`, '') - // 同时把输入框清空 - document.querySelector('.'+config.tag).querySelector(".item-other-input").value = "" + if (!event.includes(0)) { + // 如果多选里没有选择其他，就清掉other + this.$set(this[this.formConf.labelFormModel], `${scheme.__vModel__}other`, '') + // 同时把输入框清空 + document.querySelector('.' + config.tag).querySelector('.item-other-input').value = '' } event.forEach(item => { // 拼到头部 其他选项 @@ -279,14 +279,14 @@ function setValueLabel(event, config, scheme) { // 如果选择了其他，把label存在field字段，把输入框内容存在fieldother字段 let item = _.find(_.get(scheme, tagOptionKey), {'value': event}) this.$set(this[this.formConf.labelFormModel], scheme.__vModel__, item.label) - this.$set(this[this.formConf.labelFormModel], `${scheme.__vModel__}other`,this[this.formConf.labelFormModel][`${scheme.__vModel__}other`]) + this.$set(this[this.formConf.labelFormModel], `${scheme.__vModel__}other`, this[this.formConf.labelFormModel][`${scheme.__vModel__}other`]) } else { let item = _.find(_.get(scheme, tagOptionKey), {'value': event}) this.$set(this[this.formConf.labelFormModel], scheme.__vModel__, item.label) // 如果没有选择其他，就清掉other - this.$set(this[this.formConf.labelFormModel], `${scheme.__vModel__}other`,'') + this.$set(this[this.formConf.labelFormModel], `${scheme.__vModel__}other`, '') // 同时把输入框清空 - document.querySelector('.'+config.tag).querySelector(".item-other-input").value = "" + document.querySelector('.' + config.tag).querySelector('.item-other-input').value = '""' } } } else if (config.tag === 'el-upload') { diff --git a/src/router/index.js b/src/router/index.js index 757ccd1..29d4cb5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -46,16 +46,19 @@ Router.prototype.replace = function replace(location) { router.beforeEach((to, from, next) => { NProgress.start() + if (to.meta.requireLogin) { - if (store.getters['user/isLogin']) { - next() - NProgress.done() - } else if (to.query.token) { + if (to.query.token) { console.log('ro.query', to.query) + + localStorage.setItem('loginSource', 'epmet') store.dispatch('user/getUserInfo', to.query.token) store.dispatch('user/setTokens', to.query.token) next() NProgress.done() + } else if (store.getters['user/isLogin']) { + next() + NProgress.done() } else { next({ path: '/login', diff --git a/src/utils/constants.js b/src/utils/constants.js index 1798706..1788c79 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -6,5 +6,6 @@ export default { passwordRegDesc: '密码最少为6位字符', userUploadUrl: `${process.env.VUE_APP_API_ROOT}/user/file/upload`, // 启用微信功能 - enableWx: process.env.VUE_APP_WX == 'OFF' + // enableWx: process.env.VUE_APP_WX == 'OFF' + enableWx: false } diff --git a/src/views/account/ForgetPwd.vue b/src/views/account/ForgetPwd.vue index 617aa75..23bf63d 100644 --- a/src/views/account/ForgetPwd.vue +++ b/src/views/account/ForgetPwd.vue @@ -187,7 +187,7 @@ export default { if (!err) { this.emailValidateCodeBtn = true this.$api.request({ - url: '/retrieve/password/phone/code', + url: `${process.env.VUE_APP_API_ROOT_TDUCK}/retrieve/password/phone/code`, method: 'get', params: { phoneNumber: phoneNumber } }).then(() => { @@ -210,7 +210,7 @@ export default { phoneRetrievePassWordHandle() { this.$refs['phoneForm'].validate(valid => { if (valid) { - this.$api.post('/retrieve/password/check/phone-code', this.retrieveAccountForm).then(res => { + this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/retrieve/password/check/phone-code`, this.retrieveAccountForm).then(res => { if (res.data) { this.msgSuccess('验证成功') this.resetPwdForm.code = res.data @@ -224,7 +224,7 @@ export default { resetPasswordHandle() { this.$refs['resetPwdForm'].validate(valid => { if (valid) { - this.$api.post('/retrieve/password/reset', this.resetPwdForm).then(res => { + this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/retrieve/password/reset`, this.resetPwdForm).then(res => { if (res.data) { this.msgSuccess('密码重置成功，快去登录吧') setTimeout(() => { @@ -246,7 +246,7 @@ export default { this.$refs['emailForm'].validate(valid => { if (valid) { this.$api.request({ - url: '/retrieve/password/email', + url: `${process.env.VUE_APP_API_ROOT_TDUCK}/retrieve/password/email`, method: 'get', params: { email: this.retrieveAccountForm.email } }).then(() => { diff --git a/src/views/account/login.vue b/src/views/account/login.vue index 27c96af..02d1c25 100644 --- a/src/views/account/login.vue +++ b/src/views/account/login.vue @@ -375,7 +375,7 @@ export default { this.$refs['phoneRegForm'].validateField('phoneNumber', err => { if (!err) { this.phoneValidateCodeBtn = true - this.$api.get(`/register/phone/code?phoneNumber=${this.accountForm.phoneNumber}`).then(() => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/register/phone/code?phoneNumber=${this.accountForm.phoneNumber}`).then(() => { this.msgSuccess('验证码发送成功，5分钟内有效') this.phoneValidateCodeBtn = true let count = 60 @@ -442,6 +442,7 @@ export default { }) }, loginHandle() { + localStorage.setItem('loginSource', 'loginPage') this.$api.request({ url: `${process.env.VUE_APP_API_ROOT_TDUCK}/login/account`, diff --git a/src/views/account/login/index.vue b/src/views/account/login/index.vue index 0ad2f62..b311b27 100644 --- a/src/views/account/login/index.vue +++ b/src/views/account/login/index.vue @@ -154,7 +154,7 @@ export default { // 获取微信登录二维码 getLoginWxQrCode() { this.wxQrCodeLoading = true - this.$api.get('/login/wx/qrcode').then(res => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/login/wx/qrcode`).then(res => { this.wxLoginQrCode = res.data.qrCodeUrl this.wxLoginId = res.data.loginId }) @@ -166,7 +166,7 @@ export default { // qq登录授权地址 getQQLoginAuthorizeUrl() { let reUrl = getCurrentDomain() + '/redirect/qqlogin' - this.$api.get('/login/qq/authorize/url', {params: {redirectUri: reUrl}}).then(res => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/login/qq/authorize/url`, {params: {redirectUri: reUrl}}).then(res => { this.qqLoginAuthorizeUrl = res.data }) }, @@ -174,7 +174,7 @@ export default { location.href = url }, getLoginWxQrCodeResult() { - this.$api.get('/login/wx/qrcode/result', {params: {loginId: this.wxLoginId}}).then(res => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/login/wx/qrcode/result`, {params: {loginId: this.wxLoginId}}).then(res => { if (res.data) { this.loginSuccessHandle(res.data) } @@ -205,6 +205,7 @@ export default { this.loginType = 'account' }, loginHandle() { + localStorage.setItem('loginSource', 'loginPage') this.$refs['accountLoginForm'].validate(valid => { if (valid) { this.$api.request({ diff --git a/src/views/account/member.vue b/src/views/account/member.vue index bd2d868..ffeb915 100644 --- a/src/views/account/member.vue +++ b/src/views/account/member.vue @@ -299,7 +299,7 @@ export default { }, methods: { queryUserInfo() { - this.$api.get('/user/current/detail').then(res => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/current/detail`).then(res => { if (res.data) { this.userInfo = res.data this.$store.dispatch('user/update', this.userInfo).then(() => { @@ -317,14 +317,14 @@ export default { return `${process.env.VUE_APP_API_ROOT}/user/file/upload` }, getBindWxQrCode() { - this.$api.get('/user/bind/wx/qrcode').then(res => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/bind/wx/qrcode`).then(res => { this.bindWxQrcode = res.data }) }, updateUserPwdHandle() { this.$refs['updatePassWordForm'].validate(valid => { if (valid) { - this.$api.post('/user/update/password', this.userPwdForm).then(res => { + this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/update/password`, this.userPwdForm).then(res => { if (res.data) { this.msgSuccess('修改成功') this.queryUserInfo() @@ -339,7 +339,7 @@ export default { sendUpdateEmail() { this.$refs['updateEmailForm'].validateField('email', err => { if (!err) { - this.$api.get('/user/update-email/msg', {params: {email: this.userInfoForm.email}}).then(res => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/update-email/msg`, {params: {email: this.userInfoForm.email}}).then(res => { if (res.data) { this.msgSuccess('发送成功,请去您的邮箱查看') this.emailDialogVisible = false @@ -351,7 +351,7 @@ export default { sendUpdatePhoneNumber() { this.$refs['updatePhoneForm'].validateField('phoneNumber', err => { if (!err) { - this.$api.get(`/user/update-phone/code?phoneNumber=${this.userInfoForm.phoneNumber}`).then(() => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/update-phone/code?phoneNumber=${this.userInfoForm.phoneNumber}`).then(() => { this.msgSuccess('验证码发送成功，5分钟内有效') let count = 60 let timer = setInterval(() => { @@ -367,7 +367,7 @@ export default { }) }, updateUserHandle() { - this.$api.post('/user/update', this.userInfoForm).then(res => { + this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/update`, this.userInfoForm).then(res => { if (res.data) { this.msgSuccess('保存成功') this.queryUserInfo() @@ -378,7 +378,7 @@ export default { // qq登录授权地址 getQQLoginAuthorizeUrl() { let reUrl = getCurrentDomain() + '/redirect/bindqq' - this.$api.get('/login/qq/authorize/url', {params: {redirectUri: reUrl}}).then(res => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/login/qq/authorize/url`, {params: {redirectUri: reUrl}}).then(res => { this.qqLoginAuthorizeUrl = res.data }) }, @@ -388,7 +388,7 @@ export default { updateUserPhoneHandle() { this.$refs['updatePhoneForm'].validateField(['phoneNumber', 'code'], err => { if (!err) { - this.$api.post('/user/update/phone-number', this.userInfoForm).then(() => { + this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/update/phone-number`, this.userInfoForm).then(() => { this.msgSuccess('修改成功') this.queryUserInfo() }) @@ -398,7 +398,7 @@ export default { bindWxHandle() { this.bindWxDialogVisible = true this.bindWxTimer = setInterval(() => { - this.$api.get('/user/current/detail').then(res => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/current/detail`).then(res => { if (res.data) { let {wxName} = res.data if (wxName) { diff --git a/src/views/account/register/index.vue b/src/views/account/register/index.vue index edf36b7..e426b01 100644 --- a/src/views/account/register/index.vue +++ b/src/views/account/register/index.vue @@ -134,7 +134,7 @@ export default { this.$refs['emailRegForm'].validateField('email', err => { if (!err) { this.emailValidateCodeBtn = true - this.$api.get(`/register/email/code?email=${this.accountForm.email}`).then(() => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/register/email/code?email=${this.accountForm.email}`).then(() => { this.msgSuccess('验证码发送成功，5分钟内有效') this.emailValidateCodeBtn = true let count = 60 @@ -155,7 +155,7 @@ export default { this.$refs['phoneRegForm'].validateField('phoneNumber', err => { if (!err) { this.phoneValidateCodeBtn = true - this.$api.get(`/register/phone/code?phoneNumber=${this.accountForm.phoneNumber}`).then(() => { + this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/register/phone/code?phoneNumber=${this.accountForm.phoneNumber}`).then(() => { this.msgSuccess('验证码发送成功，5分钟内有效') this.phoneValidateCodeBtn = true let count = 60 @@ -175,7 +175,7 @@ export default { phoneRegHandle() { this.$refs['phoneRegForm'].validate(valid => { if (valid) { - this.$api.post('/register/phone', this.accountForm).then(() => { + this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/register/phone`, this.accountForm).then(() => { this.registerSuccessHandle() }) } else { @@ -186,7 +186,7 @@ export default { emailRegHandle() { this.$refs['emailRegForm'].validate(valid => { if (valid) { - this.$api.post('/register/email', this.accountForm).then(() => { + this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/register/email`, this.accountForm).then(() => { this.registerSuccessHandle() }) } else { diff --git a/src/views/form/editor/DraggableItem.vue b/src/views/form/editor/DraggableItem.vue index 0647fca..f466aeb 100644 --- a/src/views/form/editor/DraggableItem.vue +++ b/src/views/form/editor/DraggableItem.vue @@ -1,4 +1,6 @@ +