修改跨域及忽略上传文件

.gitignore

@@ -2,6 +2,7 @@
 /public/hot
 /public/storage
 /storage/*.key
+/storage/import/*
 /.idea
 /.vagrant
 Homestead.json

app/Service/StrategyService.php

@@ -51,23 +51,48 @@ class StrategyService
     }
     //判断excel数据问题,$day_type//外呼日期类型 0每天 1日期前一天和当天   1需要验证值班日期必填
     public function validExcelData($data,$day_type){
-        $failData = [['姓名','*手机号码','值班日期','失败原因']];
+        //$failDataTitle = ['姓名','*手机号码','值班日期','失败原因'];
+        //dump($data);
+        $failData = [];
         foreach ($data as $k=>$v){
+            $dataLab = 1;
             if (strlen($v[0]) > 20){ //姓名最大20个字符，中文处理，放入失败数据中
-                $failData[] = array_push($v, "姓名过长");                
+                array_push($v, "姓名过长");  
+                $failData[] = $v;
+                $dataLab = 0;
             }
-            if ($v[1]){//手机号格式验证，不能为空
-                $failData[] = array_push($v, "手机号格式不正确");   
+            if ($dataLab == 1 && !preg_match('/^1[3-8]{1}[0-9]{9}$/', $v[1])){//手机号格式验证（手机号码验证以13、14、15、16、17、18开头的11位数字），不能为空
+                array_push($v, "手机号格式不正确"); 
+                $failData[] = $v;
+                $dataLab = 0;
             }
-            if ($day_type == 1){//验证必填且为日期格式
-                /* if (empty($v[2])){
-                    $failData[] = array_push($v, "值班日期必填"); 
-                }elseif (){
-                    $failData[] = array_push($v, "值班日期格式错误");
-                } */
+            if ($dataLab == 1 && $day_type == 1){//验证必填且为日期格式
+                if (empty($v[2])){
+                    array_push($v, "值班日期必填"); 
+                    $failData[] = $v;
+                    $dataLab = 0;
+                }else{
+                    $unixTime = strtotime($v[2]);
+                    if (!$unixTime || (date('Y/n/j', $unixTime) != $v[2] && date('n/j/Y', $unixTime) != $v[2])) { //月日不带0（2020/5/3或者 5/3/2020）
+                        array_push($v, "值班日期格式错误");
+                        $failData[] = $v;
+                        $dataLab = 0;
+                    }else{
+                        $v[2] = date('Y-m-d',$unixTime); //处理存储db的日期格式（2020-05-13）
+                        $data[$k] = $v;
+                    }
+                    
+                }
+            }
+            if ($dataLab == 0){
+                unset($data[$k]);
             }
         }
-        
+        dump($failData, $data);
+        $failTotal = count($failData);
+        $successTotal = count($data);
+        dd('====================');
+        return compact('data','failData','failTotal','successTotal');
     }
 }
 

config/cors.php

@@ -56,5 +56,5 @@ return [
     /*
      * Sets the Access-Control-Allow-Credentials header.
      */
-    'supports_credentials' => false,
+    'supports_credentials' => true,
 ];