From 03303945e84ef4e412ecbea00fffdf036eda05bd Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Thu, 13 Feb 2020 18:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/default/appcenternav/index.html | 4 ++--
 application/admin/view/default/apphomenav/index.html   | 4 ++--
 application/admin/view/default/slide/index.html        | 4 ++--
 application/service/OrderService.php                   | 2 --
 4 files changed, 6 insertions(+), 8 deletions(-)

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 @@
                             <td class="am-hide-sm-only">
                                 <div class="event-value">
                                     {{$v.event_value}}
-                                    {{if !empty($v['event_value'])}}
+                                    {{if !empty($v['event_type_text'])}}
                                         <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
                                     {{/if}}
                                 </div>
@@ -157,7 +157,7 @@
                                                 <dd>
                                                     <div class="event-value">
                                                         {{$v.event_value}}
-                                                        {{if !empty($v['event_value'])}}
+                                                        {{if !empty($v['event_type_text'])}}
                                                             <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
                                                         {{/if}}
                                                     </div>
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 @@
                             </td>
                             <td class="am-hide-sm-only">
                                 {{$v.event_value}}
-                                {{if !empty($v['event_value'])}}
+                                {{if !empty($v['event_type_text'])}}
                                     <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
                                 {{/if}}
                             </td>
@@ -170,7 +170,7 @@
                                                 <dt>事件值</dt>
                                                 <dd>
                                                     {{$v.event_value}}
-                                                    {{if !empty($v['event_value'])}}
+                                                    {{if !empty($v['event_type_text'])}}
                                                         <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
                                                     {{/if}}
                                                 </dd>
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 @@
                             </td>
                             <td class="am-hide-sm-only">
                                 {{$v.event_value}}
-                                {{if !empty($v['event_value']) and !empty($v['event_type_text'])}}
+                                {{if !empty($v['event_type_text'])}}
                                     <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
                                 {{/if}}
                             </td>
@@ -153,7 +153,7 @@
                                                 <dd>
                                                     <div class="event-value">
                                                         {{$v.event_value}}
-                                                        {{if !empty($v['event_value'])}}
+                                                        {{if !empty($v['event_type_text'])}}
                                                             <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
                                                         {{/if}}
                                                     </div>
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'].'元';
-- 
GitLab