yuanye
/
puhui-go-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
master
袁野 4 months ago
parent 0bfd4909fd
commit 96bf7e340f
13 changed files with 116 additions and 80 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/data/goods/goods.namespace.ts
  2. 4
      src/app/pages/merchant/mer-list/mer-list.component.html
  3. 5
      src/app/pages/trade/comp-order/comp-order.component.ts
  4. 6
      src/app/pages/trade/goods-list/goods-list.component.ts
  5. 5
      src/app/pages/trade/order-after-sales/order-after-sales.component.ts
  6. 43
      src/app/pages/trade/order-cinema/order-cinema.component.html
  7. 3
      src/app/pages/trade/order-cinema/order-cinema.component.less
  8. 11
      src/app/pages/trade/order-cinema/order-cinema.component.ts
  9. 4
      src/app/pages/trade/order-refund/order-refund.component.ts
  10. 26
      src/app/pipes/goods/order-cinema-status.pipe.ts
  11. 7
      src/app/services/trade/order-cinema.service.ts
  12. 63
      src/app/utils/dateUtils.service.ts
  13. 17
      src/environments/environment.ts

2
src/app/data/goods/goods.namespace.ts
Unescape View File

@ -14,7 +14,7 @@ export const orderGoodsStatus = [
export const orderCinemaStatus = [ export const orderCinemaStatus = [
{name: "待付款" , key: 0} , {name: "未上送" , key: 0} ,
{name: "待出票" , key: 5}, {name: "待出票" , key: 5},
{name: "已出票" , key: 10}, {name: "已出票" , key: 10},
{name: "交易成功" , key: 15}, {name: "交易成功" , key: 15},

4
src/app/pages/merchant/mer-list/mer-list.component.html
Unescape View File

@ -336,8 +336,8 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item > <nz-form-item >
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>折扣比例</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>利润点</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入折扣比例!"> <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入利润点!">
<nz-input-number-group nzSuffix="%" style="width: 100%"> <nz-input-number-group nzSuffix="%" style="width: 100%">
<nz-input-number [nzMax]="100" [nzMin]="1" formControlName="discount" [nzPrecision]="2" ></nz-input-number> <nz-input-number [nzMax]="100" [nzMin]="1" formControlName="discount" [nzPrecision]="2" ></nz-input-number>
</nz-input-number-group> </nz-input-number-group>

5
src/app/pages/trade/comp-order/comp-order.component.ts
Unescape View File

@ -144,8 +144,8 @@ export class CompOrderComponent {
queryData() { queryData() {
if (this.searchForm.controls['createTimeArray'].value != null if (this.searchForm.controls['createTimeArray'].value != null
&& this.searchForm.controls['createTimeArray'].value.length > 0) { && this.searchForm.controls['createTimeArray'].value.length > 0) {
this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0]); this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0].getTime());
this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1]); this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1].getTime());
} else { } else {
this.searchForm.controls['createTimeS'].setValue(null) this.searchForm.controls['createTimeS'].setValue(null)
this.searchForm.controls['createTimeE'].setValue(null) this.searchForm.controls['createTimeE'].setValue(null)
@ -183,6 +183,7 @@ export class CompOrderComponent {
*/ */
createTimeInit() { createTimeInit() {
let createTimeSelect = this.searchForm.controls['createTimeSelect'].value; let createTimeSelect = this.searchForm.controls['createTimeSelect'].value;
console.log(createTimeSelect);
if (createTimeSelect != null) { if (createTimeSelect != null) {
let timeObj = DateUtils.getDate(new Date(), Number(createTimeSelect)); let timeObj = DateUtils.getDate(new Date(), Number(createTimeSelect));
this.searchForm.controls['createTimeArray'].setValue([timeObj.timeS, timeObj.timeE]); this.searchForm.controls['createTimeArray'].setValue([timeObj.timeS, timeObj.timeE]);

6
src/app/pages/trade/goods-list/goods-list.component.ts
Unescape View File

@ -152,7 +152,7 @@ export class GoodsListComponent {
status: [''], status: [''],
}); });
this.createTimeInit();
this.getRequest(); this.getRequest();
this.getGoodsTypeNode(); this.getGoodsTypeNode();
this.getGoodsBrandNode(); this.getGoodsBrandNode();
@ -164,8 +164,8 @@ export class GoodsListComponent {
if (this.searchForm.controls['createTimeArray'].value != null if (this.searchForm.controls['createTimeArray'].value != null
&& this.searchForm.controls['createTimeArray'].value.length > 0) { && this.searchForm.controls['createTimeArray'].value.length > 0) {
this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0]); this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0].getTime());
this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1]); this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1].getTime());
} else { } else {
this.searchForm.controls['createTimeS'].setValue(null) this.searchForm.controls['createTimeS'].setValue(null)
this.searchForm.controls['createTimeE'].setValue(null) this.searchForm.controls['createTimeE'].setValue(null)

5
src/app/pages/trade/order-after-sales/order-after-sales.component.ts
Unescape View File

@ -145,6 +145,7 @@ export class OrderAfterSalesComponent {
remarks: [''], remarks: [''],
}); });
this.createTimeInit(); this.createTimeInit();
this.createTimeInit();
this.queryData(); this.queryData();
} }
@ -154,8 +155,8 @@ export class OrderAfterSalesComponent {
queryData() { queryData() {
if (this.searchForm.controls['createTimeArray'].value != null if (this.searchForm.controls['createTimeArray'].value != null
&& this.searchForm.controls['createTimeArray'].value.length > 0) { && this.searchForm.controls['createTimeArray'].value.length > 0) {
this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0]); this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0].getTime());
this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1]); this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1].getTime());
} else { } else {
this.searchForm.controls['createTimeS'].setValue(null) this.searchForm.controls['createTimeS'].setValue(null)
this.searchForm.controls['createTimeE'].setValue(null) this.searchForm.controls['createTimeE'].setValue(null)

43
src/app/pages/trade/order-cinema/order-cinema.component.html
Unescape View File

@ -69,31 +69,31 @@
<tr> <tr>
<th nzWidth="200px">商品名称</th> <th nzWidth="200px">商品名称</th>
<th nzWidth="100px">商品图片</th> <th nzWidth="100px">商品图片</th>
<th nzWidth="100px">商品分类</th>
<th nzWidth="100px">商品品牌</th>
<th nzWidth="100px">用户手机号</th> <th nzWidth="100px">用户手机号</th>
<th nzWidth="100px">订单号</th> <th nzWidth="100px">订单号</th>
<th nzWidth="100px">子订单号</th> <th nzWidth="100px">子订单号</th>
<th nzWidth="100px">状态</th>
<th nzWidth="50px">创建时间</th> <th nzWidth="50px">创建时间</th>
<th nzWidth="50px">更新时间</th> <th nzWidth="50px">更新时间</th>
<th nzRight nzWidth="50px">物流状态</th> <th nzRight nzWidth="100px">异常问题</th>
<th nzRight nzWidth="70px">操作</th> <th nzRight nzWidth="70px">操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of basicTable.data"> <tr *ngFor="let data of basicTable.data" [ngClass]="{'fontColor': data.exceptionStatus === true }">
<td>{{data.goodsName}} - {{data.goodsSpecsName}}</td>
<td> <td>
<img nz-image width="60px" height="60px" nzSrc="{{imageUrl + data.img }}" [nzFallback]="fallbackImg" alt="" /> <p [innerHTML]="data.goodsName + data.goodsSpecsName"></p>
</td>
<td>
<img nz-image width="60px" height="60px" nzSrc="{{data.img }}" [nzFallback]="fallbackImg" alt="" />
</td> </td>
<td>{{data.goodsTypeName}}</td>
<td>{{data.goodsBrandName}}</td>
<td>{{data.userPhone}}</td> <td>{{data.userPhone}}</td>
<td>{{data.orderNo}}</td> <td>{{data.orderNo}}</td>
<td>{{data.childOrderNo}}</td> <td>{{data.childOrderNo}}</td>
<td>{{data.logisticsNo}}</td> <td>{{data.status | orderCinemaStatus}}</td>
<td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td> <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
<td>{{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td> <td>{{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td>
<td nzRight>{{data.exceptionMsg}}</td>
<td nzRight> <td nzRight>
<a (click)="showDetail(data)">详情</a> <a (click)="showDetail(data)">详情</a>
</td> </td>
@ -107,31 +107,16 @@
<nz-tabset nzType="card"> <nz-tabset nzType="card">
<nz-tab nzTitle="订单信息"> <nz-tab nzTitle="订单信息">
<nz-descriptions nzTitle="订单信息" nzBordered> <nz-descriptions nzTitle="订单信息" nzBordered>
<nz-descriptions-item nzTitle="商品名称">{{orderGoodsData?.goodsName}} - {{orderGoodsData?.goodsSpecsName}}</nz-descriptions-item> <nz-descriptions-item nzTitle="商品名称">
<p [innerHTML]="orderGoodsData.goodsName + orderGoodsData.goodsSpecsName"></p>
</nz-descriptions-item>
<nz-descriptions-item nzTitle="用户手机号">{{ orderGoodsData?.userPhone }}</nz-descriptions-item>//. <nz-descriptions-item nzTitle="用户手机号">{{ orderGoodsData?.userPhone }}</nz-descriptions-item>//.
0 <nz-descriptions-item nzTitle="商品分类">{{ orderGoodsData?.goodsTypeName }}</nz-descriptions-item> <nz-descriptions-item nzTitle="订单状态">{{ orderGoodsData?.status | orderCinemaStatus }}</nz-descriptions-item>//.
<nz-descriptions-item nzTitle="商品品牌">{{ orderGoodsData?.goodsBrandName }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="商品价格">{{ orderGoodsData?.goodsSpecsOriginalPrice }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="商品数量">{{ orderGoodsData?.goodsCount }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="图片" [nzSpan]="3"> <nz-descriptions-item nzTitle="图片" [nzSpan]="3">
<nz-image-group> <nz-image-group>
<img nz-image width="80px" [nzFallback]="fallbackImg" nzSrc="{{imageUrl + orderGoodsData.img }}" alt="" /> <img nz-image width="80px" [nzFallback]="fallbackImg" nzSrc="{{orderGoodsData.img }}" alt="" />
</nz-image-group> </nz-image-group>
</nz-descriptions-item> </nz-descriptions-item>
<nz-descriptions-item nzTitle="物流状态" [nzSpan]="3">
<span *ngIf="orderGoodsData?.logisticsStatusDesc == null">
{{orderGoodsData.status | orderGoodsStatus}}
</span>
<span *ngIf="orderGoodsData?.logisticsStatusDesc != null">
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'DELIVERING'" nzColor="cyan" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'TRANSPORT'" nzColor="lime" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'AGENT_SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'ACCEPT'" nzStatus="processing" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'FAILED'" nzStatus="error" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'WAIT_ACCEPT'" nzStatus="default" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
</span>
</nz-descriptions-item>
</nz-descriptions> </nz-descriptions>
</nz-tab> </nz-tab>
<nz-tab nzTitle="支付信息"> <nz-tab nzTitle="支付信息">

3
src/app/pages/trade/order-cinema/order-cinema.component.less
Unescape View File

@ -4,3 +4,6 @@
.search-area button { .search-area button {
margin-right: 8px; margin-right: 8px;
} }
.fontColor {
color: red;
}

11
src/app/pages/trade/order-cinema/order-cinema.component.ts
Unescape View File

@ -32,6 +32,7 @@ import {NzResultComponent} from "ng-zorro-antd/result";
import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker"; import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio"; import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio";
import {OrderCinemaService} from "../../../services/trade/order-cinema.service"; import {OrderCinemaService} from "../../../services/trade/order-cinema.service";
import {OrderCinemaStatusPipe} from "../../../pipes/goods/order-cinema-status.pipe";
@Component({ @Component({
selector: 'app-order-cinema', selector: 'app-order-cinema',
@ -82,6 +83,7 @@ import {OrderCinemaService} from "../../../services/trade/order-cinema.service";
NzRadioComponent, NzRadioComponent,
NzRadioGroupComponent, NzRadioGroupComponent,
NzRangePickerComponent, NzRangePickerComponent,
OrderCinemaStatusPipe,
], ],
templateUrl: './order-cinema.component.html', templateUrl: './order-cinema.component.html',
styleUrl: './order-cinema.component.less' styleUrl: './order-cinema.component.less'
@ -128,7 +130,7 @@ export class OrderCinemaComponent {
payType: [''], payType: [''],
status: [''], status: [''],
}); });
this.createTimeInit();
this.getRequest(); this.getRequest();
} }
@ -137,8 +139,8 @@ export class OrderCinemaComponent {
if (this.searchForm.controls['createTimeArray'].value != null if (this.searchForm.controls['createTimeArray'].value != null
&& this.searchForm.controls['createTimeArray'].value.length > 0) { && this.searchForm.controls['createTimeArray'].value.length > 0) {
this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0]); this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0].getTime());
this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1]); this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1].getTime());
} else { } else {
this.searchForm.controls['createTimeS'].setValue(null) this.searchForm.controls['createTimeS'].setValue(null)
this.searchForm.controls['createTimeE'].setValue(null) this.searchForm.controls['createTimeE'].setValue(null)
@ -168,13 +170,14 @@ export class OrderCinemaComponent {
createTimeInit() { createTimeInit() {
let createTimeSelect = this.searchForm.controls['createTimeSelect'].value; let createTimeSelect = this.searchForm.controls['createTimeSelect'].value;
if (createTimeSelect != null) { if (createTimeSelect != null) {
console.log("createTimeSelect", createTimeSelect);
let timeObj = DateUtils.getDate(new Date(), Number(createTimeSelect)); let timeObj = DateUtils.getDate(new Date(), Number(createTimeSelect));
this.searchForm.controls['createTimeArray'].setValue([timeObj.timeS, timeObj.timeE]); this.searchForm.controls['createTimeArray'].setValue([timeObj.timeS, timeObj.timeE]);
} }
} }
showDetail(data: OrderGoodsData): void { showDetail(data: any): void {
this.orderGoodsData = data; this.orderGoodsData = data;
this.orderDetailModal = true; this.orderDetailModal = true;
} }

4
src/app/pages/trade/order-refund/order-refund.component.ts
Unescape View File

@ -142,8 +142,8 @@ export class OrderRefundComponent {
queryData() { queryData() {
if (this.searchForm.controls['createTimeArray'].value != null if (this.searchForm.controls['createTimeArray'].value != null
&& this.searchForm.controls['createTimeArray'].value.length > 0) { && this.searchForm.controls['createTimeArray'].value.length > 0) {
this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0]); this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0].getTime());
this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1]); this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1].getTime());
} else { } else {
this.searchForm.controls['createTimeS'].setValue(null); this.searchForm.controls['createTimeS'].setValue(null);
this.searchForm.controls['createTimeE'].setValue(null); this.searchForm.controls['createTimeE'].setValue(null);

26
src/app/pipes/goods/order-cinema-status.pipe.ts
Unescape View File

@ -0,0 +1,26 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
name: 'orderCinemaStatus',
standalone: true
})
export class OrderCinemaStatusPipe implements PipeTransform {
transform(value: number): any {
switch (value) {
case 0:
return '未上送';
case 5:
return '待出票';
case 10:
return '已出票';
case 15:
return '交易成功';
case -5:
return '已取消';
default:
return '未知状态'
}
}
}

7
src/app/services/trade/order-cinema.service.ts
Unescape View File

@ -20,4 +20,11 @@ export class OrderCinemaService {
callBack(data); callBack(data);
}); });
} }
public queryOrder(param: any, callBack:any) {
param.time = new Date().getTime();
this.http.get(environment.orderUrl + 'orderCinema/queryOrder?'+ObjectData.objectByString(param)).subscribe(data => {
callBack(data);
});
}
} }

63
src/app/utils/dateUtils.service.ts
Unescape View File

@ -22,30 +22,39 @@ export class DateUtils {
*/ */
public static getDate(currentDate: Date, type: number): any { public static getDate(currentDate: Date, type: number): any {
const returnObj = { const returnObj = {
timeS: 0, timeS: new Date(),
timeE: 0, timeE: new Date(),
} }
if (type === 1) { if (type === 1) {
currentDate.setHours(0); const start = new Date(currentDate);
currentDate.setMinutes(0);
currentDate.setSeconds(0); start.setHours(0);
returnObj.timeS = currentDate.getTime(); start.setMinutes(0);
currentDate.setHours(23); start.setSeconds(0);
currentDate.setMinutes(59); returnObj.timeS = start;
currentDate.setSeconds(59);
returnObj.timeE = currentDate.getTime(); const end = new Date(currentDate);
end.setHours(23);
end.setMinutes(59);
end.setSeconds(59);
returnObj.timeE = currentDate;
} else if (type === 2) { } else if (type === 2) {
currentDate.setDate(currentDate.getDate() - 1)
currentDate.setHours(0); const start = new Date(currentDate);
currentDate.setMinutes(0); start.setDate(currentDate.getDate() - 1)
currentDate.setSeconds(0); start.setHours(0);
returnObj.timeS = currentDate.getTime(); start.setMinutes(0);
currentDate.setHours(23); start.setSeconds(0);
currentDate.setMinutes(59); returnObj.timeS = start;
currentDate.setSeconds(59);
returnObj.timeE = currentDate.getTime(); const end = new Date(currentDate);
end.setDate(currentDate.getDate() - 1)
end.setHours(23);
end.setMinutes(59);
end.setSeconds(59);
returnObj.timeE = end;
} else if (type === 3) { } else if (type === 3) {
const dayOfWeek = currentDate.getDay(); const dayOfWeek = currentDate.getDay();
@ -56,14 +65,14 @@ export class DateUtils {
start.setHours(0); start.setHours(0);
start.setMinutes(0); start.setMinutes(0);
start.setSeconds(0); start.setSeconds(0);
returnObj.timeS = start.getTime(); returnObj.timeS = start;
const end = new Date(currentDate); const end = new Date(currentDate);
end.setDate(end.getDate() + 6) end.setDate(end.getDate() + 6)
end.setHours(23); end.setHours(23);
end.setMinutes(59); end.setMinutes(59);
end.setSeconds(59); end.setSeconds(59);
returnObj.timeE = end.getTime(); returnObj.timeE = end;
} else if (type === 4) { } else if (type === 4) {
const startOfThisWeek = new Date(currentDate.getFullYear(),currentDate.getMonth(),currentDate.getDate() - currentDate.getDay() + 1); const startOfThisWeek = new Date(currentDate.getFullYear(),currentDate.getMonth(),currentDate.getDate() - currentDate.getDay() + 1);
@ -73,12 +82,12 @@ export class DateUtils {
startOfLastWeek .setHours(0); startOfLastWeek .setHours(0);
startOfLastWeek .setMinutes(0); startOfLastWeek .setMinutes(0);
startOfLastWeek .setSeconds(0); startOfLastWeek .setSeconds(0);
returnObj.timeS = startOfLastWeek .getTime(); returnObj.timeS = startOfLastWeek;
endOfLastWeek.setHours(23); endOfLastWeek.setHours(23);
endOfLastWeek.setMinutes(59); endOfLastWeek.setMinutes(59);
endOfLastWeek.setSeconds(59); endOfLastWeek.setSeconds(59);
returnObj.timeE = endOfLastWeek.getTime(); returnObj.timeE = endOfLastWeek;
} else if (type === 5) { } else if (type === 5) {
var daysInMonth = new Date(currentDate.getFullYear(), currentDate.getMonth()+1, 0).getDate(); var daysInMonth = new Date(currentDate.getFullYear(), currentDate.getMonth()+1, 0).getDate();
@ -88,14 +97,14 @@ export class DateUtils {
start.setHours(0); start.setHours(0);
start.setMinutes(0); start.setMinutes(0);
start.setSeconds(0); start.setSeconds(0);
returnObj.timeS = start.getTime(); returnObj.timeS = start;
const end = new Date(currentDate); const end = new Date(currentDate);
end.setDate(daysInMonth) end.setDate(daysInMonth)
end.setHours(23); end.setHours(23);
end.setMinutes(59); end.setMinutes(59);
end.setSeconds(59); end.setSeconds(59);
returnObj.timeE = end.getTime(); returnObj.timeE = end;
} else if (type === 6) { } else if (type === 6) {
var daysInMonth = new Date(currentDate.getFullYear(), currentDate.getMonth(), 0).getDate(); var daysInMonth = new Date(currentDate.getFullYear(), currentDate.getMonth(), 0).getDate();
@ -106,7 +115,7 @@ export class DateUtils {
start.setHours(0); start.setHours(0);
start.setMinutes(0); start.setMinutes(0);
start.setSeconds(0); start.setSeconds(0);
returnObj.timeS = start.getTime(); returnObj.timeS = start;
const end = new Date(currentDate); const end = new Date(currentDate);
end.setMonth(currentDate.getMonth() - 1); end.setMonth(currentDate.getMonth() - 1);
@ -114,7 +123,7 @@ export class DateUtils {
end.setHours(23); end.setHours(23);
end.setMinutes(59); end.setMinutes(59);
end.setSeconds(59); end.setSeconds(59);
returnObj.timeE = end.getTime(); returnObj.timeE = end;
} }
return returnObj; return returnObj;

17
src/environments/environment.ts
Unescape View File

@ -4,14 +4,15 @@
export const environment = { export const environment = {
production: false, production: false,
// baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
// orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
// userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址) userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/', imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/',
baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址) // baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址) // orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/', // userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/',
}; };

Write Preview
Loading…
Cancel
Save