Merge branch 'master' of ssh://119.23.72.7:22611/zhujilai/Order into lt_订单周迭代3.09

app/Http/Function.php

@@ -313,7 +313,7 @@ function export_csv($data = [], $header_data = [], $file_name = '')
     $fp = fopen('php://output', 'a');
     if (!empty($header_data)) {
         foreach ($header_data as $key => $value) {
-            $header_data[$key] = iconv('utf-8', 'gbk', $value);
+            $header_data[$key] = iconv('utf-8', 'gbk//TRANSLIT//IGNORE', $value);
         }
         fputcsv($fp, $header_data);
     }
@@ -331,7 +331,7 @@ function export_csv($data = [], $header_data = [], $file_name = '')
             }
             $row = $data[$i];
             foreach ($row as $key => $value) {
-                $row[$key] = iconv('utf-8', 'gbk', $value);
+                $row[$key] = iconv('utf-8', 'gbk//TRANSLIT//IGNORE', $value);
             }
             fputcsv($fp, $row);
         }