新增油站生成二维码

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

@@ -251,8 +251,9 @@ export class AgentListComponent implements OnInit {
         }
         this.isOkLoading = true;
 
-        this.validateFormDistribute.value['agentName'] = this.requestData.find(data => data.id = this.agentId).agentName;
+
-        this.validateFormDistribute.value['couponName'] = this.couponList.find(data => data.id = this.validateFormDistribute.value['couponId']).couponName;
+        this.validateFormDistribute.value['agentName'] = this.requestData.find(data => data.id == this.agentId).agentName;
+        this.validateFormDistribute.value['couponName'] = this.couponList.find(data => data.id == this.validateFormDistribute.value['couponId']).couponName;
         this.validateFormDistribute.value['agentId'] = this.agentId;
 
         const whereObject = {

src/app/admin/discount-package/discount-package-edit/discount-package-edit.component.ts

@@ -131,8 +131,7 @@ export class DiscountPackageEditComponent implements OnInit {
     }
 
     // 图片判断
-    // this.imgIsPost();
+    this.imgIsPost();
-
 
     if (this.editFlag) {
       this.validateForm.value.id = this.id;

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

@@ -75,7 +75,7 @@
                 <th nzWidth="80px">门店名称</th>
                 <th nzWidth="100px">门店电话</th>
                 <th nzWidth="100px">创建时间</th>
-                <th nzWidth="160px" nzRight="0px">操作</th>
+                <th nzWidth="80px" nzRight="0px">操作</th>
             </tr>
             </thead>
             <tbody>
@@ -87,15 +87,18 @@
                 <td>{{data.telephone}}</td>
                 <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
                 <td nzRight="0px" class="table-td-operation">
-                    <a (click)="getEdit(data.id)">编辑</a>
+                    <a nz-dropdown [nzDropdownMenu]="menu">更多操作</a>
-                    <nz-divider nzType="vertical"></nz-divider>
+                    <nz-dropdown-menu #menu="nzDropdownMenu">
-                    <a (click)="getDetail(data.id)">详情</a>
+                        <ul nz-menu nzSelectable>
-                    <nz-divider nzType="vertical"></nz-divider>
+                            <li class="li-a" nz-menu-item><a (click)="getEdit(data.id)">编辑</a></li>
-                    <a *ngIf="'BTN_add_blance' | button"  (click)="getRecharge(data.id)">增加余额</a>
+                            <li class="li-a" nz-menu-item><a (click)="getDetail(data.id)">详情</a></li>
-                    <nz-divider *ngIf="'BTN_add_blance' | button" nzType="vertical"></nz-divider>
+                            <li class="li-a" nz-menu-item><a (click)="getQrCode(data.storeKey)">下载二维码</a></li>
-                    <a (click)="getDelete(data.id)">删除</a>
+                            <li class="li-a" nz-menu-item><a *ngIf="'BTN_add_blance' | button"  (click)="getRecharge(data.id)">增加余额</a></li>
-                    <nz-divider nzType="vertical"></nz-divider>
+                            <li class="li-a" nz-menu-item><a (click)="getDelete(data.id)">删除</a></li>
-                    <a [routerLink]="['/admin/device/list']" [queryParams]="{ merStoreId: data.id}">设备管理</a>
+                            <li class="li-a" nz-menu-item><a [routerLink]="['/admin/device/list']" [queryParams]="{ merStoreId: data.id}">设备管理</a></li>
+                        </ul>
+                    </nz-dropdown-menu>
+
                 </td>
             </tbody>
         </nz-table>

src/app/admin/merchant-store/store-list/store-list.component.ts

@@ -137,6 +137,17 @@ export class StoreListComponent implements OnInit {
         }).then(r => console.log(r));
     }
 
+    // 下载二维码
+    public getQrCode(storeKey: string): void {
+        this.merchantStore.getQrCode(storeKey, data => {
+            if (data['return_code'] === '000000') {
+                window.location.href = data['return_data'];
+            } else {
+                this.message.warning(data['return_msg']);
+            }
+        });
+    }
+
     handleCancelError(): void {
         this.errorStudentVisible = false;
     }

src/app/services/merchant-store.service.ts

@@ -100,6 +100,18 @@ export class MerchantStoreService {
     });
   }
 
+    /**
+     * 下载二维码
+     *
+     * @param storeKey  用户id
+     * @param callBack 返回参数
+     */
+    public getQrCode(storeKey: string, callBack) {
+        this.http.get(environment.baseUrl + 'highMerchantStore/getQrCode?storeKey=' + storeKey).subscribe(data => {
+            callBack(data);
+        });
+    }
+
     /**
      * 查询油站油品详情
      *

src/environments/environment.ts

@@ -6,8 +6,8 @@ export const environment = {
   production: false,
   baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
   imageUrl: 'http://localhost:9302/filesystem/',
-  // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  // baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  // imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
+  // imageUrl: 'https://hsg.dctpay.com/filesystem/',
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
 };