修改代码

pull/1/head
袁野 2 years ago
parent d6d1471490
commit d71591fbba
  1. 2
      src/app/admin/config-manage/goods-type/goods-type.component.html
  2. 8
      src/app/admin/coupon/coupon-edit/coupon-edit.component.html
  3. 1
      src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
  4. 2
      src/app/admin/coupon/coupon-list/coupon-list.component.html

@ -66,7 +66,7 @@
<td nzRight="0px" class="table-td-operation"> <td nzRight="0px" class="table-td-operation">
<a (click)="getEdit(data.id)">编辑</a> <a (click)="getEdit(data.id)">编辑</a>
<nz-divider nzType="vertical"></nz-divider> <nz-divider nzType="vertical"></nz-divider>
<a (click)="getDetail(data.id)">删除</a> <a (click)="showDeleteConfirm(data.id)">删除</a>
</td> </td>
</tbody> </tbody>
</nz-table> </nz-table>

@ -150,6 +150,14 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col [nzSpan]="8">
<nz-form-item>
<nz-form-label [nzFor]="'buyPoints'" nzRequired>是否直接充值积分</nz-form-label>
<nz-form-control nzErrorTip="请选择!">
<nz-switch [formControlName]="'buyPoints'" ></nz-switch>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="8"> <div nz-col [nzSpan]="8">
<nz-form-item> <nz-form-item>

@ -84,6 +84,7 @@ export class CouponEditComponent implements OnInit {
merchantId: [null, [Validators.required]], merchantId: [null, [Validators.required]],
isPresent: [false], isPresent: [false],
reserveStatus: [false], reserveStatus: [false],
buyPoints: [false],
payType: [null, [Validators.required]], payType: [null, [Validators.required]],
displayArea: [null], displayArea: [null],
couponSource: [null], couponSource: [null],

@ -165,7 +165,7 @@
<td nzRight> <td nzRight>
<span *ngIf="data.status === 2" style="color: limegreen">{{data.status | couponStatus}}</span> <span *ngIf="data.status === 2" style="color: limegreen">{{data.status | couponStatus}}</span>
<span *ngIf="data.status === 3" style="color: red">{{data.status | couponStatus}}</span> <span *ngIf="data.status === 3" style="color: red">{{data.status | couponStatus}}</span>
<span *ngIf="data.status === 1 || data.status === 102">{{data.status | couponStatus}}</span> <span *ngIf="data.status === 1 || data.status === 102 || data.status === 101">{{data.status | couponStatus}}</span>
</td> </td>
<td nzRight class="table-td-operation"> <td nzRight class="table-td-operation">

Loading…
Cancel
Save