Merge branch 'master' of http://139.159.177.244:3000/yuanye/high-web

src/app/admin/coupon/coupon-edit/coupon-edit.component.html

@@ -24,7 +24,7 @@
                 <nz-form-item>
                     <nz-form-label [nzFor]="'couponType'"  nzRequired>卡券类型</nz-form-label>
                     <nz-form-control  nzErrorTip="请选择卡券类型!">
-                        <nz-select nzPlaceHolder="请选择卡券类型"  [formControlName]="'couponType'">
+                        <nz-select [nzDisabled]="editFlag" nzPlaceHolder="请选择卡券类型"  [formControlName]="'couponType'">
                             <nz-option nzValue="1" nzLabel="内部卷"></nz-option>
                             <nz-option nzValue="2" nzLabel="外部卷"></nz-option>
                         </nz-select>
@@ -35,7 +35,7 @@
                 <nz-form-item>
                     <nz-form-label [nzFor]="'couponSource'" >卡券来源</nz-form-label>
                     <nz-form-control  nzErrorTip="请选择卡券来源!">
-                        <nz-select nzPlaceHolder="请选择卡券来源"  [formControlName]="'couponSource'">
+                        <nz-select  [nzDisabled]="editFlag" nzPlaceHolder="请选择卡券来源"  [formControlName]="'couponSource'">
                             <nz-option nzValue="1" nzLabel="中石化"></nz-option>
                             <nz-option nzValue="2" nzLabel="消费券"></nz-option>
                             <nz-option nzValue="3" nzLabel="其他卡券"></nz-option>
@@ -194,6 +194,7 @@
                         <nz-upload
                                 nzAction="{{WEB_SERVE_URL}}/fileUpload/uploadfile"
                                 nzListType="picture-card"
+                                [nzMultiple]="true"
                                 [(nzFileList)]="couponCarouselImg"
                                 [nzShowButton]="couponCarouselImg.length < 5"
                                 [nzPreview]="handlePreview"
@@ -217,6 +218,7 @@
                                 nzAction="{{WEB_SERVE_URL}}/fileUpload/uploadfile"
                                 nzListType="picture-card"
                                 [(nzFileList)]="couponDescImg"
+                                [nzMultiple]="true"
                                 [nzShowButton]="couponDescImg.length < 5"
                                 [nzPreview]="handlePreview"
                         >
@@ -234,8 +236,8 @@
         </div>
         <div nz-row>
             <div nz-col [nzSpan]="24" class="search-area">
-                <button nz-button (click)="resetForm()">重置</button>
-                <button nz-button [nzType]="'primary'" (click)="getSave()">提交</button>
+<!--                <button nz-button (click)="resetForm()">重置</button>-->
+                <button nz-button [nzType]="'primary'" style="width: 200px;" [nzSize]="'Large'" (click)="getSave()">提交</button>
             </div>
         </div>
     </form>

src/app/admin/coupon/coupon-edit/coupon-edit.component.ts

@@ -150,6 +150,7 @@ export class CouponEditComponent implements OnInit {
       pageNum: this.pageNumCoupon,
       pageSize: this.pageSizeCoupon,
       merchantName: e,
+      status: 2,
     };
     this.getCouponList(paramsObject);
   }

src/app/admin/coupon/coupon-list/coupon-list.component.html

@@ -41,7 +41,7 @@
                 <nz-form-item>
                     <nz-form-label [nzSpan]="6">卡券类型</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <nz-select [formControlName]="'couponType'">
+                        <nz-select nzShowSearch nzAllowClear [formControlName]="'couponType'">
                             <nz-option nzValue="1" nzLabel="内部卷"></nz-option>
                             <nz-option nzValue="2" nzLabel="外部卷"></nz-option>
                         </nz-select>
@@ -52,7 +52,7 @@
                 <nz-form-item>
                     <nz-form-label [nzSpan]="6">卡券状态</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <nz-select [formControlName]="'status'">
+                        <nz-select nzShowSearch nzAllowClear [formControlName]="'status'">
                             <nz-option nzValue="1" nzLabel="编辑中"></nz-option>
                             <nz-option nzValue="2" nzLabel="已上架"></nz-option>
                             <nz-option nzValue="3" nzLabel="已下架"></nz-option>

src/app/admin/merchant/merchant-detail/merchant-detail.component.html

@@ -1,7 +1,7 @@
 <div class="inner-content">
     <nz-descriptions  nzBordered>
         <nz-descriptions-item nzTitle="商户logo" [nzSpan]="3">
-            <img class="head_img" src="{{data.merchantLogo}}" onerror="this.src='../../../../assets/admin/navigation/icon.png'" alt="">
+            <img class="head_img" src="{{FILE_URL + data.merchantLogo}}" onerror="this.src='../../../../assets/admin/navigation/icon.png'" alt="">
         </nz-descriptions-item>
         <nz-descriptions-item nzTitle="登录账户">{{data['secUser']['loginName']}}</nz-descriptions-item>
         <nz-descriptions-item nzTitle="商户编号">{{data['merchantKey']}}</nz-descriptions-item>

src/app/admin/merchant/merchant-detail/merchant-detail.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import {MerchantService} from '../../../services/merchant.service';
 import {NzMessageService} from 'ng-zorro-antd';
 import {ActivatedRoute} from '@angular/router';
+import {environment} from '../../../../environments/environment';
 
 @Component({
   selector: 'app-merchant-detail',
@@ -12,6 +13,7 @@ export class MerchantDetailComponent implements OnInit {
 
   data: any = {};
   id: number;
+  FILE_URL =  environment.imageUrl;
   constructor(
       private merchant: MerchantService,
       private message: NzMessageService, // 信息提示