From c952846661e4e68ae275a31483515650622bf08c Mon Sep 17 00:00:00 2001 From: denghy Date: Fri, 4 Jan 2019 09:58:37 +0800 Subject: [PATCH] pay_channels --- app/Domains/Company/Http/Controllers/BootstrapController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Domains/Company/Http/Controllers/BootstrapController.php b/app/Domains/Company/Http/Controllers/BootstrapController.php index 8230d84f..13618cb8 100644 --- a/app/Domains/Company/Http/Controllers/BootstrapController.php +++ b/app/Domains/Company/Http/Controllers/BootstrapController.php @@ -31,8 +31,8 @@ class BootstrapController extends Controller $pay_types = new PayType(); - $order_status = json_decode(json_encode(['已下单', '已取消', '已出库', '已签收'], JSON_FORCE_OBJECT)); - $transaction_status = json_decode(json_encode(['未收款', '已收款'], JSON_FORCE_OBJECT)); + $order_status = json_decode(json_encode($dicts->get('order_status'), JSON_FORCE_OBJECT)); + $transaction_status = json_decode(json_encode($dicts->get('transaction_status'), JSON_FORCE_OBJECT)); $pay_channels = ['bank' => '银行转账', 'alipay' => '支付宝转账']; $res = compact('carrier_operator', 'pay_channels', 'pay_types', 'order_status', 'transaction_status');