+
diff --git a/src/app/pages/agent/agent-list/agent-list.component.ts b/src/app/pages/agent/agent-list/agent-list.component.ts
index 9b94e97..df81112 100644
--- a/src/app/pages/agent/agent-list/agent-list.component.ts
+++ b/src/app/pages/agent/agent-list/agent-list.component.ts
@@ -143,6 +143,7 @@ export class AgentListComponent {
});
this.agentApiParamForm = this.fb.group({
+ agentType: [null],
agentId: [{value: null, disabled: true}],
agentNo: [{value: null, disabled: true}],
agentName: [{value: null, disabled: true}],
@@ -331,6 +332,7 @@ export class AgentListComponent {
this.agentApiService.getApiParam({agentId: agent['id']}, (data:any) => {
if (data['return_code'] == '000000') {
this.agentApiParamForm.patchValue({
+ agentType: agent['type'],
agentId: agent['id'],
agentNo: agent['agentNo'],
agentName: agent['name'],
diff --git a/src/app/pages/agent/agent-mer-account/agent-mer-account.component.html b/src/app/pages/agent/agent-mer-account/agent-mer-account.component.html
index 2cee7e0..8142c70 100644
--- a/src/app/pages/agent/agent-mer-account/agent-mer-account.component.html
+++ b/src/app/pages/agent/agent-mer-account/agent-mer-account.component.html
@@ -6,7 +6,7 @@
代理商【当前代理】
-
+
diff --git a/src/app/pages/agent/agent-mer-account/agent-mer-account.component.ts b/src/app/pages/agent/agent-mer-account/agent-mer-account.component.ts
index dedc96b..86234c4 100644
--- a/src/app/pages/agent/agent-mer-account/agent-mer-account.component.ts
+++ b/src/app/pages/agent/agent-mer-account/agent-mer-account.component.ts
@@ -142,7 +142,7 @@ export class AgentMerAccountComponent {
if (this.accountType == 1) {
// 获取代理商
- this.agentService.queryAgentList({pageNum:1,pageSize:999}, (data: any) => {
+ this.agentService.queryAgentList({type:'2',pageNum:1,pageSize:999}, (data: any) => {
this.agentData = data['return_data']['list'];
this.searchForm.controls['agentId'].setValue(String(this.agentData[0]['id']));
// 查询数据
diff --git a/src/app/pages/agent/agent-mer-list/agent-mer-list.component.html b/src/app/pages/agent/agent-mer-list/agent-mer-list.component.html
index f5aff0f..451bdde 100644
--- a/src/app/pages/agent/agent-mer-list/agent-mer-list.component.html
+++ b/src/app/pages/agent/agent-mer-list/agent-mer-list.component.html
@@ -6,7 +6,7 @@
代理商【当前代理】
-
+
diff --git a/src/app/pages/agent/agent-mer-list/agent-mer-list.component.ts b/src/app/pages/agent/agent-mer-list/agent-mer-list.component.ts
index 9385c97..07c8518 100644
--- a/src/app/pages/agent/agent-mer-list/agent-mer-list.component.ts
+++ b/src/app/pages/agent/agent-mer-list/agent-mer-list.component.ts
@@ -138,7 +138,7 @@ export class AgentMerListComponent {
});
if (this.accountType == 1) {
// 获取代理商
- this.agentService.queryAgentList({pageNum:1,pageSize:999}, (data: any) => {
+ this.agentService.queryAgentList({type:'1,2',pageNum:1,pageSize:999}, (data: any) => {
this.agentData = data['return_data']['list'];
this.searchForm.controls['agentId'].setValue(String(this.agentData[0]['id']));
// 查询数据
diff --git a/src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.html b/src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.html
index 7650bde..fdd2952 100644
--- a/src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.html
+++ b/src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.html
@@ -5,7 +5,7 @@
代理商【当前代理】
-
+
diff --git a/src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.ts b/src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.ts
index 439f11e..1478bc9 100644
--- a/src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.ts
+++ b/src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.ts
@@ -134,7 +134,7 @@ export class AgentReferPriceListComponent {
});
// 获取代理商
- this.agentService.queryAgentList({pageNum:1,pageSize:999}, (data: any) => {
+ this.agentService.queryAgentList({type:'1',pageNum:1,pageSize:999}, (data: any) => {
this.agentData = data['return_data']['list'];
this.searchForm.controls['agentId'].setValue(String(this.agentData[0]['id']));
// 查询业务员
diff --git a/src/app/pages/cms/cms-list/cms-list.component.html b/src/app/pages/cms/cms-list/cms-list.component.html
index f812734..87cf714 100644
--- a/src/app/pages/cms/cms-list/cms-list.component.html
+++ b/src/app/pages/cms/cms-list/cms-list.component.html
@@ -89,7 +89,7 @@
diff --git a/src/app/pages/cms/cms-list/cms-list.component.ts b/src/app/pages/cms/cms-list/cms-list.component.ts
index 3c0315f..616ed9d 100644
--- a/src/app/pages/cms/cms-list/cms-list.component.ts
+++ b/src/app/pages/cms/cms-list/cms-list.component.ts
@@ -207,12 +207,12 @@ export class CmsListComponent {
/**
* 上线
*/
- online(id: number) {
+ online(data: any) {
this.modal.confirm({
nzTitle: '提示',
- nzContent: '确定轮播图上线吗?',
+ nzContent: data.startTime!=null?'已设置自动上线时间,确定需要提前上线吗?':'确定立即上线吗?',
nzOnOk: () =>
- this.cmsService.online({id: id}, (data: any) => {
+ this.cmsService.online({id: data.id}, (data: any) => {
if (data['return_code'] == '000000') {
// 刷新数据
this.queryData();
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 78d8ba9..debd267 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,7 +4,7 @@
export const environment = {
production: false,
- baseUrl: 'https://oil.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+ baseUrl: 'https://test-oil.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://test-oil.dctpay.com/filesystem/',
};