订单管理优化

6336eacb · gongfuxiang · 81400b8e · 6336eacb · 6336eacb · 6336eacb
5 changed file
--- a/Application/Admin/Controller/OrderController.class.php
+++ b/Application/Admin/Controller/OrderController.class.php
@@ -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']);


--- a/Application/Admin/Lang/zh-cn/order.php
+++ b/Application/Admin/Lang/zh-cn/order.php
@@ -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'			=>	'支付时间',

--- a/Application/Admin/View/Default/Order/Index.html
+++ b/Application/Admin/View/Default/Order/Index.html
@@ -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>


--- a/Application/Home/View/Default/Public/Header.html
+++ b/Application/Home/View/Default/Public/Header.html
@@ -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>
\ No newline at end of file
+<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>
\ No newline at end of file
--- a/Install/shopxo.sql
+++ b/Install/shopxo.sql