From f6dbd630b5bf0c680604d6048c7f8ae8702730a0 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 29 Mar 2021 18:05:23 +0800
Subject: [PATCH] 1
---
 .../coupon-list/coupon-list.component.html     |  2 --
 .../sinopec-config.component.html              |  6 ++++--
 .../sinopec-config/sinopec-config.component.ts | 18 +++++++++---------
 .../sinopec-edit/sinopec-edit.component.html   |  8 ++++++++
 .../sinopec-edit/sinopec-edit.component.ts     |  1 +
 5 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/app/admin/coupon/coupon-list/coupon-list.component.html b/src/app/admin/coupon/coupon-list/coupon-list.component.html
index c204da8..d04cdff 100644
--- a/src/app/admin/coupon/coupon-list/coupon-list.component.html
+++ b/src/app/admin/coupon/coupon-list/coupon-list.component.html
@@ -101,7 +101,6 @@
             
编号 | 卡券编号 | 卡券名称- | 卡券面值 | 销售价格 | 有效库存 | 卡券类型@@ -116,7 +115,6 @@ | {{i+1}} | {{data.couponKey}} | {{data.couponName}}- | ¥{{data.couponPrice}} | ¥{{data.salesPrice}} | {{data.stockCount}} | {{data.couponType === 1 ? '内部卷' : '外部卷'}}diff --git a/src/app/admin/system/sinopec-config/sinopec-config.component.html b/src/app/admin/system/sinopec-config/sinopec-config.component.html
index c72542e..32447ec 100644
--- a/src/app/admin/system/sinopec-config/sinopec-config.component.html
+++ b/src/app/admin/system/sinopec-config/sinopec-config.component.html
@@ -26,7 +26,8 @@ | 客户AppId | 客户密码 | 客户编码-
+ | 客户KEY+ | 创建时间 | 操作@@ -36,7 +37,8 @@ | {{data.appId}} | {{data.appSecret}} | {{data.code}}-
+ | {{data.signkey}}+ | {{data.createTime | date: 'yyyy-MM-dd HH:mm'}} | diff --git a/src/app/admin/system/sinopec-config/sinopec-config.component.ts b/src/app/admin/system/sinopec-config/sinopec-config.component.ts
index 0658d46..fa4f333 100644
--- a/src/app/admin/system/sinopec-config/sinopec-config.component.ts
+++ b/src/app/admin/system/sinopec-config/sinopec-config.component.ts
@@ -73,18 +73,18 @@ export class SinopecConfigComponent implements OnInit {
   public getEdit(id: number): void {
     this.router.navigate(['/admin/system/sinopec-edit'], {
       queryParams: {
-        merchantId: id
+        sinopecId: id
       }
     }).then(r => console.log(r));
   }
 
-  // 查看详情
-  public getDetail(id: number): void {
-    this.router.navigate(['/admin/system/sinopec-detail'], {
-      queryParams: {
-        merchantId: id
-      }
-    }).then(r => console.log(r));
-  }
+  // // 查看详情
+  // public getDetail(id: number): void {
+  //   this.router.navigate(['/admin/system/sinopec-detail'], {
+  //     queryParams: {
+  //       merchantId: id
+  //     }
+  //   }).then(r => console.log(r));
+  // }
 
 }
diff --git a/src/app/admin/system/sinopec-edit/sinopec-edit.component.html b/src/app/admin/system/sinopec-edit/sinopec-edit.component.html
index 9f000bb..2508fae 100644
--- a/src/app/admin/system/sinopec-edit/sinopec-edit.component.html
+++ b/src/app/admin/system/sinopec-edit/sinopec-edit.component.html
@@ -36,6 +36,14 @@
                     
                 
             
+ | 
+                
+                    客户KEY
+                    
+                        
+                    
+                
+            
         
         
             
diff --git a/src/app/admin/system/sinopec-edit/sinopec-edit.component.ts b/src/app/admin/system/sinopec-edit/sinopec-edit.component.ts
index 976a932..52e7269 100644
--- a/src/app/admin/system/sinopec-edit/sinopec-edit.component.ts
+++ b/src/app/admin/system/sinopec-edit/sinopec-edit.component.ts
@@ -39,6 +39,7 @@ export class SinopecEditComponent implements OnInit {
       appId: [null, [Validators.required]],
       appSecret: [null, [Validators.required]],
       code: [null, [Validators.required]],
+      signkey: [null, [Validators.required]],
     });
   }