Merge remote-tracking branch 'origin/feature/yc-payCenter-1031' into feature/yc-payCenter-1031

# Conflicts:
#	src/main/webapp/resources/view/vendor/forstore/pay_center.html

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

@@ -228,9 +228,9 @@
 		padding-bottom: 48px;
 	}
 	#pay_center .tab .user-account-table {
-		width: 999px;
 		margin: 0 auto;
-		/*table-layout:fixed;*/
+		width:98%;
+		text-align: center;
 	}
 	#pay_center .tab .user-account-table thead {
 		background: #89aefa;
@@ -242,6 +242,24 @@
 		color: #fff;
 		font-weight: normal;
 	}
+	#pay_center .tab .user-account-table thead tr th:nth-child(1) {
+		min-width:100px;
+		max-width:165px;
+	}
+	#pay_center .tab .user-account-table thead tr th:nth-child(2) {
+		min-width:150px;
+		max-width:240px;
+	}
+	#pay_center .tab .user-account-table thead tr th:nth-child(3) {
+		width:80px;
+	}
+	#pay_center .tab .user-account-table thead tr th:nth-child(4) {
+		min-width:150px;
+		max-width:400px;
+	}
+	#pay_center .tab .user-account-table thead tr th:nth-child(5) {
+		width:130px;
+	}
 	#pay_center .tab .user-account-table tbody tr:hover {
 		background: #f1f5ff;
 	}
@@ -392,11 +410,11 @@
 				</div>
 				<table class="user-account-table" ng-table="bankInfoTableParams">
 					<thead>
-						<th width="165">开户银行</th>
-						<th width="240">开户支行</th>
-						<th width="80">银行账号</th>
-						<th width="400">开户名称</th>
-						<th width="130">操作</th>
+						<th>开户银行</th>
+						<th >开户支行</th>
+						<th >银行账号</th>
+						<th >开户名称</th>
+						<th >操作</th>
 					</thead>
 					<tbody>
 						<tr ng-repeat="account in accounts">

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

@@ -547,7 +547,8 @@
         padding-bottom: 48px;
     }
     #pay_center .tab .user-account-table {
-        width: 999px;
+        width: 98%;
+        text-align: center;
         margin: 0 auto;
     }
     #pay_center .tab .user-account-table thead {
@@ -560,6 +561,25 @@
         color: #fff;
         font-weight: normal;
     }
+    #pay_center .tab .user-account-table thead tr th:nth-child(1) {
+        min-width:100px;
+    }
+    #pay_center .tab .user-account-table thead tr th:nth-child(2) {
+        min-width:150px;
+    }
+    #pay_center .tab .user-account-table thead tr th:nth-child(3) {
+        width:80px;
+    }
+    #pay_center .tab .user-account-table thead tr th:nth-child(4) {
+        max-width:400px;
+    }
+    #pay_center .tab .user-account-table thead tr th:nth-child(5) {
+        min-width:80px;
+    }
+    #pay_center .tab .user-account-table thead tr th:nth-child(6) {
+        min-width:60px;
+        max-width:120px;
+    }
     #pay_center .tab .user-account-table tbody tr:hover {
         background: #f1f5ff;
     }
@@ -738,12 +758,12 @@
                 <table class="user-account-table" ng-table="bankInfoTableParams" style="margin-bottom:34px;">
                     <thead>
                     <tr>
-                        <th width="165">开户银行</th>
-                        <th width="240">开户支行</th>
-                        <th width="80">银行账号</th>
-                        <th width="400">开户名称</th>
-                        <th width="80">状态</th>
-                        <th width="60">操作</th>
+                        <th >开户银行</th>
+                        <th >开户支行</th>
+                        <th >银行账号</th>
+                        <th >开户名称</th>
+                        <th >状态</th>
+                        <th >操作</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -794,7 +814,7 @@
             <div class="row">
                 <div class="col-md-3"><em class="colorRed">*</em>开户银行</div>
                 <div class="col-md-5" style="position:relative;">
-                    <input ng-model="account.bankname" ng-change="checkAccount(1)" class="form-control" autocomplete="off" type="text" placeholder="例如：中国工商银行侨香支行" required style="padding:12px 6px;width:91%;border-right:transparent;border-radius:3px 0 0 3px;">
+                    <input ng-model="account.bankname" ng-change="checkAccount(1)" class="form-control" autocomplete="off" type="text" placeholder="例如：中国工商银行侨香支行" style="padding:12px 6px;width:91%;border-right:transparent;border-radius:3px 0 0 3px;">
                     <i class="select-adder" ng-click="showList()" style="display:inline-block;width:25px;height:34px;position:absolute;top:0;right:0;z-index:10;border:1px solid #ddd;border-radius:0 3px 3px 0;border-left:transparent"></i>
                     <ul class="select-down" ng-if="showBankFrame && matchData">
                         <li ng-click="fitBankToAccount(bank)" ng-repeat="bank in resultList">{{bank}}</li>
@@ -802,18 +822,18 @@
                 </div>
                 <div class="col-md-4">
                     <p ng-if="account.bankname && !matchData">请填写正确的开户银行</p>
-                    <p ng-if="myForm.bankname.$touched && myForm.bankname.$invalid">开户银行不能为空</p>
+                    <p ng-if="myForm.bankname.$touched && !account.bankname">开户银行不能为空</p>
                 </div>
             </div>
             <div class="row">
                 <div class="col-md-3"><em class="colorRed">*</em>开户支行</div>
                 <div class="col-md-5">
-                    <input name="branchname" ng-model="account.branchname" ng-change="checkAccount(2)" class="form-control" autocomplete="off" type="text" placeholder="例如：侨香支行" required>
+                    <input name="branchname" ng-model="account.branchname" ng-change="checkAccount(2)" class="form-control" autocomplete="off" type="text" placeholder="例如：侨香支行">
                 </div>
                 <div class="col-md-4">
                     <p ng-if="account.branchname && branchPattError">请填写正确的开户支行</p>
                     <p ng-if="account.branchname && !branchPattError && branchError">请勿超过20个字</p>
-                    <p ng-if="myForm.branchname.$touched && myForm.branchname.$invalid">开户支行不能为空</p>
+                    <p ng-if="myForm.branchname.$touched && !account.branchname">开户支行不能为空</p>
                 </div>
             </div>
             <div class="row">
@@ -831,11 +851,11 @@
             <div class="row">
                 <div class="col-md-3"><em class="colorRed">*</em>开户名称</div>
                 <div class="col-md-5">
-                    <input name="accountname" ng-model="account.accountname" ng-change="checkAccount(4)" class="form-control" autocomplete="off" type="text" placeholder="请填写开户人姓名或企业名称" required>
+                    <input name="accountname" ng-model="account.accountname" ng-change="checkAccount(4)" class="form-control" autocomplete="off" type="text" placeholder="请填写开户人姓名或企业名称">
                 </div>
                 <div class="col-md-4">
                     <p ng-if="account.accountname && nameError">请勿超过50个字</p>
-                    <p ng-if="myForm.accountname.$touched && myForm.accountname.$invalid">开户名称不能为空</p>
+                    <p ng-if="myForm.accountname.$touched && !account.accountname">开户名称不能为空</p>
                 </div>
             </div>
             <div class="row">