sandm 3 роки тому
батько
коміт
e44bb49471

+ 3 - 2
app/Admin/Controllers/Recruit/RecruitController.php

@@ -1048,8 +1048,8 @@ class RecruitController extends Controller
         $appoint_id = $request->appoint_id;
         if(!empty($recruit_id) && !empty($appoint_id)){
 
-            $this->fetch_word(['recruit_id'=>$recruit_id,'appoint_id'=>$appoint_id]);
-            return response()->json(['status' => 1, 'msg' => '生成Word简历成功!', 'data' => 'ok']);
+            $url = $this->fetch_word(['recruit_id'=>$recruit_id,'appoint_id'=>$appoint_id]);
+            return response()->json(['status' => 1, 'msg' => '生成Word简历成功!', 'data' => 'ok', 'url' => $url]);
         }else{
             return response()->json(['status' => 0, 'msg' => '参数缺失!', 'data' => 'fail']);
         }
@@ -1294,6 +1294,7 @@ class RecruitController extends Controller
             $appoint->word_url = "/storage/recruit/word/" . $recruit->name_en .$word_url;
             $appoint->save();
             $templateProcessor->saveAs(base_path() . "/storage/app/public/recruit/word/" . $recruit->name_en . $word_url);//另存为
+            return "/storage/recruit/word/" . $recruit->name_en .$word_url;
         }
     }
 

+ 0 - 1
public/themes/default/views/app/recruit/sign_up.blade.php

@@ -1735,7 +1735,6 @@
                     if(!this.checkIDCard(value)) {
                         callback(new Error('身份证号不正确'));
                     }
-                    callback();
                 },
                 checkIDCard(cardNo){
                     var weight_factor = [7,9,10,5,8,4,2,1,6,3,7,9,10,5,8,4,2];

+ 5 - 1
public/themes/default/views/mobile/app/index.blade.php

@@ -265,7 +265,11 @@
                 @if(array_has($articles1, '3') && $articles1['3'])
                     @foreach($articles1['3'] as $k=>$v)
                         <li>
-                            <a href="{{route('mobile.news.show',['id'=>$v->id])}}" target="_blank"><b>&gt;</b>{{cut_str($v->title, 15, 0, '...')}}<span class="jc_rt">{{date('Y-m-d',strtotime($v->created_at))}}</span></a>
+                            @if(empty($v->is_url))
+                                <a href="{{route('mobile.news.show',['id'=>$v->id])}}" target="_blank"><b>&gt;</b>{{cut_str($v->title, 15, 0, '...')}}<span class="jc_rt">{{date('Y-m-d',strtotime($v->created_at))}}</span></a>
+                            @else
+                                <a href="{{$v->is_url}}" target="_blank"><b>&gt;</b>{{cut_str($v->title, 15, 0, '...')}}<span class="jc_rt">{{date('Y-m-d',strtotime($v->created_at))}}</span></a>
+                            @endif
                         </li>
                     @endforeach
                         <div onclick="window.location='{{route($sub_site."mobile.news.list",['id'=>3])}}';" style="text-align:center;height:.8rem;line-height:.8rem;background:#fff;">查看更多</div>

+ 1 - 0
resources/views/admin/recruit/appoint_list.blade.php

@@ -528,6 +528,7 @@
                     $.post("{{ route('recruit.fetchword') }}", {_token:'{{ csrf_token() }}',recruit_id:recruit_id,appoint_id:appoint_id}, function(result) {
                         if (result.status == 1) {
                             disapperTooltip('success', result.msg);
+                            window.location.href = result.url;
                             setTimeout(function() {
                                 $.pjax.reload('#pjax-container');
                                 qsDialog.hide(true);