统计代码

dev
胡锐 7 days ago
parent e6998a951c
commit 4765f162a6
  1. 8
      src/app/pages/agent/agent-list/agent-list.component.html
  2. 2
      src/app/pages/agent/agent-list/agent-list.component.ts
  3. 2
      src/app/pages/agent/agent-mer-account/agent-mer-account.component.html
  4. 2
      src/app/pages/agent/agent-mer-account/agent-mer-account.component.ts
  5. 2
      src/app/pages/agent/agent-mer-list/agent-mer-list.component.html
  6. 2
      src/app/pages/agent/agent-mer-list/agent-mer-list.component.ts
  7. 2
      src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.html
  8. 2
      src/app/pages/agent/agent-refer-price-list/agent-refer-price-list.component.ts
  9. 2
      src/app/pages/cms/cms-list/cms-list.component.html
  10. 6
      src/app/pages/cms/cms-list/cms-list.component.ts
  11. 2
      src/environments/environment.ts

@ -87,7 +87,7 @@
<li nz-menu-item *ngIf="data.status == 1"><a (click)="showEditAgentModal(data)">修改资料</a></li> <li nz-menu-item *ngIf="data.status == 1"><a (click)="showEditAgentModal(data)">修改资料</a></li>
<li nz-menu-item *ngIf="data.type == 2"><a (click)="showApiRecharge(data)">余额充值</a></li> <li nz-menu-item *ngIf="data.type == 2"><a (click)="showApiRecharge(data)">余额充值</a></li>
<li nz-menu-item *ngIf="data.type == 2"><a (click)="showRecord(data.id)">动账记录</a></li> <li nz-menu-item *ngIf="data.type == 2"><a (click)="showRecord(data.id)">动账记录</a></li>
<li nz-menu-item *ngIf="data.type == 2"><a (click)="showApiParam(data)">接入参数</a></li> <li nz-menu-item *ngIf="data.type == 2 || data.type == 3"><a (click)="showApiParam(data)">接入参数</a></li>
<li nz-menu-item *ngIf="data.status == 1"><a (click)="disabled(data.agentNo)">禁用账户</a></li> <li nz-menu-item *ngIf="data.status == 1"><a (click)="disabled(data.agentNo)">禁用账户</a></li>
<li nz-menu-item *ngIf="data.status == 2"><a (click)="enable(data.agentNo)">恢复账户</a></li> <li nz-menu-item *ngIf="data.status == 2"><a (click)="enable(data.agentNo)">恢复账户</a></li>
</ul> </ul>
@ -227,21 +227,21 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item *ngIf="this.agentApiParamForm.controls['agentType'].value == 2">
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>油站信息变更通知</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>油站信息变更通知</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24"> <nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="merInfoNotify" placeholder="请输入油站信息变更通知地址" /> <input nz-input formControlName="merInfoNotify" placeholder="请输入油站信息变更通知地址" />
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item *ngIf="this.agentApiParamForm.controls['agentType'].value == 2">
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>订单退款审核通知</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>订单退款审核通知</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24"> <nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="orderRefundNotify" placeholder="请输入订单退款审核通知地址" /> <input nz-input formControlName="orderRefundNotify" placeholder="请输入订单退款审核通知地址" />
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<div nz-flex style="margin-top: 15px" [nzJustify]="'center'"> <div nz-flex style="margin-top: 15px" [nzJustify]="'center'" *ngIf="this.agentApiParamForm.controls['agentType'].value == 2">
<button nz-button nzType="primary" (click)="submitApiParam()" class="submit-btn">保存</button> <button nz-button nzType="primary" (click)="submitApiParam()" class="submit-btn">保存</button>
</div> </div>
</form> </form>

@ -143,6 +143,7 @@ export class AgentListComponent {
}); });
this.agentApiParamForm = this.fb.group({ this.agentApiParamForm = this.fb.group({
agentType: [null],
agentId: [{value: null, disabled: true}], agentId: [{value: null, disabled: true}],
agentNo: [{value: null, disabled: true}], agentNo: [{value: null, disabled: true}],
agentName: [{value: null, disabled: true}], agentName: [{value: null, disabled: true}],
@ -331,6 +332,7 @@ export class AgentListComponent {
this.agentApiService.getApiParam({agentId: agent['id']}, (data:any) => { this.agentApiService.getApiParam({agentId: agent['id']}, (data:any) => {
if (data['return_code'] == '000000') { if (data['return_code'] == '000000') {
this.agentApiParamForm.patchValue({ this.agentApiParamForm.patchValue({
agentType: agent['type'],
agentId: agent['id'], agentId: agent['id'],
agentNo: agent['agentNo'], agentNo: agent['agentNo'],
agentName: agent['name'], agentName: agent['name'],

@ -6,7 +6,7 @@
<nz-form-label nzRequired>代理商<span style="color: red">【当前代理】</span></nz-form-label> <nz-form-label nzRequired>代理商<span style="color: red">【当前代理】</span></nz-form-label>
<nz-form-control> <nz-form-control>
<nz-select formControlName="agentId" [nzPlaceHolder]="'请选择'"> <nz-select formControlName="agentId" [nzPlaceHolder]="'请选择'">
<nz-option *ngFor="let item of agentData" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option> <nz-option *ngFor="let item of agentData" nzValue="{{item.id}}" nzLabel="【{{item.type | dictionary:'AGENT_TYPE'}}】{{item.name}}"></nz-option>
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>

@ -142,7 +142,7 @@ export class AgentMerAccountComponent {
if (this.accountType == 1) { 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.agentData = data['return_data']['list'];
this.searchForm.controls['agentId'].setValue(String(this.agentData[0]['id'])); this.searchForm.controls['agentId'].setValue(String(this.agentData[0]['id']));
// 查询数据 // 查询数据

@ -6,7 +6,7 @@
<nz-form-label nzRequired>代理商<span style="color: red">【当前代理】</span></nz-form-label> <nz-form-label nzRequired>代理商<span style="color: red">【当前代理】</span></nz-form-label>
<nz-form-control> <nz-form-control>
<nz-select formControlName="agentId" [nzPlaceHolder]="'请选择'"> <nz-select formControlName="agentId" [nzPlaceHolder]="'请选择'">
<nz-option *ngFor="let item of agentData" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option> <nz-option *ngFor="let item of agentData" nzValue="{{item.id}}" nzLabel="【{{item.type | dictionary:'AGENT_TYPE'}}】{{item.name}}"></nz-option>
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>

@ -138,7 +138,7 @@ export class AgentMerListComponent {
}); });
if (this.accountType == 1) { 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.agentData = data['return_data']['list'];
this.searchForm.controls['agentId'].setValue(String(this.agentData[0]['id'])); this.searchForm.controls['agentId'].setValue(String(this.agentData[0]['id']));
// 查询数据 // 查询数据

@ -5,7 +5,7 @@
<nz-form-label nzRequired>代理商<span style="color: red">【当前代理】</span></nz-form-label> <nz-form-label nzRequired>代理商<span style="color: red">【当前代理】</span></nz-form-label>
<nz-form-control> <nz-form-control>
<nz-select formControlName="agentId" [nzPlaceHolder]="'请选择'" (ngModelChange)="queryAgentStaff(this.searchForm.controls['agentId'].value)"> <nz-select formControlName="agentId" [nzPlaceHolder]="'请选择'" (ngModelChange)="queryAgentStaff(this.searchForm.controls['agentId'].value)">
<nz-option *ngFor="let item of agentData" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option> <nz-option *ngFor="let item of agentData" nzValue="{{item.id}}" nzLabel="【{{item.type | dictionary:'AGENT_TYPE'}}】{{item.name}}"></nz-option>
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>

@ -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.agentData = data['return_data']['list'];
this.searchForm.controls['agentId'].setValue(String(this.agentData[0]['id'])); this.searchForm.controls['agentId'].setValue(String(this.agentData[0]['id']));
// 查询业务员 // 查询业务员

@ -89,7 +89,7 @@
<nz-dropdown-menu #menu="nzDropdownMenu"> <nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable> <ul nz-menu nzSelectable>
<li nz-menu-item *ngIf="data.status == 1"><a (click)="showEditCmsModal(data)">修改</a></li> <li nz-menu-item *ngIf="data.status == 1"><a (click)="showEditCmsModal(data)">修改</a></li>
<li nz-menu-item *ngIf="data.status == 1"><a (click)="online(data.id)">上线</a></li> <li nz-menu-item *ngIf="data.status == 1"><a (click)="online(data)">上线</a></li>
<li nz-menu-item *ngIf="data.status == 2"><a (click)="offline(data.id)">下线</a></li> <li nz-menu-item *ngIf="data.status == 2"><a (click)="offline(data.id)">下线</a></li>
<li nz-menu-item *ngIf="data.status == 1"><a (click)="delCms(data.id)">删除</a></li> <li nz-menu-item *ngIf="data.status == 1"><a (click)="delCms(data.id)">删除</a></li>
</ul> </ul>

@ -207,12 +207,12 @@ export class CmsListComponent {
/** /**
* 线 * 线
*/ */
online(id: number) { online(data: any) {
this.modal.confirm({ this.modal.confirm({
nzTitle: '提示', nzTitle: '提示',
nzContent: '确定轮播图上线吗?', nzContent: data.startTime!=null?'已设置自动上线时间,确定需要提前上线吗?':'确定立即上线吗?',
nzOnOk: () => nzOnOk: () =>
this.cmsService.online({id: id}, (data: any) => { this.cmsService.online({id: data.id}, (data: any) => {
if (data['return_code'] == '000000') { if (data['return_code'] == '000000') {
// 刷新数据 // 刷新数据
this.queryData(); this.queryData();

@ -4,7 +4,7 @@
export const environment = { export const environment = {
production: false, production: false,
baseUrl: 'https://oil.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) baseUrl: 'https://test-oil.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://test-oil.dctpay.com/filesystem/', imageUrl: 'https://test-oil.dctpay.com/filesystem/',
}; };

Loading…
Cancel
Save