|
|
@@ -596,6 +596,9 @@
|
|
|
background: #fff;
|
|
|
border:1px solid #89aefa;
|
|
|
}
|
|
|
+ .ng-table-pager .ng-table-pagination a {
|
|
|
+ color:#fff;
|
|
|
+ }
|
|
|
</style>
|
|
|
<!--右侧主体部分-->
|
|
|
<div class="user_right fr" id="pay_center">
|
|
|
@@ -618,7 +621,7 @@
|
|
|
<div class="data-input">
|
|
|
<input type="text" ng-model="startDate"
|
|
|
class="form-control select-adder" placeholder="起始时间"
|
|
|
- datepicker-popup="yyyy-MM-dd"
|
|
|
+ datepicker-popup="yyyy-MM-dd HH:mm:ss"
|
|
|
is-open="condition.startDateOpen"
|
|
|
max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
|
|
|
datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
@@ -631,7 +634,7 @@
|
|
|
<div class="data-input">
|
|
|
<input type="text" ng-model="endDate"
|
|
|
class="form-control select-adder" placeholder="结束时间"
|
|
|
- datepicker-popup="yyyy-MM-dd"
|
|
|
+ datepicker-popup="yyyy-MM-dd HH:mm:ss"
|
|
|
is-open="condition.endDateOpen"
|
|
|
min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
|
|
|
datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
@@ -643,7 +646,7 @@
|
|
|
<div class="sreach-input fr">
|
|
|
<input type="search" placeholder="商家名称/订单号" class="form-control" ng-model="keyword" ng-search="search()"/>
|
|
|
<a class="seek" href="javascript:void(0)" ng-click="search()">搜索</a>
|
|
|
- <a class="seek" href="javascript:void(0)" ng-click="exportToExcel()" style="margin-left: 5px;">导出</a>
|
|
|
+ <a class="seek" href="javascript:void(0)" style="margin-left: 5px;">导出</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -656,30 +659,31 @@
|
|
|
<span>币种</span>
|
|
|
<span>金额</span>
|
|
|
<span>
|
|
|
- <select class="form-control select-adder" style="width: 90px" ng-model="paytype" ng-change="filterLoad()">
|
|
|
- <option value="ALL">交易方式</option>
|
|
|
- <option value="1102">线上支付</option>
|
|
|
- <option value="1103">线下支付</option>
|
|
|
+ <select class="form-control select-adder" style="width: 90px">
|
|
|
+ <option>交易方式</option>
|
|
|
+ <option value="1">RMB</option>
|
|
|
+ <option value="2">USD</option>
|
|
|
</select>
|
|
|
</span>
|
|
|
<span style="width:13.52%">
|
|
|
<select class="form-control select-adder">
|
|
|
<option>状态</option>
|
|
|
- <option value="1">收款成功</option>
|
|
|
+ <option value="1">RMB</option>
|
|
|
+ <option value="2">USD</option>
|
|
|
</select>
|
|
|
</span>
|
|
|
</dt>
|
|
|
- <dd ng-repeat="record in bankTransRecore">
|
|
|
- <span ng-bind="record.transferTime | date : 'yyyy-MM-dd HH:mm:ss'">2017.01.18</span>
|
|
|
- <span ng-bind="record.bankTransAssociate.btaTableserNum">20170116001</span>
|
|
|
- <span>优软科技</span>
|
|
|
- <span ng-bind="record.currencyName">RMB</span>
|
|
|
+ <dd>
|
|
|
+ <span>2017.01.18</span>
|
|
|
+ <span>20170116001</span>
|
|
|
+ <span>￥8888.52</span>
|
|
|
+ <span>支付宝</span>
|
|
|
<span>
|
|
|
<i class="fa fa-plus" style="color:#f51c24"></i>
|
|
|
- <!--<i class="fa fa-minus" style="color:#1da902"></i>-->
|
|
|
- {{record.total}}</span>
|
|
|
- <span>线上付款</span>
|
|
|
- <span>收款成功</span>
|
|
|
+ <i class="fa fa-minus" style="color:#1da902"></i>
|
|
|
+ 12345678909</span>
|
|
|
+ <span>退款成功</span>
|
|
|
+ <span>退款成功</span>
|
|
|
</dd>
|
|
|
<div class="total">
|
|
|
<span>收入总计 <em>111111112</em></span>
|
|
|
@@ -689,7 +693,7 @@
|
|
|
<span>结余 <em>(共计5笔交易)</em></span>
|
|
|
</div>
|
|
|
|
|
|
- <dd ng-if="!bankTransRecore || bankTransRecore.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">
|
|
|
+ <dd ng-if="!tradeRecordPage.content || tradeRecordPage.content.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">
|
|
|
<div class="col-xs-offset-3 col-xs-2">
|
|
|
<img src="static/img/all/empty-cart.png">
|
|
|
</div>
|
|
|
@@ -728,7 +732,7 @@
|
|
|
<span>新增账户</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <table class="user-account-table" ng-table="bankInfoTableParams">
|
|
|
+ <table class="user-account-table" ng-table="bankInfoTableParams" style="margin-bottom:34px;">
|
|
|
<thead>
|
|
|
<tr>
|
|
|
<th width="130 ">开户银行</th>
|
|
|
@@ -754,12 +758,12 @@
|
|
|
|
|
|
</td>
|
|
|
<td class="operate-area">
|
|
|
- <span ng-if="account.status == 105">重新使用</span>
|
|
|
- <span ng-click="deleteAccount(account)">删除</span>
|
|
|
+ <span><a href="#">重新使用</a></span>
|
|
|
+ <span ng-click="deleteAccount(account)"><a href="#">删除</a></span>
|
|
|
</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
- <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:-25px;">显示{{$$bankInfo.start}}-{{$$bankInfo.end}} 条，共 {{$$bankInfo.totalElements}}条</p>
|
|
|
<div class="com-del-box" ng-if="false">
|
|
|
<div class="title">
|
|
|
<i></i>
|
hulh