|
|
@@ -370,11 +370,11 @@ table>tbody>tr>td .btn-primary {
|
|
|
<div class="minTitle">订单号</div>
|
|
|
<div class="margin-left-37" ng-bind="orderNum"></div>
|
|
|
</div>
|
|
|
- <div class="marginbot30">
|
|
|
+ <div class="marginbot30" style="position:relative;">
|
|
|
<div class="minTitle">买家付款账户</div>
|
|
|
- <div class="margin-left-37">
|
|
|
+ <div class="margin-left-37" style="position: absolute;right:0;top:-5px;">
|
|
|
<span role="button" class="pull-right action-tag"
|
|
|
- ng-click="newAccount()" style="padding-top: 0px;"><i
|
|
|
+ ng-click="newAccount()"><i
|
|
|
class="fa fa-plus-square"></i> 新增账户</span>
|
|
|
</div>
|
|
|
<div class="border-account">
|
|
|
@@ -390,10 +390,16 @@ table>tbody>tr>td .btn-primary {
|
|
|
for="{{accountInfo.id}}"></label> <span
|
|
|
ng-bind="accountInfo.accountname"></span>
|
|
|
</div>
|
|
|
- <div class="col-md-5">
|
|
|
- <span ng-bind="accountInfo.filterAccount"></span>
|
|
|
- <span ng-bind="accountInfo.bankname"></span> <i
|
|
|
- class="fa fa-credit-card"></i>
|
|
|
+ <div class="col-md-5 text-center">
|
|
|
+ <div class="row">
|
|
|
+ <div class="col-md-6 text-right">
|
|
|
+ <span ng-bind="accountInfo.filterAccount"></span>
|
|
|
+ </div>
|
|
|
+ <div class="col-md-6 text-left">
|
|
|
+ <span ng-bind="accountInfo.bankname"></span> <i
|
|
|
+ class="fa fa-credit-card"></i>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="text-right col-md-3">
|
|
|
<span role="button" class="modify-account"
|
|
|
@@ -412,10 +418,16 @@ table>tbody>tr>td .btn-primary {
|
|
|
id="{{buyAccount.id}}"><label for="{{buyAccount.id}}"></label>
|
|
|
<span ng-bind="buyAccount.accountname"></span>
|
|
|
</div>
|
|
|
- <div class="col-md-5">
|
|
|
- <span ng-bind="buyAccount.filterAccount"></span> <span
|
|
|
- ng-bind="buyAccount.bankname"></span> <i
|
|
|
- class="fa fa-credit-card"></i>
|
|
|
+ <div class="col-md-5 text-center">
|
|
|
+ <div class="row">
|
|
|
+ <div class="col-md-6 text-right">
|
|
|
+ <span ng-bind="buyAccount.filterAccount"></span>
|
|
|
+ </div>
|
|
|
+ <div class="col-md-6 text-left">
|
|
|
+ <span ng-bind="buyAccount.bankname"></span> <i
|
|
|
+ class="fa fa-credit-card"></i>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="text-right col-md-3">
|
|
|
<span role="button" class="modify-account"
|
|
|
@@ -430,15 +442,16 @@ table>tbody>tr>td .btn-primary {
|
|
|
<div ng-if="!buyAccount"
|
|
|
class="row paddingzero marginleftrightzero text-center account-line account-info-line notice">没有对应的账户信息,请新增相应的账户信息
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div ng-if="buyAccountInfos.length>1"
|
|
|
- class="pull-right action-tag">
|
|
|
+ <div ng-if="buyAccountInfos.length>1"
|
|
|
+ class="pull-right action-tag">
|
|
|
<span role="button" ng-if="!buyExpose"
|
|
|
- ng-click="doExpose(true, true)"><i
|
|
|
- class="fa fa-angle-double-down"></i> 展开列表</span> <span
|
|
|
- role="button" ng-if="buyExpose" ng-click="doExpose(false, true)"><i
|
|
|
- class="fa fa-angle-double-up"></i> 收起列表</span>
|
|
|
+ ng-click="doExpose(true, true)"><i
|
|
|
+ class="fa fa-angle-double-down"></i> 展开列表</span> <span
|
|
|
+ role="button" ng-if="buyExpose" ng-click="doExpose(false, true)"><i
|
|
|
+ class="fa fa-angle-double-up"></i> 收起列表</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="marginbot30">
|
|
|
@@ -456,10 +469,16 @@ table>tbody>tr>td .btn-primary {
|
|
|
for="{{saleAccountInfo.id}}"></label> <span
|
|
|
ng-bind="saleAccountInfo.accountname"></span>
|
|
|
</div>
|
|
|
- <div class="col-md-8">
|
|
|
- <span ng-bind="saleAccountInfo.filterAccount"></span>
|
|
|
- <span ng-bind="saleAccountInfo.bankname"></span>
|
|
|
- <i class="fa fa-credit-card"></i>
|
|
|
+ <div class="col-md-5 text-center">
|
|
|
+ <div class="row">
|
|
|
+ <div class="col-md-6 text-right">
|
|
|
+ <span ng-bind="saleAccountInfo.filterAccount"></span>
|
|
|
+ </div>
|
|
|
+ <div class="col-md-6 text-left">
|
|
|
+ <span ng-bind="saleAccountInfo.bankname"></span>
|
|
|
+ <i class="fa fa-credit-card"></i>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div ng-if="!salexpose"
|
|
|
@@ -471,20 +490,26 @@ table>tbody>tr>td .btn-primary {
|
|
|
for="{{saleAccount.id}}"></label> <span
|
|
|
ng-bind="saleAccount.accountname"></span>
|
|
|
</div>
|
|
|
- <div class="col-md-8">
|
|
|
- <span ng-bind="saleAccount.number"></span>
|
|
|
- <span ng-bind="saleAccount.bankname"></span> <i
|
|
|
- class="fa fa-credit-card"></i>
|
|
|
+ <div class="col-md-5 text-center">
|
|
|
+ <div class="row">
|
|
|
+ <div class="col-md-6 text-right">
|
|
|
+ <span ng-bind="saleAccount.number"></span>
|
|
|
+ </div>
|
|
|
+ <div class="col-md-6 text-left">
|
|
|
+ <span ng-bind="saleAccount.bankname"></span> <i
|
|
|
+ class="fa fa-credit-card"></i>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div ng-if="buyAccountInfos.length>1"
|
|
|
- class="pull-right action-tag">
|
|
|
+ <div ng-if="buyAccountInfos.length>1"
|
|
|
+ class="pull-right action-tag">
|
|
|
<span role="button" ng-if="!salexpose"
|
|
|
- ng-click="doExpose(true, false)"><i
|
|
|
- class="fa fa-angle-double-down"></i> 展开列表</span> <span
|
|
|
- role="button" ng-if="salexpose" ng-click="doExpose(false, false)"><i
|
|
|
- class="fa fa-angle-double-up"></i> 收起列表</span>
|
|
|
+ ng-click="doExpose(true, false)"><i
|
|
|
+ class="fa fa-angle-double-down"></i> 展开列表</span> <span
|
|
|
+ role="button" ng-if="salexpose" ng-click="doExpose(false, false)"><i
|
|
|
+ class="fa fa-angle-double-up"></i> 收起列表</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -509,8 +534,8 @@ table>tbody>tr>td .btn-primary {
|
|
|
</div>
|
|
|
<div class="text-right marginbot15 margintop15">
|
|
|
<span class="total">总价: <span style="color: #e64040">{{$$bankTransfer.total | number : 2 | currencySysmbol : $$bankTransfer.currency}}</span></span>
|
|
|
- <button class="ok-btn btn btn-primary btn-lg" ng-click="confirm()"
|
|
|
- ng-disabled="!$$bankTransfer.total||!buyAccount||!saleAccount||!transferTime||!imageUrl">确认</button>
|
|
|
+ <button class="ok-btn btn btn-lg" ng-click="confirm()"
|
|
|
+ ng-disabled="!$$bankTransfer.total||!buyAccount||!saleAccount||!imageUrl" style="background: #5078cb;">确认</button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|