diff --git a/src/app/pages/agent/agent-mer-discount-list/agent-mer-discount-list.component.html b/src/app/pages/agent/agent-mer-discount-list/agent-mer-discount-list.component.html
new file mode 100644
index 0000000..1904afd
--- /dev/null
+++ b/src/app/pages/agent/agent-mer-discount-list/agent-mer-discount-list.component.html
@@ -0,0 +1,225 @@
+
- 地区
+ 油站来源
-
-
+
+
@@ -60,15 +60,17 @@
- 油站来源
+ 地区
-
-
+
+
+
+
油站编号
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 07c8518..dd87554 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
@@ -131,7 +131,7 @@ export class AgentMerListComponent {
isAgentAllot: ['true'],
isAgentStaffAllot: ['true'],
provinceCode: [null],
- merSourceType: [null],
+ merSourceType: ['3'],
merNo: [null],
merName: [null],
status: [null],
diff --git a/src/app/pages/agent/agent.routes.ts b/src/app/pages/agent/agent.routes.ts
index dfd4d09..789564f 100644
--- a/src/app/pages/agent/agent.routes.ts
+++ b/src/app/pages/agent/agent.routes.ts
@@ -6,6 +6,7 @@ import {AgentStaffComponent} from "./agent-staff/agent-staff.component";
import {AgentPriceListComponent} from "./agent-price-list/agent-price-list.component";
import {AgentReferPriceListComponent} from "./agent-refer-price-list/agent-refer-price-list.component";
import {AgentApiAccountComponent} from "./agent-api-account/agent-api-account.component";
+import {AgentMerDiscountListComponent} from "./agent-mer-discount-list/agent-mer-discount-list.component";
export const AGENT_ROUTES: Routes = [
{ path: 'agent-list', component: AgentListComponent },
@@ -15,4 +16,5 @@ export const AGENT_ROUTES: Routes = [
{ path: 'agent-price-list', component: AgentPriceListComponent },
{ path: 'agent-refer-price-list', component: AgentReferPriceListComponent },
{ path: 'agent-api-account', component: AgentApiAccountComponent },
+ { path: 'agent-mer-discount-list', component: AgentMerDiscountListComponent },
];
diff --git a/src/app/pages/trade/order-oil-list/order-oil-list.component.html b/src/app/pages/trade/order-oil-list/order-oil-list.component.html
index f89b49c..2cc6d39 100644
--- a/src/app/pages/trade/order-oil-list/order-oil-list.component.html
+++ b/src/app/pages/trade/order-oil-list/order-oil-list.component.html
@@ -225,7 +225,7 @@
| {{data.gasOilNo}}# |
{{data.gasGunNo}}号枪 |
{{data.gasDiscount != 1?(data.gasDiscount*100).toFixed(2) + '折':'无'}} |
- {{data.createType==1?data.gasPricePlatform+'元':'无'}} |
+ {{data.gasPricePlatform+'元'}} |
{{data.gasPriceVip+'元'}} |
{{data.gasPriceGun}}元 |
{{data.gasPriceOfficial}}元 |
diff --git a/src/app/services/agent/agent-price.service.ts b/src/app/services/agent/agent-price.service.ts
index d8153b2..2938151 100644
--- a/src/app/services/agent/agent-price.service.ts
+++ b/src/app/services/agent/agent-price.service.ts
@@ -22,6 +22,30 @@ export class AgentPriceService {
});
}
+ /**
+ * 编辑价格
+ * @param param
+ * @param callBack
+ */
+ public editApiPrice(param: any, callBack:any) {
+ param.tm = new Date().getTime();
+ this.http.post(environment.baseUrl + 'agentPrice/editApiPrice', param).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+ /**
+ * 批量配置API价格
+ * @param param
+ * @param callBack
+ */
+ public batchConfigApiPrice(param: any, callBack:any) {
+ param.tm = new Date().getTime();
+ this.http.post(environment.baseUrl + 'agentPrice/batchConfigApiPrice', param).subscribe(data => {
+ callBack(data);
+ });
+ }
+
/**
* 批量配置价格
* @param param
@@ -57,4 +81,16 @@ export class AgentPriceService {
callBack(data);
});
}
+
+ /**
+ * 获取APi代理优惠价格列表
+ * @param param
+ * @param callBack
+ */
+ public getApiDiscountList(param: any, callBack:any) {
+ param.tm = new Date().getTime();
+ this.http.get(environment.baseUrl + 'agentPrice/getApiDiscountList?'+ObjectData.objectByString(param)).subscribe(data => {
+ callBack(data);
+ });
+ }
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 1942a40..debd267 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,7 +4,7 @@
export const environment = {
production: false,
- baseUrl: 'http://localhost:9802/brest/', // 测试环境服务器地址(请求数据地址)
+ baseUrl: 'https://test-oil.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://test-oil.dctpay.com/filesystem/',
};