Merge remote-tracking branch 'origin/feature/yc-mysql_erp-1020' into feature/yc-mysql_erp-1020

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

@@ -12,8 +12,8 @@ define(['app/app'], function(app) {
 		//银行账户信息，历史记录的的的状态
 		var hiStatus= SessionService.get('paycenter');
 
-		// $scope.status = hiStatus == null ? 'pay-info' : hiStatus;
-		$scope.status = 'pay-history';
+		$scope.status = hiStatus == null ? 'pay-info' : hiStatus;
+		// $scope.status = 'pay-history';
 		//企业和个人的账户状态
 		var accStatus= SessionService.get('accountstatus');
 		if ($rootScope.userInfo && $rootScope.userInfo.enterprises) {

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

@@ -20,7 +20,7 @@ define(['app/app'], function(app) {
         var enIdFilter = $filter('EncryptionFilter');
 
         $scope.$payCenter = {};
-        $scope.$payCenter.tab = "paymentRecode";
+        $scope.$payCenter.tab = "accountTab";
         //控制删除div显示
         $scope.$payCenter.deleteDiv = false;
         //删除id

src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -191,9 +191,9 @@
 		<!--</div>-->
 		<div class="oder01" style="margin-bottom: 16px;">
 			<ul>
-				<!--<li ng-class="{'active' : status=='pay-info'}" ng-click="toggleStatus('pay-info')"><a href="javascript:void(0)">银行账户信息</a></li>-->
+				<li ng-class="{'active' : status=='pay-info'}" ng-click="toggleStatus('pay-info')"><a href="javascript:void(0)">银行账户信息</a></li>
 				<li ng-class="{'active' : status=='pay-history'}" ng-click="toggleStatus('pay-history')"><a href="javascript:void(0)">支付记录</a></li>
-				<!--<li class="new-account" ng-click="editAccount()" style="color: #5078cb;" ng-if="!userInfo.enterprises"><i class="fa fa-plus-circle"></i>&nbsp;&nbsp;新增账户</li>-->
+				<li class="new-account" ng-click="editAccount()" style="color: #5078cb;" ng-if="!userInfo.enterprises"><i class="fa fa-plus-circle"></i>&nbsp;&nbsp;新增账户</li>
 			</ul>
 		</div>
 		<div class="oder01" ng-if="status=='pay-info' && userInfo.enterprises" style="margin-bottom: 10px;">

src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -384,10 +384,10 @@
         <!--</div>-->
         <div class="oder01">
             <ul>
-                <!--<li ng-click="setTab('accountTab')" ng-class="{'active' : $payCenter.tab == 'accountTab'}"><a href="javascript:void(0)">收款账户信息</a></li>-->
-                <!--<li ng-click="setTab('accountHis')" ng-class="{'active' : $payCenter.tab == 'accountHis'}"><a href="javascript:void(0)">账户申请记录</a></li>-->
+                <li ng-click="setTab('accountTab')" ng-class="{'active' : $payCenter.tab == 'accountTab'}"><a href="javascript:void(0)">收款账户信息</a></li>
+                <li ng-click="setTab('accountHis')" ng-class="{'active' : $payCenter.tab == 'accountHis'}"><a href="javascript:void(0)">账户申请记录</a></li>
                 <li ng-click="setTab('paymentRecode')" ng-class="{'active' : $payCenter.tab == 'paymentRecode'}"><a href="javascript:void(0)">收款记录</a></li>
-                <!--<li ng-if="$payCenter.tab == 'accountTab'" class="new-account" ng-click="newAccount()"><a ng-disabled="bankInfos.length > 0" ><i class="fa fa-plus-circle"></i>&nbsp;新增账户</a></li>-->
+                <li ng-if="$payCenter.tab == 'accountTab'" class="new-account" ng-click="newAccount()"><a ng-disabled="bankInfos.length > 0" ><i class="fa fa-plus-circle"></i>&nbsp;新增账户</a></li>
             </ul>
         </div>
         <!--支付中心列表-->