Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

This commit is contained in:
From-wh 2023-02-23 10:48:42 +08:00
commit a937e300ce
2 changed files with 4 additions and 1 deletions

View File

@ -563,6 +563,9 @@ class OtherOrderServices extends BaseServices
case "alipay" :
$v['pay_type'] = "支付宝";
break;
case 'allinpay':
$v['pay_type'] = "通联支付";
break;
case "admin" :
$v['pay_type'] = "后台赠送";
break;

View File

@ -25,7 +25,7 @@
</div>
<div class="wrapper">
<div class="title">
{{ time == 'date'?'':title }}{{ this.where.type == 1 ? $t(`营业额(元)`) : $t(`订单量(份)`) }}
{{ time == 'date'?'':title }}{{ where.type == 1 ? $t(`营业额(元)`) : $t(`订单量(份)`) }}
</div>
<div class="money">{{ time_price }}</div>
<div class="increase acea-row row-between-wrapper">