1

app/api/lists/supply_demand/SupplyDemandLists.php

@@ -84,12 +84,12 @@ class SupplyDemandLists extends BaseApiDataLists implements ListsSearchInterface
 
         $orderRaw = 'id desc';
 
-        $field = 'id,user_id,title,type,cate_id,mobile,images,address,number,content,status,remark,create_time';
+        $field = 'id,user_id,title,type,cate_id,mobile,images,area_id,address,number,content,status,remark,create_time';
         $result = SupplyDemandInfo::field($field)
             ->where($this->queryWhere())
             ->where($this->searchWhere)
             ->orderRaw($orderRaw)
-            ->append(['type_desc','cateInfo','status_desc','images','user'])
+            ->append(['type_desc','cateInfo','status_desc','images','user','area'])
             ->limit($this->limitOffset, $this->limitLength)
             ->select()->toArray();
 

app/api/logic/SupplyDemandLogic.php

@@ -57,6 +57,7 @@ class SupplyDemandLogic extends BaseLogic
             SupplyDemandInfo::create([
                 'user_id' => $params['user_id'],
                 'type' => $params['type'] ?? 1,
+                'area_id' => $params['area_id'],
                 'cate_id' => $params['cate_id'],
                 'title' => $params['title'],
                 'mobile' => $params['mobile'],
@@ -107,7 +108,7 @@ class SupplyDemandLogic extends BaseLogic
             $where = [];
             $where[]=['id','=',$params['id']];
 
-            $supplyDemandInfo = SupplyDemandInfo::where($where) ->append(['type_desc','cateInfo','images','user'])->findOrEmpty()->toArray();
+            $supplyDemandInfo = SupplyDemandInfo::where($where) ->append(['type_desc','cateInfo','images','user','area'])->findOrEmpty()->toArray();
 
             return ['code'=>true,'data'=>$supplyDemandInfo];
         } catch (\Exception $e) {

app/api/validate/SupplyDemandValidate.php

@@ -35,6 +35,7 @@ class SupplyDemandValidate extends BaseValidate
         'mobile' => 'require|mobile',
         'type'  => 'in:1,2',
         'cate_id'=> 'require|checkCate',
+        'area_id'=> 'require',
         'address'=>'require',
         'images'=>'require',
         'content'=>'require',
@@ -51,13 +52,14 @@ class SupplyDemandValidate extends BaseValidate
         'mobile.mobile' => '请填写正确的手机号',
         'type.require'  => '类型type参数必传',
         'cate_id.require'  => '供应分类参数必传',
+        'area_id.require'  => '所属地区参数必传',
         'address.require'  => '地址信息必传',
         'type.in'    =>'类型type参数规则错误',
         'images.require'                          => '请输入上传图片',
         'number.require'  => '地区信息必传',
     ];
     protected $scene = [
-        'supplyDemandRelease' => ['title','type','images','address','mobile','number','cate_id'], //
+        'supplyDemandRelease' => ['title','type','images','address','mobile','number','area_id','cate_id'], //
         'info' => ['id'], //
         'cate' => ['type'],
         'submitSupplyDemand'=>['id'],

app/common/model/supply_demand/SupplyDemandInfo.php

@@ -55,6 +55,10 @@ class SupplyDemandInfo extends BaseModel
     {
         return $this->hasOne(SupplyDemandCate::class, 'id', 'cate_id')->field('id,name');
     }
+
+    public function area(){
+        return $this->hasOne(AssetArea::class,'id','area_id');
+    }
     /**
      * @notes 状态描述
      * @param $value