color

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.starter" version="1.1.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.starter" version="1.1.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>智汇19号</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

ionic.config.json

@@ -5,9 +5,5 @@
   },
   "type": "ionic-angular",
   "proxies": [
-    {
-      "path": "/wisdomgroup",
-      "proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
-    }
   ]
 }
\ No newline at end of file

src/app/app.component.ts

@@ -66,27 +66,33 @@ export class MyApp {
     loadLogin() {
         this.storage.get("userLoginInfo").then((value) => {
             if (value != null && value != '') {
+                console.log(value);
                 this.user = value;
-                this.appService.ObserverHttpPost("/wisdomgroup/app/loginpost", this.user)
-                    .subscribe((res: Response) => {
-                            let data = res.json();
-                            if (data["code"] == '200') {
-                                //将当前登录用户存进缓存，便于后期逻辑操作
-                                this.storage.set('user', data.data);
-                                this.user.userid = data.data.id;
-                                this.storage.set('userLoginInfo', this.user);
-                                // return this.navCtrl.setRoot(TabsPage, { "user": this.user });
-                                this.rootPage = TabsPage;
-                            } else {
-                                this.appService.alert('手机号或密码错误！');
+                if(this.user.remember){
+                    this.appService.ObserverHttpPost("/wisdomgroup/app/loginpost", this.user)
+                        .subscribe((res: Response) => {
+                                let data = res.json();
+                                if (data["code"] == '200') {
+                                    //将当前登录用户存进缓存，便于后期逻辑操作
+                                    this.storage.set('user', data.data);
+                                    this.user.userid = data.data.id;
+                                    this.storage.set('userLoginInfo', this.user);
+                                    // return this.navCtrl.setRoot(TabsPage, { "user": this.user });
+                                    this.rootPage = TabsPage;
+                                } else {
+                                    this.appService.alert('手机号或密码错误！');
+                                    this.rootPage = LoginPage;
+                                    // return this.navCtrl.setRoot(LoginPage);
+                                }
+                            }, error => {
                                 this.rootPage = LoginPage;
-                                // return this.navCtrl.setRoot(LoginPage);
+                                this.appService.alert('网络异常！');
                             }
-                        }, error => {
-                            this.rootPage = LoginPage;
-                            this.appService.alert('网络异常！');
-                        }
-                    );
+                        );
+                }else{
+                    this.rootPage = LoginPage;
+                }
+
             }
             else {
                 this.rootPage = LoginPage;

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

@@ -77,10 +77,10 @@ page-order-edit {
   }
 
   .submit{
-    margin-top: 20px;
-    border: 1px solid #34b4fc;
-    background-color: #34b4fc;
-  }
+     margin-top: 20px;
+     border: 1px solid #34b4fc;
+     background-color: #34b4fc;
+   }
   .com{
     font-size: 0;
   }

src/pages/announcement/announcement.scss

 page-announcement {
-
-    .searchToolBar{
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: left;
-        box-sizing: border-box;
-    }
-
-    .list-ios .item-block .item-inner{
-        border: none;
-    }
-    .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: 18px;
-    }
-
-    .icon{
-        width: 20px;
-        height: 20px;
-        margin-right: 5px;
-    }
-
-    .btn{
-        // float: right;
-        background-color: white;
-       
-        margin: 0 0;
-        font-size: 6px;
-    }
-
-    .btn1{
-        border: 1px solid #69c4e2;
-        color: #69c4e2;
-        border-radius: 5px;
-    }
-
-    .btn2{
-        border-radius: 5px;
-        border: 1px solid #90da91;
-        color: #90da91;
-    }
-
-    // .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{
-        margin-left: 25px;
-        margin-top: 15px;
-        margin-bottom: 15px;
-        padding-bottom: 15px;
-        border-bottom: 1px solid #f1f2f3;
-    }
-
-    .content-item-box{
-        display: flex;
-        flex-direction: row;
-        align-items: flex-start;
-        justify-content: left;
-        box-sizing: border-box;
-    }
-
-    .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: #fff;
-        height: 25px;
-        width: 50px;
-        border-radius: 2px;
-        color: #ec4553;
-        float: right;
-        border: 1px solid #ec4553;
-    }
-
-    .back-btn{
-        width: 30px;
-        height: 30px;
-    }
+  td, th {
+    border: 1px solid #dddddd;
+  }
+  .searchToolBar {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: left;
+    box-sizing: border-box;
+  }
+
+  .list-ios .item-block .item-inner {
+    border: none;
+  }
+  .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: 18px;
+  }
+
+  .icon {
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
+  }
+
+  .btn {
+    // float: right;
+    background-color: white;
+
+    margin: 0 0;
+    font-size: 6px;
+  }
+
+  .btn1 {
+    border: 1px solid #69c4e2;
+    color: #69c4e2;
+    border-radius: 5px;
+  }
+
+  .btn2 {
+    border-radius: 5px;
+    border: 1px solid #90da91;
+    color: #90da91;
+  }
+
+  // .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 {
+    margin-left: 25px;
+    margin-top: 15px;
+    margin-bottom: 15px;
+    padding-bottom: 15px;
+    border-bottom: 1px solid #f1f2f3;
+  }
+
+  .content-item-box {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    justify-content: left;
+    box-sizing: border-box;
+  }
+
+  .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;
+    text-overflow: ellipsis;
+    -webkit-box-orient: vertical;
+  }
+
+  .sign-up {
+    background-color: #fff;
+    height: 25px;
+    width: 50px;
+    border-radius: 2px;
+    color: #ec4553;
+    float: right;
+    border: 1px solid #ec4553;
+  }
+
+  .back-btn {
+    width: 30px;
+    height: 30px;
+  }
 }

src/pages/announcement/announcement.ts

-import { Component} from '@angular/core';
-import { IonicPage, NavController, NavParams} from 'ionic-angular';
-import {  Response } from '@angular/http';
-import { AppService } from '../../service/appHttpService';
-import { AnnouncementViewPage } from '../announcementView/announcementView';
+import {Component} from '@angular/core';
+import {IonicPage, NavController, NavParams} from 'ionic-angular';
+import {Response} from '@angular/http';
+import {AppGlobal, AppService} from '../../service/appHttpService';
+import {AnnouncementViewPage} from '../announcementView/announcementView';
+
 @IonicPage()
 @Component({
-  selector: 'page-announcement',
-  templateUrl: 'announcement.html'
+    selector: 'page-announcement',
+    templateUrl: 'announcement.html'
 })
 
 export class AnnouncementPage {
 
-  allNotice = [];
+    allNotice = [];
+
+    constructor(public navCtrl: NavController,
+                public navParams: NavParams,
+                public appService: AppService) {
+
+    }
+
+    ionViewWillEnter() {
+        //加载通知公告
+        this.getAllNoticeAboutMe();
+        this.addRecodings();
+    }
+
+    goView(id, isRead) {
+        if (!isRead) {
+            this.createRecording(id);
+        }
+        this.navCtrl.push("AnnouncementViewPage", {
+            id: id
+        });
+    }
 
-  constructor(
-    public navCtrl: NavController,
-    public navParams: NavParams,
-    public appService: AppService
-  ) {
-    
-  }
+    //获取所有关于我的通知公告
+    getAllNoticeAboutMe() {
+        this.appService.ObserverHttpPost("/wisdomgroup/modules/notice/getAllNotice", null)
+            .subscribe((res: Response) => {
+                    let data = res.json();
+                    data.forEach(event=>{
+                        let src = event.noticeContent.split('src="');
+                        event.noticeContent = src.join('src="' + AppGlobal.pictureNotice);
+                    });
 
-  ionViewWillEnter() {
-    //加载通知公告
-    this.getAllNoticeAboutMe();
-    this.addRecodings();
-  }
+                    this.allNotice = data;
 
-  goView(id, isRead) {
-    if (!isRead) {
-      this.createRecording(id);
+                }, error => {
+                    this.appService.alert('网络异常！');
+                }
+            );
     }
-    this.navCtrl.push("AnnouncementViewPage", {
-      id: id
-    });
-  }
 
-  //获取所有关于我的通知公告
-  getAllNoticeAboutMe() {
-    this.appService.ObserverHttpPost("/wisdomgroup/modules/notice/getAllNotice", null)
-      .subscribe((res: Response) => {
-        let data = res.json();
-        console.log(data);
-        this.allNotice = data;
-      }, error => {
-        this.appService.alert('网络异常！');
-      }
-      );
-  }
+    //如果是未读状态，增加阅读记录
+    createRecording(id) {
+        this.appService.ObserverHttpPost("/wisdomgroup/modules/notice/createRecording", {id: id})
+            .subscribe((res: Response) => {
 
-  //如果是未读状态，增加阅读记录
-  createRecording(id) {
-    this.appService.ObserverHttpPost("/wisdomgroup/modules/notice/createRecording", { id: id })
-      .subscribe((res: Response) => {
+                }, error => {
+                    this.appService.alert('网络异常！');
+                }
+            );
+    }
 
-      }, error => {
-        this.appService.alert('网络异常！');
-      }
-      );
-  }
+    goBack() {
+        this.navCtrl.popToRoot();
+    }
 
-  goBack(){
-    this.navCtrl.popToRoot();
-  }
+    //增加阅读记录
+    addRecodings() {
+        this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/addRecodings", null)
+            .subscribe((res: Response) => {
 
-  //增加阅读记录
-  addRecodings(){
-    this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/addRecodings", null)
-    .subscribe((res: Response) => {
-     
-    }, error => {
-      this.appService.alert('网络异常！');
+                }, error => {
+                    this.appService.alert('网络异常！');
+                }
+            );
     }
-    );
-  }
 }

src/pages/announcementView/announcementView.scss

 page-announcementView {
+  td, th{
+    border: 1px solid #dddddd;
+  }
     .searchToolBar{
         display: flex;
         flex-direction: row;

src/pages/home/more-app/more-app.html

 <ion-header>
-  <ion-navbar>
-    <ion-title>更多应用</ion-title>
-  </ion-navbar>
+    <ion-navbar>
+        <ion-title>更多应用</ion-title>
+    </ion-navbar>
 </ion-header>
 
 <ion-content>
-  <div class="item2-2">
-    <div class="card" (click)="goActivity()">
-      <img src="./assets/imgs/home/icon-bm.png" alt="">
-      <label class="label2-2">活动报名</label>
-      <img class="new-logo" *ngIf="hasNewActivity==1" src="./assets/imgs/new.png">
+    <div class="item2-2">
+        <div class="card" (click)="goActivity()">
+            <img src="./assets/imgs/home/icon-bm.png" alt="">
+            <label class="label2-2">活动报名</label>
+            <img class="new-logo" *ngIf="hasNewActivity==1" src="./assets/imgs/new.png">
+        </div>
+        <div class="card" (click)="goAnnouncement()">
+            <img src="./assets/imgs/home/icon-tz.png" alt="">
+            <label class="label2-2">通知公告</label>
+            <img class="new-logo" *ngIf="hasNewNotice==1" src="./assets/imgs/new.png">
+        </div>
+        <div class="card" (click)="goOutGoingReportAboutAll()">
+            <img src="./assets/imgs/home/icon-lhbb.png" alt="">
+            <label class="label2-2">离沪报备</label>
+            <img class="new-logo" *ngIf="hasNewPremanager==1" src="./assets/imgs/new.png">
+        </div>
+        <div class="card" (click)="goDuty()">
+            <img src="./assets/imgs/home/icon-zb.png" alt="">
+            <label class="label2-2">值班情况</label>
+        </div>
+        <ng-container *ngIf="role == 1 || role == 2 || role == 3">
+            <div class="card" (click)="goActivityTrack()">
+                <img src="./assets/imgs/home/icon-hdgz.png" alt="">
+                <label class="label2-2">活动跟踪</label>
+            </div>
+            <div class="card" (click)="goReportTrack()">
+                <img src="./assets/imgs/home/icon-bbgz.png" alt="">
+                <label class="label2-2">报备跟踪</label>
+            </div>
+        </ng-container>
+        <div class="card" (click)="goToMySurvey()">
+            <img src="./assets/imgs/home/icon-wjtc.png" alt="">
+            <label class="label2-2">问卷调查</label>
+        </div>
+        <ng-container *ngIf="role == 3">
+            <div class="card" (click)="goToSurveyManage()">
+                <img src="./assets/imgs/home/icon-wjgl.png" alt="">
+                <label class="label2-2 more2-2">问卷管理</label>
+            </div>
+        </ng-container>
+        <ng-container *ngIf="role == 3 || role == 4">
+            <div class="card" (click)="replayManage()">
+                <img src="./assets/imgs/home/icon-zbhb.png" alt="">
+                <label class="label2-2 more2-2">值班换班</label>
+            </div>
+        </ng-container>
     </div>
-    <div class="card" (click)="goAnnouncement()">
-      <img src="./assets/imgs/home/icon-tz.png" alt="">
-      <label class="label2-2">通知公告</label>
-      <img class="new-logo" *ngIf="hasNewNotice==1" src="./assets/imgs/new.png">
-    </div>
-    <div class="card" (click)="goOutGoingReportAboutAll()">
-      <img src="./assets/imgs/home/icon-lhbb.png" alt="">
-      <label class="label2-2">离沪报备</label>
-      <img class="new-logo" *ngIf="hasNewPremanager==1" src="./assets/imgs/new.png">
-    </div>
-    <div class="card" (click)="goDuty()">
-      <img src="./assets/imgs/home/icon-zb.png" alt="">
-      <label class="label2-2">值班情况</label>
-    </div>
-    <ng-container *ngIf="role == 1 || role == 2 || role == 3">
-      <div class="card"  (click)="goActivityTrack()">
-        <img src="./assets/imgs/home/icon-hdgz.png" alt="">
-        <label class="label2-2">活动跟踪</label>
-      </div>
-      <div class="card"  (click)="goReportTrack()">
-        <img src="./assets/imgs/home/icon-bbgz.png" alt="">
-        <label class="label2-2">报备跟踪</label>
-      </div>
-    </ng-container>
-    <div class="card" (click)="goToMySurvey()">
-      <img src="./assets/imgs/home/icon-wjtc.png" alt="">
-      <label class="label2-2">问卷调查</label>
-    </div>
-    <ng-container *ngIf="role == 3">
-      <div class="card" (click)="goToSurveyManage()">
-        <img src="./assets/imgs/home/icon-wjgl.png" alt="">
-        <label class="label2-2 more2-2">问卷管理</label>
-      </div>
-      <div class="card" (click)="replayManage()">
-        <img src="./assets/imgs/home/icon-zbhb.png" alt="">
-        <label class="label2-2 more2-2">值班换班</label>
-      </div>
-    </ng-container>
-  </div>
 </ion-content>

src/pages/login/login.html

@@ -27,7 +27,7 @@
 				<!-- <button class="login-bt" ion-button (click)="login()" [disabled]="!loginForm.valid || submitted" type="submit" block>登 录</button> -->
 
 				<div class="mui-input-row mui-checkbox mui-left" style="margin-bottom: 15px;">
-					<input name="checkbox" class="jizhu-password" value="1" type="checkbox" checked="true" style="margin-left:10px;width:17px;height:17px;vertical-align:middle">
+					<input [(ngModel)]="user.remember" name="checkbox" class="jizhu-password" value="1" type="checkbox" checked="true" style="margin-left:10px;width:17px;height:17px;vertical-align:middle">
 					<label style="padding-left:5px;font-family:'微软雅黑';" class="jizhu-password-label">记住密码</label>
 				</div>
 

src/pages/login/login.ts

@@ -21,7 +21,8 @@ export class LoginPage {
   user = {
     userid: '',							//登录数据
     mobile: '',
-    password: ''
+    password: '',
+    remember:true
   };
   tabflag:any;
   constructor(public navCtrl: NavController,
@@ -43,8 +44,10 @@ export class LoginPage {
   ionViewDidEnter() {
      //默认显示
      this.storage.get("userLoginInfo").then((value)=>{
-      if(value!=null && value != ''){        
-        this.user = value;
+      if(value!=null && value != ''){
+        if( value.remember ){
+            this.user = value;
+        }
       }    
     });
   }
@@ -59,7 +62,7 @@ export class LoginPage {
   }
 
   login() {
-    
+
     //验证手机号和密码是否输入
     if(this.user.mobile == null || this.user.mobile == ''){
       this.appService.popToastView('请输入手机号！','top',2000);

src/pages/mine/myActivityList/myActivityList.html

@@ -29,10 +29,10 @@
 								<span class="item-title">{{item.activity.activityName}}</span>
 							</div>
 
-							<button style="border-radius: 4px" ion-button round class="btn color1" *ngIf="item.orderstate == '1'">待进行</button>
-							<button style="border-radius: 4px" ion-button round class="btn color2" *ngIf="item.orderstate == '2'">待确认</button>
-							<button style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '3'">报名未出行</button>
-							<button style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '4'">已完成</button>
+							<button disabled style="border-radius: 4px" ion-button round class="btn color1" *ngIf="item.orderstate == '1'">待进行</button>
+							<button disabled style="border-radius: 4px" ion-button round class="btn color2" *ngIf="item.orderstate == '2'">待确认</button>
+							<button disabled style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '3'">报名未出行</button>
+							<button disabled style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '4'">已完成</button>
 						</div>
 
 						<div class="content-box">
@@ -60,14 +60,14 @@
 							</div>
 						</div>
 						<div class="right">
-							<button class="cancel" *ngIf="item.orderstate == 1  && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消订单</button>
-							<button class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn"  (click)="reelectBatch(item);$event.stopPropagation();">修改订单</button>
-							<button class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
+							<button disabled class="cancel" *ngIf="item.orderstate == 1  && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消订单</button>
+							<button disabled class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn"  (click)="reelectBatch(item);$event.stopPropagation();">修改订单</button>
+							<button disabled class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
 
-							<button class="cancel" *ngIf="item.orderstate == 2" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
-							<button class="reselection" *ngIf="item.orderstate == 2" (click)="evaluation(item);$event.stopPropagation();">确认评价</button>
+							<button disabled class="cancel" *ngIf="item.orderstate == 2" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
+							<button disabled class="reselection" *ngIf="item.orderstate == 2" (click)="evaluation(item);$event.stopPropagation();">确认评价</button>
 
-							<button class="reselection" *ngIf="item.orderstate == 3||item.orderstate == 4">查看详情</button>
+							<button disabled class="reselection" *ngIf="item.orderstate == 3||item.orderstate == 4">查看详情</button>
 						</div>
 					</div>
 				</ion-item>
@@ -115,9 +115,9 @@
 						</div>
 						<div class="right">
 
-							<button class="cancel" *ngIf="item.orderstate == 1  && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消报名</button>
-							<button class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">重选批次</button>
-							<button class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
+							<button disabled class="cancel" *ngIf="item.orderstate == 1  && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消报名</button>
+							<button disabled class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">重选批次</button>
+							<button disabled class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
 
 						</div>
 					</div>

src/pages/mine/myActivityList/myActivityList.scss

 page-myActivityList {
-
+    button[disabled]{
+        opacity: 1;
+    }
 
     .searchToolBar{
         display: flex;

src/pages/mine/myReport/myReport.html

@@ -16,11 +16,11 @@
                                     <span class="item-title">{{report.title}}</span>
                                 </div>
                                 <ng-container *ngIf="!report.isOverTimeFlag">
-                                    <button ion-button round class="btn color1">已报备
+                                    <button disabled ion-button round class="btn color1">已报备
                                     </button>
                                 </ng-container>
                                 <ng-container *ngIf="report.isOverTimeFlag">
-                                    <button ion-button round class="btn color3">已结束
+                                    <button disabled ion-button round class="btn color3">已结束
                                     </button>
                                 </ng-container>
                             </div>

src/pages/mine/myReport/myReport.scss

 page-myReport {
+    button[disabled]{
+        opacity: 1;
+    }
     .searchToolBar{
         display: flex;
         flex-direction: row;

src/pages/report/outGoingReportDetail/outGoingReportDetail.html

@@ -56,5 +56,5 @@
       <ion-textarea placeholder="请输入" [(ngModel)]="temp_userpre.managerDesc"></ion-textarea>
     </ion-item>
   </ion-list>
-  <button ion-button block class="save" (click)="saveFieldValue()">保存</button>
+  <button class="submit-btn submit" (click)="saveFieldValue()">保存</button>
 </ion-content>
\ No newline at end of file

src/pages/report/outGoingReportDetail/outGoingReportDetail.scss

 page-outGoingReportDetail {
+    .submit{
+        margin-top: 20px;
+        border: 1px solid #34b4fc;
+        background-color: #34b4fc;
+    }
     .searchToolBar{
         display: flex;
         flex-direction: row;

src/pages/report/outGoingReportEdit/outGoingReportEdit.html

@@ -67,8 +67,8 @@
     </ion-item>
 
   </ion-list>
-  <button ion-button block class="report-btn" (click)="savePremanager()" *ngIf="!premanager.reported">提交报备</button>
-  <button ion-button block class="report-btn" (click)="editPremanager()" *ngIf="premanager.reported">修改报备</button>
+  <button class="submit-btn submit" *ngIf="!premanager.reported" (click)="savePremanager()">提交报备</button>
+  <button class="submit-btn submit" *ngIf="premanager.reported" (click)="editPremanager()">修改报备</button>
 </ion-content>
 
 

src/pages/report/outGoingReportEdit/outGoingReportEdit.scss

 page-outGoingReportEdit {
+    .submit{
+        margin-top: 20px;
+        border: 1px solid #34b4fc;
+        background-color: #34b4fc;
+    }
     .searchToolBar{
         display: flex;
         flex-direction: row;