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

src/main/webapp/resources/view/common/bankInfoModal.html

@@ -27,7 +27,7 @@
 		border:1px solid #5078cb;
 		position:absolute;
 		background: #fff;
-		top:50px;
+		top:34px;
 		z-index:1000;
 	}
 	.divinline .select-down li{
@@ -65,8 +65,9 @@
 		margin-right: 10px;
 	}
 </style>
-<div class="modal-header">
+<div class="modal-header" style="position:relative">
 	<h3 class="modal-title" style="font-weight: 700">{{title}}</h3>
+	<span style="color:#cbcaca;width:10px;height:10px;position:absolute;top:15px;right:15px;"><i class="fa fa-close" ng-click="cancelAdd()"></i></span>
 </div>
 <form class="form-horizontal add-bank-account" style="margin-left: 17px;" name="myForm" novalidate>
 	<div class="modal-body">
@@ -79,7 +80,7 @@
 						<!--<option value="2">2</option>-->
 					<!--</select>-->
 		    		<input name="bankname" ng-model="account.bankname" ng-change="checkAccount(1)" type="text" class="form-control" placeholder="请选择开户银行" required style="width:216px;border-right:transparent;border-radius:3px 0 0 3px;">
-					<i class="select-adder" style="display:inline-block;width:25px;height:34px;border:1px solid #ddd;border-radius:3px;position:absolute;right:-25px;top:0;border-radius:0 3px 3px 0;border-left:transparent"></i>
+					<i class="select-adder" style="display:inline-block;width:25px;height:34px;border:1px solid #ddd;position:absolute;right:-25px;top:0;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>
 					</ul>

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

@@ -256,6 +256,9 @@
 	#pay_center .tab .user-account-table tbody tr td.operate-area {
 		border-right: 1px solid #dae5fd;
 	}
+	#pay_center .tab .user-account-table tbody tr:hover td.operate-area .mall-btn-warn{
+		display: inline-block;
+	}
 	#pay_center .mall-btn-submit {
 		height: 24px;
 		line-height: 24px;
@@ -267,12 +270,12 @@
 		cursor: pointer;
 	}
 	#pay_center .mall-btn-warn {
+		display:none;
 		height: 24px;
 		line-height: 24px;
 		background: #fc4f03;
 		color: #fff;
 		padding: 0 9px;
-		display: inline-block;
 		margin-left: 20px;
 		cursor: pointer;
 	}
@@ -516,7 +519,7 @@
 					</dd>
 
 				</dl>
-				<div style="text-align: right;margin-right:20px;">
+				<div style="text-align: right;margin-right:20px;margin-top:10px;">
 					<span class="count-tip">显示 {{$$record.start}}-{{$$record.end}} 条,共 <em ng-bind="$$record.totalElements" style="color: #5078cb">2506</em> 条</span>
 				</div>
                 <!--<p class="height16">&nbsp</p>-->