Skip to content

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

日历

parent 190c2050
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 11 deletions
plugins/cordova-plugin-ionic-keyboard/README.md
View file @ d9616b73
......@@ -32,7 +32,7 @@ cordova plugin add cordova-plugin-ionic-keyboard --save
#### Possible values
- `native`: The whole native webview will be resized when the keyboard shows/hides, it will affect the `vh` relative unit.
- `body`: Only the html `<body>` element will be resized. Relative units are not affected, becuase the viewport does not change.
- `body`: Only the html `<body>` element will be resized. Relative units are not affected, because the viewport does not change.
- `ionic`: Only the html `ion-app` element will be resized. Only for ionic apps.
```xml
......@@ -116,7 +116,7 @@ window.addEventListener('keyboardDidHide', () => {
Attach handler to this event to be able to receive notification when keyboard is opened.
```js
window.addEventListener('keyboardDidShow', (ev) => {
window.addEventListener('keyboardDidShow', (event) => {
// Describe your logic which will be run each time when keyboard is about to be shown.
console.log(event.keyboardHeight);
});
......@@ -129,7 +129,7 @@ window.addEventListener('keyboardDidShow', (ev) => {
Attach handler to this event to be able to receive notification when keyboard is about to be shown on the screen.
```js
window.addEventListener('keyboardWillShow', (ev) => {
window.addEventListener('keyboardWillShow', (event) => {
// Describe your logic which will be run each time when keyboard is about to be shown.
console.log(event.keyboardHeight);
});
......
plugins/cordova-plugin-ionic-keyboard/plugin.xml
View file @ d9616b73
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:rim="http://www.blackberry.com/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-ionic-keyboard" version="2.0.5">
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:rim="http://www.blackberry.com/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-ionic-keyboard" version="2.1.3">
<name>cordova-plugin-ionic-keyboard</name>
<description>Ionic Keyboard Plugin</description>
<license>Apache 2.0</license>
......
src/pages/activity-track/joinDetail/joinDetail.html
View file @ d9616b73
......@@ -98,7 +98,7 @@
<img *ngIf="item.user?.gender == '1'||item.user?.gender == null" src="./assets/imgs/head.png" class="person-photo">
<img *ngIf="item.user?.gender == '0'" src="./assets/imgs/head.png" class="person-photo">
<div class="item-box">
<p class="person-name">{{item.userName}}
<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-female" *ngIf="item.user?.gender == '0'" name="female"></ion-icon>
</p>
......
src/pages/activity-track/joinDetail/joinDetail.ts
View file @ d9616b73
......@@ -6,6 +6,7 @@ import {Http, Response,} from '@angular/http';
import {AppService} from '../../../service/appHttpService';
import {ActivityStatisticService} from '../../../service/activityStatisticService';
import {ReplaceApplyPage} from "../replace-apply/replace-apply";
import {message} from "../../../app/main";
@IonicPage()
@Component({
......@@ -104,7 +105,7 @@ export class JoinDetailPage {
notJoin() {
this.isNoSignFlag = true;
this.type = '4';
this.appService.ObserverHttpGet("/wisdomgroup/modules/activityNon", null)
this.appService.ObserverHttpGetAdd("/wisdomgroup/modules/activityNon/", this.acitivityid)
.subscribe((res: Response) => {
this.items = res.json().data;
this.noJoin = this.items.length;
......@@ -121,9 +122,17 @@ export class JoinDetailPage {
//不参加
sayNo(item) {
this.appService.ObserverHttpPostAdd("/wisdomgroup/modules/activityNon/", item.id)
let msg = this.toast.create(message);
const data = {
'userId':item.id,
'userName':item.name
};
this.appService.ObserverHttpForm("/wisdomgroup/modules/activityNon/", this.acitivityid,data)
.subscribe((res: Response) => {
msg.setMessage('已保存该用户不参加');
msg.present();
this.signAll();
this.notJoin();
}, error => {
this.appService.alert('网络异常！');
}
......
src/pages/person/personInfo/personInfo.scss
View file @ d9616b73
......@@ -92,6 +92,11 @@ page-personInfo {
width: 1.5rem;
height: 1.5rem;
}
input{
border: none;
height: 3rem;
padding: 2px;
}
}
.list-md {
......
src/pages/tabs/contact/contact.html
View file @ d9616b73
......@@ -10,7 +10,6 @@
<ion-content>
<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 class="item padding-10-15" (click)="usualContactPersons()">
<ion-icon name="ios-contacts" class="contact-icon"></ion-icon>
......
src/service/appHttpService.ts
View file @ d9616b73
......@@ -182,9 +182,30 @@ export class AppService {
}
//post请求
ObserverHttpForm(url, params,body) {
return this.http.post(url + params,null,{
params:body,
headers: new Headers({
// "Accept": "application/json",
// "Content-Type": "application/json"
'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'
})
})
}
// post请求 params+body
ObserverHttpPostParamsBody(url, params, data) {
return this.http.post( url + params, data, { //app
headers: new Headers({
"Content-Type": "application/json"
})
})
}
//put请求
ObserverHttpPut(url, params, data) {
return this.http.put(url + data, params, { //本地
return this.http.put(url + params, data, { //本地
headers: new Headers({
// "Accept": "application/json",
"Content-Type": "application/json"
......@@ -402,6 +423,19 @@ export class AppService {
//
// }
//
// //post请求
// ObserverHttpForm(url, params,body) {
// return this.http.post(AppGlobal.domain+url + params,null,{
// params:body,
// headers: new Headers({
// // "Accept": "application/json",
// // "Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'
// })
// })
//
// }
//
// ObserverHttpPostForm(url, params) {
// return this.http.post(AppGlobal.domain + url, null, { //app
// params: params,
......@@ -432,9 +466,18 @@ export class AppService {
//
// }
//
// //post请求 params+body
// ObserverHttpPostParamsBody(url, params, data) {
// return this.http.post(AppGlobal.domain + url + params, data, { //app
// headers: new Headers({
// "Content-Type": "application/json"
// })
// })
// }
//
// //put请求
// ObserverHttpPut(url, params, data) {
// return this.http.post(AppGlobal.domain + url + data, params, { //app
// return this.http.put(AppGlobal.domain + url + data, params, { //app
// headers: new Headers({
// "Content-Type": "application/json"
// })
......
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