调试接口

frontend/saas-portal-web/config/dev.env.js

@@ -8,6 +8,7 @@ module.exports = merge(prodEnv, {
     // 前端地址
     web: '"http://192.168.0.181"',
     // 后端接口网关
+    // api: '"http://192.168.253.31:8560"',
     api: '"http://192.168.0.181:8560"',
     // 账户中心接口
     sso: '"http://192.168.253.12:32323"'

frontend/saas-portal-web/src/App.vue

@@ -13,7 +13,7 @@ export default {
   components: {
       // Headers,
       footers
-  }
+  },
 }
 </script>
 

frontend/saas-portal-web/src/components/conenter/addgongsi.vue

@@ -20,9 +20,9 @@
                         <li>
                             <span class="qy-biaoti">所属行业</span>
                             <select ref="qyindustry" style="width:71%" name="selectAge" id="selectAge">   
-                                <option value="飞飞公司">飞飞公司</option>   
-                                <option value="飞飞公司">飞飞公司</option>   
-                                <option value="飞飞公司">飞飞公司</option>   
+                                <option value="贸易类">贸易类</option>   
+                                <option value="制造类">制造类</option>   
+                                <option value="其他">其他</option>   
                             </select>
                         </li>
                         <li style="height:60px;">
@@ -93,11 +93,18 @@ import VDistpicker from 'v-distpicker'
                     this.$refs.qyno.innerHTML = '企业名不能为空';
                 } else {
                     this.$refs.qyno.innerHTML = '';
-                    this.$ajax.get("http://192.168.253.12:32323/"+`?spaceName=${qyname}`)
+                    let token = this.mytoken.token;
+                    this.$ajax({
+                        url: this.$url.api+"/api/account/accountCenter/checkSpaceName"+`?spaceName=${qyname}`,
+                        method :'get',
+                        headers: {
+                            "Authorization":token
+                        }
+                    })
                     .then(res=>{
-                        console.log(res);
-                        this.qymingzi = on;
-                        console.log(this.qymingzi)
+                        // console.log(res);
+                        // this.qymingzi = on;
+                        // console.log(this.qymingzi)
                     })
                     .catch(err=>{
                         console.log(err);

frontend/saas-portal-web/src/components/conenter/company.vue

@@ -2,11 +2,11 @@
   <div>
     <iframe hidden :src="setTokenPage"></iframe>
     <!-- 遮罩 -->
-    <div class="zhezhao"></div>
+    <div class="zhezhao" v-if="issetDefault || isOpensaas"></div>
     <!-- 设置默认弹窗 -->
-    <div class="tanchuang szmoren">
+    <div class="tanchuang szmoren" v-if="issetDefault">
       <div class="over"><img @click="guanbitc" class="right xs" src="/static/img/qiye/chahao.png" alt=""></div>
-      <div v-if="moren">
+      <div v-if="isDefault">
         <div class="tc-text tc-queren"><span>是否确认设为默认企业？</span></div>
         <div class="tc-anniu">
           <button @click="setDefault">确认</button>
@@ -19,7 +19,7 @@
       </div>
     </div>
     <!-- 开通sass服务弹窗 -->
-    <div class="tanchuang ktsass">
+    <div class="tanchuang ktsass" v-if="isOpensaas">
       <div class="over"><img @click="guanbitc" class="right xs" src="/static/img/qiye/chahao.png" alt=""></div>
       <div v-if="ktsass">
         <div class="tc-text tc-queren"><span>是否确认开通saas服务？</span></div>
@@ -46,7 +46,7 @@
       </div>
     </div>
     <!-- 开通10个不能继续开通 -->
-    <div class="tanchuang nokaitong" style="display:none">
+    <div class="tanchuang nokaitong" style="display:none" v-if="isNoopen">
       <div class="over"><img @click="guanbitc" class="right xs" src="/static/img/qiye/chahao.png" alt=""></div>
       <div>
         <div class="tc-conent"><img src="/static/img/qiye/buneng kaitong@1x.png" alt=""></div>
@@ -57,7 +57,7 @@
       </div>
     </div>
 
-        <div class="gs-qiyebox">
+        <div class="gs-qiyebox" ref="qiyebox">
             <!-- 点击查看企业详情 -->
             <div v-for="(d , i) in arr " :key="i" class="gs-xiangqing xs">
                 <div class="left gs-xqleft" @click= "getEnterpriseInfo(d)">
@@ -93,10 +93,14 @@
     export default {
         data(){
             return {
+                issetDefault: false,//设置默认
+                isOpensaas: false,//开通saas弹窗
+                isNoopen: false,//开通10个不能继续开通
                 index:0,
-                ktsass: true,//开通sass
-                moren: true,//开通默认
+                ktsass: true,//确认开通saas
+                isDefault: true,//开通默认
                 comdata: this.$store.state.data,//登录成功后的本地数据
+                isAutoLogin: this.$store.state.isAutoLogin,
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
                 arr: []//企业列表信息
             }
@@ -106,15 +110,19 @@
                 return this.$url.web + '/set-token.html'
             }
         },
+        watch:{
+            arr:function(){
+                this.$nextTick(function(){
+                    this.boxheight();
+                })
+            }
+        },
         mounted(){
-            this.boxheight();
-            // console.log("我是子路由的"+this.comdata)
             let mytoken = JSON.parse(localStorage.getItem('app-state-session'));
             let token = String(mytoken.token);
             // console.log(mytoken.account)
-            console.log(this.$url.api)
             this.$ajax({
-                    url: "/api/account/accountCenter/company/list",
+                    url: this.$url.api+"/api/account/accountCenter/company/list",
                     method: 'get',
                     params: {
                         mobile: mytoken.account.mobile
@@ -125,26 +133,36 @@
                     }
                 })
                 .then(res=>{
-                    this.arr = res.data.data
+                    this.arr = res.data.data.spaces;
+                    let hasCompany = res.data.data.hasDefaultCompany;
+                    let companyId = res.data.data.defaultCompanyId;
+                    if (this.isAutoLogin) {
+                        if (hasCompany) {
+                            this.selectServe(companyId)
+                        }
+                        this.isAutoLogin = false
+                    }
                     // console.log(res.data.data)
                 })
                 .catch(err=>{
                     console.log("请求失败",err)
                 })
+            
         },
         methods: {
             //设置默认弹窗
             showDefaultWin(i){
                 this.index = i;
-                $(".szmoren").css("display","block");
-                $(".zhezhao").css("display","block");
+                this.issetDefault = true;
+                // $(".szmoren").css("display","block");
+                // $(".zhezhao").css("display","block");
             },
             //确认默认
             setDefault(){
                 let i = this.index;
                 let token = this.mytoken.token;
                 this.$ajax({
-                    url: '/api/account/accountCenter/bind/defaultCompany',
+                    url: this.$url.api+'/api/account/accountCenter/bind/defaultCompany',
                     method: 'post',
                     data:{
                         companyId: this.arr[i].id,
@@ -157,7 +175,7 @@
                 })
                 .then(res=>{
                     // console.log('请求成功',res);
-                    this.moren = false;
+                    this.isDefault = false;
                 })
                 .catch(err=>{
                     console.log('请求失败',err);
@@ -169,7 +187,7 @@
                 let token = this.mytoken.token;
                 const frame = window.frames[window.frames.length - 1];
                 this.$ajax({
-                    url: '/api/auth/switch/company?companyId='+id,//http://192.168.253.31:8560
+                    url: this.$url.api+'/api/auth/switch/company?companyId='+id,//http://192.168.253.31:8560
                     method :'get',
                     headers: {
                         "Authorization":token
@@ -182,7 +200,7 @@
                     session.span = session.timestamp - new Date().getTime();
                     session.token=mytoken;
                     frame.postMessage(JSON.stringify(session), '*');
-                    window.location.href = me.$url.web
+                    window.location.href = this.$url.web
                 })
                 .catch(err=>{
                     console.log('请求失败',err)
@@ -191,8 +209,9 @@
             },
             //开通sass
             showOpenServeWin(){
-                $(".ktsass").css('display','block');
-                $(".zhezhao").css("display","block");
+                this.isOpensaas = true;
+                // $(".ktsass").css('display','block');
+                // $(".zhezhao").css("display","block");
                 this.ktsass = true;
             },
             confirmSaas(){//确认sass
@@ -200,8 +219,9 @@
             },
             //进入服务
             showServeWin(){
-                $(".ktsass").css('display','none');
-                $(".zhezhao").css("display","none");
+                this.isOpensaas = false
+                // $(".ktsass").css('display','none');
+                // $(".zhezhao").css("display","none");
             },
             //查看企业详情
             getEnterpriseInfo(d){
@@ -214,13 +234,17 @@
             },
             //关闭弹窗
             guanbitc(){
-                $(".tanchuang").css("display","none");
-                $(".zhezhao").css("display","none");
+                this.issetDefault = false;
+                this.isOpensaas = false
+                // $(".tanchuang").css("display","none");
+                // $(".zhezhao").css("display","none");
             },
             //没有内容也要有一定的高度
             boxheight(){
-                let H = $(".gs-qiyebox").height();
-                if (H <= 500) {
+                let H = this.$refs.qiyebox.offsetHeight;
+                // let H = $(".gs-qiyebox").height();
+                console.log(H)
+                if (H < 300) {
                     $(".gs-qiyebox").css("height",'500px')
                 } else {
                     $(".gs-qiyebox").css("height",'')
@@ -232,6 +256,9 @@
 
 <style scoped>
 .zhezhao {
-    display: none;
+    /* display: none */
+}
+.tanchuang {
+    /* display: none */
 }
 </style>

frontend/saas-portal-web/src/components/conenter/enterprise.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="div">
-        <div id="navigation1" class="navbar-inverse navbar-fixed-top animated-header">
+        <iframe hidden :src="setTokenPage"></iframe>
+        <div id="navigation" class="navbar-inverse navbar-fixed-top animated-header">
         <div class="container">
             <div class="navbar-header">
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -17,11 +18,14 @@
             </div>
             <div class="collapse navbar-collapse navbar-right" role="navigation">
                 <ul id="nav" class="nav navbar-nav menu">
-                    <li><router-link to="/home"><a href="#"><span>首页</span></a></router-link></li>
+                    <li><router-link to="/home"><a href="#"><span style="color: white">首页</span></a></router-link></li>
                     <li><a href="https://uas.usoftchina.com/about" target="_blank"><span>关于我们</span></a></li>
                     <li>
-                        <a href="#"><span class="">{{mytoken.realname}}</span></a>
-                        <a href=""><span class="">退出</span></a>
+                        <span style="color:#fff;font-size: 13px;">
+                            <img style="width: 25px;" src="/static/img/assets/denglu3x.png" alt="">
+                            {{mytoken.realname}}
+                        </span>
+                        <a href=""><span @click="loginout" class="">【退出】</span></a>
                     </li>
                 </ul>
             </div>
@@ -100,6 +104,7 @@
 </template>
 
 <script>
+import Session from '@/utils/session'
     export default {
         data(){
             return{
@@ -110,12 +115,11 @@
                 tab: [
                     {name: '企业信息'},
                     {name: '个人信息'},
-                    {name: '安全信息'},
+                    // {name: '安全信息'},
                     ],
             }
         },
         mounted(){
-            // console.log("我是父路由的"+this.mydata);
             // console.log(this.mydata)
         },
         components: {
@@ -125,11 +129,22 @@
             // tab切换
             qiehuan(index){
                 this.nowindex = index;
-            }, 
+            },
+            //退出
+            loginout(){
+                const frame = window.frames[window.frames.length - 1]
+                frame.postMessage('', '*')
+                Session.remove();
+                this.$router.push({name:'name',});
+            } 
         },
     }
 </script>
 
 <style scoped>
-    /* @import '../../../static/css/gongsi'; */
+.navbar-inverse {
+    /* background-color: rgba(0, 0, 0, 0.77);
+    height: 70px;
+    line-height: 70px; */
+}
 </style>

frontend/saas-portal-web/src/components/conenter/home.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-		<div id="navigation" class="navbar-inverse navbar-fixed-top animated-header" style="padding: 3px;">
+		<div id="navigation" class="navbar-inverse navbar-fixed-top animated-header">
         <div class="container">
             <div class="navbar-header">
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -19,13 +19,13 @@
           <ul id="nav" class="nav navbar-nav menu">
             <li><a href="#"><span>首页</span></a></li>
             <li @click="home">
-              <a href="#"><span>特色</span></a>
+              <a href="#feature"><span>特色</span></a>
               <!-- <router-link to="/enterprise"><a href="#"><span>特色</span></a></router-link> -->
             </li>
             <li><a href="#service"><span>功能</span></a></li>
             <li><a href="#prototype"><span>帮助中心</span></a></li>
-            <li><a href="#prototype"><span>联系我们</span></a></li>
-            <li class="login" v-if="!account">
+            <li><a href="https://uas.usoftchina.com/about" target="_blank"><span>关于我们</span></a></li>
+            <li class="login" v-if="!account" style="margin-left: 20px;">
               <span @click="login"><img src="/static/img/assets/denglu3x.png" alt="">登录  &nbsp;</span>
               <span @click="register"><img src="/static/img/assets/zhuce3x.png" alt="">注册</span>
             </li>
@@ -34,9 +34,8 @@
 								<img src="/static/img/assets/denglu3x.png" alt="">
 								<span id="user-info">{{account.realname || account.username}}</span>
 							</span>
-              <span>退出</span>    |
-              <router-link to="/enterprise"><a href="#"><span>账户管理</span></a></router-link>
-              <!-- <a href="#">账户管理</a> -->
+              <span @click="loginout">【退出】</span>    |
+              <router-link to="/enterprise"><a href="#"><span style="color: white">账户管理</span></a></router-link>
             </li>
           </ul>
         </div>
@@ -44,7 +43,7 @@
         
     </div>
 
-
+    <iframe hidden :src="setTokenPage"></iframe>
     <main class="site-content" role="main">
       <!-- 遮罩 -->
       <div class="zhezhao" v-if="isLogin || isRegister || isexperience"></div>
@@ -57,6 +56,10 @@
         <iframe hidden :src="setTokenPage"></iframe>
       </div>
       <div class="tiyan" v-if="isexperience">
+        <div><span>欢迎你访问u企云服</span></div>
+        <div>
+          <p>1.</p>
+        </div>
         我是体验
         <img @click="Closeexperience" class="tc-on shut"
                src="/static/img/qiye/chahao.png" alt="">
@@ -332,6 +335,7 @@
       this.clientId = Math.random().toString(36).substr(2)
       // 从本地加载已经登录的信息
       this.account = Session.getAccount()
+      console.log(this.$store.state.isAutoLogin)
     },
     computed: {
       setTokenPage() {
@@ -366,6 +370,7 @@
             if (!account.companyId) {
               // 添加企业
               me.$router.push({path: '/enterprise', query: {mydata: account}})
+              me.$store.state.isAutoLogin = true;
             } else {
               // 跳转应用页面
               window.location.href = me.$url.web
@@ -385,6 +390,13 @@
         this.isRegister = true
         this.listenOnCallback()
       },
+      //退出
+      loginout(){
+        const frame = window.frames[window.frames.length - 1]
+        frame.postMessage('', '*')
+        Session.remove()
+        this.$router.go(0); 
+      },
       // 关闭窗口
       closeModal() {
         const me = this
@@ -423,4 +435,10 @@
   z-index: 10001;
   background: white;
 }
+.navbar-inverse {
+  /* padding: 3px; */
+  padding: 0px;
+  /* height: 70px;
+  line-height: 70px; */
+}
 </style>

frontend/saas-portal-web/src/main.js

@@ -12,7 +12,6 @@ Vue.config.productionTip = false
 
 // 注入url配置
 Vue.prototype.$url = process.env.BASE_URL
-Axios.defaults.baseURL = 'http://192.168.253.31:8560'
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

frontend/saas-portal-web/src/router/index.js

@@ -16,7 +16,7 @@ export default new Router({
       component: Home
     },
     {
-      path: '/',
+      path: '*',
       redirect:'/home'
     },
     {

frontend/saas-portal-web/src/store/index.js

@@ -5,6 +5,7 @@ Vue.use(Vuex)
 export default new Vuex.Store({
     state:{
         data: [],
+        isAutoLogin: ''
     },
     mutations:{
          setId(state ,  id) {

frontend/saas-portal-web/static/css/gongsi.css

@@ -24,7 +24,6 @@
 }
 /* 弹窗 -----------------------------------------------*/
 .tanchuang {
-    display: none;
     background-image: url('../img/qiye/tanchuang.png');
     width: 340px;
     height: 214px;

frontend/saas-portal-web/static/css/main.css

@@ -287,7 +287,7 @@ main > section {
 }
 .login > span:hover,.profile > span:hover{
     cursor:pointer;
-    color: #0aa6bd;
+    /* color: #0aa6bd; */
 }
 .my-label {
     float: left;

frontend/saas-portal-web/static/js/mains.js

@@ -123,7 +123,7 @@ $(document).ready(function(){
             $("#navigation").removeClass("animated-header");
         } else {
             $(".navbar-brand a").css("color","inherit");
-            // $("#navigation").addClass("animated-header");
+            $("#navigation").addClass("animated-header");
         }
     });
 
@@ -136,9 +136,9 @@ $(document).ready(function(){
 
     $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
 
-    // $(window).resize(function(){'use strict',
-    //     $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
-    // });
+    $(window).resize(function(){'use strict',
+        $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
+    });