Skip to content

P
party-build-cloud
Commit 43ae4cc1 authored by wangqinghua's avatar wangqinghua
Browse files
Options

出题采纳

parent 88480c9a
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 80 deletions
src/pages/mine-pages/my-publish/my-publish.html
View file @ 43ae4cc1
......@@ -73,7 +73,7 @@
<ion-icon *ngIf="new.topTime" class="icon-fire iconfont"></ion-icon>
</p>
<p class="news-end">
<span>发布时间：</span><span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>
<span>保存时间：</span><span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>
</p>
</ion-col>
<ion-col col-4 class="news-right">
......
src/pages/mine/person/editPersonInfo/editPersonInfo.html
View file @ 43ae4cc1
......@@ -9,37 +9,26 @@
</div>
<div class="content-box">
<div class="info-item content-box-group">
<label class="info-span">房间号</label>
<ion-label class="content-label info" *ngIf="edit11">{{user?.userDetail?.user?.abbreviation}}</ion-label>
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD" [(ngModel)]="timeStarts"></ion-datetime>
<p item-end *ngIf="edit12">
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</p>
<label class="info-span">出生日期</label>
<!-- <ion-label class="content-label info">{{userinfo.birthDay}}</ion-label>-->
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD" pickerFormat="YYYY MM DD"
[(ngModel)]="userinfo.birthDay"></ion-datetime>
</div>
<div class="info-item content-box-group">
<label class="info-span">房间号</label>
<ion-label class="content-label info" *ngIf="edit11">{{user?.userDetail?.user?.abbreviation}}</ion-label>
<ion-input class="info-input" *ngIf="edit12" type="text" maxlength="20" [(ngModel)]="userinfo.abbreviation"></ion-input>
<p item-end *ngIf="edit12">
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</p>
<ion-input class="info-input" type="text" maxlength="20"
[(ngModel)]="userinfo.abbreviation"></ion-input>
</div>
<div class="info-item content-box-group">
<label class="info-span">座机</label>
<ion-label class="content-label info" *ngIf="edit21">{{user?.userDetail?.user.telephone}}</ion-label>
<ion-input class="info-input" *ngIf="edit22" type="text" maxlength="20" [(ngModel)]="userinfo.telephone"></ion-input>
<p item-end *ngIf="edit22">
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</p>
<ion-input class="info-input" type="text" maxlength="20"
[(ngModel)]="userinfo.telephone"></ion-input>
</div>
<div class="info-item content-box-group">
<label class="info-span">邮箱</label>
<ion-label class="content-label info" *ngIf="edit31">{{user?.userDetail?.user.email}}</ion-label>
<ion-input class="info-input" *ngIf="edit32" type="text" maxlength="20" [(ngModel)]="userinfo.email"></ion-input>
<p item-end *ngIf="edit32">
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</p>
<ion-input class="info-input" type="text" maxlength="20"
[(ngModel)]="userinfo.email"></ion-input>
</div>
</div>
<button class="submit-btn submit" (click)="updateUserInfo()">保存</button>
</ion-content>
src/pages/mine/person/editPersonInfo/editPersonInfo.scss
View file @ 43ae4cc1
page-editPersonInfo {
.searchToolBar{
.searchToolBar {
display: flex;
flex-direction: row;
align-items: center;
......@@ -7,11 +7,11 @@ page-editPersonInfo {
box-sizing: border-box;
}
.content{
.content {
// background-color: #f1f1f1;
}
.info-item{
.info-item {
display: flex;
flex-direction: row;
align-items: center;
......@@ -20,17 +20,17 @@ page-editPersonInfo {
}
.img{
.img {
width: 40px;
height: 40px;
}
.info{
.info {
font-size: 18px;
color: #272727;
}
.sex{
.sex {
color: #5dc3fc;
font-weight: bolder;
}
......@@ -43,24 +43,24 @@ page-editPersonInfo {
// box-sizing: border-box;
// }
.icon-more{
.icon-more {
color: #d1d1d5;
margin-left: 5px;
}
.info-span{
.info-span {
color: #747474;
font-size: 18px;
width: 90px;
}
.confirm{
.confirm {
width: 25px;
height: 25px;
margin-right: 15px;
}
.content-title{
.content-title {
background-color: #f5f5f5;
font-size: 14px;
color: #b2b2b2;
......@@ -69,11 +69,11 @@ page-editPersonInfo {
padding-bottom: 5px;
}
.list-ios{
.list-ios {
margin: 0 0;
}
.info-item-box{
.info-item-box {
display: flex;
flex-direction: row;
align-items: center;
......@@ -89,8 +89,13 @@ page-editPersonInfo {
// width: 200px;
// border: 0;
// }
.info-input{
.info-input,ion-datetime {
font-size: 18px;
text-align: right;
padding-right: 20px !important;
}
.text-input-ios{
text-align: right;
}
.list-md {
......@@ -101,22 +106,21 @@ page-editPersonInfo {
// width: 60px;
// }
.content-label{
.content-label {
text-align: right;
}
.content-box{
.content-box {
margin-left: 15px;
}
.content-box-group{
.content-box-group {
border-bottom: 1px solid #cccccc;
min-height: 4rem;
}
.back-btn{
.back-btn {
width: 30px;
height: 30px;
}
}
\ No newline at end of file
}
src/pages/mine/person/editPersonInfo/editPersonInfo.ts
View file @ 43ae4cc1
......@@ -25,7 +25,8 @@ export class EditPersonInfoPage {
userId : '',
abbreviation : '',
telephone : '',
email : ''
email : '',
birthDay:null
};
code:string ;
......@@ -36,12 +37,6 @@ export class EditPersonInfoPage {
myregEamil = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
//页面控制
edit11:boolean = true;
edit12:boolean = false;
edit21:boolean = true;
edit22:boolean = false;
edit31:boolean = true;
edit32:boolean = false;
constructor(
public navCtrl: NavController,
......@@ -58,6 +53,7 @@ export class EditPersonInfoPage {
this.user = value;
this.gender = this.user.userDetail.user.gender;
this.userinfo = this.user.userDetail.user;
console.log(this.userinfo);
this.userinfo.userId = this.user.id;
this.getOrgName(this.user.id,result=>{
let data = result;
......@@ -65,20 +61,10 @@ export class EditPersonInfoPage {
});
});
this.code = this.navParams.get("code");
if(this.code == '1'){
this.edit12 = true;
this.edit11 = false;
}
if(this.code == '2'){
this.edit22 = true;
this.edit21 = false;
}
if(this.code == '3'){
this.edit32 = true;
this.edit31 = false;
}
//保存
save(){
}
......@@ -96,8 +82,6 @@ export class EditPersonInfoPage {
//修改信息：房间号，座机号，邮箱
updateUserInfo(): void {
if(this.code == '2'){
if(!this.myregMobile.test(this.userinfo.telephone)){
this.appService.popToastView('请输入规则的电话号码！','top',2000);
......@@ -124,12 +108,4 @@ export class EditPersonInfoPage {
.catch(error => {
});
}
// scrollTo(){
// this.appService.popToastView('scroll start1！','top',2000);
// window.addEventListener('native.keyboardshow',(e:any) =>{
// this.appService.popToastView('scroll start2！','top',2000);
// 　　　　this.content.scrollTo(0,e.keyboardHeight);
// });
// }
}
src/pages/mine/person/personInfo/personInfo.html
View file @ 43ae4cc1
......@@ -57,7 +57,7 @@
<span class="info-span">出生日期</span>
<div class="info-item-content">
<span class="info">{{user?.userDetail?.user.telephone}}</span>
<img src="./assets/imgs/edit.png" class="edit" (click)="edit(2)">
<img src="./assets/imgs/edit.png" class="edit" (click)="edit()">
</div>
</div>
</ion-item>
......@@ -66,7 +66,7 @@
<span class="info-span">职务</span>
<div class="info-item-content">
<span class="info">{{user?.userDetail?.user.telephone}}</span>
<img src="./assets/imgs/edit.png" class="edit" (click)="edit(2)">
<img src="./assets/imgs/edit.png" class="edit" (click)="edit()">
</div>
</div>
</ion-item>
......@@ -75,7 +75,7 @@
<span class="info-span">房间号</span>
<div class="info-item-content">
<span class="info">{{user?.userDetail?.user.abbreviation}}</span>
<img src="./assets/imgs/edit.png" class="edit" (click)="edit(1)">
<img src="./assets/imgs/edit.png" class="edit" (click)="edit()">
</div>
</div>
</ion-item>
......@@ -84,7 +84,7 @@
<span class="info-span">座机</span>
<div class="info-item-content">
<span class="info">{{user?.userDetail?.user.telephone}}</span>
<img src="./assets/imgs/edit.png" class="edit" (click)="edit(2)">
<img src="./assets/imgs/edit.png" class="edit" (click)="edit()">
</div>
</div>
</ion-item>
......@@ -94,13 +94,13 @@
<span class="info-span">邮箱</span>
<div class="info-item-content">
<span class="info">{{user?.userDetail?.user.email}}</span>
<img src="./assets/imgs/edit.png" class="edit" (click)="edit(3)">
<img src="./assets/imgs/edit.png" class="edit" (click)="edit()">
</div>
</div>
</ion-item>
</ion-list>
<button ion-button block class="save">修改个人信息</button>
<button class="submit-btn submit" (click)="edit()">修改个人信息</button>
<!--<button ion-button block class="save" (click)="modifyPwd()">修改密码</button>-->
<button class="submit-btn submit" (click)="modifyPwd()">修改密码</button>
</ion-content>
src/pages/mine/person/personInfo/personInfo.ts
View file @ 43ae4cc1
......@@ -55,8 +55,8 @@ export class PersonInfoPage {
}
//不同的code代表修改不同的数据，1房间，2座机，3邮箱
edit(code) {
this.navCtrl.push("EditPersonInfoPage", {code: code});
edit() {
this.navCtrl.push("EditPersonInfoPage");
}
//选择头像
......
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