+
+
+
+
+
+ 共计 {{total}} 条数据
+
+
+
+
+ 编号
+ 商户编号
+ 商户名称
+ 商户LOGO
+ 商户电话
+ 创建时间
+ 状态
+ 操作
+
+
+
+
+ {{i+1}}
+ {{data.merchantKey}}
+ {{data.merchantName}}
+
+ 
+
+ {{data.telephone}}
+ {{data.createTime | date: 'yyyy-MM-dd HH:mm'}}
+ {{data.status ===1 ? '正常' : '禁用'}}
+
+
+
+
+
+
+
+
+
diff --git a/src/app/admin/price/price-list/price-list.component.scss b/src/app/admin/price/price-list/price-list.component.scss
index e69de29..8bee3fb 100644
--- a/src/app/admin/price/price-list/price-list.component.scss
+++ b/src/app/admin/price/price-list/price-list.component.scss
@@ -0,0 +1,4 @@
+.head_img {
+ height: 60px;
+ width: 60px;
+}
diff --git a/src/app/admin/price/price-list/price-list.component.ts b/src/app/admin/price/price-list/price-list.component.ts
index e576ed9..9620b52 100644
--- a/src/app/admin/price/price-list/price-list.component.ts
+++ b/src/app/admin/price/price-list/price-list.component.ts
@@ -1,4 +1,11 @@
import { Component, OnInit } from '@angular/core';
+import {environment} from '../../../../environments/environment';
+import {FormBuilder, FormGroup} from '@angular/forms';
+import {MerchantService} from '../../../services/merchant.service';
+import {IconService} from '../../../services/icon.service';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
+import {CommonsService} from '../../../services/commons.service';
@Component({
selector: 'app-price-list',
@@ -7,9 +14,122 @@ import { Component, OnInit } from '@angular/core';
})
export class PriceListComponent implements OnInit {
- constructor() { }
+ WEB_SERVE_URL = environment.imageUrl;
+ searchForm: FormGroup; // 搜索框
+ requestData = []; // 列表数据
+ total: number; // 页码
+ pageNum = 1; // 页码
+ pageSize = 10; // 条码
+ loading = true;
+
+ constructor(
+ private form: FormBuilder,
+ private merchant: MerchantService,
+ private iconService: IconService,
+ private message: NzMessageService,
+ private router: Router,
+ private common: CommonsService
+ ) {
+ }
ngOnInit(): void {
+ this.init();
+ }
+
+ public init(): void {
+ this.searchForm = this.form.group({
+ merchantKey: [null],
+ merchantName: [null],
+ telephone: [null],
+ status: [null],
+ });
+ this.getRequest(true, this.searchForm.value);
+ }
+
+ // 查询列表
+ public getRequest(reset: boolean = false, whereObject: object) {
+
+ this.loading = false;
+ if (reset) {
+ this.pageNum = 1;
+ }
+ whereObject['pageNum'] = this.pageNum;
+ whereObject['pageSize'] = this.pageSize;
+ this.merchant.getMerchantList(whereObject, data => {
+ if (data['return_code'] === '000000') {
+ this.requestData = data['return_data'].list;
+ this.total = data['return_data'].total;
+ } else {
+ this.message.error(data['return_msg']);
+ }
+ });
}
+ // 重置
+ public resetForm(): void {
+ this.searchForm.reset();
+ }
+
+ // 禁用商户
+ public disableMerchant(id): void {
+ const message = '是否禁用商户';
+ this.common.showConfirm(message, data => {
+ if (data) {
+ this.merchant.disableMerchant(id, dataReturn => {
+ if (dataReturn['return_code'] === '000000') {
+ this.message.success('操作成功');
+ this.getRequest(false , this.searchForm.value);
+ } else {
+ this.message.warning(dataReturn['return_msg']);
+ }
+ });
+ }
+ });
+ }
+
+ // 启动商户
+ public enableMerchant(id): void {
+ const message = '是否启用商户';
+ this.common.showConfirm(message, data => {
+ if (data) {
+ this.merchant.enableMerchant(id, dataReturn => {
+ if (dataReturn['return_code'] === '000000') {
+ this.message.success('操作成功');
+ this.getRequest(false , this.searchForm.value);
+ } else {
+ this.message.warning(dataReturn['return_msg']);
+ }
+ });
+ }
+ });
+ }
+
+
+ // 修改
+ public getEdit(id: number): void {
+ this.router.navigate(['/admin/merchant/merchant-edit'], {
+ queryParams: {
+ merchantId: id
+ }
+ }).then(r => console.log(r));
+ }
+
+ // 查看详情
+ public getDetail(id: number): void {
+ this.router.navigate(['/admin/merchant/merchant-detail'], {
+ queryParams: {
+ merchantId: id
+ }
+ }).then(r => console.log(r));
+ }
+
+ // 查看门店列表
+ public getList(id: number , merchantName: string): void {
+ this.router.navigate(['/admin/merchantStore/store-list'], {
+ queryParams: {
+ merchantId: id,
+ name: merchantName,
+ }
+ }).then(r => console.log(r));
+ }
}
diff --git a/src/app/pipes/system.pipe.ts b/src/app/pipes/system.pipe.ts
index 9249d55..8860468 100644
--- a/src/app/pipes/system.pipe.ts
+++ b/src/app/pipes/system.pipe.ts
@@ -15,6 +15,8 @@ export class SystemPipe implements PipeTransform {
return '商户账号';
case 3:
return '门店账号';
+ case 4:
+ return '代理商账号';
}
}
From e0cf18f505311db4b30c181c39e7cb2b07c00b75 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Sun, 28 Mar 2021 10:59:00 +0800
Subject: [PATCH 04/12] 1
---
angular.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/angular.json b/angular.json
index 1253466..0a5bfcf 100644
--- a/angular.json
+++ b/angular.json
@@ -42,7 +42,7 @@
]
},
"configurations": {
- "production": {
+ "prod": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
From e24023ea87dae3188c18e77ab8db36edc3bdaca3 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Sun, 28 Mar 2021 10:59:16 +0800
Subject: [PATCH 05/12] 1
---
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 4f785e5..bf10db9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
.idea/
node_modules/
# See http://help.github.com/ignore-files/ for more about ignoring files.
-/src/assets/node_modules/
+
# compiled output
From 596ff57f2d370bb6b0ced8045c5e6ab8612b7fc0 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Sun, 28 Mar 2021 17:03:22 +0800
Subject: [PATCH 06/12] 1
---
.../coupon-list/coupon-list.component.html | 4 +-
.../sinopec-config.component.html | 48 +++++++++
.../sinopec-config.component.scss | 0
.../sinopec-config.component.ts | 90 +++++++++++++++++
.../sinopec-edit/sinopec-edit.component.html | 48 +++++++++
.../sinopec-edit/sinopec-edit.component.scss | 6 ++
.../sinopec-edit/sinopec-edit.component.ts | 99 +++++++++++++++++++
src/app/admin/system/system-routing.module.ts | 4 +
src/app/admin/system/system.module.ts | 4 +-
src/app/services/system.service.ts | 59 ++++++++++-
10 files changed, 358 insertions(+), 4 deletions(-)
create mode 100644 src/app/admin/system/sinopec-config/sinopec-config.component.html
create mode 100644 src/app/admin/system/sinopec-config/sinopec-config.component.scss
create mode 100644 src/app/admin/system/sinopec-config/sinopec-config.component.ts
create mode 100644 src/app/admin/system/sinopec-edit/sinopec-edit.component.html
create mode 100644 src/app/admin/system/sinopec-edit/sinopec-edit.component.scss
create mode 100644 src/app/admin/system/sinopec-edit/sinopec-edit.component.ts
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 e75d625..c204da8 100644
--- a/src/app/admin/coupon/coupon-list/coupon-list.component.html
+++ b/src/app/admin/coupon/coupon-list/coupon-list.component.html
@@ -131,8 +131,8 @@
+ 共计 {{total}} 条数据
+
+
+
+
+ 编号
+ 客户AppId
+ 客户密码
+ 客户编码
+
+ 操作
+
+
+
+
+ {{i+1}}
+ {{data.appId}}
+ {{data.appSecret}}
+ {{data.code}}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/admin/system/sinopec-config/sinopec-config.component.scss b/src/app/admin/system/sinopec-config/sinopec-config.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/admin/system/sinopec-config/sinopec-config.component.ts b/src/app/admin/system/sinopec-config/sinopec-config.component.ts
new file mode 100644
index 0000000..0658d46
--- /dev/null
+++ b/src/app/admin/system/sinopec-config/sinopec-config.component.ts
@@ -0,0 +1,90 @@
+import { Component, OnInit } from '@angular/core';
+import {environment} from '../../../../environments/environment';
+import {FormBuilder, FormGroup} from '@angular/forms';
+import {MerchantService} from '../../../services/merchant.service';
+import {IconService} from '../../../services/icon.service';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
+import {SystemService} from '../../../services/system.service';
+
+@Component({
+ selector: 'app-sinopec-config',
+ templateUrl: './sinopec-config.component.html',
+ styleUrls: ['./sinopec-config.component.scss']
+})
+export class SinopecConfigComponent implements OnInit {
+
+ WEB_SERVE_URL = environment.imageUrl;
+ searchForm: FormGroup; // 搜索框
+ requestData = []; // 列表数据
+ total: number; // 页码
+ pageNum = 1; // 页码
+ pageSize = 10; // 条码
+ loading = true;
+
+ constructor(
+ private form: FormBuilder,
+ private system: SystemService,
+ private iconService: IconService,
+ private message: NzMessageService,
+ private router: Router,
+ ) {
+ }
+
+ ngOnInit(): void {
+ this.init();
+ }
+
+ public init(): void {
+ this.searchForm = this.form.group({
+ merchantKey: [null],
+ merchantName: [null],
+ telephone: [null],
+ status: [null],
+ });
+ this.getRequest(true, this.searchForm.value);
+ }
+
+ // 查询列表
+ public getRequest(reset: boolean = false, whereObject: object) {
+
+ this.loading = false;
+ if (reset) {
+ this.pageNum = 1;
+ }
+ whereObject['pageNum'] = this.pageNum;
+ whereObject['pageSize'] = this.pageSize;
+ this.system.getListSinopecConfig(whereObject, data => {
+ if (data['return_code'] === '000000') {
+ this.requestData = data['return_data'].list;
+ this.total = data['return_data'].total;
+ } else {
+ this.message.error(data['return_msg']);
+ }
+ });
+ }
+
+ // 重置
+ public resetForm(): void {
+ this.searchForm.reset();
+ }
+
+ // 修改
+ public getEdit(id: number): void {
+ this.router.navigate(['/admin/system/sinopec-edit'], {
+ 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
new file mode 100644
index 0000000..9f000bb
--- /dev/null
+++ b/src/app/admin/system/sinopec-edit/sinopec-edit.component.html
@@ -0,0 +1,48 @@
+
+
-
-
+
+
diff --git a/src/app/admin/audit/audit-coupon/audit-coupon.component.ts b/src/app/admin/audit/audit-coupon/audit-coupon.component.ts
index be0ce01..682bb47 100644
--- a/src/app/admin/audit/audit-coupon/audit-coupon.component.ts
+++ b/src/app/admin/audit/audit-coupon/audit-coupon.component.ts
@@ -25,6 +25,7 @@ export class AuditCouponComponent implements OnInit {
approve: {},
object: {}
};
+
constructor(
private form: FormBuilder,
private audit: AuditService,
@@ -91,16 +92,17 @@ export class AuditCouponComponent implements OnInit {
this.isVisible = false;
}
- public approveProcessed(statusD: number): void {
+ public approveProcessed(statusD: number, id: number): void {
+ this.id = id;
const p = {
approveId: this.id,
status: statusD,
remarks: '',
};
- this.common.showConfirm('是否确定' , r => {
+ this.common.showConfirm('是否确定', r => {
if (r) {
- this.audit.approveProcessed(p , data => {
+ this.audit.approveProcessed(p, data => {
if (data['return_code'] === '000000') {
this.isVisible = false;
this.getRequest(true, this.searchForm.value);
diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
index 3f1f9bc..a9f9fd1 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
@@ -53,14 +53,6 @@