api update

src/components/filter/filter.html

 <ion-content>
     <div class="padding-20-10">
+        <p class="title">{{title}}
+            <ion-icon (click)="dismiss()" class="close" name="close"></ion-icon>
+        </p>
         <ion-row>
             <ion-col col-4 *ngFor="let item of list" (click)="chooseItem(item)">
                 <div class="item-style" [ngClass]="type == item.type?'select':''">
@@ -7,6 +10,5 @@
                 </div>
             </ion-col>
         </ion-row>
-        <button style="margin-top: 50px" class="margin-5" small color="danger" ion-button (click)="dismiss()">确定</button>
     </div>
 </ion-content>

src/components/filter/filter.scss

 filter {
-  .item-style{
+  .item-style {
     text-align: center;
     background-color: #f2f2f2;
     border-radius: 6px;
     padding: 4px 2px;
     border: 1px solid #f2f2f2;
   }
-  .select{
+
+  .select {
     background-color: #fdf8f2;
     border: 1px solid #fdf8f2;
     color: #e42417;
   }
+
+  .title {
+    text-align: center;
+    margin-bottom: 20px;
+    position: relative;
+    font-family: SourceHanSans-Bold;
+    font-size: 2rem;
+    font-weight: 300;
+  }
+
+  .close {
+    font-size: 4rem;
+    position: absolute;
+    right: 10px;
+    top: -12px;
+    font-weight: bold;
+    color: #666;
+  }
 }

src/components/filter/filter.ts

@@ -13,6 +13,7 @@ import {NavParams, ViewController} from "ionic-angular";
 export class FilterComponent {
 
     list = [];
+    title;  //标题
     choose;
 
     type;
@@ -21,6 +22,7 @@ export class FilterComponent {
                 private viewCtrl: ViewController) {
         this.list = this.params.get("list");
         this.type = this.params.get("type");
+        this.title = this.params.get("title");
         console.log(this.type);
     }
 

src/pages/serve-pages/goods-collect/goods-collect.ts

@@ -100,7 +100,7 @@ export class GoodsCollectPage {
 
     //打开过滤条件
     fliter() {
-        let modal = this.modalCtrl.create(FilterComponent, {list: this.typeList, type: this.obj.type}, {
+        let modal = this.modalCtrl.create(FilterComponent, {list: this.typeList, type: this.obj.type,title: '物品分类'}, {
             enterAnimation: 'modal-from-right-enter',
             leaveAnimation: 'modal-from-right-leave'
         });

src/pages/serve-pages/serve.service.ts

-import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service";
@Injectable()export class ServeService {
    constructor(
        private http: HttpClient,   //该请求 将结果转为json
        private commonSer: CommonService,
        private https: Http,    //该请求不转json
    ) {
    }

    getAllOrganization(data): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data));
    }

    /**   物品领用   **/
    //办公用品列表
    searchSupplies(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data));
    }

    //物品详情
    supplyDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params);
    }

    //保存订单
    saveOrder(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data);
    }

    //查询订单
    myOrder(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data));
    }

    //类型列表
    getTypeList(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null);
    }

    //购物车
    shoppingCar(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data));
    }

    //更新购物车
    saveOrderSuppy(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data);
    }

    //删除购物车物品
    deleteOrderSuppy(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params);
    }

    //申请审核
    dealOrder(data, params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/dealOrder/' + params, this.commonSer.toFormData(data));
    }

    //查询未提交的
    searchUnsubmit(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchUnsubmit', this.commonSer.toFormData(data));
    }

    //查询已提交的
    searchSubmited(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmited', this.commonSer.toFormData(data));
    }

    /**   会议室预定   **/
    queryMeetingRoomByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMeetingRoomByDate', this.commonSer.toFormData(data));
    }

    //预定详情
    meetDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/detail/' + params);
    }

    //会议室列表
    getRoomList(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null);
    }

    //部领导列表
    getLeaders(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null);
    }

    //保存会议申请
    saveApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data);
    }

    //我的预定列表
    queryMyApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMyApply', this.commonSer.toFormData(data));
    }

    //取消预定
    cancelApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/cancel/' + params);
    }

    //查询已审核/未审核的申请
    searchCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/meetingapply/searchCheckList', this.commonSer.toFormData(data));
    }

    //审核通过/驳回
    meetOperate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/operate', this.commonSer.toFormData(data));
    }

    /** 用车申请  **/
    //保存申请
    saveCarApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/saveApply', data);
    }

    //获取司机
    getCarList(): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getCarList');
    }

    //获取车辆
    getDriverList(): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getDriverList');
    }

    //根据日期查询用车信息
    queryCarApplyByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/queryCarApplyByDate', this.commonSer.toFormData(data));
    }

    //查询用车申请详情
    carDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/detail/' + params,);
    }

    //我的申请
    myCarApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/myApply', this.commonSer.toFormData(data));
    }

    //取消申请
    cancelCarApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/cancel/' + params,);
    }

    //查询已审核/未审核的申请
    searchCarCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/carapply/searchCheckList', this.commonSer.toFormData(data));
    }

    //审核通过/驳回
    carOperate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/operate', data);
    }

    /*****理发********/
    //保存理发预约
    saveHairApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/saveApply', data);
    }

    //取消预约
    cancelHair(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/cancel/' + params,);
    }

    //预约详情
    hairApplyDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/detail/' + params,);
    }

    //根据日期查询预约信息
    queryAppointmentByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/queryAppointmentByDate', this.commonSer.toFormData(data));
    }

    //我的预约
    myAppointment(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/myAppointment', this.commonSer.toFormData(data));
    }

    /**访客登记**/
    //查询访客
    searchVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/searchVisitor', this.commonSer.toFormData(data));
    }

    //保存访客
    saveVisitorApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/save', data);
    }

    //访客登记详情
    editVisitorApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/editVisitor/' + params);
    }

    //我的访客
    myVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/myVisitor', data);
    }

    //根据日期查询访客登记
    findVisitorByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/findVisitorByDate' , this.commonSer.toFormData(data));
    }

    /** 业务制度 **/
    //业务制度详情
    businessDetail(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/detail/' + params, null);
    }

    //查询业务制度列表
    searchBusinessSystem(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/searchBusinessSystem', this.commonSer.toFormData(data) );
    }


}
+import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service";
@Injectable()export class ServeService {
    constructor(
        private http: HttpClient,   //该请求 将结果转为json
        private commonSer: CommonService,
        private https: Http,    //该请求不转json
    ) {
    }

    getAllOrganization(data): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data));
    }

    /**   物品领用   **/
    //办公用品列表
    searchSupplies(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data));
    }

    //物品详情
    supplyDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params);
    }

    //保存订单
    saveOrder(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data);
    }

    //查询订单
    myOrder(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data));
    }

    //类型列表
    getTypeList(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null);
    }

    //购物车
    shoppingCar(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data));
    }

    //更新购物车
    saveOrderSuppy(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data);
    }

    //删除购物车物品
    deleteOrderSuppy(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params);
    }

    //申请审核
    dealOrder(data, params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/dealOrder/' + params, this.commonSer.toFormData(data));
    }

    //查询未提交的
    searchUnsubmit(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchUnsubmit', this.commonSer.toFormData(data));
    }

    //查询已提交的
    searchSubmited(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmited', this.commonSer.toFormData(data));
    }

    /**   会议室预定   **/
    queryMeetingRoomByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMeetingRoomByDate', this.commonSer.toFormData(data));
    }

    //预定详情
    meetDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/detail/' + params);
    }

    //会议室列表
    getRoomList(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null);
    }

    //部领导列表
    getLeaders(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null);
    }

    //保存会议申请
    saveApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data);
    }

    //我的预定列表
    queryMyApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMyApply', this.commonSer.toFormData(data));
    }

    //取消预定
    cancelApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/cancel/' + params);
    }

    //查询已审核/未审核的申请
    searchCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/meetingapply/searchCheckList', this.commonSer.toFormData(data));
    }

    //审核通过/驳回
    meetOperate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/operate', this.commonSer.toFormData(data));
    }

    /** 用车申请  **/
    //保存申请
    saveCarApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/saveApply', data);
    }

    //获取司机
    getCarList(): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getCarList');
    }

    //获取车辆
    getDriverList(): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getDriverList');
    }

    //根据日期查询用车信息
    queryCarApplyByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/queryCarApplyByDate', this.commonSer.toFormData(data));
    }

    //查询用车申请详情
    carDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/detail/' + params,);
    }

    //我的申请
    myCarApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/myApply', this.commonSer.toFormData(data));
    }

    //取消申请
    cancelCarApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/cancel/' + params,);
    }

    //查询已审核/未审核的申请
    searchCarCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/carapply/searchCheckList', this.commonSer.toFormData(data));
    }

    //审核通过/驳回
    carOperate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/operate', data);
    }

    /*****理发********/
    //保存理发预约
    saveHairApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/saveApply', data);
    }

    //取消预约
    cancelHair(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/cancel/' + params,);
    }

    //预约详情
    hairApplyDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/detail/' + params,);
    }

    //根据日期查询预约信息
    queryAppointmentByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/queryAppointmentByDate', this.commonSer.toFormData(data));
    }

    //我的预约
    myAppointment(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/myAppointment', this.commonSer.toFormData(data));
    }

    /**访客登记**/
    //查询访客
    searchVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/searchVisitor', this.commonSer.toFormData(data));
    }

    //保存访客
    saveVisitorApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/save', data);
    }

    //访客登记详情
    editVisitorApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/editVisitor/' + params);
    }

    //我的访客
    myVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/myVisitor', data);
    }

    //根据日期查询访客登记
    findVisitorByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/findVisitorByDate', this.commonSer.toFormData(data));
    }

    //取消预约
    cancelVisitor(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/cancel/' + params);
    }

    /** 业务制度 **/
    //业务制度详情
    businessDetail(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/detail/' + params, null);
    }

    //查询业务制度列表
    searchBusinessSystem(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/searchBusinessSystem', this.commonSer.toFormData(data));
    }


}
\ No newline at end of file

src/pages/serve-pages/vistor-register/vistor-register.ts

@@ -103,7 +103,7 @@ export class VistorRegisterPage {
 
     //取消预定
     removeItem(item) {
-        this.serveSer.cancelApply(item.id).subscribe(
+        this.serveSer.cancelVisitor(item.id).subscribe(
             (res) => {
                 if (res.errcode == 1000) {
                     this.commonSer.toast('取消预定成功');

src/pages/tabs/discover/discover.ts

@@ -187,6 +187,7 @@ export class DiscoverPage {
         "plateType": null,   //分类
         "parentName": null,
         "childrenName": null,
+        "branchId": null
     };
     resourceType = 1; //1 标题图片 2 轮播图  3 视频
     relatePlateType;   //关联主题教育
@@ -273,7 +274,13 @@ export class DiscoverPage {
     getBranch() {
         this.tabsSer.getBranchList().subscribe(
             (res) => {
-                this.branchList = res.data;
+                this.branchList = res.data.map(e => {
+                    const d = {
+                        type: e.id,
+                        name: e.name
+                    };
+                    return d;
+                });
             }
         )
     }
@@ -409,7 +416,8 @@ export class DiscoverPage {
             obj: {
                 'plateType': this.obj.plateType,
                 'resourceType': this.resourceType,
-                "relatePlateType": this.relatePlateType
+                "relatePlateType": this.relatePlateType,
+                "branchId": this.obj.branchId
             }
         };
         this.tabsSer.stuffPage(data).subscribe(
@@ -632,7 +640,11 @@ export class DiscoverPage {
 
     //多模块
     moreTab() {
-        let modal = this.modalCtrl.create(FilterComponent, {list: this.tabsList, type: this.obj.plateType}, {
+        let modal = this.modalCtrl.create(FilterComponent, {
+            list: this.tabsList,
+            type: this.obj.plateType,
+            title: '我的频道'
+        }, {
             enterAnimation: 'modal-from-right-enter',
             leaveAnimation: 'modal-from-right-leave'
         });
@@ -645,7 +657,11 @@ export class DiscoverPage {
     }
 
     moreParty() {
-        let modal = this.modalCtrl.create(FilterComponent, {list: this.branchList, type: this.obj.plateType}, {
+        let modal = this.modalCtrl.create(FilterComponent, {
+            list: this.branchList,
+            type: this.obj.plateType,
+            title: '党支部'
+        }, {
             enterAnimation: 'modal-from-right-enter',
             leaveAnimation: 'modal-from-right-leave'
         });

src/pages/tabs/home/home.ts

@@ -442,7 +442,7 @@ export class HomePage {
 
     //多模块
     moreTab() {
-        let modal = this.modalCtrl.create(FilterComponent, {list: this.tabsList, type: this.plateType}, {
+        let modal = this.modalCtrl.create(FilterComponent, {list: this.tabsList, type: this.plateType, title: '我的频道'}, {
             enterAnimation: 'modal-from-right-enter',
             leaveAnimation: 'modal-from-right-leave'
         });