Skip to content

W
wisdom-ces
Commit 7f93de48 authored by wangqinghua's avatar wangqinghua
Browse files
Options

日历

parent dd33aad3
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 35 deletions
src/app/app.scss
View file @ 7f93de48
...@@ -10,11 +10,18 @@ p{ ...@@ -10,11 +10,18 @@ p{
.list-ios .item-block .item-inner{ .list-ios .item-block .item-inner{
padding-left: 10px; padding-left: 10px;
} }
.list-ios .item-block .item-inner {
border-bottom: 0.55px solid #dadada;
}
.list-ios > .item-block:last-child, .list-ios > .item-block:last-child,
.list-ios > .item-block:first-child{ .list-ios > .item-block:first-child{
border: none; border: none;
} }
.list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{
border-bottom: 0.55px solid #dadada;
}
.back-button-icon-ios{ .back-button-icon-ios{
line-height: 20px; line-height: 20px;
font-size: 3rem; font-size: 3rem;
...@@ -116,3 +123,9 @@ ion-icon { ...@@ -116,3 +123,9 @@ ion-icon {
} }
} }
//border
.border-none{
border: none !important;
}
src/pages/activity-track/joinDetail/joinDetail.html
View file @ 7f93de48
...@@ -75,45 +75,42 @@ ...@@ -75,45 +75,42 @@
<ng-container *ngIf="type == '3'"> <ng-container *ngIf="type == '3'">
<div class="group"> <div class="group">
<div class="inner-group"> <div class="inner-group">
<img *ngIf="item.user?.gender == '1'||item.user?.gender == null" src="./assets/imgs/head.png" class="person-photo"> <img *ngIf="item?.gender == '1'||item?.gender == null" src="./assets/imgs/head.png" class="person-photo">
<img *ngIf="item.user?.gender == '0'" src="./assets/imgs/head.png" class="person-photo"> <img *ngIf="item?.gender == '0'" src="./assets/imgs/head.png" class="person-photo">
<div class="item-box"> <div class="item-box">
<p class="person-name">{{item.name}} <p class="person-name">{{item.name}}
<ion-icon class="person-sex-male" *ngIf="item.user?.gender == '1'||item.user?.gender == null" name="male"></ion-icon> <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null" name="male"></ion-icon>
<ion-icon class="person-sex-female" *ngIf="item.user?.gender == '0'" name="female"></ion-icon> <ion-icon class="person-sex-female" *ngIf="item?.gender == '0'" name="female"></ion-icon>
</p> </p>
<span class="person-batch">批次：{{item.batch?.batchName}}</span> <span class="person-batch">批次：{{item.batch?.batchName}}</span>
</div> </div>
</div> </div>
<button ion-button round class="btn color2" *ngIf="item.orderstate == 1">已报名</button> <button disabled ion-button round class="btn color2" *ngIf="item.orderstate == 1">已报名</button>
<button ion-button round class="btn color1" *ngIf="item.orderstate == 2">待确认</button> <button disabled ion-button round class="btn color1" *ngIf="item.orderstate == 2">待确认</button>
<button ion-button round class="btn color5" *ngIf="item.orderstate == 3">未出行</button> <button disabled ion-button round class="btn color5" *ngIf="item.orderstate == 3">未出行</button>
<button ion-button round class="btn color4" *ngIf="item.orderstate == 4">已出行</button> <button disabled ion-button round class="btn color4" *ngIf="item.orderstate == 4">已出行</button>
<button ion-button round class="btn color3" *ngIf="item.orderstate == 0">未报名</button> <button disabled ion-button round class="btn color3" *ngIf="item.orderstate == 0">未报名</button>
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="type == '4'"> <ng-container *ngIf="type == '4'">
<div class="group"> <div class="group">
<div class="inner-group"> <div class="inner-group">
<img *ngIf="item.user?.gender == '1'||item.user?.gender == null" src="./assets/imgs/head.png" class="person-photo"> <img *ngIf="item?.gender == '1'||item?.gender == null" src="./assets/imgs/head.png" class="person-photo">
<img *ngIf="item.user?.gender == '0'" src="./assets/imgs/head.png" class="person-photo"> <img *ngIf="item?.gender == '0'" src="./assets/imgs/head.png" class="person-photo">
<div class="item-box"> <div class="item-box">
<p class="person-name">{{item.name}} <p class="person-name">{{item.name}}
<ion-icon class="person-sex-male" *ngIf="item.user?.gender == '1'||item.user?.gender == null" name="male"></ion-icon> <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null" name="male"></ion-icon>
<ion-icon class="person-sex-female" *ngIf="item.user?.gender == '0'" name="female"></ion-icon> <ion-icon class="person-sex-female" *ngIf="item?.gender == '0'" name="female"></ion-icon>
</p> </p>
</div> </div>
</div> </div>
<button ion-button round class="btn color2" *ngIf="item.orderstate == 1">已报名</button> <button disabled ion-button round class="btn color2" *ngIf="item.orderstate == 1">已报名</button>
<button ion-button round class="btn color1" *ngIf="item.orderstate == 2">待确认</button> <button disabled ion-button round class="btn color1" *ngIf="item.orderstate == 2">待确认</button>
<button ion-button round class="btn color5" *ngIf="item.orderstate == 3">未出行</button> <button disabled ion-button round class="btn color5" *ngIf="item.orderstate == 3">未出行</button>
<button ion-button round class="btn color4" *ngIf="item.orderstate == 4">已出行</button> <button disabled ion-button round class="btn color4" *ngIf="item.orderstate == 4">已出行</button>
<button ion-button round class="btn color3" *ngIf="item.orderstate == 0">未报名</button> <button disabled ion-button round class="btn color3" *ngIf="item.orderstate == 0">未报名</button>
</div> </div>
</ng-container> </ng-container>
</ion-item> </ion-item>
</ion-list> </ion-list>
......
src/pages/activity-track/joinDetail/joinDetail.scss
View file @ 7f93de48
page-joinDetail { page-joinDetail {
a[disabled], button[disabled], [ion-button][disabled]{
opacity: 1;
}
.searchToolBar{ .searchToolBar{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
...@@ -171,12 +174,14 @@ page-joinDetail { ...@@ -171,12 +174,14 @@ page-joinDetail {
.item-count{ .item-count{
color: #999999; color: #999999;
} }
.red-btn{ .red-btn,
.red-btn.activated{
background-color: #fc6063; background-color: #fc6063;
color: #fff; color: #fff;
border: 1px solid #fc6067; border: 1px solid #fc6067;
} }
.blue-btn{ .blue-btn,
.blue-btn.activated{
background-color: #34b4fc; background-color: #34b4fc;
color: #fff; color: #fff;
border: 2px solid #34b4fc; border: 2px solid #34b4fc;
......
src/pages/contact/block-list/block-list.scss
View file @ 7f93de48
...@@ -64,7 +64,7 @@ page-block-list { ...@@ -64,7 +64,7 @@ page-block-list {
box-sizing: border-box; box-sizing: border-box;
} }
.list-ios .item-block .item-inner { .list-ios .item-block .item-inner {
border-bottom: 0.55px solid #c8c7cc; border-bottom: 0.55px solid #dadada;
} }
.search{ .search{
float: right; float: right;
......
src/pages/contact/contactList/contactList.scss
View file @ 7f93de48
...@@ -7,7 +7,7 @@ page-contactList { ...@@ -7,7 +7,7 @@ page-contactList {
box-sizing: border-box; box-sizing: border-box;
} }
.list-ios .item-block .item-inner { .list-ios .item-block .item-inner {
border-bottom: 0.55px solid #c8c7cc; border-bottom: 0.55px solid #dadada;
} }
.search{ .search{
float: right; float: right;
......
src/pages/surveyManage/list/list.html
View file @ 7f93de48
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
</ion-content> </ion-content>
<ion-footer *ngIf="showOp"> <ion-footer *ngIf="showOp">
<div class="cover">
<p class="survey-title">{{temp?.title}}</p>
<div class="footter-opr"> <div class="footter-opr">
<div *ngIf="swiperIndex == 0" (click)="look()"><span>编辑</span></div> <div *ngIf="swiperIndex == 0" (click)="look()"><span>编辑</span></div>
<div *ngIf="swiperIndex == 1" (click)="look()"><span>查看</span></div> <div *ngIf="swiperIndex == 1" (click)="look()"><span>查看</span></div>
...@@ -58,4 +60,5 @@ ...@@ -58,4 +60,5 @@
<ion-toolbar> <ion-toolbar>
<p class="text-center" (click)="cancle()"> 取消 </p> <p class="text-center" (click)="cancle()"> 取消 </p>
</ion-toolbar> </ion-toolbar>
</div>
</ion-footer> </ion-footer>
src/pages/surveyManage/list/list.scss
View file @ 7f93de48
...@@ -55,7 +55,15 @@ page-list { ...@@ -55,7 +55,15 @@ page-list {
padding: 10px 0; padding: 10px 0;
} }
ion-footer {
height: 100%;
background-color: rgba(0,0,0,.3);
.cover{
position: absolute;
bottom: 0;
width: 100%;
}
}
.footter-opr{ .footter-opr{
display: flex; display: flex;
...@@ -64,7 +72,6 @@ page-list { ...@@ -64,7 +72,6 @@ page-list {
height: 11rem; height: 11rem;
background-color: #f8f8f8; background-color: #f8f8f8;
border-bottom: 1px solid #bbbbbb; border-bottom: 1px solid #bbbbbb;
box-shadow: 0px -2px 5px #bbb;
} }
.footter-opr div{ .footter-opr div{
width: 33%; width: 33%;
...@@ -78,6 +85,13 @@ page-list { ...@@ -78,6 +85,13 @@ page-list {
border: 1px solid #aaa; border: 1px solid #aaa;
padding: 10px 25px; padding: 10px 25px;
} }
.survey-title{
text-align: center;
padding: 12px 0;
background-color: #f8f8f8;
border-bottom: 1px solid #dadada;
box-shadow: 0px -2px 5px #bbb;
}
.btn1{ .btn1{
font-size: 1.5rem; font-size: 1.5rem;
color: #fca268; color: #fca268;
......
src/pages/tabs/contact/contact.scss
View file @ 7f93de48
...@@ -83,7 +83,7 @@ page-contact { ...@@ -83,7 +83,7 @@ page-contact {
} }
.item-border{ .item-border{
border-bottom: 1px solid #cccccc; border-bottom: 1px solid #dadada;
padding-bottom: 10px; padding-bottom: 10px;
margin: 15px 0px 0px; margin: 15px 0px 0px;
padding-left: 15px; padding-left: 15px;
......
src/pages/tabs/mine/mine.html
View file @ 7f93de48
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<ion-title text-center>个人中心</ion-title> <ion-title text-center>个人中心</ion-title>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content> <ion-content class="bgc-e7e8ed">
<div class="mine-header" (click)="personInfo()"> <div class="mine-header" (click)="personInfo()">
<div class="mine-header-box"> <div class="mine-header-box">
<div class="mine-header-left"> <div class="mine-header-left">
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<div style="height: 1.5rem;background-color:#eaedf3;"></div> <div style="height: 1.5rem;background-color:#eaedf3;"></div>
<ion-item> <ion-item class="border-none">
<div class="group" (click)="goSet()"> <div class="group" (click)="goSet()">
<div class="group-box"> <div class="group-box">
<img src="./assets/imgs/mine/set.png" class="group-img"> <img src="./assets/imgs/mine/set.png" class="group-img">
......
src/pages/tabs/mine/mine.scss
View file @ 7f93de48
page-mine { page-mine {
.label-ios {
margin: 15px 8px 15px 0;
}
.mine-header{ .mine-header{
background-color: #34b4fc; background-color: #34b4fc;
padding: 25px 16px padding: 25px 16px
...@@ -99,9 +101,6 @@ page-mine { ...@@ -99,9 +101,6 @@ page-mine {
width: 30px; width: 30px;
height: 15px; height: 15px;
} }
.list-ios .item-block .item-inner {
border-bottom: 0.55px solid #dddddd !important;
}
} }
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