Merge branch 'dev' of http://git.bocai108.com:10180/Ethan/Customer-Service into dev

application/admin/controller/Messages.php

@@ -197,7 +197,7 @@ class Messages extends Base
                 }
             }
 
-            if($type_id == -1){
+            if($type_id == -1 || $type_id == 0 || $type_id == ''){
                 return json(['code' => -2, 'data' => '', 'msg' => '请选择留言类别']);
             }
             try{

application/service/controller/History.php

@@ -87,7 +87,7 @@ class History extends Common
                 }//end foreach
             }//end foreach
 
-            return json(['code' => 1, 'data' => $data, 'msg' => '成功']);
+            return json(['code' => 1, 'data' => $data, 'msg' => '成功', 'serverList' => array_keys($servicelog)]);
         } catch (\Exception $e) {
             return json(['code' => $code, 'data' => [], 'msg' => $msg]);
         }//end try

public/index.php

@@ -14,9 +14,20 @@ date_default_timezone_set('PRC');
 // [ 应用入口文件 ]
 //编码
 header('content-type:text/html;charset=utf-8');
+// 处理预请求报错（将请求的头部数据全部允许，然后直接返回）.
+if($_SERVER['REQUEST_METHOD'] == 'OPTIONS'){
+    header("Access-Control-Allow-Origin: *");
+    header("Access-Control-Allow-Credentials", "true");
+    header("Access-Control-Max-Age", "3600");
+    header("Access-Control-Allow-Headers: Origin, X-Requested-With, X-Custom-Header, Content-Type, Accept, Authorization, userToken, apiToken");
+    header('Access-Control-Allow-Methods: GET, POST, PUT,DELETE,OPTIONS,PATCH');
+    header('Access-Control-Expose-Headers', "userToken, apiToken");
+    exit;
+}
 //跨域
-header('Access-Control-Allow-Origin: *');
-header("Access-Control-Allow-Credentials: true");
+header('Access-Control-Allow-Origin:*');
+header('Access-Control-Allow-Methods:OPTIONS, GET, POST'); // 允许option，get，post请求
+header('Access-Control-Allow-Headers:x-requested-with'); // 允许x-requested-with请求头
 // 定义应用目录
 define('APP_PATH', __DIR__ . '/../application/');
 // 加载框架引导文件