diff --git a/application/admin/view/default/appcenternav/index.html b/application/admin/view/default/appcenternav/index.html
index 3f4a6953a..fa22d2755 100755
--- a/application/admin/view/default/appcenternav/index.html
+++ b/application/admin/view/default/appcenternav/index.html
@@ -117,7 +117,7 @@
{{$v.event_value}}
- {{if !empty($v['event_value'])}}
+ {{if !empty($v['event_type_text'])}}
{{$v.event_type_text}}
{{/if}}
@@ -157,7 +157,7 @@
{{$v.event_value}}
- {{if !empty($v['event_value'])}}
+ {{if !empty($v['event_type_text'])}}
{{$v.event_type_text}}
{{/if}}
diff --git a/application/admin/view/default/apphomenav/index.html b/application/admin/view/default/apphomenav/index.html
index c56395401..ba759daef 100755
--- a/application/admin/view/default/apphomenav/index.html
+++ b/application/admin/view/default/apphomenav/index.html
@@ -127,7 +127,7 @@
|
{{$v.event_value}}
- {{if !empty($v['event_value'])}}
+ {{if !empty($v['event_type_text'])}}
{{$v.event_type_text}}
{{/if}}
|
@@ -170,7 +170,7 @@
事件值
{{$v.event_value}}
- {{if !empty($v['event_value'])}}
+ {{if !empty($v['event_type_text'])}}
{{$v.event_type_text}}
{{/if}}
diff --git a/application/admin/view/default/slide/index.html b/application/admin/view/default/slide/index.html
index 07b956daa..41d0a5543 100755
--- a/application/admin/view/default/slide/index.html
+++ b/application/admin/view/default/slide/index.html
@@ -114,7 +114,7 @@
{{$v.event_value}}
- {{if !empty($v['event_value']) and !empty($v['event_type_text'])}}
+ {{if !empty($v['event_type_text'])}}
{{$v.event_type_text}}
{{/if}}
|
@@ -153,7 +153,7 @@
{{$v.event_value}}
- {{if !empty($v['event_value'])}}
+ {{if !empty($v['event_type_text'])}}
{{$v.event_type_text}}
{{/if}}
diff --git a/application/service/OrderService.php b/application/service/OrderService.php
index 96023e014..c41a20674 100755
--- a/application/service/OrderService.php
+++ b/application/service/OrderService.php
@@ -819,7 +819,6 @@ class OrderService
if($is_items == 1)
{
$items = Db::name('OrderDetail')->where(['order_id'=>$v['id']])->select();
- $excel_export_items = '';
if(!empty($items))
{
foreach($items as &$vs)
@@ -862,7 +861,6 @@ class OrderService
}
$v['items'] = $items;
$v['items_count'] = count($items);
- $v['excel_export_items'] = $excel_export_items;
// 描述
$v['describe'] = '共'.$v['buy_number_count'].'件 合计:'.config('shopxo.price_symbol').$v['total_price'].'元';