Merge branch 'dev'

This commit is contained in:
zpc 2025-05-18 13:19:36 +08:00
commit ea6b9de9fd

View File

@ -1090,7 +1090,11 @@ class Order extends Base
$pay_type_text = '支付宝'; $pay_type_text = '支付宝';
break; break;
default: default:
$pay_type_text = '微信支付'; if ($item['price'] > 0) {
$pay_type_text = '微信支付';
} else {
$pay_type_text = '货币支付';
}
} }
if ($isExport) { if ($isExport) {