Explorar o código

修改b2b,金融跳转地址

wangmh %!s(int64=7) %!d(string=hai) anos
pai
achega
c7803859c3

+ 4 - 1
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);
             }

+ 2 - 2
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 href="saas/about" class="link-saas">优企云服</a></li>
-					<li><a href="/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+					<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>

+ 2 - 2
src/main/webapp/WEB-INF/views/normal/default/404.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 href="saas/about" class="link-saas">优企云服</a></li>
-					<li><a href="./#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+					<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>

+ 2 - 2
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 href="saas/about" 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>

+ 2 - 2
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 href="saas/about" class="link-saas">优企云服</a></li>
-					<li><a href="./#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+					<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>

+ 1 - 1
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 href="saas/about" class="link-saas">优企云服</a></li>
 					<li>

+ 2 - 2
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 href="saas/about" 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>

+ 11 - 0
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';
+    }
+}
+
 /**
  * 监听输入框值的变化设置联想
  */
@@ -550,6 +558,9 @@ $(function() {
 	// 退出点击
 	$('.link-logout').click(logout);
 
+    // 点击B2B
+    $('.link-b2b').click(toB2B);
+
 	// 点击链接到众创人才招聘(招聘)
     $('.link-job-get').click(jobUuzcGet);