diff --git a/src/app/admin/api-merchants/list/list.component.html b/src/app/admin/api-merchants/list/list.component.html index 07489a6..818db18 100644 --- a/src/app/admin/api-merchants/list/list.component.html +++ b/src/app/admin/api-merchants/list/list.component.html @@ -309,7 +309,7 @@ - + diff --git a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html index d43eb2a..e5217e1 100644 --- a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html +++ b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html @@ -11,60 +11,19 @@ 产品类型 - - - - + + + + + + + + + -
- - 产品 - - - - - - -
-
- - 产品 - - - - - - -
-
- - 产品 - - - - - - - - -
-
- - 产品 - - - - - - - - -
- - @@ -88,6 +47,7 @@ 编号 积分返利比例 类型 - 产品 + 返利时间范围 创建时间 操作 @@ -114,7 +74,7 @@ {{i + 1}} {{data.percentage + "%"}} {{data.type | integralType}} - {{data.type | integralProduct : data.productId}} + {{data.startTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.endTime | date: 'yyyy-MM-dd HH:mm'}} {{data.createTime | date: 'yyyy-MM-dd HH:mm'}} @@ -136,46 +96,15 @@ 产品类型 - - - - - - - - - 卡券产品 - - - - - - - - 在线加油产品 - - - - - - - - 话费产品 - - - - - - - - - - 第三方产品 - - - - - + + + + + + + + + @@ -185,7 +114,6 @@ - 积分返利比例 diff --git a/src/app/admin/config-manage/third-product/third-product.component.html b/src/app/admin/config-manage/third-product/third-product.component.html index 9330f1f..9676a12 100644 --- a/src/app/admin/config-manage/third-product/third-product.component.html +++ b/src/app/admin/config-manage/third-product/third-product.component.html @@ -37,6 +37,7 @@ 订单金额 支付金额 支付方式 - 支付卡号 订单状态 创建时间 操作 @@ -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 9dbda16..467a933 100644 --- a/src/app/admin/order-manage/order-manage-routing.module.ts +++ b/src/app/admin/order-manage/order-manage-routing.module.ts @@ -7,11 +7,12 @@ import {OrderRefundListComponent} from './order-refund-list/order-refund-list.co 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 {OrderListComponent} from '../recharge-order/order-list/order-list.component'; import {DiscountUseConditionListComponent} from './discount-use-condition-list/discount-use-condition-list.component'; import {DicountPackageOrderListComponent} from './dicount-package-order-list/dicount-package-order-list.component'; import {PreOrderComponent} from './pre-order/pre-order.component'; + + const routes: Routes = [ { path: 'order-oil-list', component: OrderOilListComponent }, { path: 'order-coupon-list', component: OrderCouponListComponent }, @@ -20,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 6be31aa..0584d39 100644 --- a/src/app/admin/order-manage/order-manage.module.ts +++ b/src/app/admin/order-manage/order-manage.module.ts @@ -21,7 +21,9 @@ import {NzSpaceModule} from 'ng-zorro-antd/space'; import {RegionSelectorModule} from '../../common/region-selector/region-selector.module'; @NgModule({ - declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent], + declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, + // MobileRechargeOrderListComponent, + PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent], 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/integral/integral-type.pipe.ts b/src/app/pipes/integral/integral-type.pipe.ts index 1ad396d..9663a1b 100644 --- a/src/app/pipes/integral/integral-type.pipe.ts +++ b/src/app/pipes/integral/integral-type.pipe.ts @@ -8,13 +8,23 @@ export class IntegralTypePipe implements PipeTransform { transform(value: number): string { switch (value) { case 1: - return '卡券'; + return '星巴克'; case 2: - return '在线加油'; + return '肯德基'; case 3: - return '话费'; + return '会员充值'; case 4: - return '第三方'; + return '积分充值'; + case 5: + return '购买卡券'; + case 6: + return '加油服务'; + case 7: + return '优惠券包'; + case 8: + return '汇联通充值'; + case 9: + return '话费充值'; } } 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 a86a6f4..76173d9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,14 +4,11 @@ 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/', - imageUrl: 'https://hsgcs.dctpay.com/filesystem/', baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址) - // imageUrl: 'https://hsgcs.dctpay.com/filesystem/', + imageUrl: 'https://hsgcs.dctpay.com/filesystem/', + // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + // 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=', };