调整地区

modules/Mall/Http/Controllers/Admin/StockOrderController.php

@@ -21,7 +21,7 @@ use Modules\Mall\Facades\Order as OrderFacade;
 class StockOrderController extends AdminController
 {
 
-    protected $title = '免费领取订单';
+    protected $title = '提货订单';
 
     protected function grid(): Grid
     {

modules/Mall/Models/Order.php

@@ -99,7 +99,7 @@ class Order extends Model
 
     const TYPE_MAP = [
         self::TYPE_NORMAL => '正常',
-        self::TYPE_SAMPLE => '免费领取',
+        self::TYPE_SAMPLE => '提货',
         self::TYPE_SCORE  => '积分兑换',
     ];
 

modules/User/Http/Controllers/Admin/IndexController.php

@@ -168,7 +168,7 @@ class IndexController extends AdminController
     public function ajax(Request $request)
     {
         $q = $request->get('q');
-
+        dd(1);
         return User::leftJoin('user_infos as info', 'users.id', '=', 'info.user_id')
             ->where('username', 'like', "%$q%")
             ->orWhere('info.nickname', 'like', "%$q%")

modules/User/Http/Resources/UserInfoResource.php

@@ -43,7 +43,7 @@ class UserInfoResource extends JsonResource
                 'orders'   => $this->getOrderCount(),
             ],
             'can'          => [
-                'area' => $this->areas()->exists(),
+                'area' => $this->area()->exists(),
             ],
             'identityShow' => $this->when(true, function () use ($identity) {
                 return [

modules/User/Models/User.php

@@ -317,12 +317,24 @@ class User extends Authenticate
      * @Date: 2023/1/28 9:32
      * @return BelongsToMany
      */
-    public function areas(): BelongsToMany
+//    public function areas(): BelongsToMany
+//    {
+//        return $this->belongsToMany(
+//            Area::class,
+//            (new AreaClerk())->getTable())->using(AreaClerk::class
+//        );
+//    }
+
+    /**
+     * Notes: 管理的区域
+     *
+     * @Author: 玄尘
+     * @Date: 2023/1/29 9:37
+     * @return HasOne
+     */
+    public function area(): HasOne
     {
-        return $this->belongsToMany(
-            Area::class,
-            (new AreaClerk())->getTable())->using(AreaClerk::class
-        );
+        return $this->hasOne(Area::class);
     }