From 290df1a0a63cb5814c489e451b2012e4bee58071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Tue, 21 Apr 2020 22:15:14 +0800
Subject: [PATCH] hotfix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复签到失败的问题；
2. 修复流量重置价格获取错误的问题；
3. 支付设置问题
---
 app/Http/Controllers/AdminController.php | 2 +-
 app/Http/Controllers/UserController.php  | 2 +-
 resources/views/user/index.blade.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 6283c1ce..a04d2ee8 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -2009,7 +2009,7 @@ EOF;
 					}
 					break;
 				case 'bitpayx':
-					if(!self::$systemConfig['bitpayx']){
+					if(!self::$systemConfig['bitpay_secret']){
 						return Response::json(['status' => 'fail', 'message' => '请先设置【麻瓜宝】必要参数']);
 					}
 					break;
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 0b8299c9..c2cc8dcc 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -271,7 +271,7 @@ class UserController extends Controller
 	//重置流量
 	public function resetUserTraffic()
 	{
-		$temp = Order::uid()->where('status', 2)->where('is_expire', 0)->first();
+		$temp = Order::uid()->where('status', 2)->where('is_expire', 0)->with(['goods'])->whereHas('goods', function($q){ $q->where('type', 2); })->first();
 		$renewCost = Goods::query()->where('id', $temp->goods_id)->first()->renew;
 		if(Auth::user()->balance < $renewCost){
 			return Response::json(['status' => 'fail', 'data' => '', 'message' => '余额不足，请充值余额']);
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
index 7ca8ae7f..f28b1ca0 100644
--- a/resources/views/user/index.blade.php
+++ b/resources/views/user/index.blade.php
@@ -230,7 +230,7 @@
 	<script type="text/javascript">
         // 签到
         function checkIn() {
-            $.post('/checkIn', function (ret) {
+            $.post('/checkIn', {_token: '{{csrf_token()}}'}, function (ret) {
                 if (ret.status === 'success') {
                     swal.fire('长者的微笑', ret.message, 'success');
                 } else {