+
+
+
+
+
+ 共计 {{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/merchant/merchant-list/merchant-list.component.scss b/src/app/admin/merchant/merchant-list/merchant-list.component.scss
new file mode 100644
index 0000000..8bee3fb
--- /dev/null
+++ b/src/app/admin/merchant/merchant-list/merchant-list.component.scss
@@ -0,0 +1,4 @@
+.head_img {
+ height: 60px;
+ width: 60px;
+}
diff --git a/src/app/admin/merchant/merchant-list/merchant-list.component.ts b/src/app/admin/merchant/merchant-list/merchant-list.component.ts
new file mode 100644
index 0000000..83c7176
--- /dev/null
+++ b/src/app/admin/merchant/merchant-list/merchant-list.component.ts
@@ -0,0 +1,94 @@
+import { Component, OnInit } from '@angular/core';
+import {FormBuilder, FormGroup} from '@angular/forms';
+import {UserService} from '../../../services/user.service';
+import {IconService} from '../../../services/icon.service';
+import {NzMessageService} from 'ng-zorro-antd';
+import {CommonsService} from '../../../services/commons.service';
+import {MerchantService} from '../../../services/merchant.service';
+import {Router} from '@angular/router';
+
+@Component({
+ selector: 'app-merchant-list',
+ templateUrl: './merchant-list.component.html',
+ styleUrls: ['./merchant-list.component.scss']
+})
+export class MerchantListComponent implements OnInit {
+
+ 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 getForbiddenUser(id, status: any): void {
+ const message = (status === 1 ? '是否禁用当前用户' : '是否启用当前用户');
+
+ this.common.showConfirm(message, data => {
+ if (data) {
+ // this.user.forbiddenUser(id, dataUser => {
+ // this.getRequest(false , this.searchForm.value);
+ // });
+ }
+ });
+ }
+
+
+ // 修改
+ public getEdit(id: number): void {
+ this.router.navigate(['/admin/merchant/merchant-list'], {
+ queryParams: {
+ merchantId: id
+ }
+ }).then(r => console.log(r));
+ }
+
+}
diff --git a/src/app/admin/merchant/merchant-routing.module.ts b/src/app/admin/merchant/merchant-routing.module.ts
index fb80d06..a7f6174 100644
--- a/src/app/admin/merchant/merchant-routing.module.ts
+++ b/src/app/admin/merchant/merchant-routing.module.ts
@@ -1,8 +1,13 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
+import {MerchantListComponent} from './merchant-list/merchant-list.component';
+import {MerchantEditComponent} from './merchant-edit/merchant-edit.component';
-const routes: Routes = [];
+const routes: Routes = [
+ { path: 'merchant-list', component: MerchantListComponent },
+ { path: 'merchant-edit', component: MerchantEditComponent },
+];
@NgModule({
imports: [RouterModule.forChild(routes)],
diff --git a/src/app/admin/merchant/merchant.module.ts b/src/app/admin/merchant/merchant.module.ts
index 0502df4..ab5731c 100644
--- a/src/app/admin/merchant/merchant.module.ts
+++ b/src/app/admin/merchant/merchant.module.ts
@@ -2,13 +2,25 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MerchantRoutingModule } from './merchant-routing.module';
+import { MerchantListComponent } from './merchant-list/merchant-list.component';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
+import {SeparateModule} from '../../common/separate/separate.module';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
+import { MerchantEditComponent } from './merchant-edit/merchant-edit.component';
+import { MerchantDetailComponent } from './merchant-detail/merchant-detail.component';
@NgModule({
- declarations: [],
+ declarations: [MerchantListComponent, MerchantEditComponent, MerchantDetailComponent],
imports: [
CommonModule,
- MerchantRoutingModule
+ MerchantRoutingModule,
+ NgZorroAntdModule,
+ SeparateModule,
+ ReactiveFormsModule,
+ FormsModule,
+ BreadcrumbModule
]
})
export class MerchantModule { }
diff --git a/src/app/admin/user/user-list/user-list.component.html b/src/app/admin/user/user-list/user-list.component.html
index e6f9e9c..e39aa44 100644
--- a/src/app/admin/user/user-list/user-list.component.html
+++ b/src/app/admin/user/user-list/user-list.component.html
@@ -6,7 +6,7 @@