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

gx



查看合并请求 !2766

@@ -236,14 +236,17 @@ class TicketController extends BaseController
             }
             //无剩余时间
             if($project['project_type'] == 1){
+                $remain_day = $project['seo_remain_day'];
                 if($project['seo_remain_day'] == 0){$data['optimize_record'] = 4;}
             }else{
+                $remain_day = $project['remain_day'];
                 if($project['remain_day'] == 0){$data['optimize_record'] = 4;}
             }
             if(in_array(2,$project['level'])){
                 $data['date_project_record'] = ['暂停优化'];
             }else{
                 $data['date_project_record'] = Project::projectProgress('optimize');
+                $data['date_project_record'][4] .= (':'.$remain_day);
             }
         }else{
             //查看是否绑定微信群

@@ -79,14 +79,17 @@ class ProcessRecordsLogic extends BaseLogic
             }
             //无剩余时间
             if($project['project_type'] == 1){
+                $remain_day = $project['seo_remain_day'];
                 if($project['seo_remain_day'] == 0){$data['optimize_record'] = 4;}
             }else{
+                $remain_day = $project['remain_day'];
                 if($project['remain_day'] == 0){$data['optimize_record'] = 4;}
             }
             if(in_array(2,$project['level'])){
                 $data['date_project_record'] = ['暂停优化'];
             }else{
                 $data['date_project_record'] = Project::projectProgress('optimize');
+                $data['date_project_record'][4] .= (':'.$remain_day);
             }
         }else{
             //查看是否绑定微信群

@@ -199,7 +199,7 @@ class Project extends Base
                 1 => 'SEO设置',
                 2 => '开始推广',
                 3 => '排名达标',
-                4 => '剩余服务时常'
+                4 => '剩余服务时长'
             ]
         ];