From ddc4c26996baab83e21c4f443a30ae98d2b124be Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Mon, 20 Nov 2023 14:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third-product/third-product.component.html | 1 + src/app/admin/coupon/coupon-routing.module.ts | 4 +++- src/app/admin/coupon/coupon.module.ts | 4 +++- .../discount-edit/discount-edit.component.html | 11 ----------- src/app/app-common.module.ts | 4 +++- src/app/pipes/index.ts | 1 + src/app/pipes/third-product/product-type.pipe.ts | 1 + src/app/services/coupon.service.ts | 11 +++++++++++ src/environments/environment.ts | 8 +++----- 9 files changed, 26 insertions(+), 19 deletions(-) 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 f1cc5ea..1ae65f8 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 @@ -99,6 +99,7 @@ + diff --git a/src/app/admin/coupon/coupon-routing.module.ts b/src/app/admin/coupon/coupon-routing.module.ts index ccd9149..a80d518 100644 --- a/src/app/admin/coupon/coupon-routing.module.ts +++ b/src/app/admin/coupon/coupon-routing.module.ts @@ -5,6 +5,7 @@ import {CouponEditComponent} from './coupon-edit/coupon-edit.component'; import {CouponDetailComponent} from './coupon-detail/coupon-detail.component'; import {SalesCodeListComponent} from './sales-code-list/sales-code-list.component'; import { BlxCouponComponent } from './blx-coupon/blx-coupon.component'; +import {ScPrinterListComponent} from "./sc-printer-list/sc-printer-list.component"; const routes: Routes = [ @@ -12,7 +13,8 @@ const routes: Routes = [ { path: 'coupon-edit', component: CouponEditComponent }, { path: 'coupon-detail', component: CouponDetailComponent }, { path: 'salesCode-list', component: SalesCodeListComponent }, - {path:'blx-coupon',component:BlxCouponComponent} + {path:'blx-coupon',component:BlxCouponComponent}, + {path:'sc-printer-list',component:ScPrinterListComponent} ]; @NgModule({ diff --git a/src/app/admin/coupon/coupon.module.ts b/src/app/admin/coupon/coupon.module.ts index a583866..14cd791 100644 --- a/src/app/admin/coupon/coupon.module.ts +++ b/src/app/admin/coupon/coupon.module.ts @@ -13,10 +13,12 @@ import {RichtextModule} from '../../common/richtext/richtext.module'; import {AppCommonModule} from '../../app-common.module'; import { SalesCodeListComponent } from './sales-code-list/sales-code-list.component'; import { BlxCouponComponent } from './blx-coupon/blx-coupon.component'; +import { ScPrinterListComponent } from './sc-printer-list/sc-printer-list.component'; @NgModule({ declarations: [CouponListComponent, CouponEditComponent, CouponDetailComponent, SalesCodeListComponent, - BlxCouponComponent], + BlxCouponComponent, + ScPrinterListComponent], imports: [ CommonModule, CouponRoutingModule, diff --git a/src/app/admin/discount/discount-edit/discount-edit.component.html b/src/app/admin/discount/discount-edit/discount-edit.component.html index 2ac4557..be06c57 100644 --- a/src/app/admin/discount/discount-edit/discount-edit.component.html +++ b/src/app/admin/discount/discount-edit/discount-edit.component.html @@ -23,17 +23,6 @@ -
优惠券名称 diff --git a/src/app/app-common.module.ts b/src/app/app-common.module.ts index 4e16f70..162724a 100644 --- a/src/app/app-common.module.ts +++ b/src/app/app-common.module.ts @@ -81,6 +81,7 @@ import {MsgTypePipe} from './pipes/msg/msg-type.pipe'; import { OrderProductTypePipe } from './pipes/order/order-product-type.pipe'; import { LogisticsStatusPipe } from './pipes/goods/logistics-status.pipe'; import { GoodsStatusPipe } from './pipes/goods/goods-status.pipe'; +import { ScPrinterPipe } from './pipes/api-coupon/sc-printer.pipe'; @@ -156,7 +157,8 @@ const PIPES = [ ReceiveTypePipe, LogisticsStatusPipe, OrderProductTypePipe, - GoodsStatusPipe + GoodsStatusPipe, + ScPrinterPipe, ]; diff --git a/src/app/pipes/index.ts b/src/app/pipes/index.ts index 646de1c..f79b133 100644 --- a/src/app/pipes/index.ts +++ b/src/app/pipes/index.ts @@ -63,3 +63,4 @@ export * from './apiMerchant/verify-product-type.pipe'; export * from './order/order-product-type.pipe'; export * from './goods/logistics-status.pipe'; export * from './goods/goods-status.pipe'; +export * from './api-coupon/sc-printer.pipe'; diff --git a/src/app/pipes/third-product/product-type.pipe.ts b/src/app/pipes/third-product/product-type.pipe.ts index 9947c43..bd7d297 100644 --- a/src/app/pipes/third-product/product-type.pipe.ts +++ b/src/app/pipes/third-product/product-type.pipe.ts @@ -15,6 +15,7 @@ export class ProductTypePipe implements PipeTransform { 7: ['优惠券包'], 8: ['汇联通充值'], 10: ['实物购买'], + 17: ['团购套餐'], }; transform(type: number , product: number): string { diff --git a/src/app/services/coupon.service.ts b/src/app/services/coupon.service.ts index bd2212b..a055d15 100644 --- a/src/app/services/coupon.service.ts +++ b/src/app/services/coupon.service.ts @@ -178,6 +178,17 @@ export class CouponService { }); } + /** + * 获取四川中石油卡券 + * + * @param callBack 返回参数 + */ + public synCouponRule(callBack) { + this.http.get(environment.baseUrl + 'apiCoupon/synCouponRule').subscribe(data => { + callBack(data); + }); + } + /** diff --git a/src/environments/environment.ts b/src/environments/environment.ts index fc4bf0d..c6b7d7c 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,11 +5,9 @@ export const environment = { production: false, baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) - // orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址) - // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - // baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址) - // orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) - orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) + orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址) + // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + // orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) imageUrl: 'https://hsgcs.dctpay.com/filesystem/', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',