sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单管理优化

feat/task1-c-wallet
gongfuxiang 2018-11-30 00:17:27 +08:00
parent 81400b8e30
commit 6336eacb60
5 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Application/Admin/Controller/OrderController.class.php
View File

@ -136,6 +136,9 @@ class OrderController extends CommonController
// 支付状态
$v['pay_status_text'] = $common_order_pay_status[$v['pay_status']]['name'];
// 支付方式
$v['payment_name'] = ($v['status'] <= 1) ? null : ResourcesService::OrderPaymentName($v['id']);
// 快递公司
$v['express_name'] = ResourcesService::ExpressName($v['express_id']);

1
Application/Admin/Lang/zh-cn/order.php
View File

@ -17,6 +17,7 @@ return array(
'order_express_text' => '快递信息',
'order_user_note_text' => '用户备注',
'order_price_th_text' => '订单金额(元)',
'order_payment_name_text' => '支付方式',
'order_confirm_time_text' => '确认时间',
'order_pay_time_text' => '支付时间',

3
Application/Admin/View/Default/Order/Index.html
View File

@ -175,6 +175,9 @@
<dt>{{:L('common_order_status_name')}}</dt>
<dd><if condition="empty($v['status_text'])"><span class="cr-ddd">{{:L('common_not_set_text')}}</span><else />{{$v.status_text}}</if></dd>
<dt>{{:L('order_payment_name_text')}}</dt>
<dd><if condition="empty($v['payment_name'])"><span class="cr-ddd">{{:L('common_on_fill_in_the_text')}}</span><else />{{$v.payment_name}}</if></dd>
<dt>{{:L('order_user_note_text')}}</dt>
<dd><if condition="empty($v['user_note'])"><span class="cr-ddd">{{:L('common_on_fill_in_the_text')}}</span><else />{{$v.user_note}}</if></dd>

12
Application/Home/View/Default/Public/Header.html
View File

@ -39,8 +39,10 @@
<body>
<!-- 商城公告 -->
<notempty name="common_shop_notice">
<div class="am-alert am-alert-warning am-radius common-shop-notice" data-am-alert>
<div class="am-container">{{$common_shop_notice}}</div>
</div>
</notempty>
<if condition="MyC('home_site_state') == 1 and (!isset($is_header) or $is_header eq 1)">
<notempty name="common_shop_notice">
<div class="am-alert am-alert-warning am-radius common-shop-notice" data-am-alert>
<div class="am-container">{{$common_shop_notice}}</div>
</div>
</notempty>
</if>

28
Install/shopxo.sql Executable file → Normal file
View File

File diff suppressed because one or more lines are too long