Merge remote-tracking branch 'origin/release-B2bOrSsr-wangcz' into release-B2bOrSsr-wangcz

src/main/webapp/resources/js/sso/controllers/b2b/LogCtrl.js

@@ -25,6 +25,9 @@ define(['app/app'], function(app) {
                 });
             }
         });
+        $scope.export = function () {
+            window.open(BaseService.getB2bUrl() + '/log/erp/xls');
+        }
         $scope.usageParams = new ngTableParams({
             page: 1,
             count: 20,

src/main/webapp/resources/view/sso/b2b/log.html

@@ -62,7 +62,7 @@
 		<div class="title-div">
 			<span class="f14 bold">数据传输日志</span>
 			<div class="pull-right">
-				<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
+				<a ng-click="export()" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 			</div>
 		</div>
 		<div class="pane-body clearfix" id="order-detail-list" style="width: 100%;">

src/main/webapp/resources/view/vendor/b2b/sale_inquiry.html

@@ -62,10 +62,10 @@
 	.order-table .order-hd .order-main span a.text-num {
 		color: #3f84f6;
 	}
-	.dropdown>.dropdown-toggle.text-default {
+	.sale-inquiry .dropdown>.dropdown-toggle.text-default {
 		color: #333333;
 	}
-	.dropdown>.dropdown-toggle:hover{
+	.sale-inquiry .dropdown>.dropdown-toggle:hover{
 		display: inline-block;
 		width: 78px;
 		height: 21px;
@@ -607,7 +607,7 @@
 		width: 40px;
 	}
 </style>
-<div class="block user_right fr" id="public" style="position: relative">
+<div class="block user_right fr sale-inquiry" id="public" style="position: relative">
 	<!--<div class="pub-com_head">-->
 		<!--<span>客户采购询价</span>-->
 		<!--<div class="p-right">-->