Merge remote-tracking branch 'origin/master' into akun

@@ -26,6 +26,8 @@ class ProcessRecordsLogic extends BaseLogic
                 'project_id' => $project_id,
                 'project_id' => $project_id,
                 'record' => [],
                 'record' => [],
                 'remark' => '',
                 'remark' => '',
+                'project_record'=>0,
+                'optimize_record'=>0
             ];
             ];
         }
         }
         $data['project_company'] = $project['company'] ?? '';
         $data['project_company'] = $project['company'] ?? '';
@@ -55,6 +57,11 @@ class ProcessRecordsLogic extends BaseLogic
                 'item' => ['资料上传', '网站修改中', '网站搭建完成，客户确认中', '等待网站品控审核后上线']
                 'item' => ['资料上传', '网站修改中', '网站搭建完成，客户确认中', '等待网站品控审核后上线']
             ]
             ]
         ];
         ];
+        if($project['type'] == 2){
+            $data['date_project_record'] = Project::projectProgress('optimize');
+        }else{
+            $data['date_project_record'] = Project::projectProgress('build');
+        }
         return $this->success($data);
         return $this->success($data);
     }
     }