Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
wangning
7 years ago
commit
11e7bd5e13
@ -1,23 +1,35 @@
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Client</th>
|
||||
<th>Send Name</th>
|
||||
<th>Act Name</th>
|
||||
<th>Operation</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="client in clients">
|
||||
<td>{{client.short_name}}({{client.client_moniker}})</td>
|
||||
<td ng-bind="client.send_name"></td>
|
||||
<td ng-bind="client.act_name"></td>
|
||||
<td>
|
||||
<a role="button" ng-click="editClientInfo(client)"><i class="fa fa-cog"></i></a>
|
||||
<a role="button" ng-click="deleteClient(client)" class="text-danger"><i class="fa fa-trash"></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="box box-warning">
|
||||
<div class="box-header">
|
||||
<div class="form-inline">
|
||||
<div class="form-group">
|
||||
<button class="btn btn-success" type="button" ng-click="addAttendClient()"><i class="fa fa-plus"></i> New Attend Partner</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="box box-warning">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Client</th>
|
||||
<th>Send Name</th>
|
||||
<th>Act Name</th>
|
||||
<th>Operation</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="client in clients">
|
||||
<td>{{client.short_name}}({{client.client_moniker}})</td>
|
||||
<td ng-bind="client.send_name"></td>
|
||||
<td ng-bind="client.act_name"></td>
|
||||
<td>
|
||||
<a role="button" ng-click="editClientInfo(client)"><i class="fa fa-cog"></i></a>
|
||||
<a role="button" ng-click="deleteClient(client)" class="text-danger"><i class="fa fa-trash"></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,37 +1,206 @@
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Client Moniker</th>
|
||||
<th>status</th>
|
||||
<th>Order Amount</th>
|
||||
<th>Create Time</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="order in orders">
|
||||
<td>{{order.client_moniker}}</td>
|
||||
<td>{{order.status|send_status}}</td>
|
||||
<td>{{order.order_amount}}</td>
|
||||
<td>{{order.create_time}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="box box-warning">
|
||||
<div class="box-header">
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="form-horizontal">
|
||||
<div class="form-group col-xs-12 col-sm-12">
|
||||
<label class="control-label col-xs-4 col-sm-2">Date Range</label>
|
||||
<div class="col-sm-10">
|
||||
<div class="form-control-static form-inline">
|
||||
<div style="display: inline-block">
|
||||
<input class="form-control" id="date-from-input"
|
||||
ng-model="analysis.begin"
|
||||
uib-datepicker-popup size="10" placeholder="From"
|
||||
is-open="analysis_dateBegin.open" ng-click="analysis_dateBegin.open=true"
|
||||
datepicker-options="{maxDate:analysis.end||today}">
|
||||
</div>
|
||||
~
|
||||
<div style="display: inline-block">
|
||||
<input class="form-control" id="date-to-input" ng-model="analysis.end"
|
||||
uib-datepicker-popup size="10" placeholder="To"
|
||||
is-open="analysis_dateTo.open" ng-click="analysis_dateTo.open=true"
|
||||
datepicker-options="{minDate:analysis.begin,maxDate:today}">
|
||||
</div>
|
||||
|
||||
<div class="box-footer" ng-if="orders.length">
|
||||
<uib-pagination class="pagination"
|
||||
total-items="redpack_order_pagination.totalCount"
|
||||
boundary-links="true"
|
||||
ng-model="redpack_order_pagination.page"
|
||||
items-per-page="redpack_order_pagination.limit"
|
||||
max-size="10"
|
||||
ng-change="listOrders()"
|
||||
previous-text="‹"
|
||||
next-text="›"
|
||||
first-text="«"
|
||||
last-text="»"></uib-pagination>
|
||||
<!--<div class="btn-group">-->
|
||||
<!--<a role="button" class="btn btn-default btn-sm"-->
|
||||
<!--ng-click="chooseToday()">Today</a>-->
|
||||
<!--</div>-->
|
||||
<!--<div class="btn-group">-->
|
||||
<!--<a role="button" class="btn btn-default btn-sm"-->
|
||||
<!--ng-click="chooseYesterday()">Yesterday</a>-->
|
||||
<!--</div>-->
|
||||
<div class="btn-group">
|
||||
<a role="button" class="btn btn-default btn-sm"
|
||||
ng-click="chooseLast7Days()">Last 7 Days</a>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<a role="button" class="btn btn-default btn-sm"
|
||||
ng-click="thisMonth()">This Month</a>
|
||||
</div>
|
||||
<!--<div class="btn-group">-->
|
||||
<!--<a role="button" class="btn btn-default btn-sm"-->
|
||||
<!--ng-click="lastMonth()">Last Month</a>-->
|
||||
<!--</div>-->
|
||||
<!--<div class="btn-group">-->
|
||||
<!--<a role="button" class="btn btn-default btn-sm"-->
|
||||
<!--ng-click="thisYear()">This Year</a>-->
|
||||
<!--</div>-->
|
||||
<!--<div class="btn-group" uib-dropdown ng-if="currentUser.client.has_children">-->
|
||||
<!--<button id="single-button" type="button" class="btn btn-primary"-->
|
||||
<!--uib-dropdown-toggle ng-disabled="disabled">-->
|
||||
<!--{{chooseShow}} <span class="caret"></span>-->
|
||||
<!--</button>-->
|
||||
<!--<ul class="dropdown-menu" uib-dropdown-menu aria-labelledby="single-button" style="min-width: 80px">-->
|
||||
<!--<li><a ng-click="chooseClient('All')">All</a></li>-->
|
||||
<!--<li ng-repeat="client in clients"><a ng-click="chooseClient(client)">{{client.short_name}}</a></li>-->
|
||||
<!--</ul>-->
|
||||
<!--</div>-->
|
||||
<button class="btn btn-success" type="button"
|
||||
ng-click="doAnalysis()">
|
||||
<i class="fa fa-search"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box">
|
||||
<div class="box-body">
|
||||
<div class="chart col-md-12" echarts="customerRedPackSendLogsHistory" style="height: 300px"
|
||||
ng-class="{nodata:customerRedPackSendLogsHistory.nodata}"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box box-warning">
|
||||
<div class="box-header">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">Total Records:{{redpack_order_pagination.totalCount}};Total Pages:{{redpack_order_pagination.totalPages}}</div>
|
||||
<div class="col-sm-12">
|
||||
<div class="form-horizontal">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-4" for="partner-search">Partner Name</label>
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<input type="text" class="form-control" id="partner-search"
|
||||
ng-enter="listOrders(1)"
|
||||
ng-model="params.short_name">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-4" for="code-search">Partner Code</label>
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<input type="text" class="form-control" id="code-search"
|
||||
ng-enter="listOrders(1)"
|
||||
ng-model="params.client_moniker">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-2 col-sm-4" for="sub-merchant-search">
|
||||
<span ng-bind='act.channel'></span>
|
||||
Nickname</label>
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<input type="text" class="form-control" id="sub-merchant-search"
|
||||
ng-enter="listOrders(1)"
|
||||
ng-model="params.nickname">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-xs-12 col-sm-12">
|
||||
<label class="control-label col-xs-4 col-sm-2">Date Range</label>
|
||||
<div class="col-sm-10">
|
||||
<div class="form-control-static form-inline">
|
||||
|
||||
<div style="display: inline-block">
|
||||
<input class="form-control" id="date-from-input-logs"
|
||||
ng-model="params.begin"
|
||||
uib-datepicker-popup size="10" placeholder="From"
|
||||
is-open="dateBegin.open" ng-click="dateBegin.open=true"
|
||||
datepicker-options="{maxDate:params.end||today}">
|
||||
</div>
|
||||
~
|
||||
<div style="display: inline-block">
|
||||
<input class="form-control" id="date-to-input-logs"
|
||||
ng-model="params.end"
|
||||
uib-datepicker-popup size="10" placeholder="To"
|
||||
is-open="dateTo.open" ng-click="dateTo.open=true"
|
||||
datepicker-options="{minDate:params.begin,maxDate:today}">
|
||||
</div>
|
||||
|
||||
<div class="btn-group">
|
||||
<a role="button" class="btn btn-default btn-sm"
|
||||
ng-click="chooseTodayForLogs()">Today</a>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<a role="button" class="btn btn-default btn-sm"
|
||||
ng-click="chooseYesterdayForLogs()">Yesterday</a>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<a role="button" class="btn btn-default btn-sm"
|
||||
ng-click="chooseLast7DaysForLogs()">Last 7 Days</a>
|
||||
</div>
|
||||
<button class="btn btn-success" type="button"
|
||||
ng-click="listOrders(1)">
|
||||
<i class="fa fa-search"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
Orders<span style="font-size: smaller;color: grey">(总共红包{{luckyMoneyAnalysis.total_counts}}|{{luckyMoneyAnalysis.total_amount}}￥;
|
||||
已发红包{{luckyMoneyAnalysis.send_counts}}|{{luckyMoneyAnalysis.send_amount}}￥;客户所得红包{{luckyMoneyAnalysis.receive_counts}}|{{luckyMoneyAnalysis.receive_amount}}￥
|
||||
待发送红包{{luckyMoneyAnalysis.unsend_counts}}|{{luckyMoneyAnalysis.unsend_amount}}￥)</span></div>
|
||||
<div class="panel-body">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Client Moniker</th>
|
||||
<th>Lucky Money</th>
|
||||
<th>Order Amount</th>
|
||||
<th>Nick Name</th>
|
||||
<th>status</th>
|
||||
<th>Event Time</th>
|
||||
<th>Create Time</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="order in orders">
|
||||
<td>{{order.client_moniker}}</td>
|
||||
<td>{{order.red_packet_amount}}</td>
|
||||
<td>{{order.order_amount}}</td>
|
||||
<td><span><img style="height: 30px;width: 30px" class="img-circle"
|
||||
ng-src="{{order.headimg}}"> {{order.nickname}}</span></td>
|
||||
<td>{{order.status|send_status}}</td>
|
||||
<td>{{order.event_time}}</td>
|
||||
<td>{{order.create_time}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="box-footer" ng-if="orders.length">
|
||||
<uib-pagination class="pagination"
|
||||
total-items="redpack_order_pagination.totalCount"
|
||||
boundary-links="true"
|
||||
ng-model="redpack_order_pagination.page"
|
||||
items-per-page="redpack_order_pagination.limit"
|
||||
max-size="10"
|
||||
ng-change="listOrders()"
|
||||
previous-text="‹"
|
||||
next-text="›"
|
||||
first-text="«"
|
||||
last-text="»"></uib-pagination>
|
||||
<div class="row">
|
||||
<div class="col-xs-12">Total Records:{{redpack_order_pagination.totalCount}};Total Pages:{{redpack_order_pagination.totalPages}}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
<div class="modal-header">
|
||||
<h4>Edit Client{{client.act_id}}</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<form name="clientForm" novalidate>
|
||||
<label class="control-label col-sm-6" for="act-name-input">Partner Code</label>
|
||||
<div class="col-sm-6">
|
||||
<input class="form-control" ng-model="client.client_moniker"
|
||||
type="text"
|
||||
name="act_name"
|
||||
id="client_moniker-input">
|
||||
</div>
|
||||
<div class="form-group"
|
||||
ng-class="{'has-error':clientForm.client_moniker.$invalid && clientForm.client_moniker.$dirty}">
|
||||
<label class="control-label col-sm-6" for="send-name-input">Send Name</label>
|
||||
|
||||
<div class="col-sm-6">
|
||||
<input class="form-control" ng-model="client.send_name"
|
||||
type="text"
|
||||
name="send_name"
|
||||
id="send-name-input">
|
||||
</div>
|
||||
|
||||
<label class="control-label col-sm-6" for="act-name-input">Act Name</label>
|
||||
<div class="col-sm-6">
|
||||
<input class="form-control" ng-model="client.act_name"
|
||||
type="text"
|
||||
name="act_name"
|
||||
id="act-name-input">
|
||||
</div>
|
||||
<label class="control-label col-sm-6" for="wishing-input">Wishing</label>
|
||||
<div class="col-sm-6">
|
||||
<input class="form-control" ng-model="client.wishing"
|
||||
type="text"
|
||||
name="wishing"
|
||||
id="wishing-input">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
<div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-danger" ng-click="$dismiss()">Cancel</button>
|
||||
<button type="button" class="btn btn-success" ng-click="doAddClientInfo()">save</button>
|
||||
</div>
|
||||
Loading…
Reference in new issue