Skip to content

Commit 297f854

Browse files
author
zhangjiangbin
committed
修正卡券界面错误
1 parent 7c42d0e commit 297f854

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

‎app/Console/Commands/UserExpireWarningJob.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function handle()
4343
$lastCanUseDays = floor(round(strtotime($user->expire_time) - strtotime(date('Y-m-d H:i:s'))) / 3600 / 24);
4444
if ($lastCanUseDays > 0 && $lastCanUseDays <= self::$config['expire_days']) {
4545
$title = '账号过期提醒';
46-
$content = '账号还剩【' . $lastCanUseDays . '】天即将过期';
46+
$content = '账号还剩' . $lastCanUseDays . '天即将过期';
4747

4848
try {
4949
Mail::to($user->username)->send(new userExpireWarning(self::$config['website_name'], $lastCanUseDays));

‎resources/views/coupon/couponList.blade.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@
4141
<tr>
4242
<th> ID </th>
4343
<th> 名称 </th>
44-
<th> LOGO </th>
4544
<th> 券码 </th>
45+
<th> LOGO </th>
46+
<th> 类型 </th>
4647
<th> 用途 </th>
4748
<th> 优惠 </th>
4849
<th> 有效期 </th>
@@ -53,24 +54,24 @@
5354
<tbody>
5455
@if($couponList->isEmpty())
5556
<tr>
56-
<td colspan="9">暂无数据</td>
57+
<td colspan="10">暂无数据</td>
5758
</tr>
5859
@else
5960
@foreach($couponList as $coupon)
6061
<tr class="odd gradeX">
6162
<td> {{$coupon->id}} </td>
6263
<td> {{$coupon->name}} </td>
64+
<td> <span class="label label-info">{{$coupon->sn}}</span> </td>
65+
<td> @if($coupon->logo) <a href="{{$coupon->logo}}" class="fancybox"><img src="{{$coupon->logo}}"/></a> @endif </td>
6366
<td>
6467
@if($coupon->type == '1')
65-
<span class="label label-default"> 抵用券 </span>
68+
抵用券
6669
@elseif($coupon->type == '2')
67-
<span class="label label-default"> 折扣券 </span>
70+
折扣券
6871
@else
69-
<span class="label label-default"> 充值券 </span>
72+
充值券
7073
@endif
7174
</td>
72-
<td> @if($coupon->logo) <a href="{{$coupon->logo}}" class="fancybox"><img src="{{$coupon->logo}}"/></a> @endif </td>
73-
<td> <span class="label label-info">{{$coupon->sn}}</span> </td>
7475
<td> {{$coupon->usage == '1' ? '一次性' : '可重复'}} </td>
7576
<td>
7677
@if($coupon->type == '1' || $coupon->type == '3')

‎resources/views/user/orderList.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</div>
2727
<div class="portlet-body">
2828
<div class="table-scrollable">
29-
<table class="table table-striped table-bordered table-hover table-checkable order-column">
29+
<table class="table table-striped table-bordered table-hover">
3030
<thead>
3131
<tr>
3232
<th> # </th>

‎resources/views/user/referral.blade.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="row">
1818
<div class="col-md-12">
1919
<div class="note note-info">
20-
<p> 通过您的推广链接注册的用户可获得 {{$referral_traffic}} 流量奖励。您可以获得他们每笔消费金额的 {{$referral_percent * 100}}% 作为现金返利。 </p>
20+
<p> 通过您的推广链接注册的用户可获得 {{$referral_traffic}} 流量奖励；当他们消费时，您可以获得他们每笔消费金额的 {{$referral_percent * 100}}% 作为奖励。 </p>
2121
</div>
2222
</div>
2323
</div>
@@ -66,7 +66,7 @@
6666
<tbody>
6767
@if($referralLogList->isEmpty())
6868
<tr>
69-
<td colspan="5"> {{trans('home.referral_table_none')}} </td>
69+
<td colspan="6"> {{trans('home.referral_table_none')}} </td>
7070
</tr>
7171
@else
7272
@foreach($referralLogList as $key => $referralLog)
@@ -92,10 +92,10 @@
9292
</table>
9393
</div>
9494
<div class="row">
95-
<div class="col-md-4 col-sm-4">
95+
<div class="col-md-5 col-sm-5">
9696
<div class="dataTables_info" role="status" aria-live="polite">共 {{$referralLogList->total()}} 条记录，合计返利<code>{{$canAmount}}</code>元，满 <code>{{$referral_money}}</code> 元可申请提现。</div>
9797
</div>
98-
<div class="col-md-8 col-sm-8">
98+
<div class="col-md-7 col-sm-7">
9999
<div class="dataTables_paginate paging_bootstrap_full_number pull-right">
100100
{{ $referralLogList->links() }}
101101
</div>

0 commit comments

Comments
 (0)