Merge branch 'dev' of ssh://10.10.101.21/source/platform-home into feature-saas20180604-wangmh

# Conflicts:
#	src/main/webapp/WEB-INF/views/normal/contact.html
#	src/main/webapp/WEB-INF/views/normal/default/404.html
#	src/main/webapp/WEB-INF/views/normal/finance.html
#	src/main/webapp/WEB-INF/views/normal/help/agreement.html
#	src/main/webapp/WEB-INF/views/normal/saas_about.html
#	src/main/webapp/resources/js/common/common.js

src/main/java/com/uas/platform/home/controller/AccountController.java

@@ -27,8 +27,11 @@ public class AccountController extends BaseController {
 	public ModelMap getAccountInfo() throws Exception {
 	    if(null != SystemSession.getUser()) {
             ModelMap map = new ModelMap();
+			map.put("content", SystemSession.getUser());
+			if (SystemSession.getUser().getSpaceUU() == null) {
+				return map;
+			}
 	        UserSpaceView detail = AccountUtils.findByBusinessCode(SystemSession.getUser().getBusinessCode());
-            map.put("content", SystemSession.getUser());
             if(null != detail) {
                 map.put("space", detail);
             }

src/main/webapp/WEB-INF/views/normal/contact.html

@@ -25,10 +25,10 @@
 			</div>
 			<div class="collapse navbar-collapse">
 				<ul class="nav navbar-nav navbar-left">
-					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
+					<li><a class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
-					<li><a class="link-saas">优企云服</a></li>
-					<li><a href="/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+                    <li><a class="link-saas">优企云服</a></li>
+                    <li><a class="link-finance" href="http://www.yitoa-fintech.com">金融服务</a></li><!-- http://finance.ubtob.com -->
 					<li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>
 						<a href="http://www.uuzcc.com/" class="">闯客平台</a>

src/main/webapp/WEB-INF/views/normal/default/404.html

@@ -26,11 +26,10 @@
 			</div>
 			<div class="collapse navbar-collapse">
 				<ul class="nav navbar-nav navbar-left">
-					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
+					<li><a class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
-					<li><a class="link-saas">优企云服</a></li>
-					<li><a href="./#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
-					<!-- http://finance.ubtob.com -->
+                    <li><a class="link-saas">优企云服</a></li>
+                    <li><a class="link-finance" href="http://www.yitoa-fintech.com">金融服务</a></li><!-- http://finance.ubtob.com -->					<!-- http://finance.ubtob.com -->
 					<li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>
 						<a href="http://www.uuzcc.com/" class="">闯客平台</a>

src/main/webapp/WEB-INF/views/normal/finance.html

@@ -268,10 +268,10 @@
         </div>
         <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav navbar-left">
-                <li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
+                <li><a class="link-b2b">B2B商务</a></li>
                 <li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
                 <li><a class="link-saas">优企云服</a></li>
-                <li><a href="finance" class="link-finance">金融服务</a></li>
+                <li><a class="link-finance" href="http://www.yitoa-fintech.com">金融服务</a></li>
                 <!-- http://finance.ubtob.com -->
                 <li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
                 <li>

src/main/webapp/WEB-INF/views/normal/help/agreement.html

@@ -26,10 +26,10 @@
 			</div>
 			<div class="collapse navbar-collapse">
 				<ul class="nav navbar-nav navbar-left">
-					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
+					<li><a class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
-					<li><a class="link-saas">优企云服</a></li>
-					<li><a href="./#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+                    <li><a class="link-saas">优企云服</a></li>
+                    <li><a class="link-finance" href="http://www.yitoa-fintech.com">金融服务</a></li><!-- http://finance.ubtob.com -->
 					<!-- http://finance.ubtob.com -->
 					<li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>

src/main/webapp/WEB-INF/views/normal/index.html

@@ -59,7 +59,7 @@ var _hmt = _hmt || [];
 			</div>
 			<div class="collapse navbar-collapse">
 				<ul class="nav navbar-nav navbar-left">
-					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
+					<li><a class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com/" class="link-mall">优软商城</a></li>
 					<li><a class="link-saas">优企云服</a></li>
 					<li>
@@ -110,8 +110,7 @@ var _hmt = _hmt || [];
 				
 			<!-- Indicators -->
 			<ol class="carousel-indicators">
-				<li data-target="#carousel-example-generic" data-slide-to="0"
-				class="active"></li>
+				<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
 				<li data-target="#carousel-example-generic" data-slide-to="1"></li>
 				<li data-target="#carousel-example-generic" data-slide-to="2"></li>
 				<li data-target="#carousel-example-generic" data-slide-to="3"></li>
@@ -179,17 +178,17 @@ var _hmt = _hmt || [];
 					</div>
 				</div>
 				<div class="item carousel-item4">
-					<img src="static/img/carousel/header-04.jpg" alt="" />
-					<div class="carousel-caption">
-						<div class="container">
-							<div class="header-text">
-								<h1>金融服务</h1>
-								<p>
-									提供融资、租赁、保理、小额贷等金融综合服务<br />为企业高速发展保驾护航！
-								</p>
-							</div>
-						</div>
-					</div>
+					<img src="static/img/carousel/header-12.png" alt="" />
+					<!--<div class="carousel-caption">-->
+						<!--<div class="container">-->
+							<!--<div class="header-text">-->
+								<!--<h1>金融服务</h1>-->
+								<!--<p>-->
+									<!--提供融资、租赁、保理、小额贷等金融综合服务<br />为企业高速发展保驾护航！-->
+								<!--</p>-->
+							<!--</div>-->
+						<!--</div>-->
+					<!--</div>-->
 				</div>
 				<div class="item carousel-item10">
 					<img src="static/img/carousel/header-11.jpg" alt="" />

src/main/webapp/WEB-INF/views/normal/saas_about.html

@@ -26,10 +26,10 @@
 			</div>
 			<div class="collapse navbar-collapse">
 				<ul class="nav navbar-nav navbar-left">
-					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
+					<li><a class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
-					<li><a class="link-saas">优企云服</a></li>
-					<li><a href="finance" class="link-finance">金融服务</a></li>
+                    <li><a class="link-saas">优企云服</a></li>
+                    <li><a class="link-finance" href="http://www.yitoa-fintech.com">金融服务</a></li>
 					<!-- http://finance.ubtob.com -->
 					<li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>

src/main/webapp/resources/css/common.css

@@ -55,6 +55,7 @@ body {
 	padding: 15px 10px;
 	font-size: 15px;
 	color: #bbbbbb;
+	cursor: pointer;
 }
 /*.navbar-inverse .navbar-nav>li>ul {
 	list-style: none;

src/main/webapp/resources/js/common/common.js

@@ -486,6 +486,14 @@ function suspendMessage() {
     toastr.error('网站正在升级中，敬请期待！');
 }
 
+function toB2B() {
+    if (!window.loginInfo || !window.loginInfo.space) {
+        window.location.href = 'https://www.usoftmall.com/btbBusiness';
+    } else {
+        window.location.href = 'http://uas.ubtob.com';
+    }
+}
+
 function toSaaS() {
     if (!window.loginInfo || !window.loginInfo.space) {
         window.location.href = "/saas/about";
@@ -564,6 +572,9 @@ $(function() {
 	// 退出点击
 	$('.link-logout').click(logout);
 
+    // 点击B2B
+    $('.link-b2b').click(toB2B);
+
 	// 点击链接到众创人才招聘（招聘）
     $('.link-job-get').click(jobUuzcGet);