-
-
+
+ brand works!
+ +
+
+
+
+
+
+ 共计 {{total}} 条数据
+
+
+
+
+ 编号
+ 标题
+ 图片
+ 创建时间
+ 更新时间
+ 操作
+
+
+
+
+ {{i+1}}
+ {{data.title}}
+
+ 
+
+ {{data.createdTime | date: 'yyyy-MM-dd HH:mm'}}
+ {{data.updatedTime | date: 'yyyy-MM-dd HH:mm'}}
+
+ 编辑
+
+
+
+
+
+
+
+ 品牌
+
+
+
+
+
+
+
+
+
+ 是否预约产品
+
+
@@ -141,6 +165,14 @@
+
+
+ 归库天数
+
+
+
+
+
diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
index 01fbc0c..48f83a4 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
@@ -7,6 +7,7 @@ import {ActivatedRoute} from '@angular/router';
import {CouponService} from '../../../services/coupon.service';
import {IconService} from '../../../services/icon.service';
import {CommonsService} from '../../../services/commons.service';
+import {ConfigService} from "../../../services/config.service";
function getBase64(file: File): Promise {
return new Promise((resolve, reject) => {
const reader = new FileReader();
@@ -46,11 +47,14 @@ export class CouponEditComponent implements OnInit {
pageNumCoupon = 1;
couponName: string;
content: string;
+ goodsTypeData;
+ brandData;
constructor(
private fb: FormBuilder,
private merchant: MerchantService,
private coupon: CouponService,
private common: CommonsService,
+ private config: ConfigService,
private message: NzMessageService, // 信息提示
private activatedRoute: ActivatedRoute,
) {
@@ -79,6 +83,7 @@ export class CouponEditComponent implements OnInit {
discountPrice: [null, [Validators.required]],
merchantId: [null, [Validators.required]],
isPresent: [false],
+ reserveStatus: [false],
payType: [null, [Validators.required]],
displayArea: [null],
couponSource: [null],
@@ -86,10 +91,20 @@ export class CouponEditComponent implements OnInit {
status: [null],
couponKey: [null],
createTime: [null],
+ brandId: [null],
+ goodsTypeId: [null],
secUser: {},
});
- }
+ const params = {
+ pageNum: 1,
+ pageSize: 10000
+ };
+ this.config.getListGoodsType(params , data => {
+ this.goodsTypeData = data['return_data'].list;
+ });
+
+ }
// 查询商户
loadMore(): void {
@@ -102,6 +117,7 @@ export class CouponEditComponent implements OnInit {
this.getMerchantList(paramsObject);
}
+
// 搜索商户
search(e): void {
this.optionList = [];
@@ -155,6 +171,19 @@ export class CouponEditComponent implements OnInit {
this.getCouponList(paramsObject);
}
+ public getBrandByList(e): void {
+
+ const params = {
+ pageNum: 1,
+ pageSize: 10000,
+ goodTypeId: e
+ };
+
+ this.config.getBrandByList(params , data => {
+ this.brandData = data['return_data'].list;
+ });
+ }
+
// 查询卡券
public getCouponList(paramsObject): void {
this.coupon.getCouponList(paramsObject , data => {
@@ -284,6 +313,8 @@ export class CouponEditComponent implements OnInit {
data['return_data']['couponType'] = String(data['return_data']['couponType']);
data['return_data']['displayArea'] = String(data['return_data']['displayArea']);
data['return_data']['payType'] = String(data['return_data']['payType']);
+ data['return_data']['brandId'] = String(data['return_data']['brandId']);
+ data['return_data']['goodsTypeId'] = String(data['return_data']['goodsTypeId']);
data['return_data']['couponSource'] = String(data['return_data']['couponSource']);
if (data['return_data']['couponImg'] != null && data['return_data']['couponImg'] !== '') {
const couponImg = String(data['return_data']['couponImg']);
diff --git a/src/app/admin/coupon/coupon-list/coupon-list.component.html b/src/app/admin/coupon/coupon-list/coupon-list.component.html
index 0440f7c..4c01bfd 100644
--- a/src/app/admin/coupon/coupon-list/coupon-list.component.html
+++ b/src/app/admin/coupon/coupon-list/coupon-list.component.html
@@ -15,6 +15,26 @@
+
+
+ 商品分类
+
+
+
+
+
+
+
+
+ 品牌
+
+
+
+
+
+