接口对接

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 遮罩 -->
-    <div class="zhezhao" v-if="showModal"></div>
+    <div class="zhezhao"></div>
     <!-- 设置默认弹窗 -->
     <div class="tanchuang szmoren">
       <div class="over"><img @click="guanbitc" class="right xs" src="/static/img/qiye/chahao.png" alt=""></div>
@@ -56,7 +56,6 @@
       </div>
     </div>
 
-<<<<<<< HEAD
         <div class="gs-qiyebox">
             <!-- 点击查看企业详情 -->
             <div v-for="(d , i) in arr " :key="i" class="gs-xiangqing xs">
@@ -84,40 +83,18 @@
                     <span @click= "tianjia"><router-link to="/addenterprise">+添加企业</router-link></span>
                 </p>
             </div>
-=======
-    <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="gs-lefttext">
-            <p class="gs-qynema"><span>企业名称：</span>{{d.name}}</p>
-            <p><span>管理员：</span>飞飞飞飞</p>
-            <p><span>开通日期：</span>{{d.time}}</p>
-          </div>
-        </div>
-        <div class="right gs-xqright">
-          <div class="gs-border">
-            <span v-if="d.kaitong" class="gs-btn1 dianji">进入服务</span>
-            <span v-else @click="kaitong" class="gs-btn1 kaitong xs">开通服务</span>
-          </div>
-          <div>
-            <span v-if="d.moren" class="gs-btn2 gs-btn3">默认企业</span>
-            <span v-else @click="szmoren" class="gs-btn2 xs">设为默认</span>
-          </div>
->>>>>>> 78b2728ff4e9a3df7d7d732ffc4f40a824a273c5
         </div>
       </div>
-      <div class="gs-xiangqing dotted">
+      <!-- <div class="gs-xiangqing dotted">
         <p class="gs-tianja">
           <span @click="tianjia"><router-link to="/addenterprise">+添加企业</router-link></span>
         </p>
-      </div>
-    </div>
-  </div>
+      </div> -->
+    <!-- </div>
+  </div> -->
 </template>
 
 <script>
-<<<<<<< HEAD
     export default {
         data(){
             return {
@@ -191,6 +168,7 @@
             //进入服务
             jinru(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,
                     method :'get',
@@ -206,8 +184,9 @@
                     session.token=mytoken;
                     debugger
                     localStorage.setItem('app-state-session',JSON.stringify(session));
-                    window.location.href = 'http://192.168.0.181';
-                    console.log('请求成功',res)
+                    frame.postMessage(JSON.stringify(session), '*');
+                    // window.location.href = 'http://192.168.0.181';
+                    // console.log('请求成功',res)
                 })
                 .catch(err=>{
                     console.log('请求失败',err)
@@ -259,82 +238,12 @@
                     $(".gs-qiyebox").css("height",'')
                 }
             },
-=======
-  export default {
-    data() {
-      return {
-        showModal: false,
-        biaoqian: [],//标签数组
-        ktsass: true,//开通sass
-        moren: true,//开通默认
-        arr: [
-          {name: "公司", time: "2018年11月20", kaitong: true, moren: true},
-          {name: "df公司", time: "2018年11月23", kaitong: false, moren: false},
-          {name: "fdf公司", time: "2018年11月24", kaitong: true, moren: false},
-        ]
-      }
-    },
-    mounted() {
-      this.boxheight();
-    },
-    methods: {
-      //没有内容也要有一定的高度
-      boxheight() {
-        let H = $(".gs-qiyebox").height();
-        if (H <= 500) {
-          $(".gs-qiyebox").css("height", '500px')
-        } else {
-          $(".gs-qiyebox").css("height", '')
->>>>>>> 78b2728ff4e9a3df7d7d732ffc4f40a824a273c5
         }
-      },
-      //添加企业
-      tianjia() {
-        document.documentElement.scrollTop = 0;
-      },
-      //添加企业标签
-      addbiaoqian() {
-        this.biaoqian.push(this.$refs.biaoqian.value)
-        this.tjbiaoqian = false;
-      },
-      //关闭弹窗
-      guanbitc() {
-        $(".tanchuang").css("display", "none");
-        this.showModal = false
-      },
-      //设置默认弹窗
-      szmoren() {
-        $(".szmoren").css("display", "block");
-        $(".zhezhao").css("display", "block");
-        this.showModal = true
-      },
-      //确认默认
-      addmoren() {
-        this.moren = false;
-      },
-      //开通sass
-      kaitong() {
-        $(".ktsass").css('display', 'block');
-        $(".zhezhao").css("display", "block");
-        this.ktsass = true;
-      },
-      addsass() {//确认sass
-        this.ktsass = false;
-      },
-      //进入服务
-      offfuwu() {
-        $(".ktsass").css('display', 'none');
-        $(".zhezhao").css("display", "none");
-      },
-      //查看企业详情
-      chakanxq() {
-        document.documentElement.scrollTop = 0;
-        this.$router.push({name: 'details',});
-      }
     }
-  }
 </script>
 
 <style scoped>
-
+.zhezhao {
+    display: none;
+}
 </style>

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

@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
     <div>
 		<div id="navigation" class="navbar-inverse navbar-fixed-top animated-header" style="padding: 3px;">
         <div class="container">
@@ -12,44 +11,11 @@
                 </button>
                 <h1 class="navbar-brand">
                     <a href="#">
-                        <img class="logo-img" src="../../../static/img/assets/dalogo3x.png" alt="">
+                        <img class="logo-img" src="/static/img/assets/dalogo3x.png" alt="">
                     </a>
                 </h1>
             </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><a href="#feature"><span>特色</span></a></li> -->
-                    <li @click= "home"><router-link to="/enterprise"><a href="#"><span>特色</span></a></router-link></li>
-                    <li><a href="#service"><span>功能</span></a></li>
-                    <li><a href="https://uas.usoftchina.com/about" target="_blank"><span>关于我们</span></a></li>
-                    <li class="login">
-                        <!-- <span class="btn1"><img src="../../../static/img/assets/denglu3x.png" alt="">登录  &nbsp;</span>
-                        <span class="register"><img src="../../../static/img/assets/zhuce3x.png" alt="">注册</span> -->
-                        <span @click= "btn1"><img src="../../../static/img/assets/denglu3x.png" alt="">登录  &nbsp;</span>
-                        <span @click= "register"><img src="../../../static/img/assets/zhuce3x.png" alt="">注册</span>
-                    </li>
-                </ul>
-            </div>
-=======
-  <div>
-    <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">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <h1 class="navbar-brand">
-            <a href="#">
-              <img class="logo-img" src="/static/img/assets/dalogo3x.png" alt="">
-            </a>
-          </h1>
->>>>>>> 78b2728ff4e9a3df7d7d732ffc4f40a824a273c5
-        </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><a href="#feature"><span>特色</span></a></li> -->
@@ -72,7 +38,8 @@
             </li>
           </ul>
         </div>
-      </div>
+        </div>
+        
     </div>
 
 
@@ -87,96 +54,12 @@
         <iframe width="430" height="440" :src="ssoPage"></iframe>
         <iframe hidden :src="setTokenPage"></iframe>
       </div>
+
       <!--Home Slider==================================== -->
       <section id="home-slider">
         <div id="slider" class="sl-slider-wrapper">
           <div class="sl-slider">
 
-<<<<<<< HEAD
-        <main class="site-content" role="main">
-			<!-- 遮罩 -->
-			<div class="zhezhao"></div>   
-			<div id="box" class="box">
-				<img @click="tcon" class="tc-on tc-guanbi" style="position: absolute;top:10px;right:10px" src="../../../static/img/qiye/chahao.png" alt="">
-				<iframe width="430" height="440"></iframe>
-			</div>
-			<div class="box tiyan" >
-				<img @click="tcon" class="tc-on tc-guanbi" style="position: absolute;top:10px;right:10px" src="../../../static/img/qiye/chahao.png" alt="">
-				fdsfdfdf
-			</div>
-<!--Home Slider==================================== -->
-		<section id="home-slider">
-            <div id="slider" class="sl-slider-wrapper"> 
-				<div class="sl-slider">
-				
-					<div class="sl-slide" data-orientation="horizontal" data-slice1-rotation="-25" data-slice2-rotation="-25" data-slice1-scale="2" data-slice2-scale="2">
-						<div class="mask-overly"></div>
-						<div class="bg-img slider-1">
-                            <img src="../../../static/img/assets/beijing2x.png" alt="">
-                        </div>
-						<!-- 首页内容 -->
-						<div class="my-text">
-							
-							<button @click="tiyan" class='my-tiyan dianji'>立即体验</button> 
-						</div>
-						<div class="slide-caption">
-                        	<div class="caption-content"></div>
-                    	</div>
-					</div>
-				</div>
-			</div>
-		</section>
-		
-    <!-- End Home SliderEnd==================================== -->
-			<!-- 特色 -->
-			<section id="feature">
-				<div class="container ts-worp">
-						<div class="section-title text-center">
-							<p class="ts-title">我们的特色</p>
-							<p class="ts-text">云端部署 &nbsp;&nbsp; 轻量应用</p>
-						</div>
-						<div class="ts-box">
-							<div style="margin:50px 0;">
-								<img  class="ts-img" src="../../../static/img/features.jpg" alt="">
-							</div>
-							<div class="right right-text">
-								<img class="ts-minimg" src="../../../static/img/assets/1.png" alt="">
-								<div class="ts-mintext">
-									<p style="font-size: 32px !important;margin-bottom: 36px;"><img class="ts-textimg" src="../../../static/img/assets/xunzhao@2x.png" alt="">迅速找到您想要的</p>
-									<p>寻找供应商资源</p>
-									<p>寻找产品货源  寻找产品资料</p>
-								</div>
-							</div>
-						</div>
-						<div class="ts-box">
-							<div class="left left-text">
-								<img class="ts-minimg" style="left:0;" src="../../../static/img/assets/2.png" alt="">
-								<div class="ts-mintext ts-lefttext">
-									<p style="font-size: 32px !important;margin-bottom: 36px;">直观看到您想看的<img class="ts-textleftimg" src="../../../static/img/assets/fen xi@2x.png" alt=""></p>
-									<p>每日订单量、收付款、月度销售分析、采购分析</p>
-									<p>让你成为企业经营老司机</p>
-								</div>
-							</div>
-							<div style="margin:50px 0;">
-								<img  class="ts-img" src="../../../static/img/features.jpg" alt="">
-							</div>
-						</div>
-						<div class="ts-box">
-							<div style="margin:50px 0;">
-								<img  class="ts-img" src="../../../static/img/features.jpg" alt="">
-							</div>
-							<div class="right right-text">
-								<img class="ts-minimg" src="../../../static/img/assets/1.png" alt="">
-								<div class="ts-mintext" style="right: 145px;">
-									<p style="font-size: 32px !important;margin-bottom: 36px;"><img class="ts-textimg" src="../../../static/img/assets/kuaisu@2x.png" alt="">快速上手 生意简单做</p>
-									<p>移动端的交互体验</p>
-									<p>简短清晰的业务流程 让你三分钟上手</p>
-								</div>
-							</div>
-						</div>
-				</div>
-			</section>
-=======
             <div class="sl-slide" data-orientation="horizontal" data-slice1-rotation="-25" data-slice2-rotation="-25"
                  data-slice1-scale="2" data-slice2-scale="2">
               <div class="mask-overly"></div>
@@ -186,6 +69,7 @@
               <!-- 首页内容 -->
               <div class="my-text">
                 <button class='my-tiyan'>立即体验</button>
+
               </div>
               <div class="slide-caption">
                 <div class="caption-content"></div>
@@ -194,7 +78,6 @@
           </div>
         </div>
       </section>
->>>>>>> 78b2728ff4e9a3df7d7d732ffc4f40a824a273c5
 
       <!-- End Home SliderEnd==================================== -->
 
@@ -428,240 +311,6 @@
   import {subscribe, disconnect} from '@/api/socket'
   import Session from '@/utils/session'
 
-<<<<<<< HEAD
-		},
-		methods:{
-			home(){
-                document.documentElement.scrollTop = 0;
-			},
-			tiyan(){ //体验
-				console.log(123)
-				$(".tiyan").css("display","block");
-				$(".zhezhao").css("display","block");
-			},
-			btn1(){ //登录
-				var Store = (function(){
-					var storeKey = 'app-state', store = window.localStorage;
-					return {
-						get: function(key, defaultValue) {
-							var value = store.getItem(storeKey + '-' + key);
-							return value === undefined? defaultValue : JSON.parse(value);
-						},
-						set: function(key, value) {
-							store.setItem(storeKey + '-' + key, JSON.stringify(value));
-						}
-					};
-				})();
-				var Session = (function(){
-					var key = 'session';
-					return {
-						load: function() {
-							return Store.get(key);
-						},
-						loadData: function(data) {
-							data.span = data.timestamp - new Date().getTime();
-							Store.set(key, data);
-						},
-						isValid: function() {
-							var token = this.load();
-							return token && token.timestamp + token.expire * 1000 > new Date().getTime() + token.span;
-						},
-						get: function(prop) {
-							var token = this.load();
-							return token ? token[prop] : null;
-						},
-						set: function(prop, value) {
-							var token = this.load();
-							if (token) {
-								token[prop] = value;
-								Store.set(key, token);
-							}
-						}
-					}
-				})();
-				var setUserProfile = function(account) {
-					if (account) {
-						$(".login").css("display","none");
-						// 显示用户信息
-						$("#user-info").text(account.realname || account.username);
-						$(".profile").css("display","block")
-					} else {
-						$(".login").css("display","block");
-						$(".profile").css("display","none")
-					}
-				};
-				// 已经登录过从Store取出信息
-				setUserProfile(Session.get('account'));
-				// socket
-				var listenOnCallback = function(clientId, resolve) {
-					var socket = new SockJS(env.server.baseUrl + "/ws");
-					var stompClient = Stomp.over(socket);
-					stompClient.connect({}, function(frame) {
-						stompClient.subscribe('/clients/' + clientId + '/sso/callback', function(message){
-							stompClient.disconnect(function(){
-								resolve(JSON.parse(message.body));
-							});
-						});
-					});
-				};
-				// 系统页面token
-				var Frontend = (function(){
-					var frame;
-					return {
-						init: function() {
-							$('body').append('<iframe id="frontend" hidden src="' + 
-								env.frontend.baseUrl + '/set-token.html"></iframe>');
-							frame = window.frames[window.frames.length - 1];
-						},
-						set: function(session, callback) {
-							window.addEventListener('message', callback, false);
-							frame.postMessage(JSON.stringify(session), '*');
-						},
-						redirect: function() {
-							window.location.href = env.frontend.baseUrl;
-						}
-					};
-				})();
-				Frontend.init();
-				var me = this;
-				if ($('#box').css('display') =="none") {
-					// 随机生成clientId
-					var clientId = Math.random().toString(36).substr(2);
-					$(".zhezhao").css("display","block");
-					$('#box iframe').attr('src', env.server.ssoUrl + '/sassLogin?appId=sp&baseUrl=' + 
-						encodeURIComponent(env.server.baseUrl + '/api/auth/sso/callback/' + clientId));
-					$('#box').show();
-					
-					listenOnCallback(clientId, function(data){
-						var session = data.token, account = data.account;
-						account.companies = account.companies || [];
-						session.account = account;
-						Session.loadData(session);
-						setUserProfile(account);
-						$('#box').hide();
-						$(".zhezhao").css("display","none");
-						// 系统页面token设置
-						Frontend.set(session, function(){
-							if (!account.companyId) {
-								// 登录成功跳转到企业设置
-								console.log("跳转前");
-								me.$router.push({path:'/enterprise',query: {mydata :account}});
-								me.$store.state.data = account;
-								console.log("跳转后"); 
-							} else {
-								//如果开通过sass直接跳转到sass页面
-								Frontend.redirect();
-							}
-						});
-					});
-				} else {
-					$('#box').hide();
-					$(".zhezhao").css("display","none")
-				}
-			},
-			register(){
-				if ($('#box').css('display') =="none") {
-					$(".zhezhao").css("display","block");
-					$('#box iframe').attr('src', env.server.ssoUrl + '/sassLogin/register?appId=sp');
-					$('#box').show();
-				} else {
-					$('#box').hide();
-					$(".zhezhao").css("display","none")
-				}
-			},
-			tcon(){
-				$('#box-zc').css('display','none');
-				$('#box').css('display','none');
-				$(".zhezhao").css("display","none");
-				$(".tiyan").css("display","none");
-			},
-			zdtoken(){
-				var Store = (function(){
-					var storeKey = 'app-state', store = window.localStorage;
-					return {
-						get: function(key, defaultValue) {
-							var value = store.getItem(storeKey + '-' + key);
-							return value === undefined? defaultValue : JSON.parse(value);
-						},
-						set: function(key, value) {
-							store.setItem(storeKey + '-' + key, JSON.stringify(value));
-						}
-					};
-				})();
-				var Session = (function(){
-					var key = 'session';
-					return {
-						load: function() {
-							return Store.get(key);
-						},
-						loadData: function(data) {
-							data.span = data.timestamp - new Date().getTime();
-							Store.set(key, data);
-						},
-						isValid: function() {
-							var token = this.load();
-							return token && token.timestamp + token.expire * 1000 > new Date().getTime() + token.span;
-						},
-						get: function(prop) {
-							var token = this.load();
-							return token ? token[prop] : null;
-						},
-						set: function(prop, value) {
-							var token = this.load();
-							if (token) {
-								token[prop] = value;
-								Store.set(key, token);
-							}
-						}
-					}
-				})();
-				var setUserProfile = function(account) {
-					if (account) {
-						$(".login").css("display","none");
-						// 显示用户信息
-						$("#user-info").text(account.realname || account.username);
-						$(".profile").css("display","block")
-					} else {
-						$(".login").css("display","block");
-						$(".profile").css("display","none")
-					}
-				};
-				// 已经登录过从Store取出信息
-				setUserProfile(Session.get('account'));
-				// socket
-				var listenOnCallback = function(clientId, resolve) {
-					var socket = new SockJS(env.server.baseUrl + "/ws");
-					var stompClient = Stomp.over(socket);
-					stompClient.connect({}, function(frame) {
-						stompClient.subscribe('/clients/' + clientId + '/sso/callback', function(message){
-							stompClient.disconnect(function(){
-								resolve(JSON.parse(message.body));
-							});
-						});
-					});
-				};
-				// 系统页面token
-				var Frontend = (function(){
-					var frame;
-					return {
-						init: function() {
-							$('body').append('<iframe id="frontend" hidden src="' + 
-								env.frontend.baseUrl + '/set-token.html"></iframe>');
-							frame = window.frames[window.frames.length - 1];
-						},
-						set: function(session, callback) {
-							window.addEventListener('message', callback, false);
-							frame.postMessage(JSON.stringify(session), '*');
-						},
-						redirect: function() {
-							window.location.href = env.frontend.baseUrl;
-						}
-					};
-				})();
-				Frontend.init();
-			}
-		}
-=======
   export default {
     data() {
       return {
@@ -734,13 +383,11 @@
           me.isRegister = false
         })
       }
->>>>>>> 78b2728ff4e9a3df7d7d732ffc4f40a824a273c5
     }
   }
 </script>
 
 <style scoped>
-<<<<<<< HEAD
 .tc-guanbi {
 	cursor: pointer;
 }
@@ -752,7 +399,3 @@
     margin-top: -100px;
 }
 </style>
-=======
-
-</style>
->>>>>>> 78b2728ff4e9a3df7d7d732ffc4f40a824a273c5

frontend/saas-portal-web/static/data.json

@@ -1,7 +0,0 @@
-{ "gsdata": [
-    { "Name": "飞飞公司", "lastName":"McLaughlin", "email": "aaaa" },
-    
-    { "Name": "ff飞飞公司", "lastName":"Hunter", "email": "bbbb"},
-    
-    { "Name": "中兴公司", "lastName":"Harold", "email": "cccc" }
-]}

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

@@ -157,7 +157,6 @@ $(document).ready(function(){
 
     $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
 
-<<<<<<< HEAD
     // $(window).resize(function(){'use strict',
     //     $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
     // });
@@ -165,15 +164,6 @@ $(document).ready(function(){
 	
 	
 	$("#works, #testimonial").owlCarousel({	 
-=======
-    $(window).resize(function(){'use strict',
-        $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
-    });
-
-
-
-	$("#works, #testimonial").owlCarousel({
->>>>>>> 78b2728ff4e9a3df7d7d732ffc4f40a824a273c5
 		navigation : true,
 		pagination : false,
 		slideSpeed : 700,