Skip to content

Commit d54b51b

Browse files
ScyllalyScyllaly
committed
修正购买商品无法自动启用SSR
1 parent 6b40431 commit d54b51b

File tree

4 files changed

+19
-45
lines changed

4 files changed

+19
-45
lines changed

‎app/Http/Controllers/AdminController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ public function index(Request $request)
4848
$view['activeUserCount'] = User::query()->where('t', '>=', $past)->count();
4949
$view['onlineUserCount'] = User::query()->where('t', '>=', $online)->count();
5050
$view['nodeCount'] = SsNode::query()->count();
51-
$flowCount = UserTrafficLog::query()->sum('u') + UserTrafficLog::sum('d');
51+
$flowCount = UserTrafficLog::query()->sum('u') + UserTrafficLog::query()->sum('d');
5252
$flowCount = $this->flowAutoShow($flowCount);
5353
$view['flowCount'] = $flowCount;
5454
$view['totalBalance'] = User::query()->sum('balance');
5555
$view['totalWaitRefAmount'] = ReferralLog::query()->whereIn('status', [0, 1])->sum('ref_amount');
5656
$view['totalRefAmount'] = ReferralApply::query()->where('status', 2)->sum('amount');
57-
$view['expireWarningUserCount'] = User::query()->where('expire_time', '<=', date('Y-m-d', strtotime("+15 days")))->where('enable', 1)->count();
57+
$view['expireWarningUserCount'] = User::query()->where('expire_time', '<=', date('Y-m-d', strtotime("+" . self::$config['expire_days'] . " days")))->where('enable', 1)->count();
5858

5959
return Response::view('admin/index', $view);
6060
}

‎app/Http/Controllers/UserController.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -769,12 +769,11 @@ public function addOrder(Request $request)
769769
$couponLogObj->save();
770770
}
771771

772-
// 把流量包内的流量加到账号上
772+
// 把商品的流量加到账号上
773773
User::query()->where('id', $user['id'])->increment('transfer_enable', $goods->traffic * 1048576);
774774

775-
// 将商品的有效期加到账号上，如果账号过期时间小于
776-
//if (date('Y-m-d H:i:s', strtotime("+" . $goods->days . " days")) ) {}
777-
User::query()->where('id', $user['id'])->update(['expire_time' => date('Y-m-d H:i:s', strtotime("+" . $goods->days . " days"))]);
775+
// 将商品的有效期加到账号上
776+
User::query()->where('id', $user['id'])->update(['expire_time' => date('Y-m-d H:i:s', strtotime("+" . $goods->days . " days")), 'enable' => 1]);
778777

779778
// 写入返利日志
780779
if ($user->referral_uid) {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
</thead>
3535
<tbody>
3636
<tr>
37-
<td style="padding: 20px;">
38-
<h3>{{$goods->name}}</h3>
39-
<p> <img src="{{$goods->logo}}" style="width:100px; height:100px;"> 内含流量 {{$goods->traffic}} MiB，有效期 {{date('Y-m-d', strtotime($goods->start_time))}} ~ {{date('Y-m-d', strtotime($goods->end_time))}} </p>
37+
<td style="padding: 10px;">
38+
<h2>{{$goods->name}}</h2>
39+
<p> 内含流量 {{$goods->traffic}} MiB <br> 有效期 {{$goods->days}}天，到期后自动扣除 </p>
4040
</td>
41-
<td class="text-center sbold"> ￥{{$goods->price}} </td>
42-
<td class="text-center sbold"> x 1 </td>
43-
<td class="text-center sbold"> ￥{{$goods->price}} </td>
41+
<td class="text-center"> ￥{{$goods->price}} </td>
42+
<td class="text-center"> x 1 </td>
43+
<td class="text-center"> ￥{{$goods->price}} </td>
4444
</tr>
4545
</tbody>
4646
</table>

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

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<!-- BEGIN PAGE BASE CONTENT -->
1818
<div class="row">
1919
<div class="col-md-12">
20-
<!-- BEGIN PAGE BASE CONTENT -->
21-
<div class="portlet light portlet-fit bordered">
20+
<!--
21+
<div class="portlet light bordered">
2222
<div class="portlet-title">
2323
<div class="caption">
24-
<span class="caption-subject bold uppercase"> 套餐 </span>
24+
<span class="caption-subject bold uppercase"> 流量套餐 </span>
2525
</div>
2626
<div class="actions"></div>
2727
</div>
@@ -38,17 +38,11 @@
3838
<h3><sup class="price-sign">￥</sup>28</h3>
3939
</div>
4040
<div class="price-table-content">
41-
<div class="row mobile-padding">
42-
<div class="col-xs-3 text-right mobile-padding">
43-
<i class="icon-user"></i>
44-
</div>
45-
<div class="col-xs-9 text-left mobile-padding">支持同时5个设备在线</div>
46-
</div>
4741
<div class="row mobile-padding">
4842
<div class="col-xs-3 text-right mobile-padding">
4943
<i class="icon-drawer"></i>
5044
</div>
51-
<div class="col-xs-9 text-left mobile-padding">流量15G/月</div>
45+
<div class="col-xs-9 text-left mobile-padding">15G/月</div>
5246
</div>
5347
<div class="row mobile-padding">
5448
<div class="col-xs-3 text-right mobile-padding">
@@ -85,17 +79,11 @@
8579
<h3><sup class="price-sign">￥</sup>78</h3>
8680
</div>
8781
<div class="price-table-content">
88-
<div class="row mobile-padding">
89-
<div class="col-xs-3 text-right mobile-padding">
90-
<i class="icon-user"></i>
91-
</div>
92-
<div class="col-xs-9 text-left mobile-padding">支持同时5个设备在线</div>
93-
</div>
9482
<div class="row mobile-padding">
9583
<div class="col-xs-3 text-right mobile-padding">
9684
<i class="icon-drawer"></i>
9785
</div>
98-
<div class="col-xs-9 text-left mobile-padding">流量25G/月</div>
86+
<div class="col-xs-9 text-left mobile-padding">25G/月</div>
9987
</div>
10088
<div class="row mobile-padding">
10189
<div class="col-xs-3 text-right mobile-padding">
@@ -133,17 +121,11 @@
133121
<div class="price-ribbon">热门</div>
134122
</div>
135123
<div class="price-table-content">
136-
<div class="row mobile-padding">
137-
<div class="col-xs-3 text-right mobile-padding">
138-
<i class="icon-user"></i>
139-
</div>
140-
<div class="col-xs-9 text-left mobile-padding">支持同时5个设备在线</div>
141-
</div>
142124
<div class="row mobile-padding">
143125
<div class="col-xs-3 text-right mobile-padding">
144126
<i class="icon-drawer"></i>
145127
</div>
146-
<div class="col-xs-9 text-left mobile-padding">流量50G/月</div>
128+
<div class="col-xs-9 text-left mobile-padding">50G/月</div>
147129
</div>
148130
<div class="row mobile-padding">
149131
<div class="col-xs-3 text-right mobile-padding">
@@ -180,17 +162,11 @@
180162
<h3><sup class="price-sign">￥</sup>320</h3>
181163
</div>
182164
<div class="price-table-content">
183-
<div class="row mobile-padding">
184-
<div class="col-xs-3 text-right mobile-padding">
185-
<i class="icon-user"></i>
186-
</div>
187-
<div class="col-xs-9 text-left mobile-padding">支持同时5个设备在线</div>
188-
</div>
189165
<div class="row mobile-padding">
190166
<div class="col-xs-3 text-right mobile-padding">
191167
<i class="icon-drawer"></i>
192168
</div>
193-
<div class="col-xs-9 text-left mobile-padding">流量50G/月</div>
169+
<div class="col-xs-9 text-left mobile-padding">50G/月</div>
194170
</div>
195171
<div class="row mobile-padding">
196172
<div class="col-xs-3 text-right mobile-padding">
@@ -221,7 +197,7 @@
221197
</div>
222198
</div>
223199
</div>
224-
<!-- BEGIN EXAMPLE TABLE PORTLET-->
200+
-->
225201
<div class="portlet light bordered">
226202
<div class="portlet-title">
227203
<div class="caption font-dark">
@@ -277,7 +253,6 @@
277253
</div>
278254
</div>
279255
</div>
280-
<!-- END EXAMPLE TABLE PORTLET-->
281256
</div>
282257
</div>
283258
<!-- END PAGE BASE CONTENT -->

0 commit comments

Comments
 (0)