Skip to content

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

color

parent 7ea1e6b0
Hide whitespace changes
Inline Side-by-side
Showing with 636 additions and 603 deletions
config.xml
View file @ 570b3483
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.starter" version="1.1.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.starter" version="1.1.6" 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 @ 570b3483
...@@ -5,9 +5,5 @@ ...@@ -5,9 +5,5 @@
}, },
"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.component.ts
View file @ 570b3483
...@@ -66,27 +66,33 @@ export class MyApp { ...@@ -66,27 +66,33 @@ export class MyApp {
loadLogin() { loadLogin() {
this.storage.get("userLoginInfo").then((value) => { this.storage.get("userLoginInfo").then((value) => {
if (value != null && value != '') { if (value != null && value != '') {
console.log(value);
this.user = value; this.user = value;
this.appService.ObserverHttpPost("/wisdomgroup/app/loginpost", this.user) if(this.user.remember){
.subscribe((res: Response) => { this.appService.ObserverHttpPost("/wisdomgroup/app/loginpost", this.user)
let data = res.json(); .subscribe((res: Response) => {
if (data["code"] == '200') { let data = res.json();
//将当前登录用户存进缓存，便于后期逻辑操作 if (data["code"] == '200') {
this.storage.set('user', data.data); //将当前登录用户存进缓存，便于后期逻辑操作
this.user.userid = data.data.id; this.storage.set('user', data.data);
this.storage.set('userLoginInfo', this.user); this.user.userid = data.data.id;
// return this.navCtrl.setRoot(TabsPage, { "user": this.user }); this.storage.set('userLoginInfo', this.user);
this.rootPage = TabsPage; // return this.navCtrl.setRoot(TabsPage, { "user": this.user });
} else { this.rootPage = TabsPage;
this.appService.alert('手机号或密码错误！'); } else {
this.appService.alert('手机号或密码错误！');
this.rootPage = LoginPage;
// return this.navCtrl.setRoot(LoginPage);
}
}, error => {
this.rootPage = LoginPage; this.rootPage = LoginPage;
// return this.navCtrl.setRoot(LoginPage); this.appService.alert('网络异常！');
} }
}, error => { );
this.rootPage = LoginPage; }else{
this.appService.alert('网络异常！'); this.rootPage = LoginPage;
} }
);
} }
else { else {
this.rootPage = LoginPage; this.rootPage = LoginPage;
......
src/pages/activity/order-edit/order-edit.scss
View file @ 570b3483
...@@ -77,10 +77,10 @@ page-order-edit { ...@@ -77,10 +77,10 @@ page-order-edit {
} }
.submit{ .submit{
margin-top: 20px; margin-top: 20px;
border: 1px solid #34b4fc; border: 1px solid #34b4fc;
background-color: #34b4fc; background-color: #34b4fc;
} }
.com{ .com{
font-size: 0; font-size: 0;
} }
......
src/pages/announcement/announcement.scss
View file @ 570b3483
page-announcement { page-announcement {
td, th {
.searchToolBar{ border: 1px solid #dddddd;
display: flex; }
flex-direction: row; .searchToolBar {
align-items: center; display: flex;
justify-content: left; flex-direction: row;
box-sizing: border-box; align-items: center;
} justify-content: left;
box-sizing: border-box;
.list-ios .item-block .item-inner{ }
border: none;
} .list-ios .item-block .item-inner {
.item-header{ border: none;
display: flex; }
flex-direction: row; .item-header {
align-items: center; display: flex;
justify-content: space-between; flex-direction: row;
box-sizing: border-box; align-items: center;
} justify-content: space-between;
box-sizing: border-box;
.item-header-style{ }
display: flex;
flex-direction: row; .item-header-style {
align-items: center; display: flex;
justify-content: left; flex-direction: row;
box-sizing: border-box; align-items: center;
} justify-content: left;
box-sizing: border-box;
.item-title{ }
font-size: 18px;
} .item-title {
font-size: 18px;
.icon{ }
width: 20px;
height: 20px; .icon {
margin-right: 5px; width: 20px;
} height: 20px;
margin-right: 5px;
.btn{ }
// float: right;
background-color: white; .btn {
// float: right;
margin: 0 0; background-color: white;
font-size: 6px;
} margin: 0 0;
font-size: 6px;
.btn1{ }
border: 1px solid #69c4e2;
color: #69c4e2; .btn1 {
border-radius: 5px; border: 1px solid #69c4e2;
} color: #69c4e2;
border-radius: 5px;
.btn2{ }
border-radius: 5px;
border: 1px solid #90da91; .btn2 {
color: #90da91; border-radius: 5px;
} border: 1px solid #90da91;
color: #90da91;
// .item-content{ }
// display: flex;
// flex-direction: row; // .item-content{
// align-items: flex-end; // display: flex;
// justify-content: space-between; // flex-direction: row;
// box-sizing: border-box; // align-items: flex-end;
// } // justify-content: space-between;
// box-sizing: border-box;
// .left{ // }
// color: #cccccc;
// font-size: 8px; // .left{
// // height: 70px; // color: #cccccc;
// display: inline-block; // font-size: 8px;
// margin-left: 20px; // // height: 70px;
// } // display: inline-block;
// margin-left: 20px;
.content-box{ // }
margin-left: 25px;
margin-top: 15px; .content-box {
margin-bottom: 15px; margin-left: 25px;
padding-bottom: 15px; margin-top: 15px;
border-bottom: 1px solid #f1f2f3; margin-bottom: 15px;
} padding-bottom: 15px;
border-bottom: 1px solid #f1f2f3;
.content-item-box{ }
display: flex;
flex-direction: row; .content-item-box {
align-items: flex-start; display: flex;
justify-content: left; flex-direction: row;
box-sizing: border-box; align-items: flex-start;
} justify-content: left;
box-sizing: border-box;
.left-title{ }
color: #8b8c8d;
font-size: 14px; .left-title {
} color: #8b8c8d;
font-size: 14px;
.data{ }
color: #666666;
font-size: 14px; .data {
} color: #666666;
font-size: 14px;
.data-1{ }
display: -webkit-box;
-webkit-box-orient: vertical; .data-1 {
-webkit-line-clamp: 2; //文本行数 display: -webkit-box;
overflow: hidden; -webkit-box-orient: vertical;
white-space: normal; -webkit-line-clamp: 2; //文本行数
} overflow: hidden;
white-space: normal;
.sign-up{ text-overflow: ellipsis;
background-color: #fff; -webkit-box-orient: vertical;
height: 25px; }
width: 50px;
border-radius: 2px; .sign-up {
color: #ec4553; background-color: #fff;
float: right; height: 25px;
border: 1px solid #ec4553; width: 50px;
} border-radius: 2px;
color: #ec4553;
.back-btn{ float: right;
width: 30px; border: 1px solid #ec4553;
height: 30px; }
}
.back-btn {
width: 30px;
height: 30px;
}
} }
src/pages/announcement/announcement.ts
View file @ 570b3483
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 {AppGlobal, AppService} from '../../service/appHttpService';
import { AnnouncementViewPage } from '../announcementView/announcementView'; import {AnnouncementViewPage} from '../announcementView/announcementView';
@IonicPage() @IonicPage()
@Component({ @Component({
selector: 'page-announcement', selector: 'page-announcement',
templateUrl: 'announcement.html' templateUrl: 'announcement.html'
}) })
export class AnnouncementPage { export class AnnouncementPage {
allNotice = []; allNotice = [];
constructor(public navCtrl: NavController,
public navParams: NavParams,
public appService: AppService) {
}
ionViewWillEnter() {
//加载通知公告
this.getAllNoticeAboutMe();
this.addRecodings();
}
goView(id, isRead) {
if (!isRead) {
this.createRecording(id);
}
this.navCtrl.push("AnnouncementViewPage", {
id: id
});
}
constructor( //获取所有关于我的通知公告
public navCtrl: NavController, getAllNoticeAboutMe() {
public navParams: NavParams, this.appService.ObserverHttpPost("/wisdomgroup/modules/notice/getAllNotice", null)
public appService: AppService .subscribe((res: Response) => {
) { let data = res.json();
data.forEach(event=>{
} let src = event.noticeContent.split('src="');
event.noticeContent = src.join('src="' + AppGlobal.pictureNotice);
});
ionViewWillEnter() { this.allNotice = data;
//加载通知公告
this.getAllNoticeAboutMe();
this.addRecodings();
}
goView(id, isRead) { }, error => {
if (!isRead) { this.appService.alert('网络异常！');
this.createRecording(id); }
);
} }
this.navCtrl.push("AnnouncementViewPage", {
id: id
});
}
//获取所有关于我的通知公告 //如果是未读状态，增加阅读记录
getAllNoticeAboutMe() { createRecording(id) {
this.appService.ObserverHttpPost("/wisdomgroup/modules/notice/getAllNotice", null) this.appService.ObserverHttpPost("/wisdomgroup/modules/notice/createRecording", {id: id})
.subscribe((res: Response) => { .subscribe((res: Response) => {
let data = res.json();
console.log(data);
this.allNotice = data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
//如果是未读状态，增加阅读记录 }, error => {
createRecording(id) { this.appService.alert('网络异常！');
this.appService.ObserverHttpPost("/wisdomgroup/modules/notice/createRecording", { id: id }) }
.subscribe((res: Response) => { );
}
}, error => { goBack() {
this.appService.alert('网络异常！'); this.navCtrl.popToRoot();
} }
);
}
goBack(){ //增加阅读记录
this.navCtrl.popToRoot(); addRecodings() {
} this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/addRecodings", null)
.subscribe((res: Response) => {
//增加阅读记录 }, error => {
addRecodings(){ this.appService.alert('网络异常！');
this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/addRecodings", null) }
.subscribe((res: Response) => { );
}, error => {
this.appService.alert('网络异常！');
} }
);
}
} }
src/pages/announcementView/announcementView.scss
View file @ 570b3483
page-announcementView { page-announcementView {
td, th{
border: 1px solid #dddddd;
}
.searchToolBar{ .searchToolBar{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
......
src/pages/home/more-app/more-app.html
View file @ 570b3483
<ion-header> <ion-header>
<ion-navbar> <ion-navbar>
<ion-title>更多应用</ion-title> <ion-title>更多应用</ion-title>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="item2-2"> <div class="item2-2">
<div class="card" (click)="goActivity()"> <div class="card" (click)="goActivity()">
<img src="./assets/imgs/home/icon-bm.png" alt=""> <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 class="card" (click)="goAnnouncement()">
<img src="./assets/imgs/home/icon-tz.png" alt="">
<label class="label2-2">通知公告</label>
<img class="new-logo" *ngIf="hasNewNotice==1" src="./assets/imgs/new.png">
</div>
<div class="card" (click)="goOutGoingReportAboutAll()">
<img src="./assets/imgs/home/icon-lhbb.png" alt="">
<label class="label2-2">离沪报备</label>
<img class="new-logo" *ngIf="hasNewPremanager==1" src="./assets/imgs/new.png">
</div>
<div class="card" (click)="goDuty()">
<img src="./assets/imgs/home/icon-zb.png" alt="">
<label class="label2-2">值班情况</label>
</div>
<ng-container *ngIf="role == 1 || role == 2 || role == 3">
<div class="card" (click)="goActivityTrack()">
<img src="./assets/imgs/home/icon-hdgz.png" alt="">
<label class="label2-2">活动跟踪</label>
</div>
<div class="card" (click)="goReportTrack()">
<img src="./assets/imgs/home/icon-bbgz.png" alt="">
<label class="label2-2">报备跟踪</label>
</div>
</ng-container>
<div class="card" (click)="goToMySurvey()">
<img src="./assets/imgs/home/icon-wjtc.png" alt="">
<label class="label2-2">问卷调查</label>
</div>
<ng-container *ngIf="role == 3">
<div class="card" (click)="goToSurveyManage()">
<img src="./assets/imgs/home/icon-wjgl.png" alt="">
<label class="label2-2 more2-2">问卷管理</label>
</div>
</ng-container>
<ng-container *ngIf="role == 3 || role == 4">
<div class="card" (click)="replayManage()">
<img src="./assets/imgs/home/icon-zbhb.png" alt="">
<label class="label2-2 more2-2">值班换班</label>
</div>
</ng-container>
</div> </div>
<div class="card" (click)="goAnnouncement()">
<img src="./assets/imgs/home/icon-tz.png" alt="">
<label class="label2-2">通知公告</label>
<img class="new-logo" *ngIf="hasNewNotice==1" src="./assets/imgs/new.png">
</div>
<div class="card" (click)="goOutGoingReportAboutAll()">
<img src="./assets/imgs/home/icon-lhbb.png" alt="">
<label class="label2-2">离沪报备</label>
<img class="new-logo" *ngIf="hasNewPremanager==1" src="./assets/imgs/new.png">
</div>
<div class="card" (click)="goDuty()">
<img src="./assets/imgs/home/icon-zb.png" alt="">
<label class="label2-2">值班情况</label>
</div>
<ng-container *ngIf="role == 1 || role == 2 || role == 3">
<div class="card" (click)="goActivityTrack()">
<img src="./assets/imgs/home/icon-hdgz.png" alt="">
<label class="label2-2">活动跟踪</label>
</div>
<div class="card" (click)="goReportTrack()">
<img src="./assets/imgs/home/icon-bbgz.png" alt="">
<label class="label2-2">报备跟踪</label>
</div>
</ng-container>
<div class="card" (click)="goToMySurvey()">
<img src="./assets/imgs/home/icon-wjtc.png" alt="">
<label class="label2-2">问卷调查</label>
</div>
<ng-container *ngIf="role == 3">
<div class="card" (click)="goToSurveyManage()">
<img src="./assets/imgs/home/icon-wjgl.png" alt="">
<label class="label2-2 more2-2">问卷管理</label>
</div>
<div class="card" (click)="replayManage()">
<img src="./assets/imgs/home/icon-zbhb.png" alt="">
<label class="label2-2 more2-2">值班换班</label>
</div>
</ng-container>
</div>
</ion-content> </ion-content>
src/pages/login/login.html
View file @ 570b3483
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<!-- <button class="login-bt" ion-button (click)="login()" [disabled]="!loginForm.valid || submitted" type="submit" block>登 录</button> --> <!-- <button class="login-bt" ion-button (click)="login()" [disabled]="!loginForm.valid || submitted" type="submit" block>登 录</button> -->
<div class="mui-input-row mui-checkbox mui-left" style="margin-bottom: 15px;"> <div class="mui-input-row mui-checkbox mui-left" style="margin-bottom: 15px;">
<input name="checkbox" class="jizhu-password" value="1" type="checkbox" checked="true" style="margin-left:10px;width:17px;height:17px;vertical-align:middle"> <input [(ngModel)]="user.remember" name="checkbox" class="jizhu-password" value="1" type="checkbox" checked="true" style="margin-left:10px;width:17px;height:17px;vertical-align:middle">
<label style="padding-left:5px;font-family:'微软雅黑';" class="jizhu-password-label">记住密码</label> <label style="padding-left:5px;font-family:'微软雅黑';" class="jizhu-password-label">记住密码</label>
</div> </div>
......
src/pages/login/login.ts
View file @ 570b3483
...@@ -21,7 +21,8 @@ export class LoginPage { ...@@ -21,7 +21,8 @@ export class LoginPage {
user = { user = {
userid: '', //登录数据 userid: '', //登录数据
mobile: '', mobile: '',
password: '' password: '',
remember:true
}; };
tabflag:any; tabflag:any;
constructor(public navCtrl: NavController, constructor(public navCtrl: NavController,
...@@ -43,8 +44,10 @@ export class LoginPage { ...@@ -43,8 +44,10 @@ export class LoginPage {
ionViewDidEnter() { ionViewDidEnter() {
//默认显示 //默认显示
this.storage.get("userLoginInfo").then((value)=>{ this.storage.get("userLoginInfo").then((value)=>{
if(value!=null && value != ''){ if(value!=null && value != ''){
this.user = value; if( value.remember ){
this.user = value;
}
} }
}); });
} }
...@@ -59,7 +62,7 @@ export class LoginPage { ...@@ -59,7 +62,7 @@ export class LoginPage {
} }
login() { login() {
//验证手机号和密码是否输入 //验证手机号和密码是否输入
if(this.user.mobile == null || this.user.mobile == ''){ if(this.user.mobile == null || this.user.mobile == ''){
this.appService.popToastView('请输入手机号！','top',2000); this.appService.popToastView('请输入手机号！','top',2000);
......
src/pages/mine/myActivityList/myActivityList.html
View file @ 570b3483
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
<span class="item-title">{{item.activity.activityName}}</span> <span class="item-title">{{item.activity.activityName}}</span>
</div> </div>
<button style="border-radius: 4px" ion-button round class="btn color1" *ngIf="item.orderstate == '1'">待进行</button> <button disabled style="border-radius: 4px" ion-button round class="btn color1" *ngIf="item.orderstate == '1'">待进行</button>
<button style="border-radius: 4px" ion-button round class="btn color2" *ngIf="item.orderstate == '2'">待确认</button> <button disabled style="border-radius: 4px" ion-button round class="btn color2" *ngIf="item.orderstate == '2'">待确认</button>
<button style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '3'">报名未出行</button> <button disabled style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '3'">报名未出行</button>
<button style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '4'">已完成</button> <button disabled style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '4'">已完成</button>
</div> </div>
<div class="content-box"> <div class="content-box">
...@@ -60,14 +60,14 @@ ...@@ -60,14 +60,14 @@
</div> </div>
</div> </div>
<div class="right"> <div class="right">
<button class="cancel" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消订单</button> <button disabled class="cancel" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消订单</button>
<button class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">修改订单</button> <button disabled class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">修改订单</button>
<button class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button> <button disabled class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
<button class="cancel" *ngIf="item.orderstate == 2" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button> <button disabled class="cancel" *ngIf="item.orderstate == 2" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
<button class="reselection" *ngIf="item.orderstate == 2" (click)="evaluation(item);$event.stopPropagation();">确认评价</button> <button disabled class="reselection" *ngIf="item.orderstate == 2" (click)="evaluation(item);$event.stopPropagation();">确认评价</button>
<button class="reselection" *ngIf="item.orderstate == 3||item.orderstate == 4">查看详情</button> <button disabled class="reselection" *ngIf="item.orderstate == 3||item.orderstate == 4">查看详情</button>
</div> </div>
</div> </div>
</ion-item> </ion-item>
...@@ -115,9 +115,9 @@ ...@@ -115,9 +115,9 @@
</div> </div>
<div class="right"> <div class="right">
<button class="cancel" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消报名</button> <button disabled class="cancel" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消报名</button>
<button class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">重选批次</button> <button disabled class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">重选批次</button>
<button class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button> <button disabled class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
</div> </div>
</div> </div>
......
src/pages/mine/myActivityList/myActivityList.scss
View file @ 570b3483
page-myActivityList { page-myActivityList {
button[disabled]{
opacity: 1;
}
.searchToolBar{ .searchToolBar{
display: flex; display: flex;
......
src/pages/mine/myReport/myReport.html
View file @ 570b3483
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
<span class="item-title">{{report.title}}</span> <span class="item-title">{{report.title}}</span>
</div> </div>
<ng-container *ngIf="!report.isOverTimeFlag"> <ng-container *ngIf="!report.isOverTimeFlag">
<button ion-button round class="btn color1">已报备 <button disabled ion-button round class="btn color1">已报备
</button> </button>
</ng-container> </ng-container>
<ng-container *ngIf="report.isOverTimeFlag"> <ng-container *ngIf="report.isOverTimeFlag">
<button ion-button round class="btn color3">已结束 <button disabled ion-button round class="btn color3">已结束
</button> </button>
</ng-container> </ng-container>
</div> </div>
......
src/pages/mine/myReport/myReport.scss
View file @ 570b3483
page-myReport { page-myReport {
button[disabled]{
opacity: 1;
}
.searchToolBar{ .searchToolBar{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
......
src/pages/report/outGoingReportDetail/outGoingReportDetail.html
View file @ 570b3483
...@@ -56,5 +56,5 @@ ...@@ -56,5 +56,5 @@
<ion-textarea placeholder="请输入" [(ngModel)]="temp_userpre.managerDesc"></ion-textarea> <ion-textarea placeholder="请输入" [(ngModel)]="temp_userpre.managerDesc"></ion-textarea>
</ion-item> </ion-item>
</ion-list> </ion-list>
<button ion-button block class="save" (click)="saveFieldValue()">保存</button> <button class="submit-btn submit" (click)="saveFieldValue()">保存</button>
</ion-content> </ion-content>
\ No newline at end of file
src/pages/report/outGoingReportDetail/outGoingReportDetail.scss
View file @ 570b3483
page-outGoingReportDetail { page-outGoingReportDetail {
.submit{
margin-top: 20px;
border: 1px solid #34b4fc;
background-color: #34b4fc;
}
.searchToolBar{ .searchToolBar{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
......
src/pages/report/outGoingReportEdit/outGoingReportEdit.html
View file @ 570b3483
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
<button ion-button block class="report-btn" (click)="savePremanager()" *ngIf="!premanager.reported">提交报备</button> <button class="submit-btn submit" *ngIf="!premanager.reported" (click)="savePremanager()">提交报备</button>
<button ion-button block class="report-btn" (click)="editPremanager()" *ngIf="premanager.reported">修改报备</button> <button class="submit-btn submit" *ngIf="premanager.reported" (click)="editPremanager()">修改报备</button>
</ion-content> </ion-content>
......
src/pages/report/outGoingReportEdit/outGoingReportEdit.scss
View file @ 570b3483
page-outGoingReportEdit { page-outGoingReportEdit {
.submit{
margin-top: 20px;
border: 1px solid #34b4fc;
background-color: #34b4fc;
}
.searchToolBar{ .searchToolBar{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
......
src/service/appHttpService.ts
View file @ 570b3483
//本地请求方式 // //本地请求方式
import {LoadingController, AlertController, ToastController} from 'ionic-angular';
import {Injectable} from '@angular/core';
import {Http, Headers} from '@angular/http';
import {Observable} from "rxjs";
@Injectable()
export class AppGlobal {
//缓存key的配置
static cache: any = {
slides: "_dress_slides",
categories: "_dress_categories",
products: "_dress_products"
}
//接口基地址 //测试环境
// static domain = "http://220.248.107.115:2239";
//正式环境
// static domain = "http://180.153.158.250:3306";
static domain = "http://180.168.156.212:2931";
//static domain = "http://localhost:8080"
//测试
// static picture = "http://220.248.107.115:2239/wisdomgroup/manager/getIcon/";
//正式
// static picture = "http://180.153.158.250:3306/wisdomgroup/manager/getIcon/";
static picture = "http://180.168.156.212:2931/wisdomgroup/manager/getIcon/";
//通知公告图片参数
static pictureNotice = "http://180.168.156.212:2931";
//接口地址
static API: any = {
getCategories: '/api/ionic3/getCategories',
getLogin: '/app/loginpost',
getDetails: '/api/ionic3/details'
};
}
@Injectable()
export class AppService {
constructor(public http: Http,
public loadingCtrl: LoadingController,
private alertCtrl: AlertController,
private toastCtrl: ToastController,) {
}
// 对参数进行编码
encode(params, flag) {
var str = '';
if (params) {
if (flag == 'get') { //get /a/b
for (var key in params) {
if (params.hasOwnProperty(key)) {
var value = params[key];
str += value + '/';
}
}
str = '/' + str.substring(0, str.length - 1);
}
if (flag == 'post') { //post a=b&c=d
for (var key in params) {
if (params.hasOwnProperty(key)) {
var value = params[key];
str += key + '=' + value + '&';
}
}
str = str.substring(0, str.length - 1);
}
}
return str;
}
//get请求
ObserverHttpGet(url, params): Observable<any> {
return this.http.get(url + this.encode(params, "get")) //本地
}
//get请求
ObserverHttpGetData(url, params): Observable<any> {
return this.http.get(url, params) //本地
}
//get请求
ObserverHttpGetAdd(url, params): Observable<any> {
return this.http.get(url+ params) //本地
}
//get请求带？的
ObserverHttpGetOption(url, params): Observable<any> {
return this.http.get(url, {params: params}); //本地
}
//delete
ObserverHttpDetelete(url, params): Observable<any> {
return this.http.delete(url + this.encode(params, "get")) //本地
}
//delete
ObserverHttpDeteleteOption(url, params): Observable<any> {
return this.http.delete(url + params); //本地
}
//delete
ObserverHttpDeteleteData(url, params,data): Observable<any> {
return this.http.delete(url + params,{
params:this.encode(data,'post'),
headers: new Headers({
// "Accept": "application/json",
"Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
})
}) //本地
}
ObserverHttpPostData(url, params) {
return this.http.post(url, params, { //本地
headers: new Headers({
// "Accept": "application/json",
"Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
})
})
}
ObserverHttpPostAdd(url, params) {
return this.http.post(url+ params, { //本地
headers: new Headers({
// "Accept": "application/json",
"Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
})
})
}
ObserverHttpPostOption(url,data) {
return this.http.post(url, null,{
params:data,
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(url, null, { //本地
params: params,
headers: new Headers({
// "Accept": "application/json",
// "Content-Type": "application/json"
'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8'
})
})
}
//post请求
ObserverHttpPost(url, params) {
return this.http.post(url, null, { //本地
params: this.encode(params, 'post'),
headers: new Headers({
// "Accept": "application/json",
//"Content-Type": "application/json,charset=UTF-8"
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
})
})
}
//post请求
ObserverHttpNoForm(url, params) {
return this.http.post(url,null,{
params:params,
headers: new Headers({
// "Accept": "application/json",
// "Content-Type": "application/json"
'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'
})
})
}
//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 + params, data, { //本地
headers: new Headers({
// "Accept": "application/json",
"Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
})
})
}
private handleError(error: Response | any) {
let msg = '';
if (error.status == 400) {
msg = '请求无效(code：404)';
console.log('请检查参数类型是否匹配');
}
if (error.status == 404) {
msg = '请求资源不存在(code：404)';
console.error(msg + '，请检查路径是否正确');
}
if (error.status == 500) {
msg = '服务器发生错误(code：500)';
console.error(msg + '，请检查路径是否正确');
}
console.log(error);
if (msg != '') {
this.toast(msg);
}
}
toast(message, callback?) {
let toast = this.toastCtrl.create({
message: message,
duration: 2000,
dismissOnPageChange: true,
});
toast.present();
if (callback) {
callback();
}
}
//position:top, bottom and middle
popToastView(message: string, position: string, duration: number) {
this.toastCtrl.create({
message: message,
position: position,
duration: duration,
//showCloseButton:true,
//closeButtonText:"关闭"
}).present();
}
alert(message, callback?) {
if (callback) {
let alert = this.alertCtrl.create({
title: '提示',
message: message,
buttons: ['取消', {
text: "确定",
handler: data => {
callback();
}
}]
});
alert.present();
} else {
let alert = this.alertCtrl.create({
title: '提示',
message: message,
buttons: ["确定"]
});
alert.present();
}
}
}
// //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';
// import {Http, Headers} from '@angular/http'; // import {Http, Headers} from '@angular/http';
...@@ -359,87 +73,85 @@ export class AppService { ...@@ -359,87 +73,85 @@ 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")) //app // return this.http.get(url + this.encode(params, "get")) //本地
// } // }
// //
// //get请求 // //get请求
// ObserverHttpGetData(url, params): Observable<any> { // ObserverHttpGetData(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain + url, params) //app // return this.http.get(url, params) //本地
// } // }
// //
// //get请求 // //get请求
// ObserverHttpGetAdd(url, params): Observable<any> { // ObserverHttpGetAdd(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain + url + params) //app // return this.http.get(url+ params) //本地
// } // }
// //
// //get请求带？的 // //get请求带？的
// ObserverHttpGetOption(url, params): Observable<any> { // ObserverHttpGetOption(url, params): Observable<any> {
// return this.http.get(AppGlobal.domain + url, {params: params}); //app // return this.http.get(url, {params: params}); //本地
// } // }
// //
// //delete // //delete
// ObserverHttpDetelete(url, params): Observable<any> { // ObserverHttpDetelete(url, params): Observable<any> {
// return this.http.delete(AppGlobal.domain + url + this.encode(params, "get")) //app // return this.http.delete(url + this.encode(params, "get")) //本地
// } // }
// //
// //delete // //delete
// ObserverHttpDeteleteOption(url, params): Observable<any> { // ObserverHttpDeteleteOption(url, params): Observable<any> {
// return this.http.delete(AppGlobal.domain + url + params) //app // return this.http.delete(url + params); //本地
// } // }
// //
// //delete // //delete
// ObserverHttpDeteleteData(url, params, data): Observable<any> { // ObserverHttpDeteleteData(url, params,data): Observable<any> {
// return this.http.delete(AppGlobal.domain + url + params, { //app // return this.http.delete(url + params,{
// params: this.encode(data, 'post'), // params:this.encode(data,'post'),
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// "Content-Type": "application/json" // "Content-Type": "application/json"
// // 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) //本地 // }) //本地
// } // }
// //
// ObserverHttpPostData(url, params) { // ObserverHttpPostData(url, params) {
// return this.http.post(AppGlobal.domain + url, params, { //app // return this.http.post(url, params, { //本地
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// "Content-Type": "application/json" // "Content-Type": "application/json"
// // 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) // })
// } // }
// //
//
// ObserverHttpPostAdd(url, params) { // ObserverHttpPostAdd(url, params) {
// return this.http.post(AppGlobal.domain + url + params, { //app // return this.http.post(url+ params, { //本地
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// "Content-Type": "application/json" // "Content-Type": "application/json"
// // 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) // })
// } // }
// //
// ObserverHttpPostOption(url, data) { // ObserverHttpPostOption(url,data) {
// return this.http.post(AppGlobal.domain + url, null, { //app // return this.http.post(url, null,{
// params: data, // params:data,
// headers: new Headers({
// 'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8'
// })
// });
//
// }
//
// //post请求
// ObserverHttpForm(url, params,body) {
// return this.http.post(AppGlobal.domain+url + params,null,{
// params:body,
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json", // // "Accept": "application/json",
// // "Content-Type": "application/json" // // "Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8' // 'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) // });
// //
// } // }
// //
// ObserverHttpPostForm(url, params) { // ObserverHttpPostForm(url, params) {
// return this.http.post(AppGlobal.domain + url, null, { //app // return this.http.post(url, null, { //本地
// params: params, // params: params,
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// // "Content-Type": "application/json"
// 'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8' // 'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) // })
...@@ -447,9 +159,11 @@ export class AppService { ...@@ -447,9 +159,11 @@ export class AppService {
// //
// //post请求 // //post请求
// ObserverHttpPost(url, params) { // ObserverHttpPost(url, params) {
// return this.http.post(AppGlobal.domain + url, null, { //app // 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",
// //"Content-Type": "application/json,charset=UTF-8"
// 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' // 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
// }) // })
// }) // })
...@@ -457,18 +171,32 @@ export class AppService { ...@@ -457,18 +171,32 @@ export class AppService {
// //
// //post请求 // //post请求
// ObserverHttpNoForm(url, params) { // ObserverHttpNoForm(url, params) {
// return this.http.post(AppGlobal.domain + url, null, { //app // return this.http.post(url,null,{
// params: params, // params:params,
// headers: new Headers({ // headers: new Headers({
// 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' // // "Accept": "application/json",
// // "Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'
// }) // })
// }) // })
// //
// } // }
// //
// //post请求 params+body // //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) { // ObserverHttpPostParamsBody(url, params, data) {
// return this.http.post(AppGlobal.domain + url + params, data, { //app // return this.http.post( url + params, data, { //app
// headers: new Headers({ // headers: new Headers({
// "Content-Type": "application/json" // "Content-Type": "application/json"
// }) // })
...@@ -477,9 +205,11 @@ export class AppService { ...@@ -477,9 +205,11 @@ export class AppService {
// //
// //put请求 // //put请求
// ObserverHttpPut(url, params, data) { // ObserverHttpPut(url, params, data) {
// return this.http.put(AppGlobal.domain + url + params, data, { //app // return this.http.put(url + params, data, { //本地
// headers: new Headers({ // headers: new Headers({
// // "Accept": "application/json",
// "Content-Type": "application/json" // "Content-Type": "application/json"
// // 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
// }) // })
// }) // })
// } // }
...@@ -522,6 +252,8 @@ export class AppService { ...@@ -522,6 +252,8 @@ export class AppService {
// message: message, // message: message,
// position: position, // position: position,
// duration: duration, // duration: duration,
// //showCloseButton:true,
// //closeButtonText:"关闭"
// }).present(); // }).present();
// } // }
// //
...@@ -551,6 +283,274 @@ export class AppService { ...@@ -551,6 +283,274 @@ export class AppService {
// } // }
//app请求方式
import {LoadingController, AlertController, ToastController} from 'ionic-angular';
import {Injectable} from '@angular/core';
import {Http, Headers} from '@angular/http';
import {Observable} from "rxjs";
@Injectable()
export class AppGlobal {
//缓存key的配置
static cache: any = {
slides: "_dress_slides",
categories: "_dress_categories",
products: "_dress_products"
}
//接口基地址 //测试环境
// static domain = "http://220.248.107.115:2239";
//正式环境
// static domain = "http://180.153.158.250:3306";
static domain = "http://180.168.156.212:2931";
//static domain = "http://localhost:8080"
//测试
// static picture = "http://220.248.107.115:2239/wisdomgroup/manager/getIcon/";
//正式
// static picture = "http://180.153.158.250:3306/wisdomgroup/manager/getIcon/";
static picture = "http://180.168.156.212:2931/wisdomgroup/manager/getIcon/";
//通知公告图片参数
static pictureNotice = "http://180.168.156.212:2931";
//接口地址
static API: any = {
getCategories: '/api/ionic3/getCategories',
getLogin: '/app/loginpost',
getDetails: '/api/ionic3/details'
};
}
@Injectable()
export class AppService {
constructor(public http: Http,
public loadingCtrl: LoadingController,
private alertCtrl: AlertController,
private toastCtrl: ToastController,) {
}
// 对参数进行编码
encode(params, flag) {
var str = '';
if (params) {
if (flag == 'get') { //get /a/b
for (var key in params) {
if (params.hasOwnProperty(key)) {
var value = params[key];
str += value + '/';
}
}
str = '/' + str.substring(0, str.length - 1);
}
if (flag == 'post') { //post a=b&c=d
for (var key in params) {
if (params.hasOwnProperty(key)) {
var value = params[key];
str += key + '=' + value + '&';
}
}
str = str.substring(0, str.length - 1);
}
}
return str;
}
//get请求
ObserverHttpGet(url, params): Observable<any> {
return this.http.get(AppGlobal.domain + url + this.encode(params, "get")) //app
}
//get请求
ObserverHttpGetData(url, params): Observable<any> {
return this.http.get(AppGlobal.domain + url, params) //app
}
//get请求
ObserverHttpGetAdd(url, params): Observable<any> {
return this.http.get(AppGlobal.domain + url + params) //app
}
//get请求带？的
ObserverHttpGetOption(url, params): Observable<any> {
return this.http.get(AppGlobal.domain + url, {params: params}); //app
}
//delete
ObserverHttpDetelete(url, params): Observable<any> {
return this.http.delete(AppGlobal.domain + url + this.encode(params, "get")) //app
}
//delete
ObserverHttpDeteleteOption(url, params): Observable<any> {
return this.http.delete(AppGlobal.domain + url + params) //app
}
//delete
ObserverHttpDeteleteData(url, params, data): Observable<any> {
return this.http.delete(AppGlobal.domain + url + params, { //app
params: this.encode(data, 'post'),
headers: new Headers({
"Content-Type": "application/json"
})
}) //本地
}
ObserverHttpPostData(url, params) {
return this.http.post(AppGlobal.domain + url, params, { //app
headers: new Headers({
"Content-Type": "application/json"
})
})
}
ObserverHttpPostAdd(url, params) {
return this.http.post(AppGlobal.domain + url + params, { //app
headers: new Headers({
"Content-Type": "application/json"
})
})
}
ObserverHttpPostOption(url, data) {
return this.http.post(AppGlobal.domain + url, null, { //app
params: data,
headers: new Headers({
'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8'
})
});
}
//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,
headers: new Headers({
'Content-Type': 'application/x-www-form-urlencoded,charset=UTF-8'
})
})
}
//post请求
ObserverHttpPost(url, params) {
return this.http.post(AppGlobal.domain + url, null, { //app
params: this.encode(params, 'post'),
headers: new Headers({
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
})
})
}
//post请求
ObserverHttpNoForm(url, params) {
return this.http.post(AppGlobal.domain + url, null, { //app
params: params,
headers: new Headers({
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
})
})
}
//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.put(AppGlobal.domain + url + params, data, { //app
headers: new Headers({
"Content-Type": "application/json"
})
})
}
private handleError(error: Response | any) {
let msg = '';
if (error.status == 400) {
msg = '请求无效(code：404)';
console.log('请检查参数类型是否匹配');
}
if (error.status == 404) {
msg = '请求资源不存在(code：404)';
console.error(msg + '，请检查路径是否正确');
}
if (error.status == 500) {
msg = '服务器发生错误(code：500)';
console.error(msg + '，请检查路径是否正确');
}
console.log(error);
if (msg != '') {
this.toast(msg);
}
}
toast(message, callback?) {
let toast = this.toastCtrl.create({
message: message,
duration: 2000,
dismissOnPageChange: true,
});
toast.present();
if (callback) {
callback();
}
}
//position:top, bottom and middle
popToastView(message: string, position: string, duration: number) {
this.toastCtrl.create({
message: message,
position: position,
duration: duration,
}).present();
}
alert(message, callback?) {
if (callback) {
let alert = this.alertCtrl.create({
title: '提示',
message: message,
buttons: ['取消', {
text: "确定",
handler: data => {
callback();
}
}]
});
alert.present();
} else {
let alert = this.alertCtrl.create({
title: '提示',
message: message,
buttons: ["确定"]
});
alert.present();
}
}
}
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