Skip to content

P
party-build-cloud
Commit 20e7f987 authored by wangqinghua's avatar wangqinghua
Browse files
Options

订购更新

parent c81d49f6
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 103 deletions
ionic.config.json
View file @ 20e7f987
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
"proxies": [ "proxies": [
{ {
"path": "/wisdomgroup", "path": "/wisdomgroup",
"proxyUrl": "http://218.78.19.169:8081/wisdomgroup" "proxyUrl": "http://47.103.33.196:8080/wisdomgroup"
}, },
{ {
"path": "/logistics", "path": "/logistics",
"proxyUrl": "http://218.78.19.169:8081/logistics" "proxyUrl": "http://47.103.33.196:8080/logistics"
} }
] ]
} }
src/pages/serve-pages/food/food.ts
View file @ 20e7f987
...@@ -201,11 +201,10 @@ export class FoodPage { ...@@ -201,11 +201,10 @@ export class FoodPage {
this.serveSer.getGoodsInfo().subscribe( this.serveSer.getGoodsInfo().subscribe(
(res) => { (res) => {
if (res.data && res.data.length > 0) { if (res.data && res.data.length > 0) {
const obj = res.data[0]; const obj = res.data[0].goodsStoreList[0];
if (obj.isPurchasing == 0) this.commonSer.toast('订购时间为:' + obj.startTime + "~" + obj.endTime); if (obj.isPurchasing == 0) this.commonSer.toast('订购时间为:' + obj.startTime + "~" + obj.endTime);
if (obj.isPurchasing == 1) this.navCtrl.push(RushBuyPage); if (obj.isPurchasing == 1) this.navCtrl.push(RushBuyPage);
if (obj.isPurchasing == 2) this.commonSer.toast('今日物品已订购完,请明天再来'); if (obj.isPurchasing == 2) this.commonSer.toast('今日物品已订购完,请明天再来');
;
} else { } else {
this.commonSer.toast('暂无订购物品') this.commonSer.toast('暂无订购物品')
} }
......
src/pages/serve-pages/food/rush-buy/rush-buy.html
View file @ 20e7f987
...@@ -8,28 +8,14 @@ ...@@ -8,28 +8,14 @@
<ion-content> <ion-content>
<ion-item (click)="chooseFood()"> <div class="item-box" *ngFor="let item of goodsInfo?.goodsStoreList">
<ion-label class="item-left"><span class="color-red">*</span>物品:</ion-label> <div class="left">{{item.goodsName}} <span>(余:{{item.everydayAmount - item.purchasedAmount}})</span>:</div>
<ion-label [ngStyle]="{'color':obj.foodText == '请选择'?'#999':'#333'}"
class="choose">{{obj.foodText}}</ion-label>
<ion-label class="right-arrow">
<ion-icon name="arrow-forward"></ion-icon>
</ion-label>
</ion-item>
<div class="item-box">
<div class="left">剩余数量:</div>
<div class="right num"> <div class="right num">
{{obj?.everydayAmount - obj?.purchasedAmount}} <span class="reduce" (click)="reduce(item)">-</span>
<input type="number" value="1" [(ngModel)]="item.peopleCount">
<span class="add" (click)="add(item)">+</span>
</div> </div>
</div> </div>
<div class="item-box"> <p class="buy-remark">{{goodsInfo?.remark}}</p>
<div class="left">数量:</div>
<div class="right num">
<span class="reduce" (click)="reduce()">-</span>
<input type="number" value="1" [(ngModel)]="obj.peopleCount">
<span class="add" (click)="add()">+</span>
</div>
</div>
<p class="buy-remark">{{obj.remark}}</p>
<button class="submit-btn submit" (click)="save()">提交</button> <button class="submit-btn submit" (click)="save()">提交</button>
</ion-content> </ion-content>
src/pages/serve-pages/food/rush-buy/rush-buy.scss
View file @ 20e7f987
...@@ -76,15 +76,24 @@ page-rush-buy { ...@@ -76,15 +76,24 @@ page-rush-buy {
border-bottom: 0.55px solid #eeeeee; border-bottom: 0.55px solid #eeeeee;
.left { .left {
text-align: right; width: 40%;
width: 20%;
font-weight: bold; font-weight: bold;
font-size: 1.4rem; font-size: 1.4rem;
margin: 11px 8px 11px 0; margin: 11px 8px 11px 0;
display: flex;
align-items: center;
justify-content: flex-end;
span {
display: inline-block;
font-size: 12px;
transform: scale(0.9);
font-weight: normal;
}
} }
.right { .right {
width: 80%; width: 60%;
padding: 11px 8px 11px 16px; padding: 11px 8px 11px 16px;
.div-tag { .div-tag {
......
src/pages/serve-pages/food/rush-buy/rush-buy.ts
View file @ 20e7f987
...@@ -9,18 +9,8 @@ import {CommonService} from "../../../../provide/common.service"; ...@@ -9,18 +9,8 @@ import {CommonService} from "../../../../provide/common.service";
}) })
export class RushBuyPage { export class RushBuyPage {
obj = {
peopleCount: 10, goodsInfo;
food: '',
foodText: '请选择',
type: null,
unitPrice: null,
purchaseVersion: null,
remark:null,
everydayAmount:null,
purchasedAmount:null
};
foodList;
constructor(public navCtrl: NavController, public navParams: NavParams, private commonSer: CommonService, constructor(public navCtrl: NavController, public navParams: NavParams, private commonSer: CommonService,
private actionSheetCtrl: ActionSheetController, private serveSer: ServeService, private actionSheetCtrl: ActionSheetController, private serveSer: ServeService,
...@@ -28,82 +18,58 @@ export class RushBuyPage { ...@@ -28,82 +18,58 @@ export class RushBuyPage {
} }
ionViewDidLoad() { ionViewDidLoad() {
console.log('ionViewDidLoad RushBuyPage');
this.getGoodsInfo(); this.getGoodsInfo();
} }
getGoodsInfo() { getGoodsInfo() {
this.serveSer.getGoodsInfo().subscribe( this.serveSer.getGoodsInfo().subscribe(
(res) => { (res) => {
this.foodList = res.data; this.goodsInfo = res.data[0];
this.obj.foodText = this.foodList[0].goodsName; this.goodsInfo.goodsStoreList.forEach(e => e.peopleCount = "0");
this.obj.purchaseVersion = this.foodList[0].version; console.log(this.goodsInfo);
this.obj.unitPrice = this.foodList[0].unitPrice;
this.obj.type = this.foodList[0].id;
this.obj.remark = this.foodList[0].remark;
this.obj.purchasedAmount = this.foodList[0].purchasedAmount;
this.obj.everydayAmount = this.foodList[0].everydayAmount;
} }
) )
} }
chooseFood() {
const btnArr = this.foodList.map(e => {
const data = {
text: e.goodsName,
role: e.id,
handler: () => {
this.obj.foodText = e.goodsName;
this.obj.purchaseVersion = e.version;
this.obj.unitPrice = e.unitPrice;
this.obj.type = e.id;
this.obj.purchasedAmount = e.purchasedAmount;
this.obj.everydayAmount = e.everydayAmount;
}
};
return data;
});
btnArr.push({
text: '取消',
role: 'cancel',
handler: () => {
console.log('Cancel clicked');
}
});
const actionSheet = this.actionSheetCtrl.create({
cssClass: 'cameraAction',
buttons: btnArr
});
actionSheet.present();
}
//增加 //增加
add() { add(item) {
if (this.obj.peopleCount < 10) this.obj.peopleCount++; if (item.peopleCount < 10) item.peopleCount++;
} }
//减少 //减少
reduce() { reduce(item) {
if (this.obj.peopleCount > 1) this.obj.peopleCount--; if (item.peopleCount > 0) item.peopleCount--;
} }
save() { save() {
if (!this.obj.type) { let sum = 0;
this.goodsInfo.goodsStoreList.forEach((e) => sum += Number(e.peopleCount));
console.log(sum);
if (sum == 0) {
this.commonSer.toast('请选择物品'); this.commonSer.toast('请选择物品');
return false; return false;
} }
if (sum > 10) {
this.commonSer.toast('总数最多选择10个');
return false;
}
const loading = this.loadCtrl.create({ const loading = this.loadCtrl.create({
content: '订购中...', content: '订购中...',
}); });
loading.present(); loading.present();
const data = { const data = [];
diffFlag: '2', this.goodsInfo.goodsStoreList.forEach(e => {
type: this.obj.type, const d = {
peopleCount: this.obj.peopleCount, type: this.goodsInfo.id,
unitPrice: this.obj.unitPrice, reserve1: e.id,
version: this.obj.purchaseVersion peopleCount: e.peopleCount,
amount: e.unitPrice,
remark: this.goodsInfo.remark,
diffFlag: 2
}; };
this.serveSer.saveMeals(data).subscribe( data.push(d);
});
this.serveSer.savePurchase(data).subscribe(
(res) => { (res) => {
loading.dismiss(); loading.dismiss();
if (res.errcode == "1000") { if (res.errcode == "1000") {
......
src/pages/serve-pages/hair-cut/hair-cut.ts
View file @ 20e7f987
...@@ -91,8 +91,9 @@ export class HairCutPage { ...@@ -91,8 +91,9 @@ export class HairCutPage {
this.page.isLoad = false; this.page.isLoad = false;
this.applyList = res.data.list; this.applyList = res.data.list;
this.page.total = res.data.total; this.page.total = res.data.total;
this.applyList.forEach(e=>{ this.applyList.forEach(e => {
e.appointmentTime = new Date(e.appointmentDate+' 00:00:00').getTime(); const startTime = e.appointmentDate + " " + e.startEndStr.split("-")[0] + ":00";
e.appointmentTime = new Date(startTime).getTime();
}) })
timer(800).subscribe(e.complete()); timer(800).subscribe(e.complete());
} }
...@@ -114,8 +115,9 @@ export class HairCutPage { ...@@ -114,8 +115,9 @@ export class HairCutPage {
(res) => { (res) => {
this.page.total = res.total; this.page.total = res.total;
this.applyList = this.applyList.concat(res.list); this.applyList = this.applyList.concat(res.list);
this.applyList.forEach(e=>{ this.applyList.forEach(e => {
e.appointmentTime = new Date(e.appointmentDate+' 00:00:00').getTime(); const startTime = e.appointmentDate + " " + e.startEndStr.split("-")[0] + ":00";
e.appointmentTime = new Date(startTime).getTime();
}) })
timer(800).subscribe(() => e.complete()); timer(800).subscribe(() => e.complete());
} }
...@@ -134,8 +136,9 @@ export class HairCutPage { ...@@ -134,8 +136,9 @@ export class HairCutPage {
this.page.isLoad = false; this.page.isLoad = false;
this.applyList = res.data.list; this.applyList = res.data.list;
this.page.total = res.data.total; this.page.total = res.data.total;
this.applyList.forEach(e=>{ this.applyList.forEach(e => {
e.appointmentTime = new Date(e.appointmentDate+' 00:00:00').getTime(); const startTime = e.appointmentDate + " " + e.startEndStr.split("-")[0] + ":00";
e.appointmentTime = new Date(startTime).getTime();
}) })
} }
) )
...@@ -147,7 +150,7 @@ export class HairCutPage { ...@@ -147,7 +150,7 @@ export class HairCutPage {
this.commonSer.toast("已过期不可取消"); this.commonSer.toast("已过期不可取消");
return; return;
} }
this.commonSer.alert('确定取消?',()=>{ this.commonSer.alert('确定取消?', () => {
this.serveSer.cancelHair(item.id).subscribe( this.serveSer.cancelHair(item.id).subscribe(
(res) => { (res) => {
if (res.errcode == 1000) { if (res.errcode == 1000) {
......
src/pages/serve-pages/serve.service.ts
View file @ 20e7f987
import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service"; @Injectable()export class ServeService { constructor( private http: HttpClient, //该请求 将结果转为json private commonSer: CommonService, private https: Http, //该请求不转json ) { } getAllOrganization(data): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data)); } /** 物品领用 **/ //办公用品列表 searchSupplies(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data)); } //物品详情 supplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params); } //保存订单 saveOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data); } //查询订单 myOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data)); } //类型列表 getTypeList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null); } //购物车 shoppingCar(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data)); } //更新购物车 saveOrderSuppy(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data); } //删除购物车物品 deleteOrderSuppy(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params); } //申请审核 dealOrder(data, params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/dealOrder/' + params, this.commonSer.toFormData(data)); } //查询待提交 searchUnsubmit(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchUnsubmit', this.commonSer.toFormData(data)); } //查询待发放 searchSubmited(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmited', this.commonSer.toFormData(data)); } //查询待发放 searchSubmitedForApp(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmitedForApp', this.commonSer.toFormData(data)); } //已完成 searchDelivery(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchDelivery', this.commonSer.toFormData(data)); } //发放物品 delivery(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/delivery', this.commonSer.toFormData(data)); } //物品评价 orderScore(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordersuppy/score', data); } orderDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/personDetail/' + params); } /** 会议室预定 **/ queryMeetingRoomByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMeetingRoomByDate', this.commonSer.toFormData(data)); } //预定详情 meetDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/detail/' + params); } //获取服务 //会议室列表 getRoomList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null); } //部领导列表 getLeaders(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null); } //保存会议申请 saveApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data); } //我的预定列表 queryMyApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMyApply', this.commonSer.toFormData(data)); } //取消预定 cancelApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/cancel/' + params); } //查询已审核/未审核的申请 searchCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/meetingapply/searchCheckList', this.commonSer.toFormData(data)); } //审核通过/驳回 meetOperate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/operate', this.commonSer.toFormData(data)); } //查询会议室 meetQueryByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryByDate', this.commonSer.toFormData(data)); } /** 用车申请 **/ //保存申请 saveCarApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/saveApply', data); } //获取司机 getCarList(): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getCarList'); } //获取车辆 getDriverList(): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getDriverList'); } //根据日期查询用车信息 queryCarApplyByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/queryCarApplyByDate', this.commonSer.toFormData(data)); } //查询用车申请详情 carDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/detail/' + params,); } //我的申请 myCarApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/myApply', this.commonSer.toFormData(data)); } //取消申请 cancelCarApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/cancel/' + params,); } //查询已审核/未审核的申请 searchCarCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/carapply/searchCheckList', this.commonSer.toFormData(data)); } //审核通过/驳回 carOperate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/operate', data); } /*****理发********/ //保存理发预约 saveHairApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/saveApply', data); } //取消预约 cancelHair(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/cancel/' + params,); } //预约详情 hairApplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/detail/' + params,); } //根据日期查询预约信息 queryAppointmentByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/queryAppointmentByDate', this.commonSer.toFormData(data)); } //我的预约 myAppointment(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/myAppointment', this.commonSer.toFormData(data)); } /**访客登记**/ //查询访客 searchVisitor(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/searchVisitor', this.commonSer.toFormData(data)); } //保存访客 saveVisitorApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/save', data); } //访客登记详情 editVisitorApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/editVisitor/' + params); } //我的访客 myVisitor(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/myVisitor', this.commonSer.toFormData(data)); } //根据日期查询访客登记 findVisitorByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/findVisitorByDate', this.commonSer.toFormData(data)); } //取消预约 cancelVisitor(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/cancel/' + params); } //确认到访 confirmVisit(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/confirmVisit/' + params); } /** 业务制度 **/ //业务制度详情 businessDetail(params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/detail/' + params, null); } //查询业务制度列表 searchBusinessSystem(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/searchBusinessSystem', this.commonSer.toFormData(data)); } /**预约订餐**/ //保存订餐信息 saveMeals(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/save', data); } //取消订单 cancelMeals(params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/cancel/' + params, null); } //审核通过/驳回接口 operateMeals(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/operate/', this.commonSer.toFormData(data)); } //我的订餐 myBook(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/myBook', this.commonSer.toFormData(data)); } //日历查询订餐信息 mealsQueryByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/queryByDate', this.commonSer.toFormData(data)); } //查询已处理/未处理订餐 searchMealCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/searchCheckList', this.commonSer.toFormData(data)); } //订餐详情 detailMeals(params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/detail/' + params, null); } //查询订购的商品 getGoodsInfo(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/purchase/everydayPurchase/getGoodsInfo', null); } /**一键报修**/ //保存报修数据 saveRepair(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/save', data); } //日历查询报修数据 findRepairByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/findRepairByDate', this.commonSer.toFormData(data) ); } //查询我的报修 myRepair(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/myRepair', data); } //查询详情 editRepair(params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/editRepair/' + params, null); } } import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service"; @Injectable()export class ServeService { constructor( private http: HttpClient, //该请求 将结果转为json private commonSer: CommonService, private https: Http, //该请求不转json ) { } getAllOrganization(data): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data)); } /** 物品领用 **/ //办公用品列表 searchSupplies(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data)); } //物品详情 supplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params); } //保存订单 saveOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data); } //查询订单 myOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data)); } //类型列表 getTypeList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null); } //购物车 shoppingCar(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data)); } //更新购物车 saveOrderSuppy(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data); } //删除购物车物品 deleteOrderSuppy(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params); } //申请审核 dealOrder(data, params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/dealOrder/' + params, this.commonSer.toFormData(data)); } //查询待提交 searchUnsubmit(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchUnsubmit', this.commonSer.toFormData(data)); } //查询待发放 searchSubmited(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmited', this.commonSer.toFormData(data)); } //查询待发放 searchSubmitedForApp(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmitedForApp', this.commonSer.toFormData(data)); } //已完成 searchDelivery(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchDelivery', this.commonSer.toFormData(data)); } //发放物品 delivery(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/delivery', this.commonSer.toFormData(data)); } //物品评价 orderScore(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordersuppy/score', data); } orderDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/personDetail/' + params); } /** 会议室预定 **/ queryMeetingRoomByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMeetingRoomByDate', this.commonSer.toFormData(data)); } //预定详情 meetDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/detail/' + params); } //获取服务 //会议室列表 getRoomList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null); } //部领导列表 getLeaders(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null); } //保存会议申请 saveApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data); } //我的预定列表 queryMyApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMyApply', this.commonSer.toFormData(data)); } //取消预定 cancelApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/cancel/' + params); } //查询已审核/未审核的申请 searchCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/meetingapply/searchCheckList', this.commonSer.toFormData(data)); } //审核通过/驳回 meetOperate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/operate', this.commonSer.toFormData(data)); } //查询会议室 meetQueryByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryByDate', this.commonSer.toFormData(data)); } /** 用车申请 **/ //保存申请 saveCarApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/saveApply', data); } //获取司机 getCarList(): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getCarList'); } //获取车辆 getDriverList(): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getDriverList'); } //根据日期查询用车信息 queryCarApplyByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/queryCarApplyByDate', this.commonSer.toFormData(data)); } //查询用车申请详情 carDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/detail/' + params,); } //我的申请 myCarApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/myApply', this.commonSer.toFormData(data)); } //取消申请 cancelCarApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/cancel/' + params,); } //查询已审核/未审核的申请 searchCarCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/carapply/searchCheckList', this.commonSer.toFormData(data)); } //审核通过/驳回 carOperate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/operate', data); } /*****理发********/ //保存理发预约 saveHairApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/saveApply', data); } //取消预约 cancelHair(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/cancel/' + params,); } //预约详情 hairApplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/detail/' + params,); } //根据日期查询预约信息 queryAppointmentByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/queryAppointmentByDate', this.commonSer.toFormData(data)); } //我的预约 myAppointment(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/myAppointment', this.commonSer.toFormData(data)); } /**访客登记**/ //查询访客 searchVisitor(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/searchVisitor', this.commonSer.toFormData(data)); } //保存访客 saveVisitorApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/save', data); } //访客登记详情 editVisitorApply(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/editVisitor/' + params); } //我的访客 myVisitor(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/myVisitor', this.commonSer.toFormData(data)); } //根据日期查询访客登记 findVisitorByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/findVisitorByDate', this.commonSer.toFormData(data)); } //取消预约 cancelVisitor(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/cancel/' + params); } //确认到访 confirmVisit(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/confirmVisit/' + params); } /** 业务制度 **/ //业务制度详情 businessDetail(params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/detail/' + params, null); } //查询业务制度列表 searchBusinessSystem(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/searchBusinessSystem', this.commonSer.toFormData(data)); } /**预约订餐**/ //保存订餐信息 saveMeals(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/save', data); } //保存订购信息 bookmeals/savePurchase savePurchase(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/savePurchase', data); } //取消订单 cancelMeals(params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/cancel/' + params, null); } //审核通过/驳回接口 operateMeals(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/operate/', this.commonSer.toFormData(data)); } //我的订餐 myBook(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/myBook', this.commonSer.toFormData(data)); } //日历查询订餐信息 mealsQueryByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/queryByDate', this.commonSer.toFormData(data)); } //查询已处理/未处理订餐 searchMealCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/searchCheckList', this.commonSer.toFormData(data)); } //订餐详情 detailMeals(params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/detail/' + params, null); } //查询订购的商品 getGoodsInfo(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/purchase/everydayPurchase/getGoodsInfo', null); } /**一键报修**/ //保存报修数据 saveRepair(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/save', data); } //日历查询报修数据 findRepairByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/findRepairByDate', this.commonSer.toFormData(data) ); } //查询我的报修 myRepair(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/myRepair', data); } //查询详情 editRepair(params): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/repair/editRepair/' + params, null); } }
\ No newline at end of file \ No newline at end of file
......
src/pages/tabs/discover/discover.ts
View file @ 20e7f987
...@@ -598,6 +598,8 @@ export class DiscoverPage { ...@@ -598,6 +598,8 @@ export class DiscoverPage {
this.obj.branchId = null; this.obj.branchId = null;
} }
this.getBanner(); this.getBanner();
this.pageNum = 1;
const data = { const data = {
pageNum: 1, pageNum: 1,
pageSize: this.pageSize, pageSize: this.pageSize,
......
src/service/http.service.ts
View file @ 20e7f987
...@@ -22,12 +22,10 @@ export class AppGlobal { ...@@ -22,12 +22,10 @@ export class AppGlobal {
static domain = ""; //本地环境 static domain = ""; //本地环境
//图片地址 //图片地址
// static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/"; //正式地址 static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/";
static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/"; //测试
//通知公告图片参数 //通知公告图片参数
// static pictureNotice = AppGlobal.domain; //正式地址 static pictureNotice = AppGlobal.domain;
static pictureNotice = AppGlobal.domain; //测试
//默认版本 //默认版本
static defaultVersion = "4.6.0"; //dev static defaultVersion = "4.6.0"; //dev
......
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