diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue index 9e6823f..a691866 100644 --- a/src/components/FirstJob/recordBill.vue +++ b/src/components/FirstJob/recordBill.vue @@ -311,7 +311,7 @@ export default { trigger: 'blur', }, ], - policy: [ + policy: [ { required: true, message: '请选择政策', @@ -351,10 +351,10 @@ export default { }, ], tel: [ - { + { required: true, - message: "请输入手机号", - trigger: "blur", + message: '请输入手机号', + trigger: 'blur', }, { pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/, @@ -613,6 +613,8 @@ export default { } else { this.$message.error(data.msg) } + this.confirmLoading = false + // setTimeout(() => { // this.confirmLoading = false; // this.form = { diff --git a/src/views/main.vue b/src/views/main.vue index 381167b..3d3ba8e 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -618,9 +618,10 @@ export default { goAdmin() { let obj = JSON.parse(localStorage.getItem('LOGIN_DATA')) + console.log(JSON.stringify(obj.user)) if (window.location.hostname == 'localhost') { // 测试环境,通过URL获取token - window.open('http://localhost:3000/#/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId) + window.open('http://localhost:3000/#/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId + '&userInfo=' + JSON.stringify(obj.user)) } else { // 正式环境,通过缓存获取 localStorage.setItem('daotian_to_admin_token', obj.token) @@ -628,18 +629,18 @@ export default { localStorage.setItem('daotian_to_admin_username', obj.user.userName ? obj.user.userName : obj.user.nickName) localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId) localStorage.setItem('daotian_to_admin_agencyid', obj.user.agencyId) - if(window.location.origin.indexOf('www') > -1){ - window.open('http://www.idaotian.com/dist2.0.0/#/merchantManagement/homePage') - }else{ - window.open('http://idaotian.com/dist2.0.0/#/merchantManagement/homePage') - } + if (window.location.origin.indexOf('www') > -1) { + window.open('http://www.idaotian.com/dist2.0.0/#/merchantManagement/homePage') + } else { + window.open('http://idaotian.com/dist2.0.0/#/merchantManagement/homePage') + } } }, goJiaofu() { let obj = JSON.parse(localStorage.getItem('LOGIN_DATA')) if (window.location.hostname == 'localhost') { // 测试环境,通过URL获取token - window.open('http://localhost:3000/#/other/delivery?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId) + window.open('http://localhost:3000/#/other/delivery?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId + '&userInfo=' + JSON.stringify(obj.user)) } else { // 正式环境,通过缓存获取 localStorage.setItem('daotian_to_admin_token', obj.token) @@ -647,11 +648,11 @@ export default { localStorage.setItem('daotian_to_admin_username', obj.user.userName ? obj.user.userName : obj.user.nickName) localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId) localStorage.setItem('daotian_to_admin_agencyid', obj.user.agencyId) - if(window.location.origin.indexOf('www') > -1){ - window.open('http://www.idaotian.com/dist2.0.0/#/other/delivery') - }else{ - window.open('http://idaotian.com/dist2.0.0/#/other/delivery') - } + if (window.location.origin.indexOf('www') > -1) { + window.open('http://www.idaotian.com/dist2.0.0/#/other/delivery') + } else { + window.open('http://idaotian.com/dist2.0.0/#/other/delivery') + } } }, },