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

细节优化

feat/task1-c-wallet
devil 2020-02-13 18:13:03 +08:00
parent 1a5e92cea2
commit 03303945e8
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/view/default/appcenternav/index.html
View File

@ -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>

4
application/admin/view/default/apphomenav/index.html
View File

@ -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>

4
application/admin/view/default/slide/index.html
View File

@ -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>

2
application/service/OrderService.php
View File

@ -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'].'元';