Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/resources/js/common/common.js

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

@@ -45,6 +45,9 @@
 							<li><a href="./#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
 						</ul>
 					</li><!-- http://help.ubtob.com -->
+                    <li>
+                        <a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
+                    </li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right x-nologin">
 					<li><a href="#" class="link-login">登录</a></li>

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

@@ -47,6 +47,9 @@
 							<li><a href="./#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
 						</ul>
 					</li><!-- http://help.ubtob.com -->
+                    <li>
+                        <a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
+                    </li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right x-nologin">
 					<li><a href="#" class="link-login">登录</a></li>

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

@@ -47,6 +47,9 @@
 							<li><a href="./#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
 						</ul>
 					</li><!-- http://help.ubtob.com -->
+                    <li>
+                        <a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
+                    </li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right x-nologin">
 					<li><a href="#" class="link-login">登录</a></li>

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

@@ -84,6 +84,9 @@ var _hmt = _hmt || [];
 							<li><a href="#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
 						</ul>
 					</li><!-- http://help.ubtob.com -->
+					<li>
+						<a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
+					</li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right x-nologin">
 					<li><a href="#" class="link-login">登录</a></li>
@@ -200,10 +203,10 @@ var _hmt = _hmt || [];
 					<img src="static/img/carousel/header-11.jpg" alt="" />
 					<div class="carousel-caption">
 						<div class="container">
-							<div class="header-text">
+							<div class="header-text" style="color: #000; top: 20px;">
 								<h1>人才招聘</h1>
 								<p>
-									优质服务,快速响应,急速入职!<br />专为电子信息行业的资深工程师发现更好的工作机会, <br/>为企业挖掘专业人才。
+									优质服务,快速响应,急速入职!<br />为行业资深工程师发现更好的工作机会， <br/>为企业挖掘专业人才。
 								</p>
 							</div>
 							<div class="header-btn">

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

@@ -48,6 +48,9 @@
 							<li><a href="#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
 						</ul>
 					</li><!-- http://help.ubtob.com -->
+					<li>
+						<a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
+					</li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right x-nologin">
 					<li><a href="#" class="link-login">登录</a></li>

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

@@ -21,7 +21,6 @@ function getAccountInfo() {
             } else {
                 $('.x-login').find('.title').text(data.content.name);
             }
-			$('.link-mall').attr('href', 'http://www.usoftmall.com/auth/login');
 			window._hasAccountInfo = true;
 		}
 	});