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

@@ -149,7 +149,7 @@ class ComController extends BaseController
     public function ceshi(){
     public function ceshi(){
         $data = DB::table('gl_customer_visit')
         $data = DB::table('gl_customer_visit')
             ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
             ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
-            ->groupBy('country')->where(['domain'=>$this->project['deploy_build']['test_domain']])
+            ->groupBy('country')->where(['domain'=>'http://lxl.petuu.shop/'])
             ->orderBy('ip','desc')->limit(10)->get()->toArray();
             ->orderBy('ip','desc')->limit(10)->get()->toArray();
         return $data;
         return $data;
     }
     }

@@ -152,7 +152,7 @@ class CountLogic extends BaseLogic
     public function access_country_count(){
     public function access_country_count(){
         $data = DB::table('gl_customer_visit')
         $data = DB::table('gl_customer_visit')
             ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
             ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
-            ->groupBy('country')->where(['domain'=>'http://lxl.petuu.shop/'])
+            ->groupBy('country')->where(['domain'=>$this->project['deploy_build']['test_domain']])
             ->orderBy('ip','desc')->limit(10)->get()->toArray();
             ->orderBy('ip','desc')->limit(10)->get()->toArray();
         if(!empty($data)){
         if(!empty($data)){
             $data = object_to_array($data);
             $data = object_to_array($data);