Skip to content

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

color

parent 3419cc59
Hide whitespace changes
Inline Side-by-side
Showing with 324 additions and 328 deletions
config.xml
View file @ 4d0a94f0
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.starter" version="1.2.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.starter" version="1.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>智汇19号</name> <name>智汇19号</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author> <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
ionic.config.json
View file @ 4d0a94f0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"proxies": [ "proxies": [
{ {
"path": "/wisdomgroup", "path": "/wisdomgroup",
"proxyUrl": "http://10.10.200.38:8080/wisdomgroup" "proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
} }
] ]
} }
\ No newline at end of file
src/app/app.scss
View file @ 4d0a94f0
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
p{ p{
margin: 0; margin: 0;
} }
.back-button.show-back-button{
margin-left: 5px;
}
//列表 //列表
.item-ios{ .item-ios{
padding-left: 0; padding-left: 0;
......
src/pages/activity/activityApply/activityApply.ts
View file @ 4d0a94f0
...@@ -7,6 +7,7 @@ import { Storage } from '@ionic/storage'; ...@@ -7,6 +7,7 @@ import { Storage } from '@ionic/storage';
import { AppService, AppGlobal } from '../../../service/appHttpService'; import { AppService, AppGlobal } from '../../../service/appHttpService';
import {ActivityConfirmPage} from "../activityConfirm/activityConfirm"; import {ActivityConfirmPage} from "../activityConfirm/activityConfirm";
import {MinePage} from "../../tabs/mine/mine"; import {MinePage} from "../../tabs/mine/mine";
import {ActivityDetailPage} from "../activityDetail/activityDetail";
@IonicPage() @IonicPage()
@Component({ @Component({
...@@ -205,11 +206,7 @@ export class ActivityApplyPage { ...@@ -205,11 +206,7 @@ export class ActivityApplyPage {
if (true) { if (true) {
this.isSuccess = true; this.isSuccess = true;
//清空 插入 //清空 插入
const index = this.navCtrl.getActive().index; this.navCtrl.push("ActivityDetailPage",{id:this.item.activityId});
this.navCtrl.remove(0, index);
this.navCtrl.setRoot(MinePage);
this.navCtrl.parent.select(3);
this.navCtrl.push("MyActivityListPage");
} else { } else {
} }
......
src/pages/activity/activityDetail/activityDetail.html
View file @ 4d0a94f0
...@@ -7,14 +7,11 @@ ...@@ -7,14 +7,11 @@
<div class="item1"> <div class="item1">
<div class="img-box"> <div class="img-box">
<img class="item1-image" src="./assets/imgs/logo.png"> <img class="item1-image" src="{{picture + activity?.activityIMG}}">
</div> </div>
<div class="item1-content"> <div class="item1-content">
<div class="margin-5-0"> <div class="margin-5-0">
<label class="item1-title">{{activity?.activityName}}</label> <label class="item1-title">{{activity?.activityName}}</label>
<div class="item1-content-box">
<span *ngIf="activity?.activityNo == '0'" (click)="sayNo()" class="item-type">不想参加</span>
</div>
</div> </div>
<div class="item1-introduction"> <div class="item1-introduction">
{{activity.activityIntro}} {{activity.activityIntro}}
...@@ -30,48 +27,59 @@ ...@@ -30,48 +27,59 @@
<span class="item-title"> <span class="item-title">
批次信息 批次信息
<ng-container *ngIf="batchList.length > 0"> <ng-container *ngIf="batchList.length > 0">
(最多可报名 (最多可报
<span *ngIf="activity.applyCount == 0 || !activity.applyCount">{{ batchList.length}}</span> <span *ngIf="activity.applyCount == 0 || !activity.applyCount">{{ batchList.length}}</span>
<span *ngIf="activity.applyCount != 0">{{activity.applyCount}}</span> <span *ngIf="activity.applyCount != 0">{{activity.applyCount}}</span>
个批次信息) 个批次)
<span *ngIf="activity?.activityNo == '0'" (click)="sayNo()" class="item-type">不想参加</span>
</ng-container> </ng-container>
</span> </span>
</label> </label>
</ion-item> </ion-item>
<ion-item class="item2-content" *ngIf="batchList.length > 0"> <ng-container *ngIf="activity?.activityNo == '0'">
<div *ngFor="let batch of batchList" class="item2-box" (click)="goBatchDetail(batch)"> <ion-item class="item2-content" *ngIf="batchList.length > 0">
<p> <div *ngFor="let batch of batchList" class="item2-box" (click)="goBatchDetail(batch)">
<span class="color-666">批次名称:</span> <p>
<span>{{batch.batchName}}</span> <span class="color-666">批次名称:</span>
<!--是否报名 > 是否截止 > 是否满员 --> <span>{{batch.batchName}}</span>
<ng-container *ngIf="batch.order"> <!--是否报名 > 是否截止 > 是否满员 -->
<span class="activity-btn2" *ngIf="batch.order.orderstate == 1 || batch.order.orderstate == 2" float-right>已报名</span> <ng-container *ngIf="batch.order">
<span class="activity-btn2" *ngIf="batch.order.orderstate == 4" float-right>已评价</span> <span class="activity-btn2"
<span class="activity-btn2" *ngIf="batch.order.orderstate == 3" float-right>未出行</span> *ngIf="batch.order.orderstate == 1 || batch.order.orderstate == 2"
</ng-container> float-right>已报名</span>
<ng-container *ngIf="!batch.order"> <span class="activity-btn2" *ngIf="batch.order.orderstate == 4" float-right>已评价</span>
<ng-container *ngIf="batch.signUp"> <span class="activity-btn2" *ngIf="batch.order.orderstate == 3" float-right>未出行</span>
<ng-container *ngIf=" batch.hasSignUpCount < batch.batchLimitNumber"> </ng-container>
<span class="activity-btn2" float-right>未报名</span> <ng-container *ngIf="!batch.order">
<ng-container *ngIf="batch.signUp">
<ng-container *ngIf=" batch.hasSignUpCount < batch.batchLimitNumber">
<span class="activity-btn2" float-right>未报名</span>
</ng-container>
<ng-container *ngIf="batch.hasSignUpCount == batch.batchLimitNumber">
<span class="activity-btn2" float-right>已满员</span>
</ng-container>
</ng-container> </ng-container>
<ng-container *ngIf="batch.hasSignUpCount == batch.batchLimitNumber"> <ng-container *ngIf="!batch.signUp">
<span class="activity-btn2" float-right>已满员</span> <span class="activity-btn2" float-right>已截止</span>
</ng-container> </ng-container>
</ng-container> </ng-container>
<ng-container *ngIf="!batch.signUp">
<span class="activity-btn2" float-right>已截止</span>
</ng-container>
</ng-container>
</p> </p>
<p> <p>
<span class="color-666">截止时间:</span> <span class="color-666">截止时间:</span>
<span>{{batch.batchEndDate}}</span> <span>{{batch.batchEndDate}}</span>
<span class="color-24bafc" <span class="color-24bafc"
float-right>{{batch.hasSignUpCount}}/{{batch.batchLimitNumber}}</span> float-right>{{batch.hasSignUpCount}}/{{batch.batchLimitNumber}}</span>
</p> </p>
</div> </div>
</ion-item> </ion-item>
</ng-container>
<ng-container *ngIf="activity?.activityNo != '0'">
<p class="no-info">
已选择不想参加
</p>
</ng-container>
<p class="no-info" *ngIf="batchList.length == 0"> <p class="no-info" *ngIf="batchList.length == 0">
暂无批次 暂无批次
</p> </p>
......
src/pages/activity/activityDetail/activityDetail.scss
View file @ 4d0a94f0
...@@ -234,5 +234,12 @@ page-activityDetail { ...@@ -234,5 +234,12 @@ page-activityDetail {
font-size: 1rem; font-size: 1rem;
border-radius: 3px; border-radius: 3px;
color: #999; color: #999;
display: inline-block;
float: right;
margin-right: 8px;
}
.list-ios .item-block .item-inner{
padding-right: 0px;
margin-right: 0px;
} }
} }
\ No newline at end of file
src/pages/activity/activityDetail/activityDetail.ts
View file @ 4d0a94f0
import { Component } from '@angular/core'; import {Component} from '@angular/core';
import { IonicPage, NavController, NavParams, AlertController, ToastController } from 'ionic-angular'; import {IonicPage, NavController, NavParams, AlertController, ToastController} from 'ionic-angular';
import {Http, Response} from '@angular/http'; import {Http, Response} from '@angular/http';
import { AppService } from '../../../service/appHttpService'; import {AppGlobal, AppService} from '../../../service/appHttpService';
import { JoinDetailPage } from '../../activity-track/joinDetail/joinDetail'; import {JoinDetailPage} from '../../activity-track/joinDetail/joinDetail';
import {BatchDetailPage} from "../batch-detail/batch-detail"; import {BatchDetailPage} from "../batch-detail/batch-detail";
@IonicPage() @IonicPage()
@Component({ @Component({
selector: 'page-activityDetail', selector: 'page-activityDetail',
templateUrl: 'activityDetail.html', templateUrl: 'activityDetail.html',
}) })
export class ActivityDetailPage { export class ActivityDetailPage {
activityId; //活动ID activityId; //活动ID
batches: object[]; batches: object[];
activity = { activity = {
batchList:[] batchList: []
}; };
picture: string = AppGlobal.picture;
batchList = []; batchList = [];
//页面报名保存展示 //页面报名保存展示
isCover: boolean = false; isCover: boolean = false;
//活动详情显示 //活动详情显示
introduce: string; introduce: string;
constructor(public navCtrl: NavController,
public navParams: NavParams,
public alertCtrl: AlertController,
public http: Http,
public appService: AppService, public toast: ToastController) {
constructor(public navCtrl: NavController, }
public navParams: NavParams,
public alertCtrl: AlertController,
public http: Http,
public appService: AppService, public toast: ToastController) {
}
ionViewDidEnter(){ ionViewDidEnter() {
this.activityId = this.navParams.get('id'); const index = this.navCtrl.length() -3;
this.findMyOrderByOrderId(); if(index > 1){
} this.navCtrl.remove(3, index);
}
this.activityId = this.navParams.get('id');
this.findMyOrderByOrderId();
}
findMyOrderByOrderId(){ findMyOrderByOrderId() {
let now = new Date().getTime(); let now = new Date().getTime();
this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/findAllActivityForAppWithXQ", {"id":this.activityId}) this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/findAllActivityForAppWithXQ", {"id": this.activityId})
.subscribe((res :Response) => { .subscribe((res: Response) => {
this.activity = res.json(); this.activity = res.json();
this.batchList = this.activity.batchList; this.batchList = this.activity.batchList;
for( let i = 0;i<this.batchList.length;i++ ){ for (let i = 0; i < this.batchList.length; i++) {
let endDate = this.batchList[i].batchEndDate + " 24:00:00"; let endDate = this.batchList[i].batchEndDate + " 24:00:00";
endDate = new Date(endDate).getTime() +''; //判断是否过截止日期 endDate = new Date(endDate).getTime() + ''; //判断是否过截止日期
if( now > Number(endDate) ){ //已截止 if (now > Number(endDate)) { //已截止
this.batchList[i].signUp = false; this.batchList[i].signUp = false;
}else{ // } else { //
this.batchList[i].signUp = true; this.batchList[i].signUp = true;
} }
console.log(this.batchList); console.log(this.batchList);
...@@ -64,33 +68,34 @@ export class ActivityDetailPage { ...@@ -64,33 +68,34 @@ export class ActivityDetailPage {
} }
goJoinDetail(){ goJoinDetail() {
this.navCtrl.push("JoinDetailPage"); this.navCtrl.push("JoinDetailPage");
} }
//批次详情 //批次详情
goBatchDetail(item){ goBatchDetail(item) {
console.log(this.activity); console.log(this.activity);
this.navCtrl.push('BatchDetailPage',{batch:item,activity:this.activity}); this.navCtrl.push('BatchDetailPage', {batch: item, activity: this.activity});
} }
//活动介绍限定65个字符串，多余以省略号代替 //活动介绍限定65个字符串，多余以省略号代替
subIntroduce(str: string) { subIntroduce(str: string) {
if (!str) this.introduce = ''; if (!str) this.introduce = '';
if (str.length <= 65) this.introduce = str; if (str.length <= 65) this.introduce = str;
if (str.length > 65) this.introduce = str.substr(0, 65) + "..."; if (str.length > 65) this.introduce = str.substr(0, 65) + "...";
} }
//具体介绍 //具体介绍
hidden() { hidden() {
this.isCover = false; this.isCover = false;
} }
show() { show() {
this.isCover = true; this.isCover = true;
} }
//不参加 //不参加
sayNo(){ sayNo() {
this.appService.ObserverHttpPostAdd("/wisdomgroup/modules/activityNon/admin/", this.activityId) this.appService.ObserverHttpPostAdd("/wisdomgroup/modules/activityNon/admin/", this.activityId)
.subscribe((res: Response) => { .subscribe((res: Response) => {
this.navCtrl.pop(); this.navCtrl.pop();
......
src/pages/activity/activityList/activityList.html
View file @ 4d0a94f0
...@@ -24,9 +24,14 @@ ...@@ -24,9 +24,14 @@
<span class="item-title">{{item.activityName}}</span> <span class="item-title">{{item.activityName}}</span>
</div> </div>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">可报名</button> <ng-container *ngIf="item.activityNo == 1">
<button ion-button round class="btn btn2" *ngIf="item.activityState==1 ">已报名</button> <button ion-button round class="btn btn2">不参加</button>
<button ion-button round class="btn btn3" *ngIf="item.activityState==3 ">不可报名</button>
</ng-container>
<ng-container *ngIf="item.activityNo == 0">
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 && item.orderList.length == 0 ">可报名</button>
<button ion-button round class="btn btn2" *ngIf="item.activityState==2 && item.orderList.length > 0 ">已报名</button>
</ng-container>
</div> </div>
<div class="content-box" (click)="goDetail(item)"> <div class="content-box" (click)="goDetail(item)">
<div class="content-item-box"> <div class="content-item-box">
......
src/pages/activity/activityList/activityList.ts
View file @ 4d0a94f0
...@@ -26,40 +26,6 @@ export class ActivityListPage { ...@@ -26,40 +26,6 @@ export class ActivityListPage {
} }
//报名按钮
goApply(item) { //活动状态：1：待发布（不可报名），2：发布中（可报名）3:已完成（报名截止）
console.log("报名按钮："+item.activityState);
if(item.activityState == 2){
let flag = false;
this.isExitOrderWithActivity(item,result=>{
flag = result;
if(flag){
this.appService.toast("您已经报名该活动，请在我的活动中查看！");
}else{
this.navCtrl.push("ActivityApplyPage", {item:item});
}
//this.navCtrl.push("ActivityApplyPage", {item:item});
});
}else{
if(item.activityState == 1){
this.appService.toast("报名暂未开通！");
}else{
this.appService.toast("活动已完成！");
}
}
}
isExitOrderWithActivity(activity,callback?): any {
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/isExitOrderWithActivity",activity)
.toPromise()
.then(res => {
var data = res.json();
callback(data == null ? "[]" : data);
})
.catch(error => {
});
}
//初始化显示活动列表 //初始化显示活动列表
ionViewDidEnter(): void { ionViewDidEnter(): void {
......
src/pages/activity/batch-detail/batch-detail.html
View file @ 4d0a94f0
...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
<p> <span>可携带人数：</span><span>{{batch.batchPerNumber}}</span> </p> <p> <span>可携带人数：</span><span>{{batch.batchPerNumber}}</span> </p>
<p> <span>集合时间：</span><span>{{batch.batchSetTime}}</span> </p> <p> <span>集合时间：</span><span>{{batch.batchSetTime}}</span> </p>
<p> <span>集合地点：</span><span>{{batch.batchSetAddress}}</span> </p> <p> <span>集合地点：</span><span>{{batch.batchSetAddress}}</span> </p>
<p> <span>活动须知：</span><span [innerHtml]='batch.batchNotice' ></span> </p> <p> <span>活动须知：</span> <br>
<span [innerHtml]='batch.batchNotice' ></span>
</p>
</div> </div>
</div> </div>
<div class="content-button"> <div class="content-button">
......
src/pages/contact/add-block/add-block.scss
View file @ 4d0a94f0
...@@ -34,7 +34,7 @@ page-add-block { ...@@ -34,7 +34,7 @@ page-add-block {
} }
.icon-span{ .icon-span{
text-align: center; text-align: center;
background-color: #eeeeee; background-color: #d5e6f3;
display: inline-block; display: inline-block;
width: 35px; width: 35px;
height: 35px; height: 35px;
......
src/pages/contact/block-list/block-list.html
View file @ 4d0a94f0
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</span> </span>
<span class="contact-title color-999">添加联系人</span> <span class="contact-title color-999">添加联系人</span>
</div> </div>
<p class="padding-10 color-666">(左滑删除该组联系人)</p>
<ion-list> <ion-list>
<ion-item-sliding *ngFor="let contactPerson of contactPersons"> <ion-item-sliding *ngFor="let contactPerson of contactPersons">
<ion-item> <ion-item>
......
src/pages/contact/block-list/block-list.scss
View file @ 4d0a94f0
...@@ -17,7 +17,7 @@ page-block-list { ...@@ -17,7 +17,7 @@ page-block-list {
} }
.icon-span{ .icon-span{
text-align: center; text-align: center;
background-color: #eeeeee; background-color: #d5e6f3;
display: inline-block; display: inline-block;
width: 35px; width: 35px;
height: 35px; height: 35px;
......
src/pages/contact/contact-modal/contact-modal.scss
View file @ 4d0a94f0
...@@ -35,7 +35,7 @@ page-contact-modal { ...@@ -35,7 +35,7 @@ page-contact-modal {
} }
.icon-span{ .icon-span{
text-align: center; text-align: center;
background-color: #eeeeee; background-color: #d5e6f3;
display: inline-block; display: inline-block;
width: 35px; width: 35px;
height: 35px; height: 35px;
......
src/pages/contact/contract-personinfo/contract-personinfo.html
View file @ 4d0a94f0
...@@ -67,27 +67,27 @@ ...@@ -67,27 +67,27 @@
<span class="info-span">房间号</span> <span class="info-span">房间号</span>
<div class="info-item-content"> <div class="info-item-content">
<ng-container *ngIf="role == 1 && orgName == nowOrgName"> <!--<ng-container *ngIf="role == 1 && orgName == nowOrgName">-->
<label (click)="editFun()"> <!--<label (click)="editFun()">-->
<input type="text" [(ngModel)]="abbreviation"> <!--<input type="text" [(ngModel)]="abbreviation">-->
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon> <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
</label> <!--</label>-->
</ng-container> <!--</ng-container>-->
<ng-container *ngIf="role == 2 && orgName == nowOrgName"> <!--<ng-container *ngIf="role == 2 && orgName == nowOrgName">-->
<label (click)="editFun()"> <!--<label (click)="editFun()">-->
<input type="text" [(ngModel)]="abbreviation"> <!--<input type="text" [(ngModel)]="abbreviation">-->
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon> <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
</label> <!--</label>-->
</ng-container> <!--</ng-container>-->
<ng-container *ngIf="role == 3"> <!--<ng-container *ngIf="role == 3">-->
<label (click)="editFun()"> <!--<label (click)="editFun()">-->
<input type="text" [(ngModel)]="abbreviation"> <!--<input type="text" [(ngModel)]="abbreviation">-->
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon> <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
</label> <!--</label>-->
</ng-container> <!--</ng-container>-->
<ng-container *ngIf="role == 0 || role == 4"> <!--<ng-container *ngIf="role == 0 || role == 4">-->
{{abbreviation}} {{abbreviation}}
</ng-container> <!--</ng-container>-->
</div> </div>
</div> </div>
</ion-item> </ion-item>
...@@ -95,27 +95,27 @@ ...@@ -95,27 +95,27 @@
<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" >
<ng-container *ngIf="role == 1 && orgName == nowOrgName"> <!--<ng-container *ngIf="role == 1 && orgName == nowOrgName">-->
<label (click)="editFun()"> <!--<label (click)="editFun()">-->
<input type="text" [(ngModel)]="telephone"> <!--<input type="text" [(ngModel)]="telephone">-->
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon> <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
</label> <!--</label>-->
</ng-container> <!--</ng-container>-->
<ng-container *ngIf="role == 2 && orgName == nowOrgName"> <!--<ng-container *ngIf="role == 2 && orgName == nowOrgName">-->
<label (click)="editFun()"> <!--<label (click)="editFun()">-->
<input type="text" [(ngModel)]="telephone"> <!--<input type="text" [(ngModel)]="telephone">-->
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon> <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
</label> <!--</label>-->
</ng-container> <!--</ng-container>-->
<ng-container *ngIf="role == 3"> <!--<ng-container *ngIf="role == 3">-->
<label (click)="editFun()"> <!--<label (click)="editFun()">-->
<input type="text" [(ngModel)]="telephone"> <!--<input type="text" [(ngModel)]="telephone">-->
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon> <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
</label> <!--</label>-->
</ng-container> <!--</ng-container>-->
<ng-container *ngIf="role == 0 || role == 4"> <!--<ng-container *ngIf="role == 0 || role == 4">-->
{{telephone}} {{telephone}}
</ng-container> <!--</ng-container>-->
</div> </div>
</div> </div>
</ion-item> </ion-item>
...@@ -125,28 +125,28 @@ ...@@ -125,28 +125,28 @@
<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">
<ng-container *ngIf="role == 1 && orgName == nowOrgName"> <!--<ng-container *ngIf="role == 1 && orgName == nowOrgName">-->
<label (click)="editFun()"> <!--<label (click)="editFun()">-->
<input type="text" [(ngModel)]="email"> <!--<input type="text" [(ngModel)]="email">-->
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon> <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
</label> <!--</label>-->
</ng-container> <!--</ng-container>-->
<ng-container *ngIf="role == 2 && orgName == nowOrgName"> <!--<ng-container *ngIf="role == 2 && orgName == nowOrgName">-->
<label (click)="editFun()"> <!--<label (click)="editFun()">-->
<input type="text" [(ngModel)]="email"> <!--<input type="text" [(ngModel)]="email">-->
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon> <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
</label> <!--</label>-->
</ng-container> <!--</ng-container>-->
<ng-container *ngIf="role == 3"> <!--<ng-container *ngIf="role == 3">-->
<label (click)="editFun()"> <!--<label (click)="editFun()">-->
<input type="text" [(ngModel)]="email"> <!--<input type="text" [(ngModel)]="email">-->
<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon> <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
</label> <!--</label>-->
</ng-container> <!--</ng-container>-->
<ng-container *ngIf="role == 0 || role == 4"> <!--<ng-container *ngIf="role == 0 || role == 4">-->
{{email}} {{email}}
</ng-container> <!--</ng-container>-->
</div> </div>
</div> </div>
</ion-item> </ion-item>
......
src/pages/contact/contract-personinfo/contract-personinfo.scss
View file @ 4d0a94f0
...@@ -28,6 +28,14 @@ page-contract-personinfo { ...@@ -28,6 +28,14 @@ page-contract-personinfo {
border: none; border: none;
height: 3rem; height: 3rem;
padding: 2px; padding: 2px;
text-align: right;
font-size: 18px;
color: #272727;
}
.info-item-content{
text-align: right;
font-size: 18px;
color: #272727;
} }
.info{ .info{
......
src/pages/contact/my-block/my-block.scss
View file @ 4d0a94f0
...@@ -33,7 +33,7 @@ page-my-block { ...@@ -33,7 +33,7 @@ page-my-block {
} }
.icon-span{ .icon-span{
text-align: center; text-align: center;
background-color: #eeeeee; background-color: #d5e6f3;
display: inline-block; display: inline-block;
width: 35px; width: 35px;
height: 35px; height: 35px;
......
src/pages/contact/select-block/select-block.scss
View file @ 4d0a94f0
...@@ -33,7 +33,7 @@ page-select-block { ...@@ -33,7 +33,7 @@ page-select-block {
} }
.icon-span{ .icon-span{
text-align: center; text-align: center;
background-color: #eeeeee; background-color: #d5e6f3;
display: inline-block; display: inline-block;
width: 35px; width: 35px;
height: 35px; height: 35px;
......
src/pages/mine/mySurvey/survery/survery.scss
View file @ 4d0a94f0
...@@ -22,7 +22,7 @@ page-survery { ...@@ -22,7 +22,7 @@ page-survery {
.going{ .going{
color: #fcb164; color: #fcb164;
font-size: 1.4rem; font-size: 1.4rem;
border: 1px solid #34b4fc; border: 1px solid #fcb164;
padding: 1px 8px; padding: 1px 8px;
border-radius: 2px; border-radius: 2px;
} }
......
src/pages/mine/mySurvey/survey-result/survey-result.html
View file @ 4d0a94f0
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
</ng-container> </ng-container>
</ng-container> </ng-container>
<ng-container *ngIf="item.quesType == 3"> <ng-container *ngIf="item.quesType == 3">
<ng-container *ngFor=" let option2 of item.quesDesc;let i2 = index;"> <ng-container *ngFor=" let option2 of item.option;let i2 = index;">
<p> {{i2 +1}}、 {{option2.option_title}} <span class="margin-left-15" *ngIf="item.option[0].index == 0">{{item.option[0].number}}</span></p> <p> {{i2 +1}}、 {{option2.title}} <span class="margin-left-15">{{option2.number}}</span></p>
</ng-container> </ng-container>
</ng-container> </ng-container>
<ng-container *ngIf="item.quesType == 4"> <ng-container *ngIf="item.quesType == 4">
......
src/pages/mine/mySurvey/survey-write/survey-write.html
View file @ 4d0a94f0
...@@ -73,13 +73,13 @@ ...@@ -73,13 +73,13 @@
</ion-item> </ion-item>
</div> </div>
</ion-list> </ion-list>
<p class="text-center"> <!--<p class="text-center">-->
<label> <!--<label>-->
<input type="checkbox" [(ngModel)]="isans"> <!--<input type="checkbox" [(ngModel)]="isans">-->
<span class="input-check"></span> <!--<span class="input-check"></span>-->
<span>匿名回答</span> <!--<span>匿名回答</span>-->
</label> <!--</label>-->
</p> <!--</p>-->
<button class="submit-btn submit" (click)="confirm()">提交</button> <button class="submit-btn submit" (click)="confirm()">提交</button>
</ion-content> </ion-content>
src/pages/person/editPersonInfo/editPersonInfo.html
View file @ 4d0a94f0
<ion-header> <ion-header>
<ion-toolbar> <ion-navbar>
<div class="searchToolBar"> <ion-title text-center>信息编辑</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">
......
src/pages/person/personInfo/personInfo.html
View file @ 4d0a94f0
...@@ -81,5 +81,6 @@ ...@@ -81,5 +81,6 @@
</ion-list> </ion-list>
<!-- <button ion-button block class="save">保存信息</button> --> <!-- <button ion-button block class="save">保存信息</button> -->
<button ion-button block class="save" (click)="modifyPwd()">修改密码</button> <!--<button ion-button block class="save" (click)="modifyPwd()">修改密码</button>-->
<button class="submit-btn submit" (click)="modifyPwd()">修改密码</button>
</ion-content> </ion-content>
\ No newline at end of file
src/pages/person/personInfo/personInfo.scss
View file @ 4d0a94f0
...@@ -105,4 +105,9 @@ page-personInfo { ...@@ -105,4 +105,9 @@ page-personInfo {
width: 30px; width: 30px;
height: 30px; height: 30px;
} }
.submit{
margin-top: 20px;
border: 1px solid #34b4fc;
background-color: #34b4fc;
}
} }
src/pages/report/outGoingReportEdit/outGoingReportEdit.ts
View file @ 4d0a94f0
...@@ -80,7 +80,7 @@ export class OutGoingReportEditPage { ...@@ -80,7 +80,7 @@ export class OutGoingReportEditPage {
//编辑初始化：查询 //编辑初始化：查询
this.appService.ObserverHttpPost("/wisdomgroup/modules/userpre/getUserpre", {premanagerId: value.id}) this.appService.ObserverHttpPost("/wisdomgroup/modules/userpre/getUserpre", {premanagerId: value.id})
.subscribe((res: Response) => { .subscribe((res: Response) => {
if(res){ if(res.json()){
let result = res.json(); let result = res.json();
this.userpre.id = result["id"]; //保存-id this.userpre.id = result["id"]; //保存-id
//离沪勾选 //离沪勾选
......
src/pages/surveyManage/item/create/create.ts
View file @ 4d0a94f0
...@@ -37,6 +37,7 @@ export class CreatePage { ...@@ -37,6 +37,7 @@ export class CreatePage {
ionViewDidLoad() { ionViewDidLoad() {
this.temp = this.navParams.get('temp'); //问卷信息 this.temp = this.navParams.get('temp'); //问卷信息
console.log(this.temp);
if (this.navParams.get('edit')) { //编辑 if (this.navParams.get('edit')) { //编辑
this.editTemp = this.navParams.get('edit'); this.editTemp = this.navParams.get('edit');
this.editIndex = this.navParams.get('index'); this.editIndex = this.navParams.get('index');
...@@ -44,7 +45,6 @@ export class CreatePage { ...@@ -44,7 +45,6 @@ export class CreatePage {
this.title = this.editTemp[this.editIndex].title; this.title = this.editTemp[this.editIndex].title;
this.isAns = this.editTemp[this.editIndex].isAns; this.isAns = this.editTemp[this.editIndex].isAns;
this.quesDescList = this.editTemp[this.editIndex].quesDesc; this.quesDescList = this.editTemp[this.editIndex].quesDesc;
console.log(this.editTemp[this.editIndex]);
} else { //新增 } else { //新增
this.qType = this.navParams.get('type'); //题目类型 this.qType = this.navParams.get('type'); //题目类型
} }
...@@ -155,7 +155,7 @@ export class CreatePage { ...@@ -155,7 +155,7 @@ export class CreatePage {
quesDesc: this.quesDescList, quesDesc: this.quesDescList,
minOps: 0, minOps: 0,
maxOps: 0, maxOps: 0,
index: 0 //序号 index: this.temp.quesNum //序号
} }
]; ];
const data = { const data = {
......
src/pages/surveyManage/item/set/set.html
View file @ 4d0a94f0
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
<ion-toggle [(ngModel)]="isopen"></ion-toggle> <ion-toggle [(ngModel)]="isopen"></ion-toggle>
</ion-item> </ion-item>
<ion-item> <!--<ion-item>-->
<ion-label>匿名回答</ion-label> <!--<ion-label>匿名回答</ion-label>-->
<ion-toggle [(ngModel)]="isans"></ion-toggle> <!--<ion-toggle [(ngModel)]="isans"></ion-toggle>-->
</ion-item> <!--</ion-item>-->
</ion-list> </ion-list>
<button class="submit-btn submit" (click)="save()">确认</button> <button class="submit-btn submit" (click)="save()">确认</button>
......
src/pages/surveyManage/item/set/set.ts
View file @ 4d0a94f0
...@@ -12,7 +12,7 @@ export class SetPage { ...@@ -12,7 +12,7 @@ export class SetPage {
id; // 问卷ID； id; // 问卷ID；
isans; //匿名 isans = null; //匿名
isopen; //公开 isopen; //公开
temp = { temp = {
id: '', id: '',
......
src/pages/surveyManage/list/list.html
View file @ 4d0a94f0
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<p class="survey-title">{{temp?.title}}</p> <p class="survey-title">{{temp?.title}}</p>
<div class="footter-opr"> <div class="footter-opr">
<div *ngIf="swiperIndex == 0" (click)="edit()"><span>编辑</span></div> <div *ngIf="swiperIndex == 0" (click)="edit()"><span>编辑</span></div>
<div *ngIf="swiperIndex == 1" (click)="edit()"><span>查看</span></div> <div *ngIf="swiperIndex == 1" (click)="look()"><span>查看</span></div>
<div *ngIf="swiperIndex == 1" (click)="cancel()"><span>取消发布</span></div> <div *ngIf="swiperIndex == 1" (click)="cancel()"><span>取消发布</span></div>
<div *ngIf="swiperIndex == 1" (click)="overDue()"><span>设为过期</span></div> <div *ngIf="swiperIndex == 1" (click)="overDue()"><span>设为过期</span></div>
<div *ngIf="swiperIndex == 0" (click)="release()"><span>发布</span></div> <div *ngIf="swiperIndex == 0" (click)="release()"><span>发布</span></div>
......
src/pages/surveyManage/list/list.ts
View file @ 4d0a94f0
...@@ -5,6 +5,7 @@ import {DesicrPage} from "../item/desicr/desicr"; ...@@ -5,6 +5,7 @@ import {DesicrPage} from "../item/desicr/desicr";
import {AppService} from "../../../service/appHttpService"; import {AppService} from "../../../service/appHttpService";
import {EditPage} from "../item/edit/edit"; import {EditPage} from "../item/edit/edit";
import {DetailPage} from "../item/detail/detail"; import {DetailPage} from "../item/detail/detail";
import {SurveyResultPage} from "../../mine/mySurvey/survey-result/survey-result";
declare var Swiper; declare var Swiper;
...@@ -86,13 +87,6 @@ export class ListPage { ...@@ -86,13 +87,6 @@ export class ListPage {
// this.contentSlides.slideTo(index); // this.contentSlides.slideTo(index);
} }
slideChanged() {
//getActiveIndex()获得当前页面的index
let index = this.contentSlides.getActiveIndex();
//s切换菜单
// this.swiper.slideTo(index, 300);
}
//显示问卷操作 //显示问卷操作
showOpra(item) { showOpra(item) {
...@@ -161,7 +155,10 @@ export class ListPage { ...@@ -161,7 +155,10 @@ export class ListPage {
//结果 //结果
result() { result() {
this.showOp = false; this.showOp = false;
this.navCtrl.push('ResultPage'); const data = {
id:this.temp.id
}
this.navCtrl.push('SurveyResultPage',{item:data});
} }
//复制 //复制
......
src/pages/tabs/contact/contact.html
View file @ 4d0a94f0
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<span class="contact-title">常用联系人</span> <span class="contact-title">常用联系人</span>
</div> </div>
<div class="common"> <div class="common">
我的分组 我的分组(左滑删除分组)
</div> </div>
<div class="item new-add" (click)="usualContactAdd()"> <div class="item new-add" (click)="usualContactAdd()">
<span class="icon-span"> <span class="icon-span">
......
src/pages/tabs/contact/contact.scss
View file @ 4d0a94f0
...@@ -58,7 +58,7 @@ page-contact { ...@@ -58,7 +58,7 @@ page-contact {
} }
.icon-span{ .icon-span{
text-align: center; text-align: center;
background-color: #eeeeee; background-color: #d5e6f3;
display: inline-block; display: inline-block;
width: 35px; width: 35px;
height: 35px; height: 35px;
......
src/pages/tabs/mine/mine.ts
View file @ 4d0a94f0
...@@ -34,7 +34,7 @@ export class MinePage { ...@@ -34,7 +34,7 @@ export class MinePage {
private alertCtrl: AlertController, private alertCtrl: AlertController,
public navParams: NavParams, public navParams: NavParams,
public appService: AppService, public appService: AppService,
public storage: Storage, public storage: Storage,public app:App,
private appUpdateService: AppUpdateService, private appUpdateService: AppUpdateService,
private appVersion: AppVersion) { private appVersion: AppVersion) {
this.orgNameInfo(); this.orgNameInfo();
...@@ -158,7 +158,8 @@ export class MinePage { ...@@ -158,7 +158,8 @@ export class MinePage {
} }
goSet() { goSet() {
this.navCtrl.push('VersionPage'); // this.navCtrl.push('VersionPage');
this.app.getRootNav().push('VersionPage');
} }
goDuty() { goDuty() {
......
src/pages/version/version.ts
View file @ 4d0a94f0
import { Component } from '@angular/core'; import {Component} from '@angular/core';
import {AlertController, IonicPage, NavController, NavParams} from 'ionic-angular'; import {AlertController, IonicPage, NavController, NavParams} from 'ionic-angular';
import { AppService } from '../../service/appHttpService'; import {AppService} from '../../service/appHttpService';
import { AppVersion } from '@ionic-native/app-version'; import {AppVersion} from '@ionic-native/app-version';
import { AppUpdateService } from '../../service/appUpdateService'; import {AppUpdateService} from '../../service/appUpdateService';
import { Storage } from "@ionic/storage"; import {Storage} from "@ionic/storage";
import {LoginPage} from "../login/login"; import {LoginPage} from "../login/login";
import {HomePage} from "../tabs/home/home"; import {HomePage} from "../tabs/home/home";
@IonicPage() @IonicPage()
@Component({ @Component({
selector: 'page-version', selector: 'page-version',
templateUrl: 'version.html' templateUrl: 'version.html'
}) })
export class VersionPage { export class VersionPage {
version: string = ''; version: string = '';
latestVersion: string = ''; latestVersion: string = '';
isLatest:boolean = true; isLatest: boolean = true;
pusNumber:boolean; pusNumber: boolean;
constructor(
public navCtrl: NavController,
public navParams: NavParams,
public appService:AppService,
private appUpdateService: AppUpdateService,
private appVersion: AppVersion,
private storage:Storage,
private alertCtrl: AlertController
) {
}
ionViewWillEnter() { constructor(public navCtrl: NavController,
this.getversion(); public navParams: NavParams,
this.getAppPush(); public appService: AppService,
private appUpdateService: AppUpdateService,
private appVersion: AppVersion,
private storage: Storage,
private alertCtrl: AlertController) {
this.appUpdateService.compariVersion().subscribe(res => { }
var data = res.json();
if (data.code == 200) { ionViewWillEnter() {
this.latestVersion = data.latestVersion; this.getversion();
} this.getAppPush();
});
} this.appUpdateService.compariVersion().subscribe(res => {
var data = res.json();
if (data.code == 200) {
this.latestVersion = data.latestVersion;
}
});
}
//获取推送开关 //获取推送开关
getAppPush(){ getAppPush() {
this.appService.ObserverHttpGet('/wisdomgroup/modules/common/file/getAppPush',null) this.appService.ObserverHttpGet('/wisdomgroup/modules/common/file/getAppPush', null)
.subscribe( .subscribe(
(res)=>{ (res) => {
this.pusNumber = res.json(); this.pusNumber = res.json();
} }
) )
} }
//保存推送开关 //保存推送开关
savePush(){ savePush() {
this.appService.ObserverHttpGetAdd('/wisdomgroup/modules/common/file/addAppPush/',this.pusNumber) this.appService.ObserverHttpGetAdd('/wisdomgroup/modules/common/file/addAppPush/', this.pusNumber)
.subscribe( .subscribe(
(res)=>{} (res) => {
}
) )
} }
//获取最新版本信息 //获取最新版本信息
getversion() { getversion() {
//检测是否需要更新 //检测是否需要更新
this.appVersion.getVersionNumber().then((version: string) => { this.appVersion.getVersionNumber().then((version: string) => {
this.version = version; this.version = version;
this.appUpdateService.compariVersion().subscribe(res => { this.appUpdateService.compariVersion().subscribe(res => {
var data = res.json(); var data = res.json();
if (data.code == 200) { if (data.code == 200) {
this.latestVersion = data.latestVersion; this.latestVersion = data.latestVersion;
if (data.latestVersion != null && data.latestVersion != version) { if (data.latestVersion != null && data.latestVersion != version) {
this.isLatest = false; this.isLatest = false;
} }
} }
}); });
}).catch(err => { }).catch(err => {
console.log('getVersionNumber:' + err); console.log('getVersionNumber:' + err);
}); });
} }
//更新 //更新
update(){ update() {
if(this.isLatest){ if (this.isLatest) {
const alert = this.alertCtrl.create({ const alert = this.alertCtrl.create({
subTitle: '已是最新版本', subTitle: '已是最新版本',
buttons: ['确定'] buttons: ['确定']
}); });
alert.present(); alert.present();
}else{ } else {
const confirm = this.alertCtrl.create({ const confirm = this.alertCtrl.create({
message: '有最新版本，是否更新?', message: '有最新版本，是否更新?',
buttons: [ buttons: [
{ {
text: '取消', text: '取消',
handler: () => { handler: () => {
console.log('Disagree clicked'); console.log('Disagree clicked');
} }
}, },
{ {
text: '确定', text: '确定',
handler: () => { handler: () => {
this.appUpdateService.downloadApp("/wisdomgroup/app/download"); this.appUpdateService.downloadApp("/wisdomgroup/app/download");
} }
} }
] ]
}); });
confirm.present(); confirm.present();
} }
} }
//后台退出 //后台退出
...@@ -118,7 +118,6 @@ export class VersionPage { ...@@ -118,7 +118,6 @@ export class VersionPage {
this.appService.ObserverHttpGet("/wisdomgroup/app/logout", null) this.appService.ObserverHttpGet("/wisdomgroup/app/logout", null)
.subscribe((res: Response) => { .subscribe((res: Response) => {
let data = res.json(); let data = res.json();
this.navCtrl.setRoot(HomePage);
this.navCtrl.push('LoginPage'); this.navCtrl.push('LoginPage');
}, error => { }, error => {
this.appService.alert('网络异常！'); this.appService.alert('网络异常！');
......
src/service/appHttpService.ts
View file @ 4d0a94f0
...@@ -294,7 +294,7 @@ export class AppService { ...@@ -294,7 +294,7 @@ export class AppService {
} }
// //app请求方式 //app请求方式
// //
// import {LoadingController, AlertController, ToastController} from 'ionic-angular'; // import {LoadingController, AlertController, ToastController} from 'ionic-angular';
// import {Injectable} from '@angular/core'; // import {Injectable} from '@angular/core';
...@@ -561,8 +561,3 @@ export class AppService { ...@@ -561,8 +561,3 @@ export class AppService {
// } // }
// //
// } // }
//
//
//
//
//
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