From 292f3e82eb6c010c0108130fcec72422f3b94bc5 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Feb 2022 13:41:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=8B=92=E7=BB=9D=E6=94=B6=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Forms/DealerOrderRefuse.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Admin/Forms/DealerOrderRefuse.php b/app/Admin/Forms/DealerOrderRefuse.php
index c7e0ec34..0525e799 100644
--- a/app/Admin/Forms/DealerOrderRefuse.php
+++ b/app/Admin/Forms/DealerOrderRefuse.php
@@ -40,6 +40,10 @@ class DealerOrderRefuse extends Form
 
             $order->update([
                 'status' => DealerOrderStatus::Paying,
+                //置空已支付的信息
+                'pay_way'=> null,
+                'pay_image'=> null,
+                'pay_info' => null,
                 'pay_time' => null,
             ]);
 

From 04d339c5526117bc35b125f7f61f58ce21364d6a Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Feb 2022 13:43:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8B=92=E7=BB=9D?=
 =?UTF-8?q?=E6=94=B6=E6=AC=BE=E7=9A=84=E8=A1=A8=E5=8D=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Forms/DealerOrderRefuse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Admin/Forms/DealerOrderRefuse.php b/app/Admin/Forms/DealerOrderRefuse.php
index 0525e799..e852922c 100644
--- a/app/Admin/Forms/DealerOrderRefuse.php
+++ b/app/Admin/Forms/DealerOrderRefuse.php
@@ -71,7 +71,7 @@ class DealerOrderRefuse extends Form
      */
     public function form()
     {
-        $this->textarea('reason', '原因')->rules('required|max:255');
+        $this->textarea('reason', '原因')->required()->rules('required|max:255');
     }
 
     /**

From 2a72d9153cc49507f0609c52448dbadb0188b17e Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Feb 2022 16:08:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E7=94=A8=E6=88=B7=E9=9A=8F=E6=9C=BA=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/Http/Controllers/Auth/SocialiteAuthController.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Endpoint/Api/Http/Controllers/Auth/SocialiteAuthController.php b/app/Endpoint/Api/Http/Controllers/Auth/SocialiteAuthController.php
index 4ec9ca48..8cf5ebb6 100644
--- a/app/Endpoint/Api/Http/Controllers/Auth/SocialiteAuthController.php
+++ b/app/Endpoint/Api/Http/Controllers/Auth/SocialiteAuthController.php
@@ -17,6 +17,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 use Overtrue\Socialite\SocialiteManager;
 use Throwable;
 
@@ -189,6 +190,7 @@ class SocialiteAuthController extends Controller
 
                 $user = User::create(
                     array_merge($input, [
+                        'password' => Str::random(6), //先随机一个密码
                         'phone_verified_at' => $time,
                         'register_ip' => $ip,
                         'last_login_at' => $time,