tabs的icon

src/app/app.component.ts

@@ -27,7 +27,7 @@ export class AppComponent {
         private storage: Storage, public commonSer: CommonService,
         private router: Router, public tabSer: TabsService,
     ) {
-        // this.initializeApp();
+        this.initializeApp();
     }
 
     initializeApp() {

src/app/pages/home-pages/activity/activityApply/activityApply.scss

-page-activityApply {
 
     .searchToolBar{
         display: flex;
@@ -383,4 +382,3 @@ page-activityApply {
         height: 2rem;
         width: 2rem;
     }
-}

src/app/pages/home-pages/activity/activityApply/activityApply.ts

@@ -7,7 +7,8 @@ import {Router, ActivatedRoute} from "@angular/router";
 
 @Component({
     selector: 'page-activityApply',
-    templateUrl: 'activityApply.html',
+    templateUrl: './activityApply.html',
+    styleUrls: ['./activityApply.scss'],
 })
 export class ActivityApplyPage {
 

src/app/pages/home-pages/activity/activityConfirm/activityConfirm.scss

-page-activityConfirm {
 
     .searchToolBar{
         display: flex;
@@ -542,6 +541,3 @@ page-activityConfirm {
             background-color: #ececec;
         }
     }
-
-
-}

src/app/pages/home-pages/activity/activityConfirm/activityConfirm.ts

@@ -6,6 +6,8 @@ import {AppService} from "../../../../../http/http.service";
 @Component({
     selector: 'page-activityConfirm',
     templateUrl: 'activityConfirm.html',
+    styleUrls: ['./activityConfirm.scss'],
+
 })
 export class ActivityConfirmPage {
 

src/app/pages/home-pages/activity/activityDetail/activityDetail.scss

-page-activityDetail {
 
   .searchToolBar {
     display: flex;
@@ -247,5 +246,4 @@ page-activityDetail {
     border: 1px solid #34b4fc;
     background-color: #34b4fc;
     margin-top: 20px;
-  }
-}
\ No newline at end of file
+  }
\ No newline at end of file

src/app/pages/home-pages/activity/activityDetail/activityDetail.ts

@@ -7,17 +7,19 @@ import {CommonService} from "../../../../../provide/common.service";
 @Component({
     selector: 'page-activityDetail',
     templateUrl: 'activityDetail.html',
+    styleUrls: ['./activityDetail.scss'],
+
 })
-export class ActivityDetailPage implements OnInit{
+export class ActivityDetailPage implements OnInit {
 
     activityId;  //活动ID
     activity = {
         batchList: [],
         activityIntro: '',
-        activityIMG:'',
-        activityName:null,
-        fileUploadEntities:null,
-        activityNo:null,
+        activityIMG: '',
+        activityName: null,
+        fileUploadEntities: null,
+        activityNo: null,
     };
     picture: string = AppGlobal.picture;
     batchList = [];
@@ -87,6 +89,12 @@ export class ActivityDetailPage implements OnInit{
     //批次详情
     goBatchDetail(item) {
         // this.navCtrl.push('BatchDetailPage', {batch: item, activity: this.activity});
+        this.router.navigate(['tabs/serve/activity/batchDetail'], {
+            queryParams: {
+                batch: item,
+                activity: this.activity
+            }
+        })
     }
 
     //活动介绍限定65个字符串，多余以省略号代替
@@ -115,6 +123,7 @@ export class ActivityDetailPage implements OnInit{
             this.appService.ObserverHttpPostAdd("/wisdomgroup/modules/activityNon/admin/", this.activityId)
                 .subscribe((res: Response) => {
                         // this.navCtrl.pop();
+                        this.router.navigate(['tabs/serve/activity/activityList']);
                     }, error => {
                     }
                 );
@@ -126,6 +135,7 @@ export class ActivityDetailPage implements OnInit{
         this.commonSer.alert('确定参加该活动?', () => {
             this.appService.ObserverHttpPostAdd("/wisdomgroup/modules/activityNon/delete/", this.activityId)
                 .subscribe((res: Response) => {
+                        this.router.navigate(['tabs/serve/activity/activityList']);
                         // this.navCtrl.pop();
                     }, error => {
                     }

src/app/pages/home-pages/activity/activityList/activityList.scss

-page-activityList {
-    .item-ios .item-button{
-        height: 2rem;
-    }
-
-    .searchToolBar{
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: left;
-        box-sizing: border-box;
-    }
-    
-    .item-header{
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
-        box-sizing: border-box;
-    }
-
-    .item-header-style{
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: left;
-        box-sizing: border-box;
-    }
-
-    .item-title{
-        font-size: 1.6rem;
-    }
-
-    .icon{
-        width: 2rem;
-        height: 2rem;
-        margin-right: 5px;
-    }
-
-    .btn{
-        background-color: white;
-        margin: 0 0;
-        font-size: 6px;
-        border-radius: 3px;
-    }
-
-    .btn1{
-        border: 1px solid #de6461;
-        color: #de6461;
-    }
-
-    .btn2{
-        border: 1px solid #19b5ff;
-        color: #19b5ff;
-    }
-
-    .btn3{
-        border: 1px solid #dddddd;
-        color: #dddddd;
-    }
-
-    // .item-content{
-    //     display: flex;
-    //     flex-direction: row;
-    //     align-items: flex-end;
-    //     justify-content: space-between;
-    //     box-sizing: border-box;
-    // }
-
-    // .left{
-    //     color: #cccccc;
-    //     font-size: 8px;
-    //     // height: 70px;
-    //     display: inline-block;
-    //     margin-left: 20px;
-    // }
-
-    .content-box{
-        padding-left: 25px;
-        margin-top: 15px;
-        margin-bottom: 15px;
-        padding-bottom: 15px;
-        border-bottom: 1px solid #dddddd;
-    }
-
-    .content-item-box{
-        display: flex;
-        flex-direction: row;
-        align-items: flex-start;
-        justify-content: left;
-        box-sizing: border-box;
-        margin: 2px 0;
-        font-size: 1.4rem;
-    }
-
-    .left-title{
-        color: #8b8c8d;
-        font-size: 14px;
-    }
-
-    .data{
-        color: #666666;
-        font-size: 14px;
-    }
-
-    .data-1{
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2; //文本行数
-        overflow: hidden;
-       white-space: normal;
-    }
-
-    .sign-up{
-        background-color: #4a89fa;
-        height: 27px;
-        width: 70px;
-        border-radius: 2px;
-        color: white;
-        float: right;
-    }
-
-    .back-btn{
-        width: 30px;
-        height: 30px;
-    }
-    .content-button{
-        font-size: 14px;
-    }
-    .content-button span:first-child{
-        color: #333;
-    }
-    .content-button span:last-child{
-        color: #999;
-    }
-    .list-ios .item-block .item-inner{
-        border: none;
-    }
-    .content-ios{
-        background-color: #e7e8ed;
-    }
-    .item-ios + .item-ios{
-        margin-top: 10px;
-    }
 
+.item-ios .item-button {
+  height: 2rem;
 }
+
+.searchToolBar {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: left;
+  box-sizing: border-box;
+}
+
+.item-header {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+}
+
+.item-header-style {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: left;
+  box-sizing: border-box;
+}
+
+.item-title {
+  font-size: 1.6rem;
+}
+
+.icon {
+  width: 2rem;
+  height: 2rem;
+  margin-right: 5px;
+}
+
+.btn {
+  background-color: white;
+  margin: 0 0;
+  font-size: 6px;
+  border-radius: 3px;
+}
+
+.btn1 {
+  border: 1px solid #de6461;
+  color: #de6461;
+}
+
+.btn2 {
+  border: 1px solid #19b5ff;
+  color: #19b5ff;
+}
+
+.btn3 {
+  border: 1px solid #dddddd;
+  color: #dddddd;
+}
+
+.content-box {
+  padding-left: 25px;
+  margin-top: 15px;
+  margin-bottom: 15px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #dddddd;
+}
+
+.content-item-box {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  justify-content: left;
+  box-sizing: border-box;
+  margin: 2px 0;
+  font-size: 1.4rem;
+}
+
+.left-title {
+  color: #8b8c8d;
+  font-size: 14px;
+}
+
+.data {
+  color: #666666;
+  font-size: 14px;
+}
+
+.data-1 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; //文本行数
+  overflow: hidden;
+  white-space: normal;
+}
+
+.sign-up {
+  background-color: #4a89fa;
+  height: 27px;
+  width: 70px;
+  border-radius: 2px;
+  color: white;
+  float: right;
+}
+
+.back-btn {
+  width: 30px;
+  height: 30px;
+}
+
+.content-button {
+  font-size: 14px;
+}
+
+.content-button span:first-child {
+  color: #333;
+}
+
+.content-button span:last-child {
+  color: #999;
+}
+
+.list-ios .item-block .item-inner {
+  border: none;
+}
+
+.content-ios {
+  background-color: #e7e8ed;
+}
+
+.item-ios + .item-ios {
+  margin-top: 10px;
+}
+

src/app/pages/home-pages/activity/activityList/activityList.ts

@@ -9,7 +9,8 @@ import {CommonService} from "../../../../../provide/common.service";
 
 @Component({
   selector: 'page-activityList',
-  templateUrl: 'activityList.html',
+  templateUrl: './activityList.html',
+  styleUrls: ['./activityList.scss'],
 })
 export class ActivityListPage {
 
@@ -48,6 +49,11 @@ export class ActivityListPage {
   //查看详情
   goDetail(item){
     let id = item.id;
+    this.router.navigate(['tabs/serve/activity/activityDetail'],{
+      queryParams: {
+        id: id,
+      }
+    })
     // this.navCtrl.push("ActivityDetailPage",{id:id});
   }
 
@@ -58,10 +64,6 @@ export class ActivityListPage {
     }, 2000);
   }
 
-  goBack(){
-    // this.navCtrl.popToRoot();
-  }
-
   //增加阅读记录
   addRecodings(){
     this.tabSer.activityAddRecodings().subscribe(

src/app/pages/home-pages/activity/batch-detail/batch-detail.scss

-page-batch-detail {
+
   p{
     margin: 0;}
   .pageMenuSlides{
@@ -109,4 +109,3 @@ page-batch-detail {
   .button-btn3{
     background-color: #d9d9d9;
   }
-}

src/app/pages/home-pages/activity/batch-detail/batch-detail.ts

@@ -10,6 +10,8 @@ declare var Swiper;
 @Component({
   selector: 'page-batch-detail',
   templateUrl: 'batch-detail.html',
+    styleUrls: ['./batch-detail.scss'],
+
 })
 export class BatchDetailPage {
     // @ViewChild('contentSlides') contentSlides: Slides;

src/app/pages/home-pages/activity/order-detail/order-detail.scss

-page-order-detail {
+
   p{
     margin: 0;}
   .pageMenuSlides{
@@ -109,4 +109,3 @@ page-order-detail {
   .button-btn3{
     background-color: #d9d9d9;
   }
-}

src/app/pages/home-pages/activity/order-detail/order-detail.ts

@@ -8,6 +8,8 @@ import {CommonService} from "../../../../../provide/common.service";
 @Component({
     selector: 'page-order-detail',
     templateUrl: 'order-detail.html',
+    styleUrls: ['./order-detail.scss'],
+
 })
 export class OrderDetailPage {
     order = {

src/app/pages/home-pages/activity/order-edit/order-edit.scss

-page-order-edit {
-  //新
 
   .content{
     text-align: left;
@@ -99,4 +97,4 @@ page-order-edit {
   .item-ios.item-block .item-inner {
     border-bottom: 1px solid #c8c7cc;
   }
-}
+

src/app/pages/home-pages/activity/order-edit/order-edit.ts

@@ -7,6 +7,7 @@ import {AppService} from "../../../../../http/http.service";
 @Component({
   selector: 'page-order-edit',
   templateUrl: 'order-edit.html',
+    styleUrls: ['./order-edit.scss'],
 })
 export class OrderEditPage implements OnInit{
     order;  //订单信息