diff --git a/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.html b/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.html index f7d9b14..02cd3c6 100644 --- a/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.html +++ b/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.html @@ -157,7 +157,6 @@ 订单金额 支付金额 支付方式 - 支付卡号 订单状态 创建时间 操作 @@ -171,7 +170,6 @@ ¥{{data.totalPrice}} ¥{{data.payPrice}} {{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}} - {{data.memCardNo}} {{data.orderStatus | orderStatus}} {{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} diff --git a/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts b/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts index d96bc99..d79b04d 100644 --- a/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts +++ b/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts @@ -7,7 +7,7 @@ import {CommonsService} from '../../../../services/commons.service'; import {animate, state, style, transition, trigger} from '@angular/animations'; import {NzMessageService} from 'ng-zorro-antd'; import {OrderThirdPartyService} from '../../../../services/order/order-third-party.service'; -import {environment} from "../../../../../environments/environment"; +import {environment} from '../../../../../environments/environment'; @Component({ diff --git a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html index 88d481d..31b4b22 100644 --- a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html +++ b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html @@ -158,7 +158,6 @@ 订单金额 支付金额 支付方式 - 支付卡号 订单状态 创建时间 操作 @@ -172,7 +171,6 @@ ¥{{data.totalPrice}} ¥{{data.payPrice}} {{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}} - {{data.memCardNo}} {{data.orderStatus | orderStatus}} {{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} diff --git a/src/app/admin/order-manage/order-manage-routing.module.ts b/src/app/admin/order-manage/order-manage-routing.module.ts index 40cec00..3624604 100644 --- a/src/app/admin/order-manage/order-manage-routing.module.ts +++ b/src/app/admin/order-manage/order-manage-routing.module.ts @@ -10,7 +10,7 @@ import {MemberChargeOrderListComponent} from './member-charge-order/member-charg import {PreOrderComponent} from '../order/pre-order/pre-order.component'; import {DiscountUseConditionListComponent} from '../order/discount-use-condition-list/discount-use-condition-list.component'; import {DicountPackageOrderListComponent} from '../order/dicount-package-order-list/dicount-package-order-list.component'; -import {OrderListComponent} from '../recharge-order/order-list/order-list.component'; +import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mobile-recharge-order-list.component'; const routes: Routes = [ @@ -21,7 +21,7 @@ const routes: Routes = [ { path: 'order-kfc-list', component: KfcOrderListComponent}, { path: 'order-starbucks--list', component: StarbucksOrderListComponent}, { path: 'order-member-charge--list', component: MemberChargeOrderListComponent}, - { path: 'mobile-recharge-order-list', component: OrderListComponent }, + { path: 'mobile-recharge-order-list', component: MobileRechargeOrderListComponent }, { path: 'pre-order', component: PreOrderComponent }, { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent }, { path: 'discount-package-order-list', component: DicountPackageOrderListComponent}, diff --git a/src/app/admin/order-manage/order-manage.module.ts b/src/app/admin/order-manage/order-manage.module.ts index 92bc788..31a7344 100644 --- a/src/app/admin/order-manage/order-manage.module.ts +++ b/src/app/admin/order-manage/order-manage.module.ts @@ -13,9 +13,10 @@ import { OrderRefundListComponent } from './order-refund-list/order-refund-list. import {KfcOrderListComponent} from './kfc-order/kfc-order-list/kfc-order-list.component'; import { StarbucksOrderListComponent } from './starbucks-order/starbucks-order-list/starbucks-order-list.component'; import { MemberChargeOrderListComponent } from './member-charge-order/member-charge-order-list/member-charge-order-list.component'; +import { MobileRechargeOrderListComponent } from './mobile-recharge-order-list/mobile-recharge-order-list.component'; @NgModule({ - declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent], + declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent], imports: [ CommonModule, OrderManageRoutingModule, diff --git a/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.html b/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.html index 88d481d..31b4b22 100644 --- a/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.html +++ b/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.html @@ -158,7 +158,6 @@ 订单金额 支付金额 支付方式 - 支付卡号 订单状态 创建时间 操作 @@ -172,7 +171,6 @@ ¥{{data.totalPrice}} ¥{{data.payPrice}} {{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}} - {{data.memCardNo}} {{data.orderStatus | orderStatus}} {{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} diff --git a/src/app/admin/recharge-order/order-list/order-list.component.ts b/src/app/admin/recharge-order/order-list/order-list.component.ts index 5d098b5..a095bdc 100644 --- a/src/app/admin/recharge-order/order-list/order-list.component.ts +++ b/src/app/admin/recharge-order/order-list/order-list.component.ts @@ -8,9 +8,9 @@ import {IconService} from '../../../services/icon.service'; import {RechargeService} from '../../../services/recharge.service'; import {NzMessageService, NzModalService, NzUploadChangeParam} from 'ng-zorro-antd'; import {FormBuilder, FormGroup, Validators} from '@angular/forms'; -import {ADMIN_INFO_OBJECT} from "../../../services/local-storage.namespace"; -import {CompanyService} from "../../../services/company.service"; -import {LocalStorageService} from "../../../services/local-storage.service"; +import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; +import {CompanyService} from '../../../services/company.service'; +import {LocalStorageService} from '../../../services/local-storage.service'; @Component({ selector: 'app-order-list', diff --git a/src/app/pipes/recharge-status.pipe.ts b/src/app/pipes/recharge-status.pipe.ts index fced286..5a6e2bf 100644 --- a/src/app/pipes/recharge-status.pipe.ts +++ b/src/app/pipes/recharge-status.pipe.ts @@ -15,6 +15,8 @@ export class RechargeStatusPipe implements PipeTransform { return '充值失败'; case 204: return '未充值'; + case 205: + return '充值异常'; } } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3a8927e..76173d9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,13 +5,10 @@ export const environment = { production: false, baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) - // imageUrl: 'https://hsgcs.dctpay.com/filesystem/', - // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - // orderUrl: 'https://hsgcs.dctpay.com/order/', + orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址) imageUrl: 'https://hsgcs.dctpay.com/filesystem/', // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) - // imageUrl: 'https://hsgcs.dctpay.com/filesystem/', + // orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', };