理发说明

ionic.config.json

@@ -7,7 +7,7 @@
   "proxies": [
   {
     "path": "/wisdomgroup",
-    "proxyUrl": "http://218.78.19.169:8081/wisdomgroup"
+    "proxyUrl": "http://47.103.33.196:8080/wisdomgroup"
   },
   {
     "path": "/logistics",

src/app/app.component.ts

@@ -34,7 +34,7 @@ export class MyApp {
     @ViewChild(Content) content: Content;
     rootPage;
     showSplash = false;
-    nowVersion = '4.6.0';
+    nowVersion = "4.6.0";
 
     user;
 

src/pages/login/login.ts

@@ -26,7 +26,7 @@ export class LoginPage {
         mobile: '',
         password: '',
         rememberMe: true,
-        newestVersion: '4.6.0'
+        newestVersion: "4.6.0"
     };
     tabflag: any;
 

src/pages/serve-pages/hair-cut/hair-apply/hair-apply.html

@@ -12,16 +12,17 @@
         <ion-item>
             <ion-label class="item-left"><span class="color-red">*</span>预约时间:</ion-label>
             <ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY年MM月DD日"
-                    pickerFormat="YYYY MM DD" placeholder="请选择"  [min]="nowDate" (ionChange)="changeStartTime($event)"
+                          pickerFormat="YYYY MM DD" placeholder="请选择" [min]="nowDate"
+                          (ionChange)="changeStartTime($event)"
                           [(ngModel)]="obj.appointmentDate"></ion-datetime>
             <ion-label *ngIf="check.appointmentDate" class="check-tips">请选择开始时间</ion-label>
         </ion-item>
         <ion-item>
             <ion-label class="item-left"><span class="color-red">*</span>时间段:</ion-label>
-      <ion-label class="choose" style="color:#333333;margin-right: 10px" >{{obj.timeText}}</ion-label>
-<!--      <ion-label (click)="chooseTime()" class="right-arrow">-->
-<!--        <ion-icon name="arrow-forward"></ion-icon>-->
-<!--      </ion-label>-->
+            <ion-label class="choose" style="color:#333333;margin-right: 10px">{{obj.timeText}}</ion-label>
+            <!--      <ion-label (click)="chooseTime()" class="right-arrow">-->
+            <!--        <ion-icon name="arrow-forward"></ion-icon>-->
+            <!--      </ion-label>-->
             <ion-label *ngIf="check.startEnd" class="check-tips">请选择时间段</ion-label>
         </ion-item>
         <div class="item-box">
@@ -44,4 +45,59 @@
     </div>
     <button class="submit-btn submit" (click)="submit()">提交</button>
 
+
+    <div class="hair-tips">
+        <p class="padding-15-0" (click)="showPrice()">理发价格及注意事项
+            <ion-icon float-end *ngIf="show.price"  name="arrow-down"></ion-icon>
+            <ion-icon float-end *ngIf="!show.price" name="ios-arrow-forward"></ion-icon>
+        </p>
+        <div class="table-p" #tableP>
+            <table border="1">
+                <thead>
+                <tr>
+                    <th></th>
+                    <th>男</th>
+                    <th>女</th>
+                    <th>备注</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td>理发</td>
+                    <td>5元</td>
+                    <td>6元</td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td>洗吹</td>
+                    <td>5元</td>
+                    <td>6元</td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td>染发</td>
+                    <td>30元</td>
+                    <td>40元</td>
+                    <td></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+        <p class="padding-15-0" (click)="showRole()">
+            理发室使用规定
+            <ion-icon float-end *ngIf="show.role"  name="arrow-down"></ion-icon>
+            <ion-icon float-end *ngIf="!show.role" name="ios-arrow-forward"></ion-icon>
+        </p>
+        <div class="hair-role" #haiRole>
+            <div >
+            1、理发时间为工作日星期一到星期五，每天上午9：00-11：15和下午13：00-17：00；
+            2、理发室地址在综合楼206室；
+            3、服务对象为我部在职职工，凭工作证（饭卡）付费，一卡一人，不得转借；
+            4、需要理发服务的人员必须提前通过网上预约，按照理发师安排的时序和电话通知为准，不接受电话预约；
+            5、预约在行政后勤“一键通”上完成，预约者根据自己的时间安排填写预约信息（包括：姓名、性别、所在处室和办公室电话等）；
+            6、理发师根据预约的顺序打电话通知，电话联系不到者或者特殊情况，理发师有权调整时序；
+            7、理发室提供理发、洗发和吹发、染发服务，项目价格见价格表，不提供超出此范围的服务项目。
+            </div>
+        </div>
+    </div>
 </ion-content>

src/pages/serve-pages/hair-cut/hair-apply/hair-apply.scss

@@ -89,16 +89,19 @@ page-hair-apply {
       }
     }
   }
-  ion-item,.item-box{
+
+  ion-item, .item-box {
     position: relative;
   }
-  .check-tips{
+
+  .check-tips {
     position: absolute;
     font-size: 1.2rem;
     top: 24px;
     color: red;
     left: 10px;
   }
+
   .right-arrow {
     position: absolute;
     right: 2px;
@@ -107,14 +110,48 @@ page-hair-apply {
     font-size: 1.6rem;
   }
 
-  .choose{
+  .choose {
     text-align: right;
     margin-right: 20px;
     font-size: 1.5rem;
     color: #999;
   }
+
+  .hair-tips {
+    padding: 25px;
+    line-height: 22px;
+     >p{
+       padding: 12px;
+       font-size: 1.5rem;
+       font-weight: 500;
+     }
+  }
+
+  .table-p {
+    table {
+      margin: 10px 0;
+      width: 100%;
+
+      td, th {
+        text-align: center;
+        height: 30px;
+      }
+    }
+  }
+
+  .hair-role {
+    div {
+      margin: 10px 0;
+    }
+  }
+  .hair-role,.table-p{
+    height: 0px;
+    overflow: hidden;
+    transition: all 500ms;
+  }
 }
+
 .picker-columns > div:first-child,
-.picker-columns > div:last-child{
+.picker-columns > div:last-child {
   flex: 2;
 }

src/pages/serve-pages/hair-cut/hair-apply/hair-apply.ts

-import {Component} from '@angular/core';
+import {Component, ElementRef, ViewChild} from '@angular/core';
 import {ActionSheetController, IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
 import {ServeService} from "../../serve.service";
 import {CommonService} from "../../../../provide/common.service";
@@ -12,7 +12,8 @@ import {TimeFormatService} from "../../../../provide/timeFormat.service";
     templateUrl: 'hair-apply.html',
 })
 export class HairApplyPage {
-
+    @ViewChild('tableP') tableP: ElementRef;
+    @ViewChild('haiRole') haiRole: ElementRef;
 
     obj = {
         appointmentDate: '',
@@ -48,8 +49,13 @@ export class HairApplyPage {
     applyId; //是否编辑
     nowDate;
 
+    show = {
+        price: false,
+        role: false,
+    }
+
     constructor(public navCtrl: NavController, public navParams: NavParams, private actionSheetCtrl: ActionSheetController,
-                private serveSer: ServeService, public modalCtrl: ModalController,private timeFormat:TimeFormatService,
+                private serveSer: ServeService, public modalCtrl: ModalController, private timeFormat: TimeFormatService,
                 private commonSer: CommonService, private datePipe: DatePipe) {
     }
 
@@ -151,7 +157,7 @@ export class HairApplyPage {
 
 
         const data = {
-            appointmentDate: this.datePipe.transform(this.obj.appointmentDate,'yyyy-MM-dd'),
+            appointmentDate: this.datePipe.transform(this.obj.appointmentDate, 'yyyy-MM-dd'),
             service: this.obj.serviceStr.join(','),
             remark: this.obj.remark,
             startEnd: this.obj.startEnd,
@@ -172,4 +178,13 @@ export class HairApplyPage {
         });
     }
 
+    showPrice() {
+        this.show.price = !this.show.price;
+        this.tableP.nativeElement.style.height = this.show.price ? '145px' : '0';
+    }
+
+    showRole() {
+        this.show.role = !this.show.role;
+        this.haiRole.nativeElement.style.height = this.show.role ? '350px' : '0';
+    }
 }

src/pages/tabs/discover/discover.ts

@@ -235,8 +235,8 @@ export class DiscoverPage {
 
     noReadNum;
 
-    slideList = new Array(7);   //数组的改变 会导致上拉加载更多失效。。
-    slideArr = new Array(7);
+    slideList = new Array(8);   //数组的改变 会导致上拉加载更多失效。。
+    slideArr = new Array(8);
     toIndex;
 
     //分页
@@ -433,6 +433,7 @@ export class DiscoverPage {
 
     //父级选择
     changeParent(item) {
+        console.log(item)
         if (this.indexParent === item.indexParent) return;
 
         this.obj.parentName = item.name;
@@ -501,9 +502,10 @@ export class DiscoverPage {
                         }
                     }
                 });
+                console.log(this.indexParent)
+                console.log(this.slides.realIndex)
                 this.slides.slideTo(this.indexParent, 500);
                 this.slideList[this.indexParent] = this.newList;
-                console.log(this.slideList)
             }
         )
     }

src/pages/tabs/serve/serve.ts

@@ -358,7 +358,6 @@ export class ServePage {
         const height =  this.calendarEle.nativeElement.children[0].clientHeight;
         this.scrollDown.nativeElement.style.top = height - 15 +'px';
         this.calendarEle.nativeElement.style.height = height + 20 +'px';
-
     }
 
     //收缩日历

src/service/http.service.ts

@@ -15,11 +15,11 @@ export class AppGlobal {
     //接口基地址
     // static domain = "http://192.168.2.106:8080";     //正式环境
     // static domain = "http://192.168.2.235:8080";   //测试环境
-    static domain = "http://47.103.33.196:8080";   //阿里云正式地址
+    // static domain = "http://47.103.33.196:8080";   //阿里云正式地址
     // static domain = "http://47.103.35.216:8080";   //阿里云测试地址
     // static domain = "http://218.78.19.169:8081";   //天翼云地址
     // static domain = "http://218.78.19.169:8082/";   //天翼测试云地址
-    // static domain = "";   //本地环境
+    static domain = "";   //本地环境
 
     //图片地址
     //  static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/";     //正式地址