Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -376,7 +376,7 @@ class RelayInquiry extends Command
                     $lang = $translateSl['texts']['sl'] ?? 'en';
                     $lang = $translateSl['texts']['sl'] ?? 'en';
                 }
                 }
 
 
-                if ($lang != 'en' || $lang != 'zh-CN') {
+                if ($lang != 'en' && Str::contains($lang, 'zh')) {
                     $message = Translate::tran($message, $lang);
                     $message = Translate::tran($message, $lang);
                 }
                 }
             }
             }

@@ -62,7 +62,7 @@ class AdsController extends BaseController
         foreach ($result as &$item){
         foreach ($result as &$item){
             $relay_site_total += count($item->target);
             $relay_site_total += count($item->target);
             $item->requiry_num = ReInquiryDetail::where('task_id', $item->id)->where('status', ReInquiryDetail::STATUS_SUCCESS)->count();
             $item->requiry_num = ReInquiryDetail::where('task_id', $item->id)->where('status', ReInquiryDetail::STATUS_SUCCESS)->count();
-            $item->form_num = ReInquiryDetail::where('task_id', $item->id)->count();
+            $item->form_num = ReInquiryForm::where('ad_id', $item->ad_id)->count();
         }
         }
         $result = $result->toArray();
         $result = $result->toArray();
         $result['relay_site_total'] = $relay_site_total;
         $result['relay_site_total'] = $relay_site_total;

@@ -179,7 +179,7 @@ class CountLogic extends BaseLogic
         $result =array();
         $result =array();
         if(!empty($data)){
         if(!empty($data)){
             foreach ($data as $k => $v){
             foreach ($data as $k => $v){
-                if(($this->project['is_record_china_visit'] != 1) && ($v['country'] == '中国')){
+                if(isset($v['country']) && isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] != 1) && ($v['country'] == '中国')){
                     continue;
                     continue;
                 }else{
                 }else{
                     $v['pv'] = (int)$v['pv'];
                     $v['pv'] = (int)$v['pv'];