Merge branch 'test'

www/protected/modules/j/controllers/WebController.php

@@ -118,4 +118,11 @@ class WebController extends JBaseController {
 		));
 	}
 
+	// 服务介绍
+	public function actionServiceIntroduction()
+	{
+
+		$this->renderpartial('serviceIntroduction');
+	}
+
 }

www/webapp/housekeeping/src/components/reservation.vue

@@ -421,10 +421,10 @@
       this.createCode = createCode();
       this.serviceType = config.serviceType;
       this.time = this.serviceType == 1 ? "选择您的预产期" : "选择服务日期";
-      for (let i = 6; i < 20; i++) {
+      for (let i = 6; i < 18; i++) {
         this.serviceTimeArrAM.push(i + ":00");
       }
-      for (let i = 7; i < 22; i++) {
+      for (let i = 7; i < 19; i++) {
         this.serviceTimeArrPM.push(i + ":00");
       }
       /*     axios.post(config.apiPath + 'j/HouseKeeping/GetStore').then(res => {