合并分支 'master-server' 到 'master'

gx脚本



查看合并请求 !1277

@@ -218,14 +218,14 @@ class DownloadProject extends Command
                 $content1 .= '本周新收 '.$data['week_inquiry_total'].' 封询盘。';
                 $content1 .= '本周新收 '.$data['week_inquiry_total'].' 封询盘。';
             }
             }
             if(!empty($data['inquiry_country'])){
             if(!empty($data['inquiry_country'])){
-                $data['inquiry_country'] = json_decode($data['inquiry_country'],JSON_UNESCAPED_UNICODE);
+                $data['inquiry_country'] = json_decode($data['inquiry_country'],true);
                 arsort($data['inquiry_country']);
                 arsort($data['inquiry_country']);
                 $data['inquiry_country'] = array_slice($data['inquiry_country'], 0, 4, true);
                 $data['inquiry_country'] = array_slice($data['inquiry_country'], 0, 4, true);
                 $country = '';
                 $country = '';
                 foreach ($data['inquiry_country'] as $k => $v){
                 foreach ($data['inquiry_country'] as $k => $v){
-                    $country .= $k.'、';
+                    $country .= $k.',';
                 };
                 };
-                $country = trim($country,'、');
+                $country = trim($country,',');
                 $content1 .= '询盘主要来源于'.$country.'等国家地区';
                 $content1 .= '询盘主要来源于'.$country.'等国家地区';
             }
             }
             $content1 .= '如有高质量客户，请您密切关注与跟进;';
             $content1 .= '如有高质量客户，请您密切关注与跟进;';