Merge branch 'dev'

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

@@ -198,7 +198,7 @@
                 <nz-form-label [nzSpan]="6" nzRequired>卡券</nz-form-label>
                 <nz-form-control [nzSpan]="16" nzErrorTip="请选择卡券!">
                     <nz-select nzShowSearch nzAllowClear formControlName="couponId" nzPlaceHolder="请选择卡券">
-                        <nz-option *ngFor="let item of distributeList" nzLabel="{{item.couponName + '-(有效库存:' + item.stockCount + ')'}}"
+                        <nz-option *ngFor="let item of distributeList" nzLabel="【{{item['displayArea'] | displayArea}}】{{ item.couponName + '-(有效库存:' + item.stockCount + ')'}}"
                                    nzValue="{{item.id}}"></nz-option>
                     </nz-select>
                 </nz-form-control>
@@ -238,16 +238,18 @@
             (nzPageSizeChange)="getRequestList(false)">
         <thead nzSingleSort>
         <tr>
-            <th nzWidth="80px">卡券名称</th>
-            <th nzWidth="80px">卡券销售价格</th>
-            <th nzWidth="80px">库存数量</th>
-            <th nzWidth="70px">销售数量</th>
+            <th nzWidth="50px">展示专区</th>
+            <th nzWidth="100px">卡券名称</th>
+            <th nzWidth="50px">卡券价格</th>
+            <th nzWidth="50px">库存数量</th>
+            <th nzWidth="50px">销售数量</th>
             <th nzWidth="70px">分发时间</th>
             <th nzWidth="70px">操作</th>
         </tr>
         </thead>
         <tbody>
         <tr *ngFor="let data of ajaxTableList.data; let i = index">
+            <td>{{data['highCoupon']['displayArea'] | displayArea}}</td>
             <td>{{data['couponName']}}</td>
             <td>{{data['salesPrice']}}元</td>
             <td>{{data['stockCount']}}</td>

src/app/admin/merchant-store/store-edit/store-edit.component.html

@@ -94,7 +94,7 @@
                         </nz-form-control>
                     </nz-form-item>
                 </div>
-                <nz-divider nzText="设备信息"></nz-divider>
+<!--                <nz-divider nzText="设备信息"></nz-divider>
                 <div nz-col [nzSpan]="8">
                     <nz-form-item>
                         <nz-form-label [nzFor]="'deviceSn'" >打印机编号</nz-form-label>
@@ -118,7 +118,7 @@
                             <input nz-input placeholder="请输入打印机名称..."  [formControlName]="'deviceName'" id="'deviceName'" />
                         </nz-form-control>
                     </nz-form-item>
-                </div>
+                </div>-->
                 <nz-divider nzText="定位信息"></nz-divider>
 
 <!--                <div nz-col [nzSpan]="8">-->