From 8cddb906f5a4cc4a97180fd5b098026215d5f7b4 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Fri, 10 Jun 2022 15:46:44 +0800
Subject: [PATCH] 1

---
 .../Api/Http/Controllers/Auth/MiniprogramController.php       | 4 ++--
 .../Api/Http/Controllers/Product/ProductSkuController.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Endpoint/Api/Http/Controllers/Auth/MiniprogramController.php b/app/Endpoint/Api/Http/Controllers/Auth/MiniprogramController.php
index e9eb7193..7b9de3ad 100644
--- a/app/Endpoint/Api/Http/Controllers/Auth/MiniprogramController.php
+++ b/app/Endpoint/Api/Http/Controllers/Auth/MiniprogramController.php
@@ -112,13 +112,13 @@ class MiniprogramController extends Controller
             $old_user = User::where('phone', $phone)->where('status', User::STATUS_ACTIVE)->where('id', '!=', $user->id)->first();
             if ($old_user) {
                 // 禁用新用户
-                // throw new BizException('手机号已经注册');
+                throw new BizException('手机号已经注册');
                 // $user->update([
                 //     'phone' => '',
                 //     'status' => User::STATUS_DISABLED,
                 //     'status_remark' => '手机号重复: ' . $phone
                 // ]);
-                $user = $old_user;
+                // $user = $old_user;
             } else {
                 $user->update([
                     'phone' => $phone,
diff --git a/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php b/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php
index ddc63e62..135cdc35 100644
--- a/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php
+++ b/app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php
@@ -66,7 +66,7 @@ class ProductSkuController extends Controller
         $user = $request->user();
         $spu = ProductSpu::with(['specs', 'features'])->findOrFail($id);
 
-        $sku = $spu->skus()->with(['buynote'])->online()->first();
+        $sku = $spu->skus()->with(['buynote', 'spu'])->online()->first();
         if (!$sku) {
             throw new BizException('商品sku未上架');
         }