api update

src/components/filter/filter.ts

@@ -24,6 +24,7 @@ export class FilterComponent {
         this.type = this.params.get("type");
         this.title = this.params.get("title");
         console.log(this.type);
+        console.log(this.list);
     }
 
     chooseItem(item){

src/pages/tabs/discover/discover.html

@@ -57,7 +57,7 @@
             <div class="tabs-fixed ">
                 <div #scrollTab class="scroll-tab">
                     <div #newContentParent (scroll)="dragTo($event)" class="news-content parent">
-                        <div #tabsParent class="tabs-parent parent">
+                        <div #tabsParent  class="tabs-parent parent">
                             <div #tabsChildren *ngFor="let item of tabsList;" (click)="changeParent(item)"
                                  class="tabs-children">
                                 <span #tabSpan [style.color]="indexParent == item.indexParent ? '#e12724':''">
@@ -67,7 +67,7 @@
                             <span #tips id="tips"></span>
                         </div>
                     </div>
-                    <span class="more" (click)="moreTab()">
+                    <span  class="more" (click)="moreTab()">
                          <ion-icon name="list"></ion-icon>
                     </span>
                 </div>
@@ -77,7 +77,7 @@
             <div class="tabs-fixed">
                 <div class="scroll-tab" style="padding: 0;background-color:#fff;">
                     <div class="news-content" #newsContent>
-                        <div class="tabs-parent">
+                        <div class="tabs-parent" [ngStyle]="{'margin-left':indexParent == '3'?'30px':'0'}">
                             <div class="tabs-child">
                             <span *ngFor="let ch of childrenList"
                                   [ngClass]="{'select':indexChildren == ch.indexChildren}"
@@ -85,7 +85,7 @@
                             </div>
                         </div>
                     </div>
-                    <span class="more" (click)="moreParty()">
+                    <span *ngIf="indexParent == '3'" class="moreParty" (click)="moreParty()">
                          <ion-icon name="list"></ion-icon>
                     </span>
                 </div>

src/pages/tabs/discover/discover.scss

@@ -379,4 +379,17 @@ page-discover {
       }
     }
   }
+
+  .moreParty{
+    position: absolute;
+    padding: 0 5px;
+    top: -2px;
+    left: 0;
+    font-size: 3.5rem;
+    color: #333;
+    background-color: #fff1f0;
+    z-index: 999999;
+    height: 100%;
+  }
+
 }

src/pages/tabs/discover/discover.ts

@@ -468,7 +468,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(
@@ -650,7 +651,8 @@ export class DiscoverPage {
         });
         modal.onDidDismiss(data => {
             if (data) {
-                this.changeParent(data)
+                this.changeParent(data);
+                console.log(data);
             }
         });
         modal.present();
@@ -659,7 +661,7 @@ export class DiscoverPage {
     moreParty() {
         let modal = this.modalCtrl.create(FilterComponent, {
             list: this.branchList,
-            type: this.obj.plateType,
+            type: this.obj.branchId,
             title: '党支部'
         }, {
             enterAnimation: 'modal-from-right-enter',
@@ -667,7 +669,16 @@ export class DiscoverPage {
         });
         modal.onDidDismiss(data => {
             if (data) {
-                this.changeParent(data)
+                console.log(data);
+
+                this.obj.branchId = data.type;
+                const res = {
+                    type:'13',
+                    indexChildren:'32',
+                    name:"支部活动"
+                };
+                this.changeChildren(res);
+
             }
         });
         modal.present();

src/pages/tabs/serve/serve.scss

@@ -121,6 +121,7 @@ page-serve {
     margin-right: 10px;
   }
 
+
   .item-notice{
     margin: .8rem;
     font-size: 0;
@@ -446,4 +447,5 @@ page-serve {
     }
   }
 
+
 }