Skip to content

W
wisdom-ces
Commit 375830a0 authored by wangqinghua's avatar wangqinghua
Browse files
Options

init

parent 35dc9bf6
Show whitespace changes
Inline Side-by-side
Showing with 383 additions and 229 deletions
ionic.config.json
View file @ 375830a0
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
"type": "ionic-angular", "type": "ionic-angular",
"proxies": [ "proxies": [
{ {
"path": "/wisdomgroup",
"proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
} }
] ]
} }
\ No newline at end of file
src/app/app.module.ts
View file @ 375830a0
...@@ -19,14 +19,24 @@ import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer'; ...@@ -19,14 +19,24 @@ import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer';
import { File } from '@ionic-native/file'; import { File } from '@ionic-native/file';
import { Keyboard } from '@ionic-native/keyboard'; import { Keyboard } from '@ionic-native/keyboard';
import { Badge } from "@ionic-native/badge"; import { Badge } from "@ionic-native/badge";
import {ContactModalPage} from "../pages/contact/contact-modal/contact-modal";
@NgModule({ @NgModule({
declarations: [ declarations: [
MyApp MyApp,
ContactModalPage
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
IonicModule.forRoot(MyApp,{tabsHideOnSubPages: 'true'}), IonicModule.forRoot(MyApp,{
tabsHideOnSubPages: 'true',
backButtonText:'', //返回按钮显示中文
statusbarPadding:false,
iconModel:'ios', //icon显示图标为IOS版
mode:'ios', //安卓和IOS的样式以IOS样式为准
modalEnter:'modal-slide-in',
modalLeave:'modal-slide-out'
}),
IonicStorageModule.forRoot(), IonicStorageModule.forRoot(),
TabsModule, TabsModule,
LoginModule, LoginModule,
...@@ -35,7 +45,8 @@ import { Badge } from "@ionic-native/badge"; ...@@ -35,7 +45,8 @@ import { Badge } from "@ionic-native/badge";
], ],
bootstrap: [IonicApp], bootstrap: [IonicApp],
entryComponents: [ entryComponents: [
MyApp MyApp,
ContactModalPage
], ],
providers: [ providers: [
StatusBar, StatusBar,
......
src/app/app.scss
View file @ 375830a0
...@@ -14,4 +14,9 @@ ...@@ -14,4 +14,9 @@
// To declare rules for a specific mode, create a child rule // To declare rules for a specific mode, create a child rule
// for the .md, .ios, or .wp mode classes. The mode class is // for the .md, .ios, or .wp mode classes. The mode class is
// automatically applied to the <body> element in the app. // automatically applied to the <body> element in the app.
@import "../theme/icon.scss" @import "../theme/icon.scss";
\ No newline at end of file
.back-button-icon-ios{
line-height: 20px;
font-size: 3rem;
}
\ No newline at end of file
src/pages/activityDetail/activityDetail.html
View file @ 375830a0
<ion-header> <ion-header>
<ion-toolbar> <ion-toolbar>
<div class="searchToolBar"> <div class="searchToolBar">
<button ion-button clear small navPop style="padding: 0;">
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-title text-center>活动详情</ion-title> <ion-title text-center>活动详情</ion-title>
</div> </div>
</ion-toolbar> </ion-toolbar>
......
src/pages/contactList/contactList.html → src/pages/contact/contactList/contactList.html
View file @ 375830a0
<ion-header> <ion-header>
<ion-toolbar> <ion-navbar>
<div class="searchToolBar">
<button ion-button clear small navPop style="padding: 0;" (click)="goBack()">
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-title text-center> <ion-title text-center>
<span *ngIf="orgid == null">常用联系人</span> <span *ngIf="orgid == null">常用联系人</span>
<span *ngIf="orgid!=null && this.orgid != ''">{{orgName}}</span> <span *ngIf="orgid!=null && this.orgid != ''">{{orgName}}</span>
</ion-title> </ion-title>
</div> </ion-navbar>
</ion-toolbar>
</ion-header> </ion-header>
<ion-content direction="y" scrollbar-y="true"> <ion-content direction="y" scrollbar-y="true">
......
src/pages/contactList/contactList.ts → src/pages/contact/contactList/contactList.ts
View file @ 375830a0
...@@ -2,7 +2,7 @@ import { Component } from '@angular/core'; ...@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams, ToastController,Content } from 'ionic-angular'; import { IonicPage, NavController, NavParams, ToastController,Content } from 'ionic-angular';
import { Response } from '@angular/http'; import { Response } from '@angular/http';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { AppService } from '../../service/appHttpService'; import { AppService } from '../../../service/appHttpService';
import { ContractPersoninfoPage } from '../contract-personinfo/contract-personinfo'; import { ContractPersoninfoPage } from '../contract-personinfo/contract-personinfo';
......
src/pages/contract-personinfo/contract-personinfo.html → src/pages/contact/contract-personinfo/contract-personinfo.html
View file @ 375830a0
<ion-header> <ion-header>
<ion-toolbar> <ion-navbar>
<div class="searchToolBar"> <ion-title>个人信息</ion-title>
<button ion-button clear small navPop style="padding: 0;"> </ion-navbar>
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-title text-center>
个人信息
</ion-title>
</div>
</ion-toolbar>
</ion-header> </ion-header>
<ion-content class="content"> <ion-content class="content">
<ion-list class="list-item"> <!--<ion-list class="list-item">-->
<!--<ion-item>-->
<!--<div class="info-item">-->
<!--<div>-->
<!--<div>-->
<!--<span class="info-span">{{contactPersonInfo.name}}</span>-->
<!--<ion-icon name="male" class="contact-sex male" *ngIf="contactPersonInfo.gender == '1' || contactPersonInfo.gender == null"></ion-icon>-->
<!--<ion-icon name="female" class="contact-sex female" *ngIf="contactPersonInfo.gender == 0"></ion-icon>-->
<!--</div>-->
<!--<span class="info-span">{{contactPersonInfo.orgName}}</span>-->
<!--</div>-->
<!--<div>-->
<!--<img src="./assets/imgs/woman.png" *ngIf="contactPersonInfo.gender == 0" class="contact-img">-->
<!--<img src="./assets/imgs/man.png" *ngIf="contactPersonInfo.gender == '1' || contactPersonInfo.gender == null " class="contact-img">-->
<!--</div>-->
<!--</div>-->
<!--</ion-item>-->
<!--</ion-list>-->
<!--<div class="content-gap"></div>-->
<ion-list>
<p class="person-tips">基础信息(如需修改，请联系人事处)</p>
<ion-item> <ion-item>
<div class="info-item"> <div class="info-item">
<div> <span class="info-span">头像</span>
<div> <div class="info-item-content">
<span class="info-span">{{contactPersonInfo.name}}</span>
<ion-icon name="male" class="contact-sex male" *ngIf="contactPersonInfo.gender == '1' || contactPersonInfo.gender == null"></ion-icon>
<ion-icon name="female" class="contact-sex female" *ngIf="contactPersonInfo.gender == 0"></ion-icon>
</div> </div>
<span class="info-span">{{contactPersonInfo.orgName}}</span>
</div> </div>
<div> </ion-item>
<img src="./assets/imgs/woman.png" *ngIf="contactPersonInfo.gender == 0" class="contact-img"> <ion-item>
<img src="./assets/imgs/man.png" *ngIf="contactPersonInfo.gender == '1' || contactPersonInfo.gender == null " class="contact-img"> <div class="info-item">
<span class="info-span">姓名</span>
<div class="info-item-content">
<span class="info">{{contactPersonInfo.name}}</span>
</div> </div>
</div> </div>
</ion-item> </ion-item>
</ion-list>
<div class="content-gap"></div>
<ion-list>
<ion-item> <ion-item>
<div class="info-item"> <div class="info-item">
<span class="info-span">房间号</span> <span class="info-span">手机号</span>
<div class="info-item-content"> <div class="info-item-content">
<span class="info">{{contactPersonInfo.abbreviation}}</span> <span class="info">{{contactPersonInfo.mobile}}</span>
</div> </div>
</div> </div>
</ion-item> </ion-item>
<ion-item> <ion-item>
<div class="info-item"> <div class="info-item">
<span class="info-span">座机</span> <span class="info-span">性别</span>
<div class="info-item-content"> <div class="info-item-content">
<span class="info">{{contactPersonInfo.telephone}}</span> <span class="info">
<span *ngIf="contactPersonInfo.gender == '1' || contactPersonInfo.gender == null">男</span>
<span *ngIf="contactPersonInfo.gender == 0">女</span>
</span>
</div> </div>
</div> </div>
</ion-item> </ion-item>
<p class="person-tips">补充信息</p>
<ion-item> <ion-item>
<div class="info-item"> <div class="info-item">
<span class="info-span">手机</span> <span class="info-span">房间号</span>
<div class="info-item-content"> <div class="info-item-content">
<span class="info">{{contactPersonInfo.mobile}}</span> <span class="info">{{contactPersonInfo.abbreviation}}</span>
</div>
</div>
</ion-item>
<ion-item>
<div class="info-item">
<span class="info-span">座机</span>
<div class="info-item-content">
<span class="info">{{contactPersonInfo.telephone}}</span>
</div> </div>
</div> </div>
</ion-item> </ion-item>
<ion-item> <ion-item>
<div class="info-item"> <div class="info-item">
<span class="info-span">邮箱</span> <span class="info-span">邮箱</span>
...@@ -71,7 +94,6 @@ ...@@ -71,7 +94,6 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
<!-- <button ion-button block class="call-btn" (click)="call()">拨打座机</button> -->
<button class="call-btn" (click)="call(contactPersonInfo.telephone)">拨打座机</button> <button class="call-btn" (click)="call(contactPersonInfo.telephone)">拨打座机</button>
...@@ -81,4 +103,6 @@ ...@@ -81,4 +103,6 @@
<button class="call-btn" (click)="cancelGenaralPersons()" *ngIf="contactPersonInfo.hasgeneralpersonsflag">移除常用联系人</button> <button class="call-btn" (click)="cancelGenaralPersons()" *ngIf="contactPersonInfo.hasgeneralpersonsflag">移除常用联系人</button>
<button class="call-btn" (click)="usualContactSet()">设置分组</button>
</ion-content> </ion-content>
\ No newline at end of file
src/pages/contract-personinfo/contract-personinfo.scss → src/pages/contact/contract-personinfo/contract-personinfo.scss
View file @ 375830a0
...@@ -63,26 +63,32 @@ page-contract-personinfo { ...@@ -63,26 +63,32 @@ page-contract-personinfo {
width: 80%; width: 80%;
margin-left: 10%; margin-left: 10%;
margin-right: 10%; margin-right: 10%;
color: #fff; color: #fff;
border: 1px solid #4a89f9; border: 1px solid #34b4fc;
background-color: #4a89f9; background-color: #34b4fc;
font-size: 18px; font-size: 15px;
font-weight: 600;
position: relative; position: relative;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
border-radius: 3px; border-radius: 3px;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
} }
.back-btn{ .back-btn{
width: 30px; width: 30px;
height: 30px; height: 30px;
} }
.person-tips{
margin: 0;
padding: 8px 16px;
color: #666;
font-size: 12px;
}
.item-ios{
font-size: 14px;
padding-left: 0px;
}
.list-ios .item-block .item-inner{
padding-left: 16px;
}
} }
src/pages/contract-personinfo/contract-personinfo.ts → src/pages/contact/contract-personinfo/contract-personinfo.ts
View file @ 375830a0
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular'; import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { Response } from '@angular/http'; import { Response } from '@angular/http';
import { AppService } from '../../service/appHttpService'; import { AppService } from '../../../service/appHttpService';
import { ContactListPage } from '../contactList/contactList'; import { ContactListPage } from '../contactList/contactList';
import {MyBlockPage} from "../my-block/my-block";
@IonicPage() @IonicPage()
@Component({ @Component({
...@@ -69,4 +70,9 @@ export class ContractPersoninfoPage { ...@@ -69,4 +70,9 @@ export class ContractPersoninfoPage {
console.log("拨打:" + number); console.log("拨打:" + number);
window.location.href = "tel:" + number; window.location.href = "tel:" + number;
} }
//跳转设置分组
usualContactSet(){
this.navCtrl.push('MyBlockPage');
}
} }
src/pages/myActivityList/myActivityList.html
View file @ 375830a0
<ion-header> <ion-header>
<ion-toolbar> <ion-navbar>
<div class="searchToolBar"> <ion-title>我的活动</ion-title>
<button ion-button clear small navPop style="padding: 0;" (click)="goBack()"> </ion-navbar>
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-title text-center>
我的活动
</ion-title>
</div>
</ion-toolbar>
<div class="pageMenuSlides"> <div class="pageMenuSlides">
<div class="swiper-container"> <div class="swiper-container">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
......
src/pages/myReport/myReport.html
View file @ 375830a0
<ion-header> <ion-header>
<ion-toolbar> <ion-navbar>
<div class="searchToolBar"> <ion-title>我的报备</ion-title>
<button ion-button clear small navPop style="padding: 0;" (click)="goBack()"> </ion-navbar>
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-title text-center>
我的报备
</ion-title>
</div>
</ion-toolbar>
<div class="pageMenuSlides"> <div class="pageMenuSlides">
<div class="swiper-container"> <div class="swiper-container">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
......
src/pages/operation-list/operation-list.html
View file @ 375830a0
<ion-header> <ion-header>
<ion-toolbar> <ion-navbar>
<div class="searchToolBar"> <ion-title>操作记录({{totalNum}})</ion-title>
<button ion-button clear small navPop style="padding: 0;" (click)="goBack()"> </ion-navbar>
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-title text-center>
操作记录({{totalNum}})
</ion-title>
</div>
</ion-toolbar>
</ion-header> </ion-header>
......
src/pages/search/search.html
View file @ 375830a0
<ion-header> <ion-header>
<ion-toolbar> <!--<ion-toolbar>-->
<div class="searchToolBar"> <!--<div class="searchToolBar">-->
<button ion-button clear small navPop style="padding: 0;"> <!--<button ion-button clear small navPop style="padding: 0;">-->
<img class="back-btn" src="./assets/imgs/back.png" /> <!--<img class="back-btn" src="./assets/imgs/back.png" />-->
</button> <!--</button>-->
<!--<div class="search-header">-->
<!--<ion-input type="text" placeholder="按姓名搜索" [(ngModel)]="searchValue" (ionChange)="searchUser()"></ion-input>-->
<!--<ion-icon name="close" class="clear" (click)="clearValue()"></ion-icon>-->
<!--</div>-->
<!--</div>-->
<!--</ion-toolbar>-->
<ion-navbar>
<ion-navbar>
<div class="search-header"> <div class="search-header">
<ion-input type="text" placeholder="按姓名搜索" [(ngModel)]="searchValue" (ionChange)="searchUser()"></ion-input> <ion-input type="text" placeholder="按姓名搜索" [(ngModel)]="searchValue" (ionChange)="searchUser()"></ion-input>
<ion-icon name="close" class="clear" (click)="clearValue()"></ion-icon> <ion-icon name="close" class="clear" (click)="clearValue()"></ion-icon>
</div> </div>
</div> </ion-navbar>
</ion-toolbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="common"> <div class="common">
......
src/pages/search/search.scss
View file @ 375830a0
...@@ -7,6 +7,9 @@ page-search { ...@@ -7,6 +7,9 @@ page-search {
justify-content: left; justify-content: left;
box-sizing: border-box; box-sizing: border-box;
} }
.toolbar-background-ios{
border-bottom: none;
}
.search-header{ .search-header{
display: flex; display: flex;
...@@ -25,6 +28,7 @@ page-search { ...@@ -25,6 +28,7 @@ page-search {
height: 15px; height: 15px;
border-radius: 15px; border-radius: 15px;
text-align: center; text-align: center;
margin-right: 10px;
} }
.common{ .common{
......
src/pages/tabs/contact/contact.html
View file @ 375830a0
<!-- <ion-header> <ion-header>
<ion-toolbar> <ion-toolbar>
<ion-title text-center>通讯录</ion-title> <ion-title text-center>通讯录</ion-title>
<img class="search" (click)="search()" src="./assets/imgs/search.png"/> <img class="search" (click)="search()" src="./assets/imgs/search.png"/>
</ion-toolbar> </ion-toolbar>
</ion-header> --> </ion-header>
<ion-header>
<ion-navbar>
<ion-icon name="search" class="search" (click)="search()"></ion-icon>
<ion-title style="margin-right:40px;margin-left:40px;text-align:center" >
通讯录
</ion-title>
</ion-navbar>
</ion-header>
<ion-content> <ion-content>
<div class="common"> <div class="common">
常用联系人 常用联系人
<span float-right class="margin-right-10" >添加时间<ion-icon class="margin-left-5 color-666" name="md-arrow-dropdown"></ion-icon></span>
</div> </div>
<div class="item" (click)="usualContactPersons()"> <div class="item" (click)="usualContactPersons()">
<ion-icon name="ios-contacts" class="contact-icon"></ion-icon> <ion-icon name="ios-contacts" class="contact-icon"></ion-icon>
<span class="contact-title">常用联系人</span> <span class="contact-title">常用联系人</span>
</div> </div>
<div class="common"> <div class="common">
我的分组
</div>
<div class="item" (click)="usualContactAdd()">
<span class="icon-span">
<ion-icon ios="ios-add" class="add-icon-contact" md="md-add"></ion-icon>
</span>
<span class="contact-title color-999">添加分组</span>
</div>
<div class="common">
上海市委组织部组织架构 上海市委组织部组织架构
<span float-right class="margin-right-10" >A~Z字母排序<ion-icon class="margin-left-5 color-666" name="md-arrow-dropdown"></ion-icon></span>
</div> </div>
<div class="item item-border" *ngFor="let organization of organizations" (click)="usualContactOrgPersons(organization)"> <div class="item item-border" *ngFor="let organization of organizations" (click)="usualContactOrgPersons(organization)">
<ion-icon name="folder" class="contact-icon"></ion-icon> <ion-icon name="folder" class="contact-icon"></ion-icon>
......
src/pages/tabs/contact/contact.scss
View file @ 375830a0
page-contact { page-contact {
.search{ .search{
width: 30px; width: 18px;
height: 30px; height: 18px;
float: right; float: right;
margin-right: 10px; margin-right: 15px;
} }
.common{ .common{
...@@ -28,10 +28,25 @@ page-contact { ...@@ -28,10 +28,25 @@ page-contact {
} }
.contact-icon{ .contact-icon{
font-size: 40px; font-size: 30px;
color: #81afe8; color: #81afe8;
margin-right: 15px; margin-right: 15px;
} }
.icon-span{
text-align: center;
background-color: #eeeeee;
display: inline-block;
width: 35px;
height: 35px;
margin-right: 10px;
border-radius: 2px;
}
.add-icon-contact{
font-weight: 600;
color: #fff;
font-size: 48px;
line-height: 35px;
}
.contact-title{ .contact-title{
font-size: 18px; font-size: 18px;
......
src/pages/tabs/contact/contact.ts
View file @ 375830a0
...@@ -6,7 +6,8 @@ import { Storage } from '@ionic/storage'; ...@@ -6,7 +6,8 @@ import { Storage } from '@ionic/storage';
import { AppService } from '../../../service/appHttpService'; import { AppService } from '../../../service/appHttpService';
import { SearchPage } from '../../search/search'; import { SearchPage } from '../../search/search';
import { ContactListPage } from '../../contactList/contactList'; import { ContactListPage } from '../../contact/contactList/contactList';
import {AddBlockPage} from "../../contact/add-block/add-block";
@Component({ @Component({
selector: 'page-contact', selector: 'page-contact',
...@@ -67,5 +68,10 @@ export class ContactPage { ...@@ -67,5 +68,10 @@ export class ContactPage {
this.navCtrl.push("ContactListPage"); this.navCtrl.push("ContactListPage");
} }
//添加分组
usualContactAdd(){
this.navCtrl.push('AddBlockPage');
}
} }
src/pages/tabs/home/home.html
View file @ 375830a0
...@@ -12,76 +12,93 @@ ...@@ -12,76 +12,93 @@
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
<div class="item2"> <div class="item2">
<div class="item2-1"> <!--<div class="item2-1">-->
<ion-icon name="apps" class="icon2"></ion-icon> <!--<ion-icon name="apps" class="icon2"></ion-icon>-->
<label class="common_applications">常用应用</label> <!--<label class="common_applications">常用应用</label>-->
</div> <!--</div>-->
<div class="item2-2"> <div class="item2-2">
<div class="card" (click)="goActivity()"> <div class="card" (click)="goActivity()">
<ion-icon name="flag" class="icon2-2"></ion-icon> <img src="./assets/imgs/home/icon-bm.png" alt="">
<label class="label2-2">组织活动</label> <label class="label2-2">活动报名</label>
<img class="new-logo" *ngIf="hasNewActivity==1" src="./assets/imgs/new.png"> <img class="new-logo" *ngIf="hasNewActivity==1" src="./assets/imgs/new.png">
</div> </div>
<div class="card" (click)="goAnnouncement()"> <div class="card" (click)="goAnnouncement()">
<ion-icon name="alert" class="icon2-2"></ion-icon> <img src="./assets/imgs/home/icon-tz.png" alt="">
<label class="label2-2">通知公告</label> <label class="label2-2">通知公告</label>
<img class="new-logo" *ngIf="hasNewNotice==1" src="./assets/imgs/new.png"> <img class="new-logo" *ngIf="hasNewNotice==1" src="./assets/imgs/new.png">
</div> </div>
<div class="card" (click)="goOutGoingReportAboutAll()"> <div class="card" (click)="goOutGoingReportAboutAll()">
<ion-icon name="alarm" class="icon2-2"></ion-icon> <img src="./assets/imgs/home/icon-lhbb.png" alt="">
<label class="label2-2">外出报备</label> <label class="label2-2">离沪报备</label>
<img class="new-logo" *ngIf="hasNewPremanager==1" src="./assets/imgs/new.png"> <img class="new-logo" *ngIf="hasNewPremanager==1" src="./assets/imgs/new.png">
</div> </div>
<!-- <div class="card" (click)="wait()"> <div class="card" (click)="wait()">
<ion-icon name="alarm" class="icon2-2"></ion-icon> <img src="./assets/imgs/home/icon-zb.png" alt="">
<label class="label2-2">智能审批</label> <label class="label2-2">值班情况</label>
</div> </div>
<div class="card" (click)="wait()"> <div class="card" (click)="wait()">
<ion-icon name="albums" class="icon2-2"></ion-icon> <img src="./assets/imgs/home/icon-hdgz.png" alt="">
<label class="label2-2">值班安排</label> <label class="label2-2">活动跟踪</label>
</div> </div>
<div class="card" (click)="wait()"> <div class="card" (click)="wait()">
<ion-icon name="bicycle" class="icon2-2"></ion-icon> <img src="./assets/imgs/home/icon-bbgz.png" alt="">
<label class="label2-2">外出申请</label> <label class="label2-2">报备跟踪</label>
</div> </div>
<div class="card" (click)="wait()"> <div class="card" (click)="wait()">
<ion-icon name="body" class="icon2-2"></ion-icon> <img src="./assets/imgs/home/icon-wjtc.png" alt="">
<label class="label2-2">体检报告</label> <label class="label2-2">问卷调查</label>
</div> --> </div>
<div class="card" (click)="wait()"> <div class="card" (click)="wait()">
<ion-icon name="ios-more" class="icon2-2"></ion-icon> <img src="./assets/imgs/home/icon-more.png" alt="">
<label class="label2-2 more2-2">更多</label> <label class="label2-2 more2-2">更多应用</label>
</div> </div>
</div> </div>
</div> </div>
<div class="item3"> <div class="item3">
<div class="item3-1"> <!--<div class="item3-1">-->
<ion-icon name="alarm" class="icon3"></ion-icon> <!--<ion-icon name="alarm" class="icon3"></ion-icon>-->
<label class="daily_reminder">日常提醒</label> <!--<label class="daily_reminder">日常提醒</label>-->
<!--</div>-->
</div>
<div class="item3-2"> <div class="item3-2">
<div class="card3" (click)="goMyNotice()" style="background-color:#ffffff;"> <div class="card3" style="width: 15%;">
<div *ngIf="NoticeNotreadCount>0" class="common-menu-count">{{NoticeNotreadCount}}</div> <span class="img-tips"></span>
<div class="common-menu">未读 <img src="./assets/imgs/home/icon-mail.png" alt="">
<br/>通知</div> </div>
</div> <div class="card3" style="width: 75%;">
<div class="card3" (click)="goOutGoingReportAboutNot()" style="background-color:#ffffff;"> <div class="card3-item">
<div *ngIf="PremanagerNotdoCount>0" class="common-menu-count">{{PremanagerNotdoCount}}</div> <span class="tips"></span>
<div class="common-menu">尚未 <span class="color-996">生日祝福</span>
<br/>报备</div> <span>今天是XXX生日，祝他生日快乐</span>
</div> </div>
<div class="card3" (click)="goMyActivity()" style="background-color:#ffffff;"> <div class="card3-item">
<div *ngIf="waitgoCount>0" class="common-menu-count">{{waitgoCount}}</div> <span class="tips"></span>
<div class="common-menu">已报 <span class="color-996">生日祝福</span>
<br/>活动</div> <span>今天是XXX生日，祝他生日快乐</span>
</div> </div>
<div class="card3" (click)="goMyActivity()" style="background-color:#ffffff;"> </div>
<div *ngIf="waitsureCount>0" class="common-menu-count">{{waitsureCount}}</div> <div class="card3" style="width: 10%;color: #999999">
<div class="common-menu">待评 <ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
<br/>活动</div> </div>
</div> <!--<div class="card3" (click)="goMyNotice()" style="background-color:#ffffff;">-->
<!--<div *ngIf="NoticeNotreadCount>0" class="common-menu-count">{{NoticeNotreadCount}}</div>-->
<!--<div class="common-menu">未读-->
<!--<br/>通知</div>-->
<!--</div>-->
<!--<div class="card3" (click)="goOutGoingReportAboutNot()" style="background-color:#ffffff;">-->
<!--<div *ngIf="PremanagerNotdoCount>0" class="common-menu-count">{{PremanagerNotdoCount}}</div>-->
<!--<div class="common-menu">尚未-->
<!--<br/>报备</div>-->
<!--</div>-->
<!--<div class="card3" (click)="goMyActivity()" style="background-color:#ffffff;">-->
<!--<div *ngIf="waitgoCount>0" class="common-menu-count">{{waitgoCount}}</div>-->
<!--<div class="common-menu">已报-->
<!--<br/>活动</div>-->
<!--</div>-->
<!--<div class="card3" (click)="goMyActivity()" style="background-color:#ffffff;">-->
<!--<div *ngIf="waitsureCount>0" class="common-menu-count">{{waitsureCount}}</div>-->
<!--<div class="common-menu">待评-->
<!--<br/>活动</div>-->
<!--</div>-->
</div> </div>
</div> </div>
<div class="item4"> <div class="item4">
...@@ -103,28 +120,28 @@ ...@@ -103,28 +120,28 @@
</div> </div>
</div> </div>
</div> </div>
<div class="item5"> <!--<div class="item5">-->
<div class="item5-1"> <!--<div class="item5-1">-->
<ion-icon name="list" class="icon5"></ion-icon> <!--<ion-icon name="list" class="icon5"></ion-icon>-->
<label class="operation_record">操作记录</label> <!--<label class="operation_record">操作记录</label>-->
<label class="more" (click)="goOperationListPage()"> <!--<label class="more" (click)="goOperationListPage()">-->
更多 <!--更多-->
<ion-icon name="arrow-dropright"></ion-icon> <!--<ion-icon name="arrow-dropright"></ion-icon>-->
</label> <!--</label>-->
</div> <!--</div>-->
<div class="item5-2"> <!--<div class="item5-2">-->
<div class="card5" *ngFor="let operation of operations;let idx = index"> <!--<div class="card5" *ngFor="let operation of operations;let idx = index">-->
<label class="card5-1"> <!--<label class="card5-1">-->
<span class="card5-1-1">{{idx+1}}、</span>{{operation.opertionContent|slice:0:20}}...</label> <!--<span class="card5-1-1">{{idx+1}}、</span>{{operation.opertionContent|slice:0:20}}...</label>-->
<label class="time_home">{{operation.timegapvalue}}</label> <!--<label class="time_home">{{operation.timegapvalue}}</label>-->
</div> <!--</div>-->
<!-- <div class="card5"> <!--&lt;!&ndash; <div class="card5">-->
<label class="card5-1"> <!--<label class="card5-1">-->
<span class="card5-1-1">2、</span>你已取消报名2018年疗养活动，详情见“我的活动”</label> <!--<span class="card5-1-1">2、</span>你已取消报名2018年疗养活动，详情见“我的活动”</label>-->
<label class="time">1天前</label> <!--<label class="time">1天前</label>-->
</div> --> <!--</div> &ndash;&gt;-->
</div> <!--</div>-->
</div> <!--</div>-->
</ion-content> </ion-content>
<div class="cover" *ngIf="isWait" (click)="cancleWait()"> <div class="cover" *ngIf="isWait" (click)="cancleWait()">
......
src/pages/tabs/home/home.scss
View file @ 375830a0
...@@ -14,7 +14,7 @@ page-home { ...@@ -14,7 +14,7 @@ page-home {
.item2,.item3,.item4,.item5{ .item2,.item3,.item4,.item5{
background-color: #f1f1f1; background-color: #f1f1f1;
padding: 5px 6px; padding: 5px 0px;
} }
.item2-1,.item3-1,.item4-1,.item5-1{ .item2-1,.item3-1,.item4-1,.item5-1{
...@@ -36,11 +36,11 @@ page-home { ...@@ -36,11 +36,11 @@ page-home {
.item2-2,.item3-2,.item4-2,.item5-2{ .item2-2,.item3-2,.item4-2,.item5-2{
background-color: #ffffff; background-color: #ffffff;
box-shadow:0px 5px 5px #b5cef7; //box-shadow:0px 5px 5px #b5cef7;
padding-bottom: 15px; padding-bottom: 8px;
} }
.item2-2{ .item2-2,.item3-2{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap:wrap; flex-wrap:wrap;
...@@ -49,7 +49,9 @@ page-home { ...@@ -49,7 +49,9 @@ page-home {
justify-content: left; justify-content: left;
box-sizing: border-box; box-sizing: border-box;
} }
.card3-item{
margin: 3px 0;
}
.card{ .card{
height: 100%; height: 100%;
width: 20%; width: 20%;
...@@ -59,10 +61,12 @@ page-home { ...@@ -59,10 +61,12 @@ page-home {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
margin: 0 2.5%; margin:2.5%;
position: relative; position: relative;
} }
.card img:first-child{
width: 50%;
}
.icon2-2{ .icon2-2{
color: #488afe; color: #488afe;
font-size: 40px; font-size: 40px;
...@@ -98,28 +102,44 @@ page-home { ...@@ -98,28 +102,44 @@ page-home {
} }
.item3-2{ .item3-2{
padding-top: 15px; padding-top: 8px;
text-align: center; text-align: center;
} }
.card3{ .card3{
height: 100%; font-size: 12px;
width: 66px;
display: inline-flex; display: inline-flex;
flex-direction: column; flex-direction: column;
// flex-direction: center; // flex-direction: center;
align-items: center; align-items: flex-start;
justify-content: space-between; justify-content: center;
box-sizing: border-box; box-sizing: border-box;
margin: 0 5px; padding:3px;
background-color: #e0e9fa;
padding: 8px 3px;
position: relative; position: relative;
} }
.img-tips{
position: absolute;
padding: 4px;
background-color: red;
border-radius: 50%;
right: 10px;
top: 12px;
}
.label3-1{ .label3-1{
font-size: 20px; font-size: 20px;
color: #f26d3a; color: #f26d3a;
} }
.color-996{
color: #fb9662;
}
.tips{
display: inline-block;
padding: 2px;
background-color: #fb9662;
border-radius: 50%;
vertical-align: middle;
margin-right: 5px;
}
.label3-2{ .label3-2{
font-size: 12px; font-size: 12px;
......
src/pages/tabs/mine/mine.html
View file @ 375830a0
...@@ -35,41 +35,61 @@ ...@@ -35,41 +35,61 @@
<img src="./assets/imgs/wdzb.png" class="group-img"> <img src="./assets/imgs/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>
</div> </div>
</ion-item> </ion-item>
<!-- <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/dcwj.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()"> <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/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>
</div> </div>
</ion-item> </ion-item>
<ion-item (click)="currentVersion()">
<div style="height: 1.5rem;background-color:#eaedf3;"></div>
<ion-item>
<div class="group"> <div class="group">
<div class="group-box"> <div class="group-box">
<img src="./assets/imgs/version.png" class="group-img"> <img src="./assets/imgs/czjl.png" class="group-img">
<span>版本信息</span> <span>设置</span>
<img *ngIf="!isLatest" src="./assets/imgs/new.png" class="new">
</div> </div>
<!-- <span>{{version}}</span> -->
<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
src/pages/tabs/mine/mine.scss
View file @ 375830a0
...@@ -39,6 +39,10 @@ page-mine { ...@@ -39,6 +39,10 @@ page-mine {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
ion-icon{
color: #999999;
}
} }
.group-box{ .group-box{
...@@ -84,5 +88,9 @@ page-mine { ...@@ -84,5 +88,9 @@ page-mine {
height: 15px; height: 15px;
} }
.list-ios .list-bottom-none .item-inner{
border-bottom: none;
}
} }
src/pages/tabs/tabs.module.ts
View file @ 375830a0
...@@ -7,6 +7,7 @@ import { HomeModule } from './home/home.module'; ...@@ -7,6 +7,7 @@ import { HomeModule } from './home/home.module';
import { MineModule } from './mine/mine.module'; import { MineModule } from './mine/mine.module';
import { ContactModule } from './contact/contact.module'; import { ContactModule } from './contact/contact.module';
import { WorkbenchModule } from './workbench/workbench.module'; import { WorkbenchModule } from './workbench/workbench.module';
import {NoticePageModule} from "./notice/notice.module";
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -18,7 +19,8 @@ import { WorkbenchModule } from './workbench/workbench.module'; ...@@ -18,7 +19,8 @@ import { WorkbenchModule } from './workbench/workbench.module';
HomeModule, HomeModule,
ContactModule, ContactModule,
WorkbenchModule, WorkbenchModule,
MineModule MineModule,
NoticePageModule
], ],
entryComponents: [ entryComponents: [
TabsPage, TabsPage,
......
src/pages/tabs/tabs.ts
View file @ 375830a0
...@@ -10,6 +10,7 @@ import { Storage } from '@ionic/storage'; ...@@ -10,6 +10,7 @@ import { Storage } from '@ionic/storage';
import { ModifyPasswordPage } from '../modifyPassword/modifyPassword'; import { ModifyPasswordPage } from '../modifyPassword/modifyPassword';
import { AppService, AppGlobal } from '../../service/appHttpService'; import { AppService, AppGlobal } from '../../service/appHttpService';
import {NoticePage} from "./notice/notice";
@Component({ @Component({
templateUrl: 'tabs.html' templateUrl: 'tabs.html'
...@@ -49,8 +50,8 @@ export class TabsPage { ...@@ -49,8 +50,8 @@ export class TabsPage {
tabTitle: '通讯录', tabTitle: '通讯录',
tabIcon: 'mycontact' tabIcon: 'mycontact'
}, { }, {
root: WorkbenchPage, root: NoticePage,
tabTitle: '工作台', tabTitle: '消息',
tabIcon: 'myworkbench' tabIcon: 'myworkbench'
}, { }, {
root: MinePage, root: MinePage,
...@@ -59,13 +60,13 @@ export class TabsPage { ...@@ -59,13 +60,13 @@ export class TabsPage {
}]; }];
//判断是否密码为初始六个0 //判断是否密码为初始六个0
this.userInfo = this.storage.get("userLoginInfo").then((value) => { // this.userInfo = this.storage.get("userLoginInfo").then((value) => {
this.userInfo = value; // this.userInfo = value;
if (this.userInfo.password == '000000') { // if (this.userInfo.password == '000000') {
//进入修改密码页面 // //进入修改密码页面
this.navCtrl.push("ModifyPasswordPage") // this.navCtrl.push("ModifyPasswordPage")
} // }
}); // });
} }
......
src/pages/tabs/workbench/workbench.scss
View file @ 375830a0
...@@ -15,7 +15,7 @@ page-workbench { ...@@ -15,7 +15,7 @@ page-workbench {
.count{ .count{
display: inline-block; display: inline-block;
font-size: 15px; font-size: 13px;
width: 16px; width: 16px;
height: 16px; height: 16px;
border-radius: 16px; border-radius: 16px;
......
src/service/appHttpService.ts
View file @ 375830a0
...@@ -13,12 +13,12 @@ import {Observable} from "rxjs"; ...@@ -13,12 +13,12 @@ import {Observable} from "rxjs";
//接口基地址 //测试环境 //接口基地址 //测试环境
// static domain = "http://220.248.107.115:2239"; // static domain = "http://220.248.107.115:2239";
//正式环境 //正式环境
static domain = "http://180.153.158.250:3306"; // static domain = "http://180.153.158.250:3306";
// static domain = "http://180.168.156.212:2931"; static domain = "http://180.168.156.212:2931";
//static domain = "http://localhost:8080" //static domain = "http://localhost:8080"
//乔坤 //乔坤
//static domain = "http://10.10.202.54:8080"; //static domain = "http://10.10.202.54:8080";220.248.107.115:2239
//测试 //测试
// static picture = "http://220.248.107.115:2239/wisdomgroup/manager/getIcon/"; // static picture = "http://220.248.107.115:2239/wisdomgroup/manager/getIcon/";
...@@ -68,15 +68,15 @@ export class AppService { ...@@ -68,15 +68,15 @@ export class AppService {
} }
//get请求 //get请求
ObserverHttpGet(url,params): Observable<any>{ ObserverHttpGet(url,params): Observable<any>{
return this.http.get(AppGlobal.domain+url+this.encode(params,"get")) // return this.http.get(AppGlobal.domain+url+this.encode(params,"get")) //app
// return this.http.get(url+this.encode(params,"get")) return this.http.get(url+this.encode(params,"get")) //本地
} }
//post请求 //post请求
ObserverHttpPost(url, params) { ObserverHttpPost(url, params) {
return this.http.post(AppGlobal.domain+url,null,{ // return this.http.post(AppGlobal.domain+url,null,{ //app
// return this.http.post(url,null,{ return this.http.post(url,null,{ //本地
params: this.encode(params,'post'), params: this.encode(params,'post'),
headers: new Headers({ headers: new Headers({
// "Accept": "application/json", // "Accept": "application/json",
......
src/theme/icon.scss
View file @ 375830a0
...@@ -31,3 +31,27 @@ ...@@ -31,3 +31,27 @@
.tab-button-text{ .tab-button-text{
margin-top: 0 !important; margin-top: 0 !important;
} }
.color-333{
color: #333;
}
.color-666{
color: #666;
}
.color-999{
color: #999;
}
@for $i from 1 through 51{
.margin-right-#{$i}{
margin-right: #{$i}px;
}
.margin-left-#{$i}{
margin-left: #{$i}px;
}
.margin-#{$i}{
margin: #{$i}px;
}
.padding-#{$i}{
padding: #{$i}px;
}
}
\ No newline at end of file
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