q792602257/qlg.tsgz.moe
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决部分问题

Browse Source
This commit is contained in:
Jerry Yan
2020-06-02 22:30:23 +08:00
parent 7e88154991
commit 4e3cd3a47e
8 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hyhproject/admin/view/cashdraws/view_report.html
View File

@ -98,7 +98,13 @@
</div>
<!--start-->
<!--start-->
<style>
table.layui-table th,
table.layui-table td {
font-size: 18px;
}
</style>
<table class="layui-table">
<tbody>
<tr>

19
hyhproject/admin/view/orders/orders.js
View File

@ -158,25 +158,28 @@ function initGrid(){
}},
{title:'交易额', name:'realTotalMoney', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'购户', name:'loginName', width: 50,sortable:true},
{title:'收货人', name:'userName', width: 50,sortable:true},
{title:'购户付现', name:'moneyNum', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'收货人', name:'userName', width: 50,sortable:true},
{title:'旺旺券', name:'wangNum', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'产品券', name:'productNum', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'产品券税', name:'productTaxFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'产品券手续费', name:'productHandlingFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'偶然所得', name:'accidentGet', width: 70,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'偶然所得税', name:'accidentTaxGet', width: 70,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'所得手续费', name:'accidentHandlingGet', width: 70,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'产品券', name:'productNum', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'产品券税', name:'productTaxFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'产品券手续费', name:'productHandlingFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'产品券手续费+税', name:'productHandlingFee', width: 30,sortable:true, renderer:function(val,item,rowIndex){
// return item['productTaxFee']+val;
// }},
{title:'优惠券', name:'couponsNum', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'优惠券税', name:'couponsTaxFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'优惠券手续费', name:'couponsHandlingFee', width: 40,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'优惠券', name:'couponsNum', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'优惠券税', name:'couponsTaxFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'优惠券手续费', name:'couponsHandlingFee', width: 40,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'优惠券手续费+税', name:'couponsHandlingFee', width: 30,sortable:true, renderer:function(val,item,rowIndex){
// return item['couponsTaxFee']+val;;
// }},
{title:'商户', name:'shopLoginName', width: 50,sortable:true},
{title:'店铺', name:'shopName', width: 60,sortable:true},
{title:'优惠款', name:'coupons', width: 40,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'商户付现', name:'payable', width: 40,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
// {title:'店铺', name:'shopName', width: 60,sortable:true},
// {title:'支付方式', name:'payType' , width: 30,sortable:true},
// // mark by cheng 添加支付通道显示
// {title:'支付通道', name:'payFrom' , width: 30,sortable:true, renderer:function(val,item,rowIndex){

3
hyhproject/admin/view/orders/view.html
View File

@ -486,8 +486,6 @@
<div class='summary'>应付总金额：¥<span>{$object['totalMoney']}</span></div>
<div class='summary line'>积分抵扣金额：¥-<span>{$object['scoreMoney']}</span></div>
{:hook('adminDocumentOrderSummaryView',['order'=>$object])}
<div class='summary'>实付总金额：¥<span>{$object['realTotalMoney']}</span></div>
@ -495,7 +493,6 @@
<div class='summary'>使用优惠券：¥<span>{$object['couponsNum']}</span></div>
<div class='summary'>使用旺旺券：¥<span>{$object['wangNum']}</span></div>
<div class='summary'>使用现金：¥<span>{$object['moneyNum']}</span></div>
<div>可获得积分：<span class='orderScore'>{$object["orderScore"]}</span>个</div>
</div>