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

@@ -86,9 +86,9 @@ class Demo extends Command
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
                 if(!empty($v['keyword_video_id'])){
                 if(!empty($v['keyword_video_id'])){
-                    echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                     foreach ($v['keyword_video_id'] as $val){
                     foreach ($v['keyword_video_id'] as $val){
                         $keywordRelaModel = new KeywordRelated();
                         $keywordRelaModel = new KeywordRelated();
+                        echo date('Y-m-d H:i:s') . 'keyword_id :'.$val . 'product_id :'.$v['id'] . PHP_EOL;
                         $keywordRelaModel->edit(['type'=>2],['keyword_id'=>$val,'product_id'=>$v['id']]);
                         $keywordRelaModel->edit(['type'=>2],['keyword_id'=>$val,'product_id'=>$v['id']]);
                     }
                     }
                 }
                 }

@@ -230,7 +230,7 @@ class AdsController extends BaseController
     public function fbInquiryChart(Request $request)
     public function fbInquiryChart(Request $request)
     {
     {
         $start_date = $request->input('start_date', date('Y-m-d', strtotime('-1 month')));
         $start_date = $request->input('start_date', date('Y-m-d', strtotime('-1 month')));
-        $end_date = $request->input('end', date('Y-m-d'));
+        $end_date = $request->input('end_date', date('Y-m-d'));
         $result = ReInquiryForm::select(DB::raw('DATE(inquiry_date) as date'), DB::raw('COUNT(*) as count'))
         $result = ReInquiryForm::select(DB::raw('DATE(inquiry_date) as date'), DB::raw('COUNT(*) as count'))
             ->whereBetween('inquiry_date', [$start_date, date('Y-m-d', strtotime($end_date . ' +1 day'))])
             ->whereBetween('inquiry_date', [$start_date, date('Y-m-d', strtotime($end_date . ' +1 day'))])
             ->groupBy(DB::raw('DATE(inquiry_date)'))
             ->groupBy(DB::raw('DATE(inquiry_date)'))

@@ -31,7 +31,7 @@ class KeywordController extends BaseController
     public function index(Keyword $keyword)
     public function index(Keyword $keyword)
     {
     {
         $this->map = $this->searchParam($this->map);
         $this->map = $this->searchParam($this->map);
-        $filed =  ['id', 'project_id', 'title', 'seo_title', 'seo_keywords', 'seo_description', 'status', 'created_at','route','keyword_title'];
+        $filed =  ['id', 'project_id', 'title', 'seo_title', 'seo_keywords', 'seo_description', 'status', 'created_at','route','keyword_title','is_video_keyword'];
         $data = $keyword->lists($this->map,$this->page,$this->row,$this->order,$filed);
         $data = $keyword->lists($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($data)){
         if(!empty($data)){
             foreach ($data['list'] as &$v){
             foreach ($data['list'] as &$v){