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 2019-10-30 22:55:31 +08:00
parent ac667a26c7
commit 3eb89f3797
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hyhproject/admin/model/Orders.php
View File

@ -85,11 +85,16 @@ class Orders extends Base
foreach ($orderGoodsList as &$val) {
$discountMoney += ($val['goodsPrice'] * $val['goodsNum'] + $val['freight']) * ($val['discountRate'] * 0.01);//优惠款
}
$page['Rows'][$key]['coupons'] = round($discountMoney,2);
$page['Rows'][$key]['loginName'] = "【" . $v['loginName'] . "】";
$page['Rows'][$key]['coupons'] = number_format($discountMoney,2,'.','');
if((float)$v['payable'] < 0){
$page['Rows'][$key]['payable'] = number_format(abs($v['payable']),2,'.','');
}else{
$page['Rows'][$key]['payable'] = '0.00';
}
$page['Rows'][$key]['loginName'] = $v['loginName'];
$page['Rows'][$key]['userName'] = $v['userName'];
$shopUserInfo = getUserInfo(['userId' => $v['shopUserId']], 'loginName');
$page['Rows'][$key]['shopLoginName'] = "【" . $shopUserInfo['loginName'] . "】";
$page['Rows'][$key]['shopLoginName'] = $shopUserInfo['loginName'];
$page['Rows'][$key]['payType'] = WSTLangPayType($v['payType']);
$page['Rows'][$key]['deliverType'] = WSTLangDeliverType($v['deliverType'] == 1);
if ($v["helpUserId"] != 0) {

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

@ -140,7 +140,7 @@ function initGrid(){
var p = WST.arrayParams('.j-ipt');
var h = WST.pageHeight();
var cols = [
{title:'订单编号', name:'orderNo', width: 50,sortable:true, renderer:function(val,item,rowIndex){
{title:'订单编号', name:'orderNo', width: 45,sortable:true, renderer:function(val,item,rowIndex){
var h = "";
if(item['orderSrc']==0){
h += "<img class='order-source2' src='"+WST.conf.ROOT+"/hyhproject/admin/view/img/order_source_1.png'>";
@ -156,33 +156,27 @@ function initGrid(){
h += item['orderNo'];
return h;
}},
{title:'交易额', name:'realTotalMoney', width: 30,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'购户', name:'loginName', width: 120,sortable:true},
{title:'收货人', name:'userName', width: 120,sortable:true},
{title:'购户付现', name:'moneyNum', width: 30,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'旺旺券', name:'wangNum', width: 30,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'产品券', name:'productNum', width: 30,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'产品券税', name:'productTaxFee', width: 30,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'产品券手续费', name:'productHandlingFee', width: 30,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{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:'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:'productHandlingFee', width: 30,sortable:true, renderer:function(val,item,rowIndex){
// return item['productTaxFee']+val;
// }},
{title:'优惠券', name:'couponsNum', width: 30,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'优惠券税', name:'couponsTaxFee', width: 30,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'优惠券手续费', name:'couponsHandlingFee', width: 30,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: 120,sortable:true},
{title:'店铺', name:'shopName', width: 90,sortable:true},
{title:'优惠款', name:'coupons', width: 90,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
{title:'商户付现', name:'payable', width: 30,sortable:true, renderer:function(val,item,rowIndex){
if(val<0){
return Math.abs(val);
}else{
return 0;
}
}},
{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:'payType' , width: 30,sortable:true},
// // mark by cheng 添加支付通道显示
// {title:'支付通道', name:'payFrom' , width: 30,sortable:true, renderer:function(val,item,rowIndex){
@ -200,8 +194,8 @@ function initGrid(){
// }},
// {title:'配送方式', name:'deliverType', width: 30,sortable:true},
// {title:'订单来源', name:'orderCodeTitle', width: 30,sortable:true},
{title:'下单时间', name:'createTime', width: 100,sortable:true},
{title:'订单状态', name:'orderStatus', width: 30,sortable:true, renderer:function(val,item,rowIndex){
{title:'下单时间', name:'createTime', width: 90,sortable:true},
{title:'订单状态', name:'orderStatus', width: 40,sortable:true, renderer:function(val,item,rowIndex){
if(item['orderStatus']==-1){
return "<span class='statu-no'><i class='fa fa-ban'></i> "+item.status+"</span>";
}else if(item['orderStatus']==-3){