收货地址改动

addons/unishop/controller/Address.php

@@ -53,11 +53,11 @@ class Address extends Base
         $pagesize = input('pagesize', 15);
 
         $data = (new AddressModel())
-            ->with([
+            /*->with([
                 'province' => function($query) {$query->field('id,name');},
                 'city' => function($query) {$query->field('id,name');},
                 'area' => function($query) {$query->field('id,name');}
-            ])
+            ])*/
             ->where('user_id', $this->auth->id)
             ->order(['is_default' => 'desc', 'id' => 'desc'])
             ->limit(($page - 1) * $pagesize, $pagesize)
@@ -242,11 +242,11 @@ class Address extends Base
     {
         $id = input('id');
         $address = (new AddressModel())
-            ->with([
+           /* ->with([
                 'province' => function($query) {$query->field('id,name');},
                 'city' => function($query) {$query->field('id,name');},
                 'area' => function($query) {$query->field('id,name');}
-            ])
+            ])*/
             ->where(['id' => $id, 'user_id' => $this->auth->id])->find()->toArray();
         $this->success('', $address);
     }

addons/unishop/validate/Address.php

@@ -21,9 +21,9 @@ class Address extends Validate
         'mobile' => 'require|number|max:20',
         'address' => 'require|max:255',
         'is_default' => 'integer',
-        'province_id' => 'require',
-        'city_id' => 'require',
-        'area_id' => 'require',
+//        'province_id' => 'require',
+//        'city_id' => 'require',
+//        'area_id' => 'require',
     ];
 
     /**
@@ -38,17 +38,17 @@ class Address extends Validate
         'address.required' => '地址不能为空',
         'address.max' => '地址不能超过255字',
         'is_default.integer' => '默认地址格式不对',
-        'province_id.require' => '请选择省份',
-        'city_id.require' => '请选择城市',
-        'area_id.require' => '请选择地区',
+//        'province_id.require' => '请选择省份',
+//        'city_id.require' => '请选择城市',
+//        'area_id.require' => '请选择地区',
     ];
 
     /**
      * 验证场景
      */
     protected $scene = [
-        'add'  => ['name', 'mobile', 'address', 'is_default', 'province_id', 'city_id', 'area_id'],
-        'edit' => ['id', 'name', 'mobile', 'address', 'is_default', 'province_id', 'city_id', 'area_id'],
+        'add'  => ['name', 'mobile', 'address', 'is_default'/*, 'province_id', 'city_id', 'area_id'*/],
+        'edit' => ['id', 'name', 'mobile', 'address', 'is_default'/*, 'province_id', 'city_id', 'area_id'*/],
     ];
 
 }