Просмотр исходного кода

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

# Conflicts:
#	src/main/webapp/resources/view/vendor/forstore/pay_center.html
hulh 8 лет назад
Родитель
Сommit
c4de766124
1 измененных файлов с 6 добавлено и 3 удалено
  1. 6 3
      src/main/webapp/resources/view/vendor/forstore/pay_center.html

+ 6 - 3
src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -419,7 +419,7 @@
         top: 1px;
         width: 20px;
         height: 30px;
-        background: url(static/img/user/images/xiala.png) right no-repeat #fff !important;
+        background: url('static/img/user/images/xiala.png') right no-repeat #fff !important;
         background-position-x: 100% !important;
         border: none;
     }
@@ -630,7 +630,10 @@
                         <span>20170116001</span>
                         <span>¥8888.52</span>
                         <span>支付宝</span>
-                        <span>12345678909</span>
+                        <span>
+                            <i class="fa fa-plus" style="color:#f51c24"></i>
+                            <i class="fa fa-minus" style="color:#1da902"></i>
+                            12345678909</span>
                         <span>退款成功</span>
                         <span>退款成功</span>
                     </dd>
@@ -696,7 +699,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"> <i class="fa fa-exclamation-circle"></i>状态</td>
+                        <td ng-bind="account.status | bankStatusFilter"> <i class="fa fa-exclamation-circle" style="position:relative;"><span style="display:block;width:130px;padding:5px;font-size: 12px;line-height:15px;color:#666;position:absolute;top:0px;left:20px;background: #fff;border:1px solid #89aefa;">审核通过后,原账户将自动失效</span></i>状态</td>
                         <td class="operate-area">
                             <span>重新使用</span>
                             <span ng-click="deleteAccount(account)">删除</span>