Browse Source

修改邀请加入页面获取身份信息失败bug

jinsy 7 years ago
parent
commit
81ab8916c1

+ 1 - 0
frontend/saas-portal-web/src/components/conenter/addenterprise.vue

@@ -492,6 +492,7 @@ import { setTimeout, clearTimeout } from 'timers';
                                     document.documentElement.scrollTop = 0;
                                     let session = Session.get();
                                     session.account.realname = name;
+                                    session.account.email = email;
                                     Session.set(session);
                                     // this.$router.push({name:'company'})
                                     this.$router.push({path: '/enterprise'});

+ 12 - 31
frontend/saas-portal-web/src/components/conenter/invitation.vue

@@ -2,9 +2,7 @@
     <div class="invitation">
         <div class="zhezhao" v-if="istanchaung"></div>
         <div class="Popup" v-if="istanchaung">
-        <!-- <div class="Popup"> -->
             <div class="shang">
-                <!-- <img src="/static/img/caidian2x.png" alt=""> -->
                 <img src="/static/img/tijiao.png" alt="">
                 <img class="xs" @click="hidden" src="/static/img/assets/chahao.png" alt="">
             </div>
@@ -54,6 +52,7 @@
 <script>
 import Session from '@/utils/session'
 import { setTimeout } from 'timers';
+import { log } from 'util';
     export default {
         data(){
             return {
@@ -170,10 +169,7 @@ import { setTimeout } from 'timers';
                     let phone = this.$refs.phone.value;//手机 
                     this.$ajax({
                         url: this.$url.api+'/api/commons/share/getSmsCode'+`?mobile=${phone}`,//http://192.168.253.31:8560
-                        method:'POST',
-                        headers:{
-                            "Authorization":Session.getToken(),
-                        }
+                        method:'POST'
                     })
                     .then(res=>{
                         if (res.data.success) {
@@ -216,9 +212,6 @@ import { setTimeout } from 'timers';
                             roleId:roleid,
                             validCode:Verification,
                         },
-                        headers:{
-                            "Authorization":Session.getToken(),
-                        }
                     })
                     .then(res=>{
                         if (res.data.success) {
@@ -251,9 +244,6 @@ import { setTimeout } from 'timers';
                 let companyId = this.enterprise.companyId;
                 this.$ajax({
                     url: this.$url.api+'/api/account/role/list/'+companyId,
-                    headers:{
-                        "Authorization":Session.getToken(),
-                    }
                 })
                 .then(res=>{
                     if (res.data.success) {
@@ -261,32 +251,23 @@ import { setTimeout } from 'timers';
                     }
                 })
             },
-            //获取页面参数
-            param(){
+            //同步获取页面参数
+            param: async function () {
                 let url1 = window.location.href;
                 let param = url1.substring(url1.lastIndexOf('=')+1, url1.length);
-                this.$ajax({
+                let data = await this.$ajax({
                     url: this.$url.api+"/api/commons/share/valid/param?param="+param,
                     method:'POST',
                     headers:{
-                        "Authorization":Session.getToken(),
                         "Content-Type":"application/x-www-form-urlencoded",
                     }
-                })
-                .then(res=>{
-                    if (res.data.success) {
-                        this.enterprise = res.data.data;
-                        //获取角色
-                        setTimeout(()=>{
-                            this.role()
-                        },800)
-                    } else {
-                        this.$message.error({
-                            message:res.data.message,
-                            });
-                        this.$router.push({path:'/failure'})
-                    }
-                })
+                });
+                if (data.data.success) {
+                    this.enterprise = data.data.data;
+                    this.role();//获取角色
+                } else {
+                    this.$router.push({path:'/failure'})
+                }
             },
             //关闭弹窗
             hidden(){

File diff suppressed because it is too large
+ 0 - 0
frontend/saas-portal-web/static/js/stomp.min.js


Some files were not shown because too many files changed in this diff