This commit is contained in:
邓皓元 2018-12-19 13:56:03 +08:00
parent c006727e1d
commit 97af9db0aa
12 changed files with 134 additions and 12 deletions

View File

@ -51,8 +51,10 @@ class OrderController extends Controller
'counts' => $item->counts,
'total_price' => $item->total_price,
'custom_price' => $item->custom_price,
'order_status' => $orderStatues[$item->order_status],
'transaction_status' => $transactionStatuses[$item->transaction_status],
'order_status' => $item->order_status,
'order_status_name' => $orderStatues[$item->order_status],
'transaction_status' => $item->transaction_status,
'transaction_status_name' => $transactionStatuses[$item->transaction_status],
'order_at' => $item->order_at,
];
});
@ -89,8 +91,10 @@ class OrderController extends Controller
$order->pay_channel = CommonService::namePayChannel($order->pay_channel);
$order->carrier_operator = $carrierOperators[$order->package->carrier_operator];
$order->order_status = $orderStatues[$order->order_status];
$order->transaction_status = $transactionStatuses[$order->transaction_status];
$order->order_status = $order->order_status;
$order->order_status_name = $orderStatues[$order->order_status];
$order->transaction_status = $order->transaction_status;
$order->transaction_status_name = $transactionStatuses[$order->transaction_status];
return res($order, '订单详情', 201);
}

View File

@ -1,9 +1,9 @@
var CONFIG = {
title: "车联网企业管理平台",
login_background: "/assets/login_background.jpg",
logo_big: "/assets/logo_big.png",
logo_small: "/assets/logo_small.jpg",
url: "http://v.denghaoyuan.cn"
}
title: '流量卡BOSS管理平台',
login_background: '/assets/login_background.jpg',
logo_big: '/assets/logo_big.png',
logo_small: '/assets/logo_small.jpg',
url: (window.location.hostname === 'localhost') ? 'http://v.denghaoyuan.cn' : '/'
};
window.CONFIG = CONFIG;
window.CONFIG = CONFIG;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-de5f8dae.d57f70a9.css rel=prefetch><link href=/js/chunk-abcdb748.df734f75.js rel=prefetch><link href=/js/chunk-de5f8dae.368554e6.js rel=prefetch><link href=/css/app.36043160.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.38fdf22c.js rel=preload as=script><link href=/js/chunk-vendors.0507d74c.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.36043160.css rel=stylesheet></head><body><noscript><strong>很抱歉如果没有启用JavaScript程序不能正常工作若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.0507d74c.js></script><script src=/js/app.38fdf22c.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-cbfbba16.9ab0f008.css rel=prefetch><link href=/js/chunk-abcdb748.342d96e3.js rel=prefetch><link href=/js/chunk-cbfbba16.553a9aa8.js rel=prefetch><link href=/css/app.36043160.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.e7ac55dc.js rel=preload as=script><link href=/js/chunk-vendors.894c9903.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.36043160.css rel=stylesheet></head><body><noscript><strong>很抱歉如果没有启用JavaScript程序不能正常工作若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.894c9903.js></script><script src=/js/app.e7ac55dc.js></script></body></html>