Commit f1423d25 authored by wangqinghua's avatar wangqinghua

报备

parent c966a935
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
</div> </div>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content >
<ion-slides #contentSlides (ionSlideDidChange)="slideChanged()"> <ion-slides #contentSlides (ionSlideDidChange)="slideChanged()">
<ion-slide> <ion-slide>
<ion-content direction="y" scrollbar-y="true"> <ion-content direction="y" scrollbar-y="true" class="bgc-e7e8ed">
<ion-list> <ion-list>
<ion-item *ngFor="let report of allReport"> <ion-item *ngFor="let report of allReport">
<div class="item"> <div class="item">
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
</ion-slide> </ion-slide>
<ion-slide> <ion-slide>
<ion-content direction="y" scrollbar-y="true"> <ion-content class="bgc-e7e8ed" direction="y" scrollbar-y="true">
<ion-list> <ion-list>
<ion-item *ngFor="let report of processingReport"> <ion-item *ngFor="let report of processingReport">
<div class="item"> <div class="item">
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
<button ion-button round class="btn color4" *ngIf="!report.isOverTimeFlag && !report.reported">未报备</button> <button ion-button round class="btn color4" *ngIf="!report.isOverTimeFlag && !report.reported">未报备</button>
</div> </div>
<div class="content-box" (click)="goReport(report)" > <div class="content-box margin-bottom-10" (click)="goReport(report)" >
<div class="content-item-box"> <div class="content-item-box ">
<label class="left-title">离沪日期:</label> <label class="left-title">离沪日期:</label>
<div class="data">{{report.leaveDate}}</div> <div class="data">{{report.leaveDate}}</div>
</div> </div>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
</ion-slide> </ion-slide>
<ion-slide> <ion-slide>
<ion-content direction="y" scrollbar-y="true"> <ion-content class="bgc-e7e8ed" direction="y" scrollbar-y="true">
<ion-list> <ion-list>
<ion-item *ngFor="let report of endReport"> <ion-item *ngFor="let report of endReport">
<div class="item"> <div class="item">
......
...@@ -93,6 +93,7 @@ page-myReport { ...@@ -93,6 +93,7 @@ page-myReport {
color: #90da91; color: #90da91;
margin: 0 0; margin: 0 0;
font-size: 6px; font-size: 6px;
border-radius: 4px;
} }
.left{ .left{
...@@ -188,7 +189,6 @@ page-myReport { ...@@ -188,7 +189,6 @@ page-myReport {
.content-box{ .content-box{
margin-left: 25px; margin-left: 25px;
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px;
padding-bottom: 15px; padding-bottom: 15px;
border-bottom: 1px solid #f1f2f3; border-bottom: 1px solid #f1f2f3;
} }
...@@ -325,4 +325,11 @@ page-myReport { ...@@ -325,4 +325,11 @@ page-myReport {
height: 30px; height: 30px;
} }
.item-ios{
margin-top: 1rem;
}
.list-ios .item-block .item-inner{
border: none;
}
} }
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div class="group"> <div class="group">
<div class="group-box"> <div class="group-box">
<!-- <ion-icon name="aperture" class="icon-left icon1"></ion-icon> --> <!-- <ion-icon name="aperture" class="icon-left icon1"></ion-icon> -->
<img src="./assets/imgs/wdhd.png" class="group-img"> <img src="./assets/imgs/mine/wdhd.png" class="group-img">
<span>我的活动</span> <span>我的活动</span>
</div> </div>
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon> <ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<ion-item (click)="myReport()"> <ion-item (click)="myReport()">
<div class="group"> <div class="group">
<div class="group-box"> <div class="group-box">
<img src="./assets/imgs/wdzb.png" class="group-img"> <img src="./assets/imgs/mine/wdbb.png" class="group-img">
<span>我的报备</span> <span>我的报备</span>
</div> </div>
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon> <ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<ion-item> <ion-item>
<div class="group"> <div class="group">
<div class="group-box"> <div class="group-box">
<img src="./assets/imgs/dcwj.png" class="group-img"> <img src="./assets/imgs/mine/wdwj.png" class="group-img">
<span>我的问卷</span> <span>我的问卷</span>
</div> </div>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<ion-item (click)="myOperationList()" class="list-bottom-none"> <ion-item (click)="myOperationList()" class="list-bottom-none">
<div class="group"> <div class="group">
<div class="group-box"> <div class="group-box">
<img src="./assets/imgs/czjl.png" class="group-img"> <img src="./assets/imgs/mine/wdzb.png" class="group-img">
<span>我的值班</span> <span>我的值班</span>
</div> </div>
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon> <ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<ion-item (click)="myOperationList()" class="list-bottom-none"> <ion-item (click)="myOperationList()" class="list-bottom-none">
<div class="group"> <div class="group">
<div class="group-box"> <div class="group-box">
<img src="./assets/imgs/czjl.png" class="group-img"> <img src="./assets/imgs/mine/czjl.png" class="group-img">
<span>操作记录</span> <span>操作记录</span>
</div> </div>
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon> <ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
...@@ -74,32 +74,13 @@ ...@@ -74,32 +74,13 @@
<ion-item> <ion-item>
<div class="group" (click)="goSet()"> <div class="group" (click)="goSet()">
<div class="group-box"> <div class="group-box">
<img src="./assets/imgs/czjl.png" class="group-img"> <img src="./assets/imgs/mine/set.png" class="group-img">
<span>设置</span> <span>设置</span>
</div> </div>
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon> <ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
</div> </div>
</ion-item> </ion-item>
<!--<ion-item (click)="myOperationList()">-->
<!--<div class="group">-->
<!--<div class="group-box">-->
<!--<img src="./assets/imgs/czjl.png" class="group-img">-->
<!--<span>操作记录</span>-->
<!--</div>-->
<!--<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>-->
<!--</div>-->
<!--</ion-item>-->
<!--<ion-item (click)="currentVersion()">-->
<!--<div class="group">-->
<!--<div class="group-box">-->
<!--<img src="./assets/imgs/version.png" class="group-img">-->
<!--<span>版本信息</span>-->
<!--<img *ngIf="!isLatest" src="./assets/imgs/new.png" class="new">-->
<!--</div>-->
<!--&lt;!&ndash; <span>{{version}}</span> &ndash;&gt;-->
<!--<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>-->
<!--</div>-->
<!--</ion-item>-->
</ion-list> </ion-list>
<!--<button ion-button block class="logout" (click)="logout()">退出登录</button>--> <!--<button ion-button block class="logout" (click)="logout()">退出登录</button>-->
</ion-content> </ion-content>
\ No newline at end of file
...@@ -54,6 +54,7 @@ page-mine { ...@@ -54,6 +54,7 @@ page-mine {
} }
.group-img{ .group-img{
width: 2.5rem;
margin-right: 5px; margin-right: 5px;
} }
...@@ -87,9 +88,8 @@ page-mine { ...@@ -87,9 +88,8 @@ page-mine {
width: 30px; width: 30px;
height: 15px; height: 15px;
} }
.list-ios .item-block .item-inner {
.list-ios .list-bottom-none .item-inner{ border-bottom: 0.55px solid #c8c7cc !important;
border-bottom: none;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment