新增家庭地址功能

app/Http/Controllers/Admin/Orders.php

@@ -257,6 +257,8 @@ class Orders extends Auth{
         if (!$res)                  return json_send(['code'=>'error','msg'=>'退款失败']);
         //修改订单状态
         $res                        =   $Model->query()->where('snowflake_id','=',$orderInfo['snowflake_id'])->update(['out_refund_no'=>$out_refund_no,'status'=>5]);
+        // 记录行为
+        $this->addAdminHistory(admin('uid'),$Model->getTable(),$id,1,[],$orderInfo);
         //修改订单产品状态
         $res                        =   $OrdersProduct->query()->where('order_id','=',$id)->update(['status'=>5]);
         return json_send(['code'=>'success','msg'=>'退款成功']);

app/Http/Controllers/Api/StudentAddr.php

@@ -2,7 +2,7 @@
 
 use App\Http\Controllers\Api\Api;
 use App\Models\StudentAddr as Model;
-use App\Http\Requests\Api\StudentAddr as Request;
+use App\Http\Requests\Api\StudentAddr as request;
 
 /**
  * 学生地址
@@ -40,17 +40,19 @@ class StudentAddr extends Api{
 		// 接口验签
 		// $this->verify_sign();
 		// 验证参数
-		$request->scene('add')->validate();
+        $request->scene('add')->validate();
 		// 检查登录
 		$uid							= $this->checkLogin();
 		// 接收参数
-		$data['contact_area']			= request('contact_area','');
-		$data['contact_school']			= request('contact_school','');
-		$data['contact_grade']			= request('contact_grade','');
-		$data['contact_class']			= request('contact_class','');
-		$data['contact_name']			= request('contact_name','');
-		$data['contact_phone']			= request('contact_phone','');
+        $data['type']				    = request('type',0);
+        $data['contact_area']			= request('contact_area','');
+        $data['contact_school']		    = request('contact_school','');
+        $data['contact_grade']		    = request('contact_grade','');
+        $data['contact_class']		    = request('contact_class','');
+        $data['contact_name']		    = request('contact_name','');
+        $data['contact_phone']		    = request('contact_phone','');
 		$data['is_default']				= request('is_default',0);
+		$data['type']				    = request('type',0);
 		$data['custom_uid']				= $uid;
 		// 最大数量
 		$limitMax						= 20;
@@ -84,13 +86,13 @@ class StudentAddr extends Api{
 		// 接收参数
 		$id								= request('id',0);
 		$data['contact_area']			= request('contact_area','');
-		$data['contact_school']			= request('contact_school','');
-		$data['contact_grade']			= request('contact_grade','');
-		$data['contact_class']			= request('contact_class','');
+        $data['type']				    = request('type',0);
+        $data['contact_school']		    = request('contact_school','');
+        $data['contact_grade']		    = request('contact_grade','');
+        $data['contact_class']		    = request('contact_class','');
 		$data['contact_name']			= request('contact_name','');
 		$data['contact_phone']			= request('contact_phone','');
 		$data['is_default']				= request('is_default',0);
-		$data['is_default']				= request('is_default',0);
 		// 如果需要默认当前的话
 		if( $data['is_default'] )		$Model->query()->where([['custom_uid','=',$uid]])->update(['is_default'=>0]);
 		// 查询是否已经提交过

app/Models/StudentAddr.php

@@ -66,7 +66,7 @@ class StudentAddr extends Model
      */
     public function getOne($id,$field=''){
         // 返回结果
-        $result     = $field ? $this->query()->where([['id','=',$id]])->value($field) : $this->query()->where([['id','=',$id]])->first(['id','custom_uid','contact_area','contact_school','contact_grade','contact_class','contact_name','contact_phone','is_default']);
+        $result     = $field ? $this->query()->where([['id','=',$id]])->value($field) : $this->query()->where([['id','=',$id]])->first(['id','custom_uid','contact_area','contact_school','contact_grade','contact_class','contact_name','contact_phone','is_default','type']);
         // 返回结果
         return      $result;
     }
@@ -77,7 +77,7 @@ class StudentAddr extends Model
      */
     public function getListByCustom($uid){
         // 返回结果
-        $result     = $this->query()->where([['custom_uid','=',$uid]])->get(['id','custom_uid','contact_area','contact_school','contact_grade','contact_class','contact_name','contact_phone','is_default']);
+        $result     = $this->query()->where([['custom_uid','=',$uid]])->get(['id','custom_uid','contact_area','contact_school','contact_grade','contact_class','contact_name','contact_phone','is_default','type']);
         // 返回结果
         return      $result;
     }

resources/views/admin/orders/index.blade.php

@@ -86,10 +86,10 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>成交总价</th>
 						<th>收货人</th>
 						<th>联系方式</th>
-						<th>区域</th>
-						<th>学校</th>
-						<th>年级</th>
-						<th>班级</th>
+						<th>区域/省</th>
+						<th>学校/市</th>
+						<th>年级/区域</th>
+						<th>班级/详细地址</th>
 						<th>订单状态</th>
 						<th>下单时间</th>
 						<th>操作</th>