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

src/main/webapp/resources/js/usercenter/controllers/forstore/pay_center_ctrl.js

@@ -6,7 +6,6 @@ define(['app/app'], function(app) {
 	app.register.controller('buyerPayCenterCtrl', ['$scope', '$rootScope', 'ngTableParams', 'BaseService', 'bankInfoService', '$filter', 'SessionService', '$modal', 'toaster', 'OrderSimpleInfo', 'Loading', 'Authority', '$stateParams', function($scope, $rootScope, ngTableParams, BaseService, bankInfoService, $filter, SessionService, $modal, toaster, OrderSimpleInfo, Loading, Authority, $stateParams) {
 		$rootScope.active = 'buyer_pay_center';
 
-		document.title = '支付中心-优软商城';
 		var hideBankFilter = $filter("hideBankFilter");
 
 		//历史记录的状态
@@ -19,6 +18,8 @@ define(['app/app'], function(app) {
 			$scope.status = $stateParams.status;
 		}
 
+		document.title = ($scope.status == 'pay-history' ? '应付对账' : '付款账户') + '-优软商城';
+
 		//切换银行账户信息，历史记录的状态
 		$scope.toggleStatus = function(status) {
 			if($scope.status != status) {

src/main/webapp/resources/js/vendor/controllers/forstore/pay_center_ctrl.js

@@ -6,7 +6,6 @@ define(['app/app'], function(app) {
     app.register.controller('vendorPayCenterCtrl', ['$scope', '$rootScope', 'bankInfoService', 'toaster', '$upload', 'bankTransferService', 'Purchase', '$filter', 'Loading', 'ngTableParams', 'BaseService', 'SessionService', '$stateParams', '$http', 'Authority', function($scope, $rootScope, bankInfoService, toaster, $upload, bankTransferService, Purchase, $filter, Loading, ngTableParams, BaseService, SessionService, $stateParams, $http, Authority) {
         $rootScope.active = 'vendor_pay_center';
 
-        document.title = '结算中心-优软商城';
         // 加密订单的ID过滤器
         var enIdFilter = $filter('EncryptionFilter');
 
@@ -17,6 +16,9 @@ define(['app/app'], function(app) {
         $scope.param = {};
 
         $scope.tab = $stateParams.tab == 'accountTab' ? $stateParams.tab : hiStatus == null ? 'paymentRecord' : hiStatus;
+
+        document.title = $stateParams.tab == 'accountTab' ? '收款账户' : '应收对账' + '-优软商城';
+
         $scope.$$bankInfo = {};
 
         $scope.paytype = 'ALL';

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_upload_ctrl.js

@@ -6,7 +6,7 @@ define([ 'app/app' ], function(app) {
             $rootScope.$$productOn.leadIn = 'bathOn';
             $rootScope.$$productOn.tab = 'bathOn';
         }
-		$rootScope.active = 'vendor_material';
+		$rootScope.active = 'vendor_productOn';
 		document.title = '产品导入-优软商城';
         //切换展示的信息
         $scope.toggleActive = function(active) {