test

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

@@ -66,11 +66,11 @@ class RecuperateController extends MobileBaseController
 
         //增加点击量
         $this->recuperateService->incrementData(['id' => $id], 1, 'click');
-        $uid = auth('web-member')->id();
-        $recuperate_app=RecuperateApply::where('uid',$uid)->where('recuperate_id',$id)->first();
-        if($recuperate_app){
-           return redirect()->route('mobile.person.recuperate');
-        }else{
+        $uid            = auth('web-member')->id();
+        $recuperate_app = RecuperateApply::where('uid', $uid)->where('recuperate_id', $id)->where('status', '!=', 3)->first();
+        if ($recuperate_app) {
+            return redirect()->route('mobile.person.recuperate');
+        } else {
             $return_data = [
                 'wap_title' => $info->title,
                 'info'      => $info,
@@ -95,15 +95,15 @@ class RecuperateController extends MobileBaseController
 
         /*查看手机是否认证*/
         $member = auth('web-member')->user();
-        if($member->mobile_audit!='1'){
+        if ($member->mobile_audit != '1') {
             return $this->showMessage('请到个人中心先绑定手机号码', route('mobile.person.perSecTel'), true, '上一页', '3');
         }
 
-        $members_info=MemberInfo::where('uid',$member->id)->select('realname','id_card','phone','card_t_cn')->first();
+        $members_info = MemberInfo::where('uid', $member->id)->select('realname', 'id_card', 'phone', 'card_t_cn')->first();
         if (empty($members_info)) {
             return $this->showMessage('请到个人中心填写身份证号', route('mobile.person.memberInfo'), true, '上一页', '3');
         }
-        if($members_info->card_t_cn!='306' && !$members_info->id_card){
+        if ($members_info->card_t_cn != '306' && !$members_info->id_card) {
             return $this->showMessage('请到个人中心填写身份证号', route('mobile.person.memberInfo'), true, '上一页', '3');
         }
 
@@ -118,7 +118,7 @@ class RecuperateController extends MobileBaseController
         $return_data = [
             'wap_title' => '优秀人才疗休养活动报名',
             'info'      => $info,
-            'members'  =>array_merge($member->toArray(),$members_info->toArray(),['year'=>date('Y',strtotime("-1 year"))])
+            'members'   => array_merge($member->toArray(), $members_info->toArray(), ['year' => date('Y', strtotime("-1 year"))]),
         ];
         return view('mobile.app.recuperate.apply', $return_data);
     }
@@ -128,15 +128,15 @@ class RecuperateController extends MobileBaseController
      */
     public function applyPost(Request $request)
     {
-        $data        = $request->all();
-        $uid = auth('web-member')->id();
+        $data = $request->all();
+        $uid  = auth('web-member')->id();
         //一个活动只能报名一次
-        $recuperate_apply = RecuperateApply::where('uid',$uid)->where('recuperate_id',$data['recuperate_id'])->first();
+        $recuperate_apply = RecuperateApply::where('uid', $uid)->where('recuperate_id', $data['recuperate_id'])->where('status', '!=', 3)->first();
         if ($recuperate_apply) {
             return $this->sendErrorResponse('一个活动只能报名一次', '', 400);
         }
 
-        $recuperate=Recuperate::where('id',$data['recuperate_id'])->select('price')->first();
+        $recuperate = Recuperate::where('id', $data['recuperate_id'])->select('price')->first();
 
 //        if(date('Y',time())!='2021'){
 //            $verification=$this->verification($uid,$recuperate);
@@ -147,9 +147,9 @@ class RecuperateController extends MobileBaseController
 //        }
 
         //报名
-        $data['uid'] = $uid;
+        $data['uid']   = $uid;
         $data['price'] = $recuperate->price;
-        $res         = $this->recuperateApplyService->create($data);
+        $res           = $this->recuperateApplyService->create($data);
         if ($res) {
             return response()->json(['status' => 1, 'info' => '报名成功']);
         } else {
@@ -170,39 +170,40 @@ class RecuperateController extends MobileBaseController
         return view('mobile.app.recuperate.project', $return_data);
     }
 
-    protected function  verification($uid,$info,$members_info=false){
-        $year=date('Y', strtotime("-1 year"));
-        $recuperate_time=RecuperateTime::where('uid',$uid)->where('year',$year)->first();
+    protected function verification($uid, $info, $members_info = false)
+    {
+        $year            = date('Y', strtotime("-1 year"));
+        $recuperate_time = RecuperateTime::where('uid', $uid)->where('year', $year)->first();
 
-        if($recuperate_time){
-            $old_integral=RecuperateApply::where('uid',$uid)->where('recuperate_time_id',$recuperate_time->id)->where('status','!=',2)->sum('price');
-            if($recuperate_time->price<($old_integral+$info['price'])){
-                return  ['state'=>0,'msg'=>'今年的金额额度不够'];
-            }else{
-                return ['state'=>1,'msg'=>'ok','info'=>$recuperate_time];
+        if ($recuperate_time) {
+            $old_integral = RecuperateApply::where('uid', $uid)->where('recuperate_time_id', $recuperate_time->id)->where('status', '!=', 2)->sum('price');
+            if ($recuperate_time->price < ($old_integral + $info['price'])) {
+                return ['state' => 0, 'msg' => '今年的金额额度不够'];
+            } else {
+                return ['state' => 1, 'msg' => 'ok', 'info' => $recuperate_time];
             }
-        }else{
-
-            $data['idCard']=$members_info->id_card;
-            $data['phone']=$members_info->phone;
-            $arr['year']=$data['year']=$year;;
-              $result_json = https_request('http://rc.jucai.gov.cn/api/jucaiInterface/getDevelopAllowance', $data);
-          //  $result_json = https_request('http://120.26.63.153:8080/JJRCW/api/jucaiInterface/getDevelopAllowance', $data);
-            $result_json=json_decode($result_json);
+        } else {
+
+            $data['idCard'] = $members_info->id_card;
+            $data['phone']  = $members_info->phone;
+            $arr['year']    = $data['year'] = $year;;
+            $result_json = https_request('http://rc.jucai.gov.cn/api/jucaiInterface/getDevelopAllowance', $data);
+            //  $result_json = https_request('http://120.26.63.153:8080/JJRCW/api/jucaiInterface/getDevelopAllowance', $data);
+            $result_json = json_decode($result_json);
             if (!empty($result_json)) {
-                if($result_json->state=='3'){
-                    if($result_json->total<$info['price']){
-                        return  ['state'=>0,'msg'=>'今年的金额额度不够'];
+                if ($result_json->state == '3') {
+                    if ($result_json->total < $info['price']) {
+                        return ['state' => 0, 'msg' => '今年的金额额度不够'];
                     }
-                    $arr['price']=$result_json->total;
-                    $arr['uid']=$uid;
+                    $arr['price'] = $result_json->total;
+                    $arr['uid']   = $uid;
                     RecuperateTime::create($arr);
-                    return ['state'=>1,'msg'=>$result_json->msg];
-                }else{
-                    return ['state'=>0,'msg'=>$result_json->msg];
+                    return ['state' => 1, 'msg' => $result_json->msg];
+                } else {
+                    return ['state' => 0, 'msg' => $result_json->msg];
                 }
             } else {
-                return ['state'=>0,'msg'=>'未查到您的人才信息，请确认是否已申报！'];
+                return ['state' => 0, 'msg' => '未查到您的人才信息，请确认是否已申报！'];
             }
         }
     }

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

@@ -45,6 +45,9 @@ class RecuperateController extends WebBaseController
      */
     public function show($id)
     {
+        if (isMobile()) {
+            return redirect(route('mobile.recuperate.show', ['id' => $id]));
+        }
         //获取详情
         $info = $this->recuperateService->getRecuperateInfo($id);
         if (!$info) {
@@ -52,7 +55,7 @@ class RecuperateController extends WebBaseController
             return $this->showMessage('资讯不存在', $back_url, true, '上一页', '3');
         }
         $uid            = auth('web-member')->id();
-        $recuperate_app = RecuperateApply::where('uid', $uid)->where('recuperate_id', $id)->first();
+        $recuperate_app = RecuperateApply::where('uid', $uid)->where('recuperate_id', $id)->where('status', '!=', 3)->first();
         //增加点击量
         $this->recuperateService->incrementData(['id' => $id], 1, 'click');
 
@@ -175,7 +178,7 @@ class RecuperateController extends WebBaseController
             }
         }
         //一个活动只能报名一次
-        $recuperate_apply = RecuperateApply::where('uid', $uid)->where('recuperate_id', $data['recuperate_id'])->first();
+        $recuperate_apply = RecuperateApply::where('uid', $uid)->where('recuperate_id', $data['recuperate_id'])->where('status', '!=', 3)->first();
         if ($recuperate_apply) {
             return $this->sendErrorResponse('一个活动只能报名一次', '', 400);
         }

public/themes/default/views/app/recuperate/apply.blade.php

@@ -22,7 +22,7 @@
                         <td class="w1"><span>&nbsp;</span>姓名：</td>
                         <td><input name="user_name" id="user_name" type="text" value="@isset($members['realname']) {{$members['realname']}}@endisset" class="input_245_34"/></td>
                         <td class="w1"><span>&nbsp;</span>证件号：</td>
-                        <td><input name="user_idcard" id="user_idcard" type="text"  @if($members['id_card']) readonly @endif value="@isset($members['id_card']) {{$members['id_card']}}@endisset"    class="input_245_34"/></td>
+                        <td><input name="user_idcard" placeholder="身份证号或其他有效证件号" id="user_idcard" type="text" class="input_245_34"/></td>
                     </tr>
                     <tr>
                         <td class="w1"><span>&nbsp;</span>联系电话：</td>
@@ -56,7 +56,7 @@
                     </tr>
                     <tr>
                         <td colspan="2" class="w1 radio_list J_radioitme_parent" style="text-align:left;padding-left:30px;">
-                            <span>&nbsp;</span>人才有效期：
+                            人才有效期：
                             <input name="validate_time" id="validate_time" type="text" placeholder="例如2023-11-12" value="" class="input_245_34" required/>
                         </td>
                     </tr>
@@ -156,11 +156,11 @@
                     disapperTooltip("remind", '工作单位不能为空！');
                     return false;
                 }
-                if (validate_time == '') {
+                /*if (validate_time == '') {
                     disapperTooltip("remind", '人才有效期不能为空！');
                     return false;
                 }
-                /*if (salary == '') {
+                if (salary == '') {
                     disapperTooltip("remind",'请选择年工资选项');
                     return false;
                 }

public/themes/default/views/mobile/app/recuperate/apply.blade.php

@@ -43,7 +43,7 @@
         <form class="mui-input-group">
             <div class="list_height plist-txt notarrow">
                 <div class="pic"></div>
-                <div class="tit font14">姓名</div>
+                <div class="tit font14"><span style="color:red">*</span>姓名</div>
                 <div class="describe font12">
                     <input id="user_name" type="text"  name="user_name" value="@isset($members['realname']) {{$members['realname']}}@endisset"  placeholder="请输入您的姓名">
                 </div>
@@ -52,16 +52,16 @@
             </div>
             <div class="list_height plist-txt notarrow">
                 <div class="pic"></div>
-                <div class="tit font14">身份证号</div>
+                <div class="tit font14"><span style="color:red">*</span>证件号</div>
                 <div class="describe font12">
-                    <input id="user_idcard" type="text"   name="user_idcard" value="@isset($members['id_card']) {{$members['id_card']}}@endisset"   class="mui-input-clear" placeholder="请输入您的身份证号">
+                    <input id="user_idcard" type="text" name="user_idcard" class="mui-input-clear" placeholder="身份证号或其他有效证件号">
                 </div>
                 <div class="arrow"></div>
                 <div class="clear"></div>
             </div>
             <div class="list_height plist-txt notarrow">
                 <div class="pic"></div>
-                <div class="tit font14">联系电话</div>
+                <div class="tit font14"><span style="color:red">*</span>联系电话</div>
                 <div class="describe font12">
                     <input id="mobile" type="text" name="mobile"   value="@isset($members['mobile']) {{$members['mobile']}}@endisset"  class="mui-input-clear" placeholder="请输入您的联系方式">
                 </div>
@@ -70,7 +70,7 @@
             </div>
             <div class="list_height plist-txt notarrow">
                 <div class="pic"></div>
-                <div class="tit font14">个人微信号</div>
+                <div class="tit font14"><span style="color:red">*</span>个人微信号</div>
                 <div class="describe font12">
                     <input id="wechat" type="text" name="wechat" class="mui-input-clear" placeholder="便于建群联系">
                 </div>
@@ -79,7 +79,7 @@
             </div>
             <div class="list_height plist-txt">
                 <div class="pic"></div>
-                <div class="tit font14">人才层次</div>
+                <div class="tit font14"><span style="color:red">*</span>人才层次</div>
                 <div class="describe font13 qs-relative">
                     <div class="for-select">请选择人才层次</div>
                     <select id="level" name="level">
@@ -98,7 +98,7 @@
             </div>
             <div class="list_height plist-txt notarrow">
                 <div class="pic"></div>
-                <div class="tit font14">工作单位</div>
+                <div class="tit font14"><span style="color:red">*</span>工作单位</div>
                 <div class="describe font12">
                     <input id="company_name" type="text" name="company_name" class="mui-input-clear" placeholder="请输入您的工作单位">
                 </div>
@@ -230,7 +230,7 @@
                 return false;
             }
             if (user_idcard == '') {
-                qsToast({type: 2, context: '身份证号不能为空'});
+                qsToast({type: 2, context: '证件号不能为空'});
                 return false;
             }
             if (mobile == '') {
@@ -249,11 +249,11 @@
                 qsToast({type: 2, context: '工作单位不能为空'});
                 return false;
             }
-            if (validate_time == '') {
+            /*if (validate_time == '') {
                 qsToast({type: 2, context: '人才有效期不能为空'});
                 return false;
             }
-            /*if (salary === undefined) {
+            if (salary === undefined) {
                 qsToast({type: 2, context: '请选择年工资选项'});
                 return false;
             }

routes/web.php

@@ -934,6 +934,7 @@ Route::group([
     $router->post('/create_word', 'Web\Talent\JjhcController@create_word')->name('talent.jjhc.create_word');
     $router->post('/coze_callback', 'Web\Talent\JjhcController@callback')->name('talent.jjhc.coze_callback');
     $router->get('/aibot', 'Web\Talent\JjhcController@aibot')->name('talent.jjhc.aibot');
+    $router->post('/generateExcel', 'Web\Talent\JjhcController@generateExcel')->name('talent.jjhc.generateExcel');
 });
 
 Route::group([