hurui
/
high-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
pull/1/head
袁野 2 years ago
parent 420c05bee4
commit 4318a6760a
9 changed files with 73 additions and 57 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  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. 2
      src/app/admin/system/system-msg/system-msg.component.html
  6. 13
      src/app/app-common.module.ts
  7. 1
      src/app/pipes/index.ts
  8. 12
      src/app/pipes/msg/msg-type.pipe.ts
  9. 8
      src/environments/environment.ts

4
src/app/admin/agent/agent-list/agent-list.component.ts
Unescape View File

@ -251,9 +251,11 @@ export class AgentListComponent implements OnInit {
}
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['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;
const whereObject = {

4
src/app/admin/config-manage/third-product/third-product.component.html
Unescape View File

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

60
src/app/admin/index/test/test.component.html
Unescape View File

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

26
src/app/admin/index/test/test.component.ts
Unescape View File

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

2
src/app/admin/system/system-msg/system-msg.component.html
Unescape View File

@ -91,7 +91,7 @@
</tr>
</thead>
<tbody>
<tr *ngFor="let data of ajaxTable.data; let i = index">
<tr *ngFor="let data of ajaxTable.data; let i = index">
<td>{{i+1}}</td>
<td>{{data.title}}</td>
<td>{{data.type | msgType : 1 }}</td>

13
src/app/app-common.module.ts
Unescape View File

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

1
src/app/pipes/index.ts
Unescape View File

@ -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-order/gas-order-status.pipe';
export * from './recharge-pipe/platform.pipe';
export * from './third-product/product-type.pipe';

12
src/app/pipes/msg/msg-type.pipe.ts
Unescape View File

@ -15,4 +15,16 @@ export class MsgTypePipe implements PipeTransform {
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;
// }
}

8
src/environments/environment.ts
Unescape View File

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

Write Preview
Loading…
Cancel
Save