Merge branch 'master' of http://47.118.43.255:3000/jjhc/jucai

app/Http/Controllers/Web/Recuperate/RecuperateController.php

@@ -168,10 +168,10 @@ class RecuperateController extends WebBaseController
         $uid = auth('web-member')->id();
         $id_card=MemberInfo::where('uid',$uid)->value('id_card');
         if(empty($id_card)){
-            if(MemberInfo::where('id_card',$data['user_idcard'])){
-                return $this->sendErrorResponse('身份证已经重复', '', 400);
+            $member_info = MemberInfo::where('id_card',$data['user_idcard'])->first();
+            if(empty($member_info)){
+                MemberInfo::where('uid',$uid)->update(['card_t_cn'=>306,'id_card'=>$data['user_idcard']]);
             }
-            MemberInfo::where('uid',$uid)->update(['card_t_cn'=>306,'id_card'=>$data['user_idcard']]);
         }
         //一个活动只能报名一次
         $recuperate_apply = RecuperateApply::where('uid',$uid)->where('recuperate_id',$data['recuperate_id'])->first();