Compare commits

...

3 Commits

Author SHA1 Message Date
袁野 48b9c4fb94 1 9 months ago
袁野 83b28e62eb 1 9 months ago
袁野 82e00c8dff 1 1 year ago
  1. 13447
      package-lock.json
  2. 2
      src/app/admin/activate/activate-edit/activate-edit.component.html
  3. 13
      src/app/admin/api-merchants/list/list.component.html
  4. 3
      src/app/admin/api-merchants/list/list.component.ts

13447
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -127,7 +127,7 @@
<nz-form-label [nzSpan]="6" nzRequired>奖励图片</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-upload
nzAction="{{POST_URL}}/fileUpload/uploadfile"
nzAction="{{POST_URL}}/fileUpload/fileUpload"
nzListType="picture-card"
[(nzFileList)]="logoFile"
[nzShowButton]="logoFile.length < 1"

@ -161,6 +161,19 @@
<nz-input-number style="width: 100%" formControlName="amount" [nzMin]="0" [nzMax]="9999999" [nzStep]="1" [nzPrecision]="2"></nz-input-number>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired >验证码手机号</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select nzShowSearch nzAllowClear formControlName="phone" nzPlaceHolder="请选择验证码手机号">
<nz-option nzLabel="18090580471" [nzValue]="'18090580471'"></nz-option>
<nz-option nzLabel="17726395120" [nzValue]="'17726395120'"></nz-option>
<nz-option nzLabel="15736027036" [nzValue]="'15736027036'"></nz-option>
<nz-option nzLabel="13251378838" [nzValue]="'13251378838'"></nz-option>
<nz-option nzLabel="13983618575" [nzValue]="'13983618575'"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired >验证码</nz-form-label>
<nz-form-control [nzSpan]="14">

@ -103,6 +103,7 @@ export class ListComponent implements OnInit {
this.rechargeForm = this.form.group({
merchantId: [null, [Validators.required]],
amount: [null, [Validators.required]],
phone: [null, [Validators.required]],
smsCode: [null, [Validators.required]],
});
this.searchForm = this.form.group({
@ -298,7 +299,7 @@ export class ListComponent implements OnInit {
this.rechargeForm.controls.merchantId.disable();
this.rechargeForm.controls.amount.disable();
this.common.sendRechargeSmsCode('18090580471', this.rechargeParam['merchantId'], this.rechargeParam['amount'], data => {
this.common.sendRechargeSmsCode(this.rechargeForm.value['phone'], this.rechargeParam['merchantId'], this.rechargeParam['amount'], data => {
if (data['return_code'] === '000000') {
this.getVerifyCodeCountdown();
} else {

Loading…
Cancel
Save