修改接口标准

frontend/saas-portal-web/config/index.js

@@ -14,7 +14,7 @@ module.exports = {
 
     // Various Dev Server settings
     // host: 'localhost', // can be overwritten by process.env.HOST
-    host: '127.0.0.1', // can be overwritten by process.env.HOST
+    host: '192.168.253.183', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

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

@@ -18,12 +18,5 @@ export default {
 </script>
 
 <style>
-/* #app {
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
-} */
+
 </style>

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

@@ -36,17 +36,6 @@
                                 <input ref="address" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
                             </div>
                         </li>
-                        <!-- <li>
-                            <span class="qy-biaoti">公司标签</span>
-                            <div class="addbiaoqian">
-                                <span v-if= "tjbiaoqian" class="tj-biaoqian">暂无标签</span>
-                                <span v-else v-for="(b , i) in biaoqian" :key="i" class="qy-biaoqian tj-bqleft">{{b}}</span>
-                            </div>
-                            <div class="tj-gsbiaoqian">
-                                <input type="text" ref="biaoqian" name="" id="biaoqian" placeholder="请输入小于等于10个字符">
-                                <span @click= "addbiaoqian" class="dianji">添加标签</span>
-                            </div>
-                        </li> -->
                     </ul>
                 </div>
             </div>
@@ -64,7 +53,7 @@
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
                         <li>
                             <span class="qy-biaoti">邮箱</span>
-                            <input ref="email" type="email">
+                            <input @input="email" ref="email" type="email">
                         </li>
                     </ul>
                 </div>
@@ -78,8 +67,6 @@ import VDistpicker from 'v-distpicker'
     export default {
         data(){
             return {
-                tjbiaoqian:true,//标签切换
-                biaoqian:[],//标签数组
                 province:'',//省
                 city:'',//市
                 area:'',//区
@@ -91,13 +78,7 @@ import VDistpicker from 'v-distpicker'
             VDistpicker
         },
         mounted(){
-            this.$ajax.get('../../../static/data.json')
-            .then(res=>{
-                // console.log('请求成功',res.data);
-            })
-            .catch(err=>{
-                // console.log('请求失败',err);
-            });
+
         },
         methods: {
             //取消添加企业
@@ -133,6 +114,11 @@ import VDistpicker from 'v-distpicker'
                     this.$refs.usname.innerHTML = ''
                 }
             },
+            
+            email(){
+                let email = this.$refs.email.value;//邮箱
+
+            },
             //保存
             Preservation(){
                 let qyname = this.$refs.qyname.value;//公司名字
@@ -140,7 +126,6 @@ import VDistpicker from 'v-distpicker'
                 let address = this.province+this.city+this.area+this.$refs.address.value;//公司详细地址
                 let name = this.$refs.name.value;//个人姓名
                 let email = this.$refs.email.value;//邮箱
-                // let mobile = this.$store.state.data.mobile;//手机号
                 let mytoken = JSON.parse(localStorage.getItem('app-state-session'));
                 let token = String(mytoken.token);
                 let uu = mytoken.account.uu;
@@ -149,7 +134,7 @@ import VDistpicker from 'v-distpicker'
                 let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu}
                 if (name != '' && qyname != '') {
                     this.$ajax({
-                        url:"http://192.168.253.31:8560/api/account/accountCenter/companyAccount/save",
+                        url: this.$url.api+"/api/account/accountCenter/companyAccount/save",
                         method: 'post',
                         data: {
                             companyRegDTO:company,
@@ -189,13 +174,6 @@ import VDistpicker from 'v-distpicker'
             qyarea(qu){
                 this.area = qu.value;
             },
-            //添加标签
-            addbiaoqian(){
-                let text = this.$refs.biaoqian.value;
-                this.biaoqian.push(text);
-                this.tjbiaoqian = false;
-                this.$refs.biaoqian.value = '';
-            },
         }
     }
 </script>

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

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <iframe hidden :src="setTokenPage"></iframe>
     <!-- 遮罩 -->
     <div class="zhezhao"></div>
     <!-- 设置默认弹窗 -->
@@ -8,7 +9,7 @@
       <div v-if="moren">
         <div class="tc-text tc-queren"><span>是否确认设为默认企业？</span></div>
         <div class="tc-anniu">
-          <button @click="addmoren">确认</button>
+          <button @click="setDefault">确认</button>
           <button @click="guanbitc">取消</button>
         </div>
       </div>
@@ -23,13 +24,13 @@
       <div v-if="ktsass">
         <div class="tc-text tc-queren"><span>是否确认开通saas服务？</span></div>
         <div class="tc-anniu">
-          <button @click="addsass">确认</button>
+          <button @click="confirmSaas">确认</button>
           <button @click="guanbitc">取消</button>
         </div>
       </div>
       <div v-else>
         <div class="tc-text tc-conent"><span>开通成功</span></div>
-        <div style="margin-top: 40px;"><span @click="offfuwu" class="gs-btn1 dianji">进入服务</span></div>
+        <div style="margin-top: 40px;"><span @click="showServeWin" class="gs-btn1 dianji">进入服务</span></div>
       </div>
     </div>
     <!-- 该企业已开通服务弹窗 -->
@@ -59,7 +60,7 @@
         <div class="gs-qiyebox">
             <!-- 点击查看企业详情 -->
             <div v-for="(d , i) in arr " :key="i" class="gs-xiangqing xs">
-                <div class="left gs-xqleft" @click= "chakanxq">
+                <div class="left gs-xqleft" @click= "getEnterpriseInfo(d)">
                     <div class="gs-lefttext">
                         <p class="gs-qynema"><span>企业名称：</span>{{d.address}}</p>
                         <p><span>管理员：</span>{{d.name}}</p>
@@ -68,37 +69,30 @@
                 </div>
                 <div class="right gs-xqright">
                     <div class="gs-border">
-                        <span v-if= "d.saas_" class="gs-btn1 dianji" @click="jinru(d.id)">进入服务</span>
-                        <span v-else @click= "kaitong" class="gs-btn1 kaitong xs">开通服务</span>
+                        <span v-if= "d.saas_" class="gs-btn1 dianji" @click="selectServe(d.id)">进入服务</span>
+                        <span v-else @click= "showOpenServeWin" class="gs-btn1 kaitong xs">开通服务</span>
                     </div>
                     <div>
                         <span v-if = "d.default_" class="gs-btn2 gs-btn3">默认企业</span>
-                        <span v-else @click="szmoren(i)" class="gs-btn2 xs">设为默认</span>
+                        <span v-else @click="showDefaultWin(i)" class="gs-btn2 xs">设为默认</span>
                         
                     </div>
                 </div>
             </div>
             <div class="gs-xiangqing dotted">
                 <p class="gs-tianja">
-                    <span @click= "tianjia"><router-link to="/addenterprise">+添加企业</router-link></span>
+                    <span @click= "addEnterprise"><router-link to="/addenterprise">+添加企业</router-link></span>
                 </p>
             </div>
         </div>
       </div>
-      <!-- <div class="gs-xiangqing dotted">
-        <p class="gs-tianja">
-          <span @click="tianjia"><router-link to="/addenterprise">+添加企业</router-link></span>
-        </p>
-      </div> -->
-    <!-- </div>
-  </div> -->
 </template>
 
 <script>
+ import Session from '@/utils/session'
     export default {
         data(){
             return {
-                biaoqian: [],//标签数组
                 index:0,
                 ktsass: true,//开通sass
                 moren: true,//开通默认
@@ -107,15 +101,20 @@
                 arr: []//企业列表信息
             }
         },
+        computed :{
+            setTokenPage() {
+                return this.$url.web + '/set-token.html'
+            }
+        },
         mounted(){
             this.boxheight();
             // console.log("我是子路由的"+this.comdata)
-            this.addqy();
             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:"http://192.168.253.31:8560/api/account/accountCenter/company/list",
+                    url: "/api/account/accountCenter/company/list",
                     method: 'get',
                     params: {
                         mobile: mytoken.account.mobile
@@ -135,17 +134,17 @@
         },
         methods: {
             //设置默认弹窗
-            szmoren(i){
+            showDefaultWin(i){
                 this.index = i;
                 $(".szmoren").css("display","block");
                 $(".zhezhao").css("display","block");
             },
             //确认默认
-            addmoren(){
+            setDefault(){
                 let i = this.index;
                 let token = this.mytoken.token;
                 this.$ajax({
-                    url:'http://192.168.253.31:8560/api/account/accountCenter/bind/defaultCompany',
+                    url: '/api/account/accountCenter/bind/defaultCompany',
                     method: 'post',
                     data:{
                         companyId: this.arr[i].id,
@@ -166,14 +165,14 @@
                 
             },
             //进入服务
-            jinru(id){
+            selectServe(id){
                 let token = this.mytoken.token;
                 const frame = window.frames[window.frames.length - 1];
                 this.$ajax({
-                    url: 'http://192.168.253.31:8560/api/auth/switch/company?companyId='+id,
+                    url: '/api/auth/switch/company?companyId='+id,//http://192.168.253.31:8560
                     method :'get',
                     headers: {
-                        "Authorization":token,
+                        "Authorization":token
                     }
                 })
                 .then(res=>{
@@ -182,11 +181,8 @@
                     session.account.companyId=id;
                     session.span = session.timestamp - new Date().getTime();
                     session.token=mytoken;
-                    debugger
-                    localStorage.setItem('app-state-session',JSON.stringify(session));
                     frame.postMessage(JSON.stringify(session), '*');
-                    // window.location.href = 'http://192.168.0.181';
-                    // console.log('请求成功',res)
+                    window.location.href = me.$url.web
                 })
                 .catch(err=>{
                     console.log('请求失败',err)
@@ -194,36 +190,28 @@
             
             },
             //开通sass
-            kaitong(){
+            showOpenServeWin(){
                 $(".ktsass").css('display','block');
                 $(".zhezhao").css("display","block");
                 this.ktsass = true;
             },
-            addsass(){//确认sass
+            confirmSaas(){//确认sass
                 this.ktsass = false;
             },
             //进入服务
-            offfuwu(){
+            showServeWin(){
                 $(".ktsass").css('display','none');
                 $(".zhezhao").css("display","none");
             },
             //查看企业详情
-            chakanxq(){
+            getEnterpriseInfo(d){
                 document.documentElement.scrollTop = 0;
-                this.$router.push({name:'details',});
+                this.$router.push({path:'/details',query:{content:d}});
             },
              //添加企业
-            tianjia(){
+            addEnterprise(){
                 document.documentElement.scrollTop = 0;
             },
-            addqy(){
-
-            },
-             //添加企业标签
-            addbiaoqian(){
-                this.biaoqian.push(this.$refs.biaoqian.value)
-                this.tjbiaoqian = false;
-            },
             //关闭弹窗
             guanbitc(){
                 $(".tanchuang").css("display","none");

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

@@ -17,15 +17,11 @@
             </div>
             <div class="collapse navbar-collapse navbar-right" role="navigation">
                 <ul id="nav" class="nav navbar-nav menu">
-                    <!-- <li><a href="#"><span>首页</span></a></li> -->
                     <li><router-link to="/home"><a href="#"><span>首页</span></a></router-link></li>
-                    <li><a href="#"><span>特色</span></a></li>
-                    <!-- <li><router-link to="/enterprise"><a href="#"><span>特色</span></a></router-link></li> -->
-                    <li><a href="#"><span>功能</span></a></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>
+                        <a href=""><span class="">退出</span></a>
                     </li>
                 </ul>
             </div>

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

@@ -18,9 +18,9 @@
             <div class="collapse navbar-collapse navbar-right" role="navigation">
           <ul id="nav" class="nav navbar-nav menu">
             <li><a href="#"><span>首页</span></a></li>
-            <!-- <li><a href="#feature"><span>特色</span></a></li> -->
             <li @click="home">
-              <router-link to="/enterprise"><a href="#"><span>特色</span></a></router-link>
+              <a href="#"><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>
@@ -33,8 +33,10 @@
 							<span class="user-info">
 								<img src="/static/img/assets/denglu3x.png" alt="">
 								<span id="user-info">{{account.realname || account.username}}</span>
-							</span>|
-              <a href="#">账户管理</a>
+							</span>
+              <span>退出</span>    |
+              <router-link to="/enterprise"><a href="#"><span>账户管理</span></a></router-link>
+              <!-- <a href="#">账户管理</a> -->
             </li>
           </ul>
         </div>
@@ -45,15 +47,20 @@
 
     <main class="site-content" role="main">
       <!-- 遮罩 -->
-      <div class="zhezhao" v-if="isLogin || isRegister"></div>
+      <div class="zhezhao" v-if="isLogin || isRegister || isexperience"></div>
       <div class="box" v-if="isLogin || isRegister">
         <div>
-          <img @click="closeModal" class="tc-on xs" style="float: right;padding: 10px"
+          <img @click="closeModal" class="tc-on shut"
                src="/static/img/qiye/chahao.png" alt="">
         </div>
         <iframe width="430" height="440" :src="ssoPage"></iframe>
         <iframe hidden :src="setTokenPage"></iframe>
       </div>
+      <div class="tiyan" v-if="isexperience">
+        我是体验
+        <img @click="Closeexperience" class="tc-on shut"
+               src="/static/img/qiye/chahao.png" alt="">
+      </div>
 
       <!--Home Slider==================================== -->
       <section id="home-slider">
@@ -68,7 +75,7 @@
               </div>
               <!-- 首页内容 -->
               <div class="my-text">
-                <button class='my-tiyan'>立即体验</button>
+                <button class='my-tiyan' @click="experience">立即体验</button>
 
               </div>
               <div class="slide-caption">
@@ -317,7 +324,8 @@
         isLogin: false,
         isRegister: false,
         clientId: null,
-        account: null
+        account: null,
+        isexperience: false
       }
     },
     mounted() {
@@ -353,6 +361,7 @@
           Session.set(session)
           const frame = window.frames[window.frames.length - 1]
           window.addEventListener('message', () => {
+           if(me.isLogin){
             me.isLogin = false
             if (!account.companyId) {
               // 添加企业
@@ -361,6 +370,7 @@
               // 跳转应用页面
               window.location.href = me.$url.web
             }
+           } 
           }, false)
           frame.postMessage(JSON.stringify(session), '*')
         })
@@ -382,20 +392,35 @@
           me.isLogin = false
           me.isRegister = false
         })
+      },
+      //体验
+      experience(){
+        this.isexperience = true;
+      },
+      //关闭体验
+      Closeexperience(){
+        this.isexperience = false;
       }
     }
   }
 </script>
 
 <style scoped>
-.tc-guanbi {
-	cursor: pointer;
+.shut {
+  cursor: pointer;
+  position: absolute;
+  top: 10px;
+  right: 10px;
 }
 .tiyan {
-	display: none;
+  position: absolute;
+  top: 50%;
+  left: 50%;
 	width: 400px;
 	height: 200px;
 	margin-left: -200px;
-    margin-top: -100px;
+  margin-top: -100px;
+  z-index: 10001;
+  background: white;
 }
 </style>

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

@@ -1,7 +1,7 @@
 <template>
     <div>
         <!-- 企业详细信息 -->
-        <div v-if= "xiugai">
+        <div v-if="xiugai">
             <div class="gs-worp qy-worp" style="width:100%">
                 <div class="qy-title">
                     <span><img @click= "gobick" style="float: left;padding: 20px; cursor:pointer" src="../../../static/img/fanhui.png" alt=""></span>
@@ -10,10 +10,9 @@
                 </div>
                 <div class="qy-conent">
                     <ul>
-                        <li><span class="qy-biaoti">公司名称</span><span>飞飞有限公司</span></li>
+                        <li><span class="qy-biaoti">公司名称</span><span>{{content.address}}</span></li>
                         <li><span class="qy-biaoti">所属行业</span><span>飞飞有限公司</span></li>
-                        <li><span class="qy-biaoti">公司地址</span><span>飞飞有限公司</span></li>
-                        <!-- <li><span class="qy-biaoti">营业范围</span><span class="qy-biaoqian">飞飞标签</span><span class="qy-biaoqian">飞飞标签</span></li> -->
+                        <li><span class="qy-biaoti">公司地址</span><span>{{content.address}}</span></li>
                     </ul>
                 </div>
             </div>
@@ -44,7 +43,7 @@
                     <ul>
                         <li>
                             <span class="qy-biaoti"><span class="xingxing">*</span>公司名称</span>
-                            <span>飞飞有限公司</span>
+                            <span>{{content.address}}</span>
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
@@ -52,30 +51,8 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">公司地址</span>
-                            <span>飞飞有限公司</span>
+                            <span>{{content.address}}</span>
                         </li>
-                        <!-- <li style="height:60px;">
-                            <span class="qy-biaoti"><span class="xingxing">*</span>注册地址</span>
-                            <span>飞飞有限公司</span>
-                        </li>
-                        <li>
-                            <span class="qy-biaoti">所属行业</span>
-                            <input type="text">
-                        </li>
-                        <li class="over">
-                            <span class="qy-biaoti">公司标签</span>
-                            <div class="addbiaoqian">
-                                <div style="overflow: hidden;padding-top: 5px;">
-                                    <span v-for="(b , i) in biaoqian" :key="i" class="xg-biaoqian tj-bqleft">
-                                        {{b}}
-                                        <img class="qcbiaoqian xs" @click="qcbiaoqian(i)" src="../../../static/img/qiye/CHA HAO.png"/>
-                                    </span>
-                                </div>
-                                <div>
-                                    <input style="100%" type="text" placeholder="飞飞公司" />
-                                </div>
-                            </div>
-                        </li> -->
                     </ul>
                 </div>
             </div>
@@ -101,15 +78,11 @@
         data(){
             return {
                 xiugai:true,
-                biaoqian: [
-                    'feifei',
-                    '飞飞公司',
-                    '飞飞企业',
-                ]
+                content: this.$route.query.content,
             }
         },
         mounted(){
-
+            // console.log(this.content)
         },
         methods: {//修改企业信息
             xiugaiqiye(){
@@ -126,10 +99,6 @@
                 document.documentElement.scrollTop = 0;
                 this.xiugai = true;
             },
-            //清除标签
-            qcbiaoqian(i){
-                this.biaoqian.splice(i,1);
-            },
             //返回
             gobick(){
                 // this.$router.go(-1); 

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

@@ -12,6 +12,7 @@ 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/static/css/gongsi.css

@@ -141,6 +141,9 @@
     position: absolute;
     top: 50%;
     left: 50%;
+    width: 70%;
+    margin-left: 30%;
+    height: 50%;
     transform: translate(-100%,-50%);
 }
 .gs-xqright {

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

@@ -36,55 +36,34 @@ $(function() {
             } ),
 
             init = function() {
-
                 initEvents();
-
             },
             initEvents = function() {
-
                 // add navigation events
                 $navArrows.children( ':last' ).on( 'click', function() {
-
                     slitslider.next();
                     return false;
-
                 } );
 
                 $navArrows.children( ':first' ).on( 'click', function() {
-
                     slitslider.previous();
                     return false;
-
                 } );
-
                 $nav.each( function( i ) {
-
                     $( this ).on( 'click', function( event ) {
-
                         var $dot = $( this );
-
                         if( !slitslider.isActive() ) {
-
                             $nav.removeClass( 'nav-dot-current' );
                             $dot.addClass( 'nav-dot-current' );
-
                         }
-
                         slitslider.jump( i + 1 );
                         return false;
-
                     } );
-
                 } );
-
             };
-
             return { init : init };
-
     })();
-
     Page.init();
-
 });