msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix' into develop

Browse Source
master
kira 6 years ago
parent 3a26ccf90f aa70bf4d41
commit 08dca2e1af
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
src/main/ui/index.html
Unescape View File

@ -934,7 +934,7 @@ margin-bottom: 10%;"/>
<li ng-if="currentUser.client.client_moniker=='WOWW' || currentUser.client.client_moniker=='PINE'"> <li ng-if="currentUser.client.client_moniker=='WOWW' || currentUser.client.client_moniker=='PINE'">
<a ui-sref="custom"> <a ui-sref="custom">
Declare Custom Report Custom
</a> </a>
</li> </li>
</ul> </ul>

24
src/main/ui/static/payment/custom/templates/custom.html
Unescape View File

@ -10,7 +10,7 @@
<li> <li>
<i class="fa fa-sitemap"></i> Custom <i class="fa fa-sitemap"></i> Custom
</li> </li>
<li class="active">Custom Management</li> <li class="active">Report Custom </li>
</ol> </ol>
</section> </section>
@ -41,13 +41,13 @@
<a role="button" ng-class="{'bg-primary':params.report_status=='ALL'}" <a role="button" ng-class="{'bg-primary':params.report_status=='ALL'}"
ng-click="params.report_status='ALL';loadList()">All</a> | ng-click="params.report_status='ALL';loadList()">All</a> |
<a role="button" ng-class="{'bg-primary':params.report_status=='0'}" <a role="button" ng-class="{'bg-primary':params.report_status=='0'}"
ng-click="params.report_status='0';loadList()">暂存</a> | ng-click="params.report_status='0';loadList()">Saved</a> |
<a role="button" ng-class="{'bg-primary':params.report_status=='1'}" <a role="button" ng-class="{'bg-primary':params.report_status=='1'}"
ng-click="params.report_status='1';loadList()">提交</a> | ng-click="params.report_status='1';loadList()">Submitted</a> |
<a role="button" ng-class="{'bg-primary':params.report_status=='2'}" <a role="button" ng-class="{'bg-primary':params.report_status=='2'}"
ng-click="params.report_status='2';loadList()">提交失败</a> | ng-click="params.report_status='2';loadList()">Failed</a> |
<a role="button" ng-class="{'bg-primary':params.report_status=='3'}" <a role="button" ng-class="{'bg-primary':params.report_status=='3'}"
ng-click="params.report_status='3';loadList()">提交成功</a> | ng-click="params.report_status='3';loadList()">Success</a> |
</p> </p>
</div> </div>
</div> </div>
@ -75,13 +75,13 @@
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>渠道</th> <th>Channel</th>
<th>订单号</th> <th>Order Id</th>
<th>时间</th> <th>Time</th>
<th>订单金额</th> <th>Order Amount</th>
<th>人民币金额</th> <th>CNY Amount</th>
<th>报关状态</th> <th>Report Status</th>
<th>操作</th> <th>Operation</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

16
src/main/ui/static/payment/custom/templates/custom_add.html
Unescape View File

@ -8,7 +8,7 @@
<form class="form-horizontal" novalidate name="rate_form"> <form class="form-horizontal" novalidate name="rate_form">
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-4">海关</label> <label class="control-label col-sm-4">Customs</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select class="form-control" name="industry" <select class="form-control" name="industry"
ng-model="custom.custom" ng-model="custom.custom"
@ -19,14 +19,14 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-4" for="mch_custom_no">备案号</label> <label class="control-label col-sm-4" for="mch_custom_no">Customs No</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input class="form-control" ng-model="custom.mch_custom_no" id="mch_custom_no" type="text"> <input class="form-control" ng-model="custom.mch_custom_no" id="mch_custom_no" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-4" for="has_sub">是否拆单</label> <label class="control-label col-sm-4" for="has_sub">Split</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input ng-model="custom.has_sub" id="has_sub" type="checkbox"> <input ng-model="custom.has_sub" id="has_sub" type="checkbox">
</div> </div>
@ -39,11 +39,11 @@
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>海关金额</th> <th>Order Amount</th>
<th>运费金额</th> <th>Transport Fee</th>
<!--<th>消费者名称</th>--> <!--<th>消费者名称</th>-->
<!--<th>消费者ID</th>--> <!--<th>消费者ID</th>-->
<th>操作</th> <th>Operation</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -63,14 +63,14 @@
<div ng-if="custom.has_sub"> <div ng-if="custom.has_sub">
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-4" for="order_fee">订单金额</label> <label class="control-label col-sm-4" for="order_fee">Order Amount</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input class="form-control" ng-model="subOrder.order_fee" id="order_fee" type="text"> <input class="form-control" ng-model="subOrder.order_fee" id="order_fee" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-4" for="transport_fee">运费金额</label> <label class="control-label col-sm-4" for="transport_fee">Transport Fee</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input class="form-control" ng-model="subOrder.transport_fee" id="transport_fee" type="text"> <input class="form-control" ng-model="subOrder.transport_fee" id="transport_fee" type="text">
</div> </div>

Write Preview
Loading…
Cancel
Save