Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/views/mobile/signin.html

@@ -20,7 +20,7 @@
 var _hmt = _hmt || [];
 (function() {
   var hm = document.createElement("script");
-  hm.src = "//hm.baidu.com/hm.js?457b54f7c471179f669eb5bb6397523e";
+  hm.src = "https://hm.baidu.com/hm.js?5701b143e26c91522f816effc41f5df0";
   var s = document.getElementsByTagName("script")[0]; 
   s.parentNode.insertBefore(hm, s);
 })();

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

@@ -188,19 +188,19 @@
 	<!-- body End -->
 
  <!--金控广告 -->
-<div ng-controller="AdController">
-	<div class="jinkong_bottom" ng-show="bannerShow" ng-class="{'jinkong_animation': jingKongAnmiation}"></div>
-	<div class="jinkong" ng-if="imgShow" ng-class="{'jinkong_animation': jingKongAnmiation}">
-		<div class="container">
-			<div class="img" ng-class="{'img_stater': imgAnmiation}">
-				<span class="qcrode_close close" ng-click="closeClick()">×</span>
-				<span class="close time" ng-if="!imgAnmiation">{{count}}s</span>
-				<img src="static/img/jinkong/xiaoren.png" ng-class="{'animation_xr': imgAnmiation}">
-				<img src="static/img/jinkong/qrcode.png">
-			</div>
-		</div>
-	</div>
-</div>
+<!--<div ng-controller="AdController">-->
+	<!--<div class="jinkong_bottom" ng-show="bannerShow" ng-class="{'jinkong_animation': jingKongAnmiation}"></div>-->
+	<!--<div class="jinkong" ng-if="imgShow" ng-class="{'jinkong_animation': jingKongAnmiation}">-->
+		<!--<div class="container">-->
+			<!--<div class="img" ng-class="{'img_stater': imgAnmiation}">-->
+				<!--<span class="qcrode_close close" ng-click="closeClick()">×</span>-->
+				<!--<span class="close time" ng-if="!imgAnmiation">{{count}}s</span>-->
+				<!--<img src="static/img/jinkong/xiaoren.png" ng-class="{'animation_xr': imgAnmiation}">-->
+				<!--<img src="static/img/jinkong/qrcode.png">-->
+			<!--</div>-->
+		<!--</div>-->
+	<!--</div>-->
+<!--</div>-->
  <!-- -金控广告 -->
 
 <!-- footer Start -->

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

@@ -20,7 +20,7 @@
 var _hmt = _hmt || [];
 (function() {
   var hm = document.createElement("script");
-  hm.src = "//hm.baidu.com/hm.js?457b54f7c471179f669eb5bb6397523e";
+  hm.src = "https://hm.baidu.com/hm.js?5701b143e26c91522f816effc41f5df0";
   var s = document.getElementsByTagName("script")[0]; 
   s.parentNode.insertBefore(hm, s);
 })();

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -846,9 +846,9 @@
 	<div class="com_title01"><span>已开通服务</span></div>
 	<div class="pane-body">
 		<div class="row">
-			<div class="col-xs-4"><a href="http://uas.ubtob.com/#/index" class="bule" title="B2B商务平台">B2B商务平台</a></div>
+			<div class="col-xs-4"><a href="http://b2b.usoftchina.com/" class="bule" title="B2B商务平台">B2B商务平台</a></div>
 			<div class="col-xs-4"><a href="http://mall.usoftchina.com/" class="bule" target="_blank" title="优软商城">优软商城</a></div>
-			<div class="col-xs-4"><a href="http://v2.usoftchina.com/uu" class="bule" target="_blank" title="UU互联">UU互联</a></div>
+			<div class="col-xs-4"><a class="bule" title="UU互联">UU互联</a></div>
 		</div>
 	</div>
 	<div class="save-btn">

src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html

@@ -206,8 +206,8 @@
 				<td colspan="5">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+							<a><img src="static/img/empty/uas_empty.png"></a>
+							<a>B2B 商务</a>
 						</div>
 						<div class="right_link">
 							<p>暂无客户信息</p>

src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -421,8 +421,8 @@
                            </table>
                             <div id="empty" ng-if="tableParams.total() == 0">
                                 <div class="left_img">
-                                    <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                                    <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                                    <a><img src="static/img/empty/uas_empty.png"></a>
+                                    <a>B2B 商务</a>
                                 </div>
                                 <div class="right_link">
                                     <p>暂无对应的公共询价信息</p>

src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -194,8 +194,8 @@
 				<td colspan="5">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+							<a><img src="static/img/empty/uas_empty.png"></a>
+							<a>B2B 商务</a>
 						</div>
 						<div class="right_link">
 							<p>暂无邀请记录</p>

src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -421,8 +421,8 @@
 		<td colspan="5">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					<a><img src="static/img/empty/uas_empty.png"></a>
+					<a>B2B 商务</a>
 				</div>
 				<div class="right_link">
 					<p>暂无合作伙伴</p>

src/main/webapp/resources/tpl/index/baseInfo/servicerInfo.html

@@ -220,8 +220,8 @@
 				<td colspan="5">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+							<a><img src="static/img/empty/uas_empty.png"></a>
+							<a>B2B 商务</a>
 						</div>
 						<div class="right_link">
 							<p>暂无服务商信息</p>

src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html

@@ -222,8 +222,8 @@
 				<td colspan="5">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+							<a><img src="static/img/empty/uas_empty.png"></a>
+							<a>B2B 商务</a>
 						</div>
 						<div class="right_link">
 							<p>暂无供应商信息</p>

src/main/webapp/resources/tpl/index/common/header.html

@@ -261,7 +261,7 @@
                 <a ng-click="b2cLink('/pcb')">PCB专区</a>
             </li>
             <li>
-                <a href="https://zb.usoftchina.com/" target="_blank">U创网</a>
+                <a href="https://zb.usoftchina.com/" target="_blank">闯客网</a>
             </li>
             <li>
                 <a href="https://bbs.usoftchina.com/" target="_blank">U客论坛</a>

src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -205,8 +205,8 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					<a><img src="static/img/empty/uas_empty.png"></a>
+					<a>B2B 商务</a>
 				</div>
 				<div class="right_link">
 					<p>暂无对应的发票信息</p>

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -320,8 +320,8 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						<a><img src="static/img/empty/uas_empty.png"></a>
+						<a>B2B 商务</a>
 					</div>
 					<div class="right_link">
 						<p ng-if="active != 'all'">您还未生成对账单，请立即新增对账！</p>

src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -210,8 +210,8 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						<a><img src="static/img/empty/uas_empty.png"></a>
+						<a>B2B 商务</a>
 					</div>
 					<div class="right_link">
 						<p>暂无对应的对账单信息</p>

src/main/webapp/resources/tpl/index/home/right.html

@@ -282,9 +282,9 @@
 		<div class="border01 todo-content" ng-controller="TodoCtrl">
 			<!--工作台导航-->
 			<div class="toto-menu">
-				<div class="advertising">
-					<img src="static/img/jinkong/flag.gif">
-				</div>
+				<!--<div class="advertising">-->
+					<!--<img src="static/img/jinkong/flag.gif">-->
+				<!--</div>-->
 				<div class="menu01 row">
 					<div class="header"><img src="static/img/home/xiaoshou.png" alt=""/>销售</div>
 					<div class="content">
@@ -574,9 +574,7 @@
 			<!-- 轮播（Carousel）项目 -->
 			<div class="carousel-inner">
 				<div class="item active">
-					<a href="http://www.yitoa-fintech.com/" target="_blank">
-						<img src="static/img/home/jingkong.png" alt="First slide" >
-					</a>
+					<img src="static/img/home/board.jpg" alt="First slide" >
 				</div>
 				<!-- <div class="item">
 					<img src="static/img/home/UU.png" alt="Second slide">

src/main/webapp/resources/tpl/index/make/accept.html

@@ -290,8 +290,8 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						<a><img src="static/img/empty/uas_empty.png"></a>
+						<a>B2B 商务</a>
 					</div>
 					<div class="right_link">
 						<p>暂无对应的单据</p>

src/main/webapp/resources/tpl/index/make/order.html

@@ -423,8 +423,8 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					<a><img src="static/img/empty/uas_empty.png"></a>
+					<a>B2B 商务</a>
 				</div>
 				<div class="right_link">
 					<p>暂无对应的单据</p>

src/main/webapp/resources/tpl/index/make/returns.html

@@ -273,8 +273,8 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						<a><img src="static/img/empty/uas_empty.png"></a>
+						<a>B2B 商务</a>
 					</div>
 					<div class="right_link">
 						<p>暂无对应的单据</p>

src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -264,8 +264,8 @@
 						<td colspan="5">
 							<div id="empty">
 								<div class="left_img">
-									<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-									<a href="#/index" title="B2B商务首页">B2B 商务</a>
+									<a><img src="static/img/empty/uas_empty.png"></a>
+									<a>B2B 商务</a>
 								</div>
 								<div class="right_link">
 									<p ng-if="tip != null">搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</p>

src/main/webapp/resources/tpl/index/purc/changeList.html

@@ -386,8 +386,8 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					<a><img src="static/img/empty/uas_empty.png"></a>
+					<a>B2B 商务</a>
 				</div>
 				<div class="right_link">
 					<p>暂无对应的单据</p>

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -320,8 +320,8 @@
                 <td colspan="4">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                            <a><img src="static/img/empty/uas_empty.png"></a>
+                            <a>B2B 商务</a>
                         </div>
                         <div class="right_link">
                             <p>暂无对应的订单信息</p>

src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -1166,8 +1166,8 @@
                 <td colspan="5" style="border-bottom: 1px solid transparent">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                            <a><img src="static/img/empty/uas_empty.png"></a>
+                            <a>B2B 商务</a>
                         </div>
                         <div class="right_link">
                             <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</p>

src/main/webapp/resources/tpl/index/purc/modal/enableOrderList.html

@@ -184,9 +184,8 @@
                 <td colspan="6">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img
-                                    src="static/img/empty/uas_empty.png"></a>
-                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                            <a><img src="static/img/empty/uas_empty.png"></a>
+                            <a>B2B 商务</a>
                         </div>
                         <div class="right_link">
                             <p>当前没有对应的采购订单！</p>
@@ -212,8 +211,8 @@
                             <div class="info">
                                 <p>3、您的供应商正在使用旧版本的UAS商务平台<br>
                                     解决：我们仍有部分用户在使用旧版本UAS商务平台系统，你可以用您的企业UU号和管理员个人UU号
-                                    <a href="http://www.usoftchina.com" class="text-bold text-link"
-                                       title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a>
+                                    <a href="http://uas.usoftchina.com" class="text-bold text-link"
+                                       title="http://uas.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a>
                                 </p>
                             </div>
                         </div>

src/main/webapp/resources/tpl/index/purc/prodList.html

@@ -287,8 +287,8 @@
         </table>
         <div id="empty" ng-if="tableParams.total() == 0">
             <div class="left_img">
-                <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                <a><img src="static/img/empty/uas_empty.png"></a>
+                <a>B2B 商务</a>
             </div>
             <div class="right_link">
                 <p>暂无对应的物料信息</p>

src/main/webapp/resources/tpl/index/purc/pubInquiry_new.html

@@ -1132,8 +1132,8 @@ select.disabled {
                 <td colspan="7" style="border-bottom: none;">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                            <a><img src="static/img/empty/uas_empty.png"></a>
+                            <a>B2B 商务</a>
                         </div>
                         <div class="right_link">
                             <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</p>

src/main/webapp/resources/tpl/index/purc/saved_tender.html

@@ -1063,8 +1063,8 @@
         </table>
         <div id="empty" ng-if="tableParams.total() == 0">
             <div class="left_img">
-                <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                <a><img src="static/img/empty/uas_empty.png"></a>
+                <a>B2B 商务</a>
             </div>
             <div class="right_link">
                 <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</p>

src/main/webapp/resources/tpl/index/purc/vendor_detail.html

@@ -127,8 +127,8 @@
                     <td colspan="5">
                         <div id="empty">
                             <div class="left_img">
-                                <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                                <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                                <a><img src="static/img/empty/uas_empty.png"></a>
+                                <a>B2B 商务</a>
                             </div>
                             <div class="right_link">
                                 <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</p>

src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -303,8 +303,8 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					<a><img src="static/img/empty/uas_empty.png"></a>
+					<a>B2B 商务</a>
 				</div>
 				<div class="right_link">
 					<p>暂无对应的单据</p>

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -271,8 +271,8 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						<a><img src="static/img/empty/uas_empty.png"></a>
+						<a>B2B 商务</a>
 					</div>
 					<div class="right_link">
 						<p>暂无对应的单据</p>

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -272,8 +272,8 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					<a><img src="static/img/empty/uas_empty.png"></a>
+					<a>B2B 商务</a>
 				</div>
 				<div class="right_link">
 					<p>暂无对应的单据</p>

src/main/webapp/resources/tpl/index/sale/pubinquiry.html

@@ -339,8 +339,8 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						<a><img src="static/img/empty/uas_empty.png"></a>
+						<a>B2B 商务</a>
 					</div>
 					<div class="right_link">
 						<p>当前没有对应的客户询价单！</p>