tabs的icon

src/app/app.component.ts

@@ -28,22 +28,22 @@ export class AppComponent {
         private router: Router, public tabSer: TabsService,
     ) {
         this.initializeApp();
-        // console.log(App)
     }
 
     initializeApp() {
         this.platform.ready().then(() => {
+
             this.splashScreen.hide();
             this.statusBar.show();
             this.statusBar.overlaysWebView(false);
             this.statusBar.backgroundColorByHexString('#e12724');
             this.statusBar.styleLightContent();
+
             this.appVersion.getVersionNumber().then((version: string) => {
                 alert(version);
             })
 
             this.loadLogin();
-
         });
     }
 

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

@@ -10,15 +10,15 @@
 <ion-content class="content">
 	<ion-item class="content-title">
 		<span>活动名称</span>
-		<span float-right>{{activity.activityName}}</span>
+		<span float-right>{{activity?.activityName}}</span>
 	</ion-item>
 	<ion-item>
 		<span>选择批次</span>
-		<span float-right>{{item.batchName}}</span>
+		<span float-right>{{item?.batchName}}</span>
 	</ion-item>
 	<ion-item class="margin-top-10">
 		<ion-label>报名用户</ion-label>
-		<span class="lettr-space-1"  item-right>{{role.loginName}}</span>
+		<span class="lettr-space-1"  item-right>{{role?.loginName}}</span>
 	</ion-item>
 	<ion-item class="margin-top-10">
 		<span>携带人数</span>

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

@@ -13,7 +13,11 @@ export class ActivityDetailPage implements OnInit{
     activityId;  //活动ID
     activity = {
         batchList: [],
-        activityIntro: ''
+        activityIntro: '',
+        activityIMG:'',
+        activityName:null,
+        fileUploadEntities:null,
+        activityNo:null,
     };
     picture: string = AppGlobal.picture;
     batchList = [];

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

@@ -23,18 +23,18 @@
           </div>
           <div class="batch-info">
             <div class="content-item">
-              <p> <span>报名截止：</span><span>{{this.batch.batchEndDate}}</span> </p>
-              <p> <span>出行日期：</span><span>{{batch.batchGoDate}}</span> </p>
-              <p> <span>可携带人数：</span><span>{{batch.batchPerNumber}}</span> </p>
-              <p> <span>集合时间：</span><span>{{batch.batchSetTime}}</span> </p>
-              <p> <span>集合地点：</span><span>{{batch.batchSetAddress}}</span> </p>
+              <p> <span>报名截止：</span><span>{{batch?.batchEndDate}}</span> </p>
+              <p> <span>出行日期：</span><span>{{batch?.batchGoDate}}</span> </p>
+              <p> <span>可携带人数：</span><span>{{batch?.batchPerNumber}}</span> </p>
+              <p> <span>集合时间：</span><span>{{batch?.batchSetTime}}</span> </p>
+              <p> <span>集合地点：</span><span>{{batch?.batchSetAddress}}</span> </p>
               <p> <span>活动须知：</span> <br>
                 <span [innerHtml]='batch.batchNotice' ></span>
               </p>
             </div>
           </div>
           <div class="content-button">
-            <div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch.hasSignUpCount}}/{{batch.batchLimitNumber}}</span></div>
+            <div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch?.hasSignUpCount}}/{{batch.batchLimitNumber}}</span></div>
             <div class="button-right" >
               <!--是否报名了>时间是否截止->人数是否满了->-->
               <ng-container  *ngIf="batch.order">

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

@@ -18,7 +18,13 @@ export class BatchDetailPage {
         signUp:true,
         order:null,
         batchName:'',
-        batchNotice:null
+        batchNotice:null,
+        batchGoDate:null,
+        batchPerNumber:null,
+        batchSetTime:null,
+        batchSetAddress:null,
+        hasSignUpCount:null,
+        batchLimitNumber:null,
     };
     activity;
     order = {

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

@@ -17,7 +17,7 @@
         <div class="sign-info">
             <p class="info-title">报名信息</p>
             <div class="content-item">
-                <p><span>携带人数：</span><span>{{order?.personnumber}}</span></p>
+                <p><span>携带人数：</span><span>{{order.personnumber}}</span></p>
                 <p><span>报名备注：</span><span>{{order?.orderbz}}</span></p>
             </div>
         </div>

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

@@ -13,14 +13,25 @@ export class OrderDetailPage {
     order = {
         orderstate: '',
         orderpjlevel: '',
-        orderid:''
+        orderid:'',
+        personnumber:null,
+        orderbz:null,
     };  //订单信息
     activity = {
         activityName: '',
         activityIntro: ''
     };    //活动
     batch = {
-        batchNotice:<any>''
+        batchNotice:<any>'',
+        batchEndDate:null,
+        batchGoDate:null,
+        batchSetTime:null,
+        batchSetAddress:null,
+        liamand:null,
+        liamantel:null,
+        batchName:null,
+        hasSignUpCount:null,
+        batchLimitNumber:null,
     };    //批次
 
     isCover = false;

src/app/tabs/home/home.page.ts

@@ -11,7 +11,6 @@ export class HomePage implements OnInit {
   ) { }
 
   ngOnInit() {
-    console.log('ngOnInit')
   }
 
 }

src/app/tabs/login/login.page.html

@@ -24,7 +24,7 @@
           <label style="padding-left:5px;font-family:'微软雅黑';" class="jizhu-password-label">记住密码</label>
         </div>
 
-        <button type="button" (click)="forgetPassword()" class="login-btn" style="width: 48%;float: left;background-color: #b3bdcf;border-color: #b3bdcf;">忘记密码</button>
+        <button type="button" (click)="forgetPassword()" class="login-btn" style="width: 48%;color:#e12724;float: left;background-color: #ffffff;border-color: #e12724;">忘记密码</button>
 
         <button type="button" (click)="login()" class="login-btn" style="width: 48%;float: right;">登&nbsp;&nbsp;录</button>
 

src/app/tabs/login/login.page.scss

@@ -7,9 +7,8 @@
 }
 
 .login-box{
-
   background-color: #f0f1f2;
-  height: 100%
+  height: 100%;
 }
 
 .login{
@@ -18,6 +17,7 @@
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
+  padding-top: 2rem;
 }
 
 .login-logo{
@@ -87,8 +87,8 @@
   margin-bottom: 10px;
   padding: 11px 0;
   color: #fff;
-  border: 1px solid #4a89f9;
-  background-color: #4a89f9;
+  border: 1px solid #e12724;
+  background-color: #e12724;
   font-size: 18px;
   font-weight: 600;
   position: relative;

src/app/tabs/serve/serve.page.ts

@@ -66,7 +66,6 @@ export class ServePage implements OnInit {
     }
 
     ngOnInit(): void {
-        console.log('ngOnInit')
         this.tabsSer.findAllActivityForAppWithXQ().subscribe(
             (res) => {
                 this.noticeList = res.slice(0, 2);
@@ -90,7 +89,6 @@ export class ServePage implements OnInit {
         this.tabsSer.getBanner().subscribe(
             (res) => {
                 this.slidersItems = res;
-                console.log(this.slidersItems)
             }
         )
 
@@ -230,7 +228,6 @@ export class ServePage implements OnInit {
             .subscribe((res) => {
                 let data = Number(res.json());
                 this.noticeTips = data;
-                console.log(this.noticeTips)
                 if (data > 0) {
                     this.badge.set(data);
                 } else {

src/app/tabs/tabs.core.ts

@@ -31,7 +31,6 @@ export class TabsCore {
     navEvent(){
         this.router.events.pipe(filter(e=> e instanceof NavigationEnd))
             .subscribe((e:any)=>{
-                console.log(e);
                 this.showHideTabs(e)
             })
     }

src/app/tabs/tabs.page.html

 <ion-tabs>
 
   <ion-tab-bar #myTabBar id="myTabBar" slot="bottom">
-    <ion-tab-button tab="home">
-      <ion-icon class="home"></ion-icon>
-      <ion-label>首页</ion-label>
-    </ion-tab-button>
-
-    <ion-tab-button tab="discover">
-      <ion-icon name="discover"></ion-icon>
-      <ion-label>发现</ion-label>
-    </ion-tab-button>
-
-    <ion-tab-button tab="serve">
-      <ion-icon name="serve"></ion-icon>
-      <ion-label>服务</ion-label>
-    </ion-tab-button>
-
-    <ion-tab-button tab="mine">
-      <ion-icon name="mine"></ion-icon>
-      <ion-label>我的</ion-label>
+    <ng-container *ngFor="let item of tabsList;let i =index;">
+      <ion-tab-button (click)="tabChange(i)" [tab]="item.root">
+        <ion-icon [ngClass]="tabIndex == i ? item.tabIconOn:item.tabIconOff"></ion-icon>
+        <ion-label [style.color]="tabIndex == i?'#e12724':''">{{item.title}}</ion-label>
       </ion-tab-button>
+    </ng-container>
   </ion-tab-bar>
-
 </ion-tabs>

src/app/tabs/tabs.page.ts

@@ -5,4 +5,21 @@ import { Component } from '@angular/core';
   templateUrl: 'tabs.page.html',
   styleUrls: ['tabs.page.scss']
 })
-export class TabsPage {}
+export class TabsPage {
+
+  tabsList = [
+      {root:'home',title:'首页',tabIconOn:'custom-home-on',tabIconOff:'custom-home-off'},
+      {root:'discover',title:'发现',tabIconOn:'custom-discover-on',tabIconOff:'custom-discover-off'},
+      {root:'serve',title:'服务',tabIconOn:'custom-serve-on',tabIconOff:'custom-serve-off'},
+      {root:'mine',title:'我的',tabIconOn:'custom-mine-on',tabIconOff:'custom-mine-off'},
+
+  ];
+  tabIndex = 0;
+
+  constructor(){}
+
+  tabChange(index){
+    this.tabIndex = index;
+    console.log(index);
+  }
+}

src/environments/environment.prod.ts

 export const environment = {
     production: true,
-    domain: 'http://101.89.112.92:80/wisdomgroup'
+    domain: 'http://180.168.156.212:2931'
 };