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

@@ -156,9 +156,11 @@ class ReplaceHtml extends Command
             foreach ($bTemplateList as $v){
             foreach ($bTemplateList as $v){
                 $source_id = $v['source'] == 1 ? 0 : $v['source_id'];
                 $source_id = $v['source'] == 1 ? 0 : $v['source_id'];
                 $name_route = $this->getSourceName($v['source'],$source_id,$v['is_list'],$v['is_custom']);
                 $name_route = $this->getSourceName($v['source'],$source_id,$v['is_list'],$v['is_custom']);
+                if($name_route !== false){
                     $saveData[] = $this->saveData($info,$v,$source_id,$name_route);
                     $saveData[] = $this->saveData($info,$v,$source_id,$name_route);
                 }
                 }
             }
             }
+        }
         if(!empty($saveData)){
         if(!empty($saveData)){
             $templateHtmlLogModel = new TemplateReplaceHtmlLog();
             $templateHtmlLogModel = new TemplateReplaceHtmlLog();
             $templateHtmlLogModel->insert($saveData);
             $templateHtmlLogModel->insert($saveData);
@@ -205,7 +207,7 @@ class ReplaceHtml extends Command
             return $this->getCustomName($source,$source_id,$is_list);
             return $this->getCustomName($source,$source_id,$is_list);
         }
         }
         if($source == BTemplate::SOURCE_HOME){
         if($source == BTemplate::SOURCE_HOME){
-            return '';
+            return ['name'=>'','route'=>''];;
         }elseif ($source == BTemplate::SOURCE_PRODUCT){
         }elseif ($source == BTemplate::SOURCE_PRODUCT){
             return $this->getProductName($source_id,$is_list);
             return $this->getProductName($source_id,$is_list);
         }elseif ($source == BTemplate::SOURCE_BLOG){
         }elseif ($source == BTemplate::SOURCE_BLOG){

@@ -688,7 +688,7 @@ class ProjectLogic extends BaseLogic
      */
      */
     public function copyProject(){
     public function copyProject(){
         CopyProjectJob::dispatch(['project_id'=>$this->param['project_id']]);
         CopyProjectJob::dispatch(['project_id'=>$this->param['project_id']]);
-        return $this->success();
+        return $this->success('项目复制中，请稍后前往初始化项目查看；');
     }
     }
 
 
     /**
     /**

@@ -60,6 +60,7 @@ class CopyProjectJob implements ShouldQueue
             $data['status'] = 0;
             $data['status'] = 0;
             $data['finish_remain_day'] = 0;
             $data['finish_remain_day'] = 0;
             $data['title'] = $data['title'].'-copy';
             $data['title'] = $data['title'].'-copy';
+            $data['delete_status'] = 1;
             unset($data['id']);
             unset($data['id']);
             $project_id = $projectModel->insertGetId($data);
             $project_id = $projectModel->insertGetId($data);
             $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
             $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
@@ -131,6 +132,8 @@ class CopyProjectJob implements ShouldQueue
         if($type != 0){
         if($type != 0){
             $this->copyMysql($this->param['project_id'],$project_id);
             $this->copyMysql($this->param['project_id'],$project_id);
         }
         }
+        //修改项目状态
+        $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);
         return true;
         return true;
     }
     }