Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Admin/Controllers/Recruit/RecruitController.php

app/Admin/Controllers/Recruit/RecruitController.php

@@ -406,7 +406,7 @@ class RecruitController extends Controller
             $data['phone'] = $verify['phone'];
         }
         if(array_key_exists('qr_code',$verify)){
-            $data['qr_code'] = "/storage/" . $verify['qr_code'];
+            $data['qr_code'] = $verify['qr_code'];
         }
         if($verify['addFile']){
             $data['addFile'] = $verify['addFile'];
@@ -590,7 +590,7 @@ class RecruitController extends Controller
         $data['introduction'] = $verify['introduction'];
         $data['host_address'] = $verify['host_address'];
         if(array_key_exists('qr_code',$verify)){
-            $data['qr_code'] = "/storage/" . $verify['qr_code'];
+            $data['qr_code'] = $verify['qr_code'];
         }
         //$data['addFile'] = $verify['addFile'];
         $data['contact'] = $verify['contact'];
@@ -626,14 +626,12 @@ class RecruitController extends Controller
         $data['reexamine_ticket_content'] = $verify['reexamine_ticket_content'];
         $data['reexamine_field'] = implode(',',$verify['reexamine_field']);
         $ids = RecruitPost::where('recruit_id', $recruit_id)->pluck('id');
-        //$fileCharater = $request->input('addFile');
+        $fileCharater = $request->input('addFile');
         $data['special'] = 0;
 
-
         DB::beginTransaction();//检查数据库事务
         try {
             $res = Recruit::where('id', $recruit_id)->update($data);
-
             $postcode_array = $request->postcode;
             $postname_array = $request->postname;
             $postnumber_array = $request->postnumber;
@@ -709,7 +707,6 @@ class RecruitController extends Controller
             return admin_toastr('操作成功!', 'success');
 
         } catch (\Exception $e) {
-
             DB::rollback();
             return admin_toastr($e->getMessage(), 'error');
         }

app/Http/Controllers/Web/Recruit/IndexController.php

@@ -1442,7 +1442,7 @@ class IndexController extends WebBaseController
                         return ['status' => 1, 'msg' => '提交成功', 'data' => $appoint_info->id, 'is_html' => 0];
 
                     }else{
-                        return ['status' => 1, 'msg' => "<h3 style='text-align: center'>提交成功，添加工作人员企业微信了解后续信息</h3><p><img src='{$recruit->qr_code}' width='240' height='240' /></p>", 'data' => $appoint_info->id,'is_html' => 1];
+                        return ['status' => 1, 'msg' => "<h3 style='text-align: center'>提交成功，添加工作人员企业微信了解后续信息</h3><p><img src='/storage/{$recruit->qr_code}' width='240' height='240' /></p>", 'data' => $appoint_info->id,'is_html' => 1];
 
                     }
                     //return ['status' => 1, 'msg' => '提交成功', 'data' => $result->id];