提交 03303945 编写于 作者: D devil

细节优化

上级 1a5e92ce
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<td class="am-hide-sm-only"> <td class="am-hide-sm-only">
<div class="event-value"> <div class="event-value">
{{$v.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> <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
{{/if}} {{/if}}
</div> </div>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<dd> <dd>
<div class="event-value"> <div class="event-value">
{{$v.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> <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
{{/if}} {{/if}}
</div> </div>
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</td> </td>
<td class="am-hide-sm-only"> <td class="am-hide-sm-only">
{{$v.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> <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
{{/if}} {{/if}}
</td> </td>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
<dt>事件值</dt> <dt>事件值</dt>
<dd> <dd>
{{$v.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> <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
{{/if}} {{/if}}
</dd> </dd>
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</td> </td>
<td class="am-hide-sm-only"> <td class="am-hide-sm-only">
{{$v.event_value}} {{$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> <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
{{/if}} {{/if}}
</td> </td>
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<dd> <dd>
<div class="event-value"> <div class="event-value">
{{$v.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> <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
{{/if}} {{/if}}
</div> </div>
......
...@@ -819,7 +819,6 @@ class OrderService ...@@ -819,7 +819,6 @@ class OrderService
if($is_items == 1) if($is_items == 1)
{ {
$items = Db::name('OrderDetail')->where(['order_id'=>$v['id']])->select(); $items = Db::name('OrderDetail')->where(['order_id'=>$v['id']])->select();
$excel_export_items = '';
if(!empty($items)) if(!empty($items))
{ {
foreach($items as &$vs) foreach($items as &$vs)
...@@ -862,7 +861,6 @@ class OrderService ...@@ -862,7 +861,6 @@ class OrderService
} }
$v['items'] = $items; $v['items'] = $items;
$v['items_count'] = count($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'].'元'; $v['describe'] = '共'.$v['buy_number_count'].'件 合计:'.config('shopxo.price_symbol').$v['total_price'].'元';
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册