pull/1/head
袁野 2 years ago
parent 420c05bee4
commit 4318a6760a
  1. 4
      src/app/admin/agent/agent-list/agent-list.component.ts
  2. 4
      src/app/admin/config-manage/third-product/third-product.component.html
  3. 60
      src/app/admin/index/test/test.component.html
  4. 26
      src/app/admin/index/test/test.component.ts
  5. 13
      src/app/app-common.module.ts
  6. 1
      src/app/pipes/index.ts
  7. 12
      src/app/pipes/msg/msg-type.pipe.ts
  8. 8
      src/environments/environment.ts

@ -251,9 +251,11 @@ export class AgentListComponent implements OnInit {
} }
this.isOkLoading = true; this.isOkLoading = true;
console.log(this.couponList);
console.log(this.distributeList);
this.validateFormDistribute.value['agentName'] = this.requestData.find(data => data.id == this.agentId).agentName; this.validateFormDistribute.value['agentName'] = this.requestData.find(data => data.id == this.agentId).agentName;
this.validateFormDistribute.value['couponName'] = this.couponList.find(data => data.id == this.validateFormDistribute.value['couponId']).couponName; this.validateFormDistribute.value['couponName'] = this.distributeList.find(data => data.id == this.validateFormDistribute.value['couponId']).couponName;
this.validateFormDistribute.value['agentId'] = this.agentId; this.validateFormDistribute.value['agentId'] = this.agentId;
const whereObject = { const whereObject = {

@ -62,6 +62,7 @@
<tr> <tr>
<th nzWidth="60px">编号</th> <th nzWidth="60px">编号</th>
<!-- <th nzWidth="90px">产品类型</th>--> <!-- <th nzWidth="90px">产品类型</th>-->
<th nzWidth="90px">产品类型</th>
<th nzWidth="90px">产品名称</th> <th nzWidth="90px">产品名称</th>
<th nzWidth="90px">利润比例</th> <th nzWidth="90px">利润比例</th>
<th nzWidth="120px">积分抵扣比例</th> <th nzWidth="120px">积分抵扣比例</th>
@ -76,7 +77,8 @@
<td>{{i + 1}}</td> <td>{{i + 1}}</td>
<!-- <td>{{data.productType == 1 ? '星巴克' : '肯德基'}}</td>--> <!-- <td>{{data.productType == 1 ? '星巴克' : '肯德基'}}</td>-->
<td>{{data.productName}}</td> <td>{{data.productName}}</td>
<td>{{data.discount == null ? '0' : data.discount + "%"}}</td> <td>{{data.productType | productType : data.productId}}</td>
<td>{{data.discount == null ? '暂未配置' : data.discount + "%"}}</td>
<td>{{data.integralDiscount == null ? '0' : data.integralDiscount + "%"}}</td> <td>{{data.integralDiscount == null ? '0' : data.integralDiscount + "%"}}</td>
<td>{{data.productPayTypeString.substring(0 , data.productPayTypeString.length - 1)}}</td> <td>{{data.productPayTypeString.substring(0 , data.productPayTypeString.length - 1)}}</td>
<td>{{data.productPlatformString.substring(0 , data.productPlatformString.length - 1)}}</td> <td>{{data.productPlatformString.substring(0 , data.productPlatformString.length - 1)}}</td>

@ -1,30 +1,30 @@
<!--<section>--> <section>
<!-- 大家好!我是:{{currentUser}}--> 大家好!我是:{{currentUser}}
<!--</section>--> </section>
<!--<section *ngFor="let msg of messages">--> <section *ngFor="let msg of messages">
<!-- <section>{{msg}}</section>--> <section>{{msg}}</section>
<!--</section>--> </section>
<!--<section>--> <section>
<!-- 当前登录用户:{{users}}--> 当前登录用户:{{users}}
<!--</section>--> </section>
<!--<section>--> <section>
<!-- <label>--> <label>
<!-- <select name="type" [(ngModel)]="type">--> <select name="type" [(ngModel)]="type">
<!-- <option value="all">发送给所有人</option>--> <option value="all">发送给所有人</option>
<!-- <option value="single">发送给个人</option>--> <option value="single">发送给个人</option>
<!-- </select>--> </select>
<!-- </label>--> </label>
<!--</section>--> </section>
<!--<section>--> <section>
<!-- <label *ngIf="type === 'single'">--> <label *ngIf="type === 'single'">
<!-- <select name="user" [(ngModel)]="sendToUser">--> <select name="user" [(ngModel)]="sendToUser">
<!-- <option *ngFor="let person of users" [value]="person">{{person}}</option>--> <option *ngFor="let person of users" [value]="person">{{person}}</option>
<!-- </select>--> </select>
<!-- </label>--> </label>
<!--</section>--> </section>
<!--<p *ngIf="error">{{error | json}}</p>--> <p *ngIf="error">{{error | json}}</p>
<!--<p *ngIf="completed">completed!</p>--> <p *ngIf="completed">completed!</p>
<!--<label>--> <label>
<!-- <input type="text" [(ngModel)]="message">--> <input type="text" [(ngModel)]="message">
<!--</label>--> </label>
<!--<button (click)="send()">发送</button>--> <button (click)="send()">发送</button>

@ -37,7 +37,7 @@ export class TestComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
console.log(this.currentUser); console.log(this.currentUser);
// 连接websocket // 连接websocket
// this.webSocketService.connect(`ws://139.159.177.244:9302/brest/WebSocket/` + this.currentUser); this.webSocketService.connect(`ws://139.159.177.244:9302/brest/WebSocket/` + this.currentUser);
// 接收消息 // 接收消息
this.webSocketService.messageSubject.subscribe( this.webSocketService.messageSubject.subscribe(
data => { data => {
@ -54,18 +54,18 @@ export class TestComponent implements OnInit {
); );
} }
// send() { send() {
// // 创建消息对象 // 创建消息对象
// const msg = { const msg = {
// msg: this.message, // 消息内容 msg: this.message, // 消息内容
// type: this.type === SEND_TYPE.ALL ? SEND_TYPE.ALL : SEND_TYPE.SINGLE, // 类型 type: this.type === SEND_TYPE.ALL ? SEND_TYPE.ALL : SEND_TYPE.SINGLE, // 类型
// to: this.type === SEND_TYPE.SINGLE ? this.sendToUser : undefined // 要发送的对象 to: this.type === SEND_TYPE.SINGLE ? this.sendToUser : undefined // 要发送的对象
// }; };
// // 发送 // 发送
// this.webSocketService.sendMessage(JSON.stringify(msg)); this.webSocketService.sendMessage(JSON.stringify(msg));
// // 发送完成,情况message内容 // 发送完成,情况message内容
// this.message = ''; this.message = '';
// } }
} }

@ -59,6 +59,7 @@ import { PlatformPipe } from './pipes/recharge-pipe/platform.pipe';
import { IntegralTypePipe } from './pipes/integral/integral-type.pipe'; import { IntegralTypePipe } from './pipes/integral/integral-type.pipe';
import { IntegralProductPipe } from './pipes/integral/integral-product.pipe'; import { IntegralProductPipe } from './pipes/integral/integral-product.pipe';
import { MsgTypePipe } from './pipes/msg/msg-type.pipe'; import { MsgTypePipe } from './pipes/msg/msg-type.pipe';
import { ProductTypePipe } from './pipes/third-product/product-type.pipe';
const PIPES = [ const PIPES = [
TimesPipe, TimesPipe,
@ -109,6 +110,10 @@ const PIPES = [
GasClassGroupTaskStatusPipe, GasClassGroupTaskStatusPipe,
GasOrderStatusPipe, GasOrderStatusPipe,
PlatformPipe, PlatformPipe,
IntegralTypePipe,
IntegralProductPipe,
MsgTypePipe,
ProductTypePipe,
]; ];
@ -121,17 +126,11 @@ const PIPES = [
NgxNeditorModule NgxNeditorModule
], ],
declarations: [ declarations: [
...PIPES, ...PIPES
IntegralTypePipe,
IntegralProductPipe,
MsgTypePipe,
], ],
exports: [ exports: [
...PIPES, ...PIPES,
IntegralTypePipe,
IntegralProductPipe,
MsgTypePipe,
], ],
}) })

@ -41,3 +41,4 @@ export * from './apiMerchant/source-type.pipe';
export * from './gas-class-group-task/gas-class-group-task-status.pipe'; export * from './gas-class-group-task/gas-class-group-task-status.pipe';
export * from './gas-order/gas-order-status.pipe'; export * from './gas-order/gas-order-status.pipe';
export * from './recharge-pipe/platform.pipe'; export * from './recharge-pipe/platform.pipe';
export * from './third-product/product-type.pipe';

@ -15,4 +15,16 @@ export class MsgTypePipe implements PipeTransform {
return this.array[product][type - 1]; return this.array[product][type - 1];
} }
// transform(object: string , objectName: string): string {
//
// console.log(object);
//
// const o = JSON.parse(object);
// if (typeof o == 'object') {
// return o[objectName];
// }
// return null;
// }
} }

@ -4,10 +4,10 @@
export const environment = { export const environment = {
production: false, production: false,
baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'http://localhost:9302/filesystem/', // imageUrl: 'http://localhost:9302/filesystem/',
// baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'https://hsgcs.dctpay.com/filesystem/', imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
}; };

Loading…
Cancel
Save