Merge branch 'yc-payCenter' into payCenter-1102

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

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

@@ -270,7 +270,7 @@
         cursor: not-allowed;
     }
 
-     <!-- 分页的样式 start-->
+     /*<!-- 分页的样式 start -->*/
     ul.pagination.ng-table-pagination > li > a > span {
         height: 17px;
         line-height: 17px;
@@ -356,9 +356,7 @@
     .colorRed{
         color: #f00;
         font-size: 12px;
-    }
-    .col-md-2{
-        padding-right: 0;
+        margin-right:5px;
     }
 
     .pay_record .ticket_record_list .tab {
@@ -369,7 +367,7 @@
         text-overflow: ellipsis;
         white-space: nowrap;
     }
-    <!-- 分页的样式 end-->
+    /*<!-- 分页的样式end -->*/
      /*搜索时间筛选*/
       .screen {
 
@@ -652,7 +650,7 @@
                         </div>
                     </dd>
                 </dl>
-                <p style="text-align:right;margin-right:28px;margin-top:10px;">显示{{$$bankInfo.start}}-{{$$bankInfo.end}} 条，共 {{$$bankInfo.totalElements}} 条</p>
+                <p style="text-align:right;margin-right:28px;margin-top:10px;">显示1-10 条，共 2506 条</p>
                 <div style="background-color: white; width: 100%; height: 75px;">
                     <div class="ng-cloak ng-table-pager" ng-if="pages.length" style="float: right;margin-right: 60px;">
                         <ul class="pagination ng-table-pagination">
@@ -698,7 +696,7 @@
                         <td ng-bind="account.branchname">南山支行</td>
                         <td ng-bind="account.number | hideBankFilter">1256325*******************5621</td>
                         <td ng-bind="account.accountname">优软*********有限公司</td>
-                        <td ng-bind="account.status | bankStatusFilter">状态</td>
+                        <td ng-bind="account.status | bankStatusFilter"> <i class="fa fa-exclamation-circle"></i>状态</td>
                         <td class="operate-area">
                             <span>重新使用</span>
                             <span ng-click="deleteAccount(account)">删除</span>
@@ -722,69 +720,79 @@
             </div>
         </div>
     </div>
-
 </div>
 <!--模态框-->
-<div class="view-box" ng-if="$payCenter.newAccount">
+<div class="view-box" >
     <div class="box">
         <div class="add-count">
-            <h2>新增账户</h2>
-            <div class="row" style="height: 20px; margin-top: 10px;">
-                <label class="radio-inline margin15">
-                    <input type="radio" ng-checked="true" name="inlineRadioOptions" id="inlineRadio1" value="option1" style="position: relative; vertical-align: sub;"> 企业账户
-                </label>
+            <h2>新增账户信息</h2>
+            <span style="color:#cbcaca;width:10px;height:10px;position:absolute;top:15px;right:15px;"><i class="fa fa-close"></i></span>
+            <div class="row">
+                <div class="col-md-3"><em class="colorRed">*</em>开户银行</div>
+                <div class="col-md-5">
+                    <input ng-model="bankInfo.bankname" maxlength="30" ng-change="validateName(bankInfo.bankname, 2)" class="form-control" type="text" placeholder="例如：中国工商银行侨香支行" required>
+                </div>
+                <div class="col-md-4">
+                    <p>请填写正确的开户银行</p>
+                </div>
             </div>
             <div class="row">
-                <div class="col-md-2"><em class="colorRed">*</em>企业名称:</div>
-                <div class="col-md-8">
-                    <input ng-model="bankInfo.accountname" maxlength="30" ng-change="validateName(bankInfo.accountname, 1)" class="form-control" type="text" placeholder="例如：优软商城科技有限公司" required>
+                <div class="col-md-3"><em class="colorRed">*</em>开户支行</div>
+                <div class="col-md-5">
+                    <input ng-model="bankInfo.accountname" maxlength="30" ng-change="validateName(bankInfo.accountname, 1)" class="form-control" type="text" placeholder="例如：侨香支行" required>
+                </div>
+                <div class="col-md-4">
+                    <p>请勿超过20个字</p>
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-2"><em class="colorRed">*</em>开户银行:</div>
-                <div class="col-md-8">
-                    <input ng-model="bankInfo.bankname" maxlength="30" ng-change="validateName(bankInfo.bankname, 2)" class="form-control" type="text" placeholder="例如：中国工商银行侨香支行" required>
+                <div class="col-md-3"><em class="colorRed">*</em>银行账号</div>
+                <div class="col-md-5">
+                    <input ng-model="bankInfo.number" maxlength="30" ng-change="validateNumber(bankInfo.number)" class="form-control" type="text" placeholder="请填写银行账号" required>
+                </div>
+                <div class="col-md-4">
+                    <p>请勿超过20个字符</p>
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-2"><em class="colorRed">*</em>银行账号:</div>
-                <div class="col-md-8">
-                    <input ng-model="bankInfo.number" maxlength="30" ng-change="validateNumber(bankInfo.number)" class="form-control" type="text" placeholder="" required>
+                <div class="col-md-3"><em class="colorRed">*</em>开户名称</div>
+                <div class="col-md-5">
+                    <input ng-model="bankInfo.number" maxlength="30" ng-change="validateNumber(bankInfo.number)" class="form-control" type="text" placeholder="请填写开户人姓名或企业名称" required>
+                </div>
+                <div class="col-md-4">
+                    <p>请勿超过50个字</p>
                 </div>
             </div>
             <div class="row">
-                <p style="  padding-left: 15px; color: #666;"><em class="colorRed">*</em>请点击【选择文件】选择上传已加盖公章的开户行信息，并点击【提交】完成上传！ </p>
-                <div class="col-md-2"></div>
-                <div class="col-md-8">
-                    <div class="upload">
-                        <input type="text" name="txt" id="upload_text" />
-                        <i>选择文件</i>
-                        <!--<input required="true" type="file" onchange="upload_text.value=this.value" class="upload01"-->
-                               <!--ng-model="bankInfo.files" image-upload name="bankInfo" id="InputFile" ng-multiple="false"/>-->
-                            <input type="file" class="upload01" ng-file-select="" ng-model="bankInfo.files" id="InputFile" required="true" onchange="angular.element(this).scope().change()" ng-multiple="false" />
-                        <!--<a href="#" class="upload-btn">确认上传</a>-->
-                    </div>
-                    <p style="margin-top:0px; padding-left: 15px; color: #666;">仅支持JPG、PNG、GIF、PDF格式，大小不超过3M</p>
+                <div class="col-md-3"><em class="colorRed">*</em>上传开户许可证</div>
+                <div class="col-md-5 upload">
+                    <input type="text" name="txt" id="upload_text" class="form-control" style="width:70%;margin-right:10px;"/>
+                    <i>选择文件</i>
+                    <input type="file" class="upload01" ng-file-select="" ng-model="bankInfo.files" id="InputFile" required="true" onchange="angular.element(this).scope().change()" ng-multiple="false" />
+                </div>
+                <div class="col-md-4">
+                    <p>请勿超过3M</p>
                 </div>
             </div>
-            <div class="modal-footer">
-                <div class="pull-right">
-                    <button class="btn btn-success" type="submit"
-                            ng-disabled="!$payCenter.accountNameVal || !$payCenter.bankNameVal || !$payCenter.numberVal || !$payCenter.fileVal" ng-click="confirm()">提交</button>
-                    <button class="btn btn-warning" ng-click="cancle()">取消</button>
+            <div class="row">
+                <div class="col-md-12" style="text-align: center;">
+                    <button class="btn" ng-click="cancle()" style="background: #acabab;">取消</button>
+                    <button class="btn" type="submit"
+                            ng-disabled="!$payCenter.accountNameVal || !$payCenter.bankNameVal || !$payCenter.numberVal || !$payCenter.fileVal" ng-click="confirm()" style="background: #5078cb;">确定</button>
                 </div>
             </div>
             <div class="beizhu row">
                 <div class="col-md-1" style="color: #f00;line-height: 20px;">*声明：</div>
-                <div class="col-md-8">
+                <div class="col-md-10">
                     1. 此账户为卖家收款账户，请仔细核对信息内容，若由信息错误造成的损失，优软商城不承担赔偿责任。<br/>
-                    2. 如您的企业名称、开户银行及账号变更，您须在优软商城开展资金结算前进行更正，否则发生转账错误优软商城不承担赔偿责任。<br/>
-                    3. 更多的条款请阅读<a href="help/helpDetail/51" style="color: #5078cb;" target="_blank">《优软商城代收代付协议》</a> 。
+                    2. 卖家只能有唯一一个“使用中”的收款账户，新增账户审核通过后，原账户将自动失效。<br/>
+                    3. 如您的企业名称、开户银行及账号变更，您须在优软商城开展资金结算前进行更正，否则发生转账错误优软商城不承担赔偿责任。<br/>
+                    4. 更多的条款请阅读<a href="help/helpDetail/51" style="color: #5078cb;" target="_blank">《优软商城代收代付协议》</a> 。<br/>
+                    5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。
                 </div>
             </div>
         </div>
     </div>
-    </div>
 </div>
 <!--删除账户操作-->
 <div class="com-del-box" ng-if="$payCenter.deleteDiv">
@@ -807,7 +815,7 @@
         background: rgba(0,0,0,.5);
     }
     .view-box .box{
-        width:600px;
+        width:645px;
         height: 550px;
         position: absolute;
         left: 0;
@@ -829,47 +837,46 @@
         padding-left: 20px;
         font-size: 14px;
         font-family: normal;
+        font-weight: bold;
         border-bottom: #e5e5e5 1px solid;
     }
     .add-count .row{
-        margin: 0;
+        margin: 15px 0 20px 0;
         line-height: 34px;
-        margin-bottom: 20px;
         font-size: 14px;
-        padding-left: 45px;
+    }
+    .add-count .row p{
+        color:#f00;
+    }
+    .add-count .col-md-3{
+        text-align: right;
+    }
+    .add-count .col-md-5{
+       padding:0;
     }
     .add-count .row label{
         margin-left: 14px;
     }
    .upload {
        position: relative;
-       width: 100%;
-       min-height: 50px;
        line-height: 50px;
        font-size: 14px;
     }
-    .upload #upload_text {
-        width:335px;
-        height: 34px;
-        border: #ccc 1px solid;
-        padding-left: 20px;
-        border-radius: 5px;
-    }
+
     .upload i {
-        background: #ecf2fd;
-        width: 80px;
-        height: 32px;
+        background: #ff8522;
+        width: 25%;
+        height: 22px;
         display: inline-block;
         text-align: center;
-        color: #5078cb;
-        line-height: 34px;
+        color: #fff;
+        line-height: 22px;
         font-size: 14px;
         position: absolute;
-        left: 254px;
-        top: 10px;
-        border-left: #ccc 1px solid;
+        right:0;
+        top: 9px;
         cursor: pointer;
-        border-bottom-right-radius: 10px;
+        border-radius: 3px;
     }
     .upload01 {
         width:335px;
@@ -893,22 +900,21 @@
         border-radius: 5px;
     }
     .add-count .beizhu{
-        background: #fff;
-        padding: 0 0 15px;
-        margin: 0;
+        margin: 15px 0;
+        background: #ebebeb;
     }
     .add-count .beizhu .col-md-1{
-        width: 44px;
         padding: 0;
         font-size: 12px;
-        margin-left: 65px;
         line-height: 20px;
+        text-align: right;
     }
-    .add-count .beizhu .col-md-8{
+    .add-count .beizhu .col-md-10{
         line-height: 20px;
         font-size: 12px;
+        padding:0;
     }
-    .add-count .beizhu .col-md-8 a:hover{
+    .add-count .beizhu .col-md-10 a:hover{
         font-weight: 700;
         text-decoration: underline;
     }
@@ -918,6 +924,7 @@
     .btn-success,.btn-success[disabled] {
         background-color: #337ab7;
         border-color: #2e6da4;
+        margin-left: 15px;
     }
     .btn-warning {
         color: #fff;