审核流水号
diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
index 113f489..275bf48 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
@@ -59,6 +59,7 @@
+
diff --git a/src/app/admin/discount-package/discount-package-list/discount-package-list.component.ts b/src/app/admin/discount-package/discount-package-list/discount-package-list.component.ts
index c22ed83..14f2e5a 100644
--- a/src/app/admin/discount-package/discount-package-list/discount-package-list.component.ts
+++ b/src/app/admin/discount-package/discount-package-list/discount-package-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {CompanyService} from '../../../services/company.service';
@@ -11,386 +11,386 @@ import {DiscountPackageService} from '../../../services/discount-package.service
import {ValidatorsService} from '../../../services/validators.service';
@Component({
- selector: 'app-discount-package-list',
- templateUrl: './discount-package-list.component.html',
- styleUrls: ['./discount-package-list.component.scss']
+ selector: 'app-discount-package-list',
+ templateUrl: './discount-package-list.component.html',
+ styleUrls: ['./discount-package-list.component.scss']
})
export class DiscountPackageListComponent implements OnInit {
- BASE_URL = environment.baseUrl;
- WEB_SERVE_URL = environment.imageUrl;
- searchForm: FormGroup; // 搜索框
- requestData = []; // 列表数据
- usingAttribution = []; // 列表数据
- total: number; // 页码
- pageNum = 1; // 页码
- pageSize = 10; // 条码
- loading = true;
- listOfData = [];
- isVisible = false;
- isVisibleInventory = false;
- id: number;
- num: number;
-
- deliverUserAddForm: FormGroup;
- deliverUserAddModal = false;
- userInterval;
-
- deliverUserSearchForm: FormGroup;
- deliverUserModal = false;
- deliverUserArray = [];
- deliverUserForm: FormGroup;
- serialNumber: string;
-
- excelUserModal = false;
- excelUploadBtn = true;
- excelUploadFile = [];
-
- spinObject = {
- title: '处理中',
- status: false
- };
-
- constructor(
- private form: FormBuilder,
- private company: CompanyService,
- private activate: ActivateService,
- private iconService: IconService,
- private message: NzMessageService,
- private modal: NzModalService,
- private router: Router,
- private discountPackage: DiscountPackageService,
- private commonsService: CommonsService,
- ) {
- }
-
- ngOnInit(): void {
- this.init();
- }
-
- public init(): void {
- this.searchForm = this.form.group({
- title: [null],
- salesType: [null],
- usingAttribution: [null],
- recordNo: [null],
- status: [null],
- phone: [null],
- });
-
- this.deliverUserSearchForm = this.form.group({
- phone: [null],
- registerStatus: [null],
- errorStatus: [null],
- });
-
- this.deliverUserForm = this.form.group({
- packageId: [null],
- packageName: [''],
- phoneArray: [null],
- });
-
- this.deliverUserAddForm = this.form.group({
- phone: [null, [Validators.required, ValidatorsService.mobile]],
- });
-
- this.getRequest(true, this.searchForm.value);
- this.commonsService.getDictionary('USING_ATTRIBUTION ', data => {
- this.usingAttribution = data['return_data'];
- });
- }
-
- // 查询列表
- public getRequest(reset: boolean = false, whereObject: object) {
-
- this.loading = false;
- if (reset) {
- this.pageNum = 1;
+ BASE_URL = environment.baseUrl;
+ WEB_SERVE_URL = environment.imageUrl;
+ searchForm: FormGroup; // 搜索框
+ requestData = []; // 列表数据
+ usingAttribution = []; // 列表数据
+ total: number; // 页码
+ pageNum = 1; // 页码
+ pageSize = 10; // 条码
+ loading = true;
+ listOfData = [];
+ isVisible = false;
+ isVisibleInventory = false;
+ id: number;
+ num: number;
+
+ deliverUserAddForm: FormGroup;
+ deliverUserAddModal = false;
+ userInterval;
+
+ deliverUserSearchForm: FormGroup;
+ deliverUserModal = false;
+ deliverUserArray = [];
+ deliverUserForm: FormGroup;
+ serialNumber: string;
+
+ excelUserModal = false;
+ excelUploadBtn = true;
+ excelUploadFile = [];
+
+ spinObject = {
+ title: '处理中',
+ status: false
+ };
+
+ constructor(
+ private form: FormBuilder,
+ private company: CompanyService,
+ private activate: ActivateService,
+ private iconService: IconService,
+ private message: NzMessageService,
+ private modal: NzModalService,
+ private router: Router,
+ private discountPackage: DiscountPackageService,
+ private commonsService: CommonsService,
+ ) {
}
- whereObject['pageNum'] = this.pageNum;
- whereObject['pageSize'] = this.pageSize;
- this.discountPackage.getDiscountPackageList(whereObject, data => {
- if (data['return_code'] === '000000') {
- this.requestData = data['return_data'].list;
- this.total = data['return_data'].total;
- } else {
- this.message.error(data['return_msg']);
- }
- });
- }
-
- // 重置
- public resetForm(): void {
- this.searchForm.reset();
- }
-
- // 活动开始
- public upDiscountPackage(id: number): void {
- this.discountPackage.upDiscountPackage({discountPackageId : id}, data => {
- if (data['return_code'] === '000000') {
- this.message.success('上架成功');
- this.getRequest(true, this.searchForm.value);
- } else {
- this.message.error(data['return_msg']);
- }
- });
- }
-
- // 活动结束
- public downDiscountPackage(id: number): void {
- this.discountPackage.downDiscountPackage({discountPackageId : id}, data => {
- if (data['return_code'] === '000000') {
- this.message.success('下架成功');
+
+ ngOnInit(): void {
+ this.init();
+ }
+
+ public init(): void {
+ this.searchForm = this.form.group({
+ title: [null],
+ salesType: [null],
+ usingAttribution: [null],
+ recordNo: [null],
+ status: [null],
+ phone: [null],
+ });
+
+ this.deliverUserSearchForm = this.form.group({
+ phone: [null],
+ registerStatus: [null],
+ errorStatus: [null],
+ });
+
+ this.deliverUserForm = this.form.group({
+ packageId: [null],
+ packageName: [''],
+ phoneArray: [null],
+ });
+
+ this.deliverUserAddForm = this.form.group({
+ phone: [null, [Validators.required, ValidatorsService.mobile]],
+ });
+
this.getRequest(true, this.searchForm.value);
- } else {
- this.message.error(data['return_msg']);
- }
- });
- }
-
- // 删除
- public deleteDiscountPackage(id: number): void {
- this.commonsService.showConfirm('是否确认删除', isDelete => {
- if (isDelete) {
- this.discountPackage.deleteDiscountPackage({discountPackageId : id}, data => {
- if (data['return_code'] === '000000') {
- this.message.success('删除成功');
- this.getRequest(true, this.searchForm.value);
- } else {
- this.message.error(data['return_msg']);
- }
+ this.commonsService.getDictionary('USING_ATTRIBUTION ', data => {
+ this.usingAttribution = data['return_data'];
});
- }
- });
- }
-
-
- // 修改
- public getEdit(id: number): void {
- this.router.navigate(['/admin/discount-package/discount-package-edit'], {
- queryParams: {
- id
- }
- }).then(r => console.log(r));
- }
-
- handleCancel(): void {
- this.isVisible = false;
- }
-
- public getDetails(id: number): void {
- this.discountPackage.getDiscountPackageRuleById(id , data => {
- if (data['return_code'] === '000000') {
- this.listOfData = data['return_data'];
- this.isVisible = true;
- } else {
- this.message.create('error', data['return_msg']);
- }
- });
- }
-
- // 增加库存
- public addInventory(id: number): void {
- this.id = id;
- this.isVisibleInventory = true;
- }
-
-
- handleCancelInventory(): void {
- this.isVisibleInventory = false;
- }
-
- handleOkdInventory(): void {
-
- if (this.num == null || this.num === 0) {
- this.message.error('请输入新增库存数量');
- return;
}
+ // 查询列表
+ public getRequest(reset: boolean = false, whereObject: object) {
- const param = {
- num: this.num,
- discountPackageId: this.id
- };
- const id = this.message.loading('增加库存中..', { nzDuration: 0 }).messageId;
- this.discountPackage.addDiscountPackageStock(param , data => {
- if (data['return_code'] === '000000') {
+ this.loading = false;
+ if (reset) {
+ this.pageNum = 1;
+ }
+ whereObject['pageNum'] = this.pageNum;
+ whereObject['pageSize'] = this.pageSize;
+ this.discountPackage.getDiscountPackageList(whereObject, data => {
+ if (data['return_code'] === '000000') {
+ this.requestData = data['return_data'].list;
+ this.total = data['return_data'].total;
+ } else {
+ this.message.error(data['return_msg']);
+ }
+ });
+ }
+
+ // 重置
+ public resetForm(): void {
+ this.searchForm.reset();
+ }
+
+ // 活动开始
+ public upDiscountPackage(id: number): void {
+ this.discountPackage.upDiscountPackage({discountPackageId: id}, data => {
+ if (data['return_code'] === '000000') {
+ this.message.success('上架成功');
+ this.getRequest(true, this.searchForm.value);
+ } else {
+ this.message.error(data['return_msg']);
+ }
+ });
+ }
+
+ // 活动结束
+ public downDiscountPackage(id: number): void {
+ this.discountPackage.downDiscountPackage({discountPackageId: id}, data => {
+ if (data['return_code'] === '000000') {
+ this.message.success('下架成功');
+ this.getRequest(true, this.searchForm.value);
+ } else {
+ this.message.error(data['return_msg']);
+ }
+ });
+ }
+
+ // 删除
+ public deleteDiscountPackage(id: number): void {
+ this.commonsService.showConfirm('是否确认删除', isDelete => {
+ if (isDelete) {
+ this.discountPackage.deleteDiscountPackage({discountPackageId: id}, data => {
+ if (data['return_code'] === '000000') {
+ this.message.success('删除成功');
+ this.getRequest(true, this.searchForm.value);
+ } else {
+ this.message.error(data['return_msg']);
+ }
+ });
+ }
+ });
+ }
+
+
+ // 修改
+ public getEdit(id: number): void {
+ this.router.navigate(['/admin/discount-package/discount-package-edit'], {
+ queryParams: {
+ id
+ }
+ }).then(r => console.log(r));
+ }
+
+ handleCancel(): void {
+ this.isVisible = false;
+ }
+
+ public getDetails(id: number): void {
+ this.discountPackage.getDiscountPackageRuleById(id, data => {
+ if (data['return_code'] === '000000') {
+ this.listOfData = data['return_data'];
+ this.isVisible = true;
+ } else {
+ this.message.create('error', data['return_msg']);
+ }
+ });
+ }
+
+ // 增加库存
+ public addInventory(id: number): void {
+ this.id = id;
+ this.isVisibleInventory = true;
+ }
+
+
+ handleCancelInventory(): void {
this.isVisibleInventory = false;
- this.getRequest(true, this.searchForm.value);
- this.message.success('新增成功');
- } else {
- this.message.create('error', data['return_msg']);
- }
- this.message.remove(id);
- });
- }
-
- // 打开 发送优惠券包给用户模态框
- showDeliverUserModal(packageId: number, packageName: string) {
- this.discountPackage.getHandleByPackageId({ packageId: packageId}, data => {
- if (data['return_code'] === '000000') {
- if (data['return_data'] != null) {
- this.modal.confirm({
- nzTitle: '提示',
- nzContent: '当前卷包有赠送任务进行中，是否查看赠送进度？',
- nzOnOk: () => this.processRate(data['return_data']['serialNumber'])
- })
- } else {
- this.deliverUserForm.patchValue({ packageId: packageId, packageName: packageName});
- this.deliverUserModal = true;
+ }
+
+ handleOkdInventory(): void {
+
+ if (this.num == null || this.num === 0) {
+ this.message.error('请输入新增库存数量');
+ return;
}
- }
- });
- }
-
- // 关闭 发送优惠券包给用户模态框
- closeDeliverUserModal() {
- this.deliverUserForm.reset();
- this.deliverUserModal = false;
- }
-
- // 删除赠送用户
- delDeliverUser(serialNum: number) {
- this.deliverUserArray = this.deliverUserArray.filter(o => o.serialNum != serialNum);
- }
-
- // 展示导入模态框
- showExcelUserModal() {
- this.excelUserModal = true;
- }
-
- // 关闭导入模态框
- closeExcelUserModal() {
- this.spinObject.status = false;
- this.excelUploadBtn = true;
- this.excelUploadFile = [];
- this.excelUserModal = false;
- }
-
- // 提交赠送数据
- submitDeliverUser() {
- if (this.deliverUserArray.length == 0) {
- this.modal.warning({ nzTitle: '提示', nzContent: '没有需要赠送的用户'});
+
+
+ const param = {
+ num: this.num,
+ discountPackageId: this.id
+ };
+ const id = this.message.loading('增加库存中..', {nzDuration: 0}).messageId;
+ this.discountPackage.addDiscountPackageStock(param, data => {
+ if (data['return_code'] === '000000') {
+ this.isVisibleInventory = false;
+ this.getRequest(true, this.searchForm.value);
+ this.message.success('新增成功');
+ } else {
+ this.message.create('error', data['return_msg']);
+ }
+ this.message.remove(id);
+ });
}
- this.deliverUserForm.patchValue({ phoneArray: this.deliverUserArray.filter(o => o.errorStatus == false)});
- this.spinObject.status = true;
- this.spinObject.title = '处理中...';
- const param = this.deliverUserForm.value;
- this.closeDeliverUserModal();
-
- this.discountPackage.giveAway(param, data => {
- if (data['return_code'] === '000000') {
- this.serialNumber = data['return_data'];
- this.processRate(this.serialNumber);
- } else {
- this.showDeliverUserModal(this.deliverUserForm.controls.packageId.value, this.deliverUserForm.controls.packageName.value);
- this.message.create('error', data['return_msg']);
- this.spinObject.status = false;
- }
- });
- }
-
- // 处理进度
- processRate(serialNum: string) {
- this.spinObject.status = true;
- this.userInterval = setInterval(() => this.commonsService.getRedisValueByType(serialNum, data => {
- if (data['return_data'] != null) {
- this.spinObject.title = '已处理' + data['return_data'] + '条数据';
- } else {
+
+ // 打开 发送优惠券包给用户模态框
+ showDeliverUserModal(packageId: number, packageName: string) {
+ this.discountPackage.getHandleByPackageId({packageId: packageId}, data => {
+ if (data['return_code'] === '000000') {
+ if (data['return_data'] != null) {
+ this.modal.confirm({
+ nzTitle: '提示',
+ nzContent: '当前卷包有赠送任务进行中，是否查看赠送进度？',
+ nzOnOk: () => this.processRate(data['return_data']['serialNumber'])
+ });
+ } else {
+ this.deliverUserForm.patchValue({packageId: packageId, packageName: packageName});
+ this.deliverUserModal = true;
+ }
+ }
+ });
+ }
+
+ // 关闭 发送优惠券包给用户模态框
+ closeDeliverUserModal() {
+ this.deliverUserForm.reset();
+ this.deliverUserModal = false;
+ }
+
+ // 删除赠送用户
+ delDeliverUser(serialNum: number) {
+ this.deliverUserArray = this.deliverUserArray.filter(o => o.serialNum != serialNum);
+ }
+
+ // 展示导入模态框
+ showExcelUserModal() {
+ this.excelUserModal = true;
+ }
+
+ // 关闭导入模态框
+ closeExcelUserModal() {
this.spinObject.status = false;
- this.getRequest(true, this.searchForm.value);
- clearTimeout(this.userInterval);
- }
- }), 1000);
- }
-
- // 提交excel数据
- submitExcelUser() {
- this.spinObject.title = '文件导入中... 数据太多会占用较长时间';
- this.spinObject.status = true;
- this.discountPackage.getPhoneListByFileUrl({ fileUrl: this.excelUploadFile[0]['url']}, data => {
- if (data['return_code'] === '000000') {
- this.deliverUserArray = data['return_data']['data'];
- this.closeExcelUserModal();
- } else {
- this.spinObject.status = false;
- this.message.error(data['return_msg']);
+ this.excelUploadBtn = true;
+ this.excelUploadFile = [];
+ this.excelUserModal = false;
+ }
+
+ // 提交赠送数据
+ submitDeliverUser() {
+ if (this.deliverUserArray.length == 0) {
+ this.modal.warning({nzTitle: '提示', nzContent: '没有需要赠送的用户'});
}
- });
- }
+ this.deliverUserForm.patchValue({phoneArray: this.deliverUserArray.filter(o => o.errorStatus == false)});
+ this.spinObject.status = true;
+ this.spinObject.title = '处理中...';
+ const param = this.deliverUserForm.value;
+ this.closeDeliverUserModal();
+
+ this.discountPackage.giveAway(param, data => {
+ if (data['return_code'] === '000000') {
+ this.serialNumber = data['return_data'];
+ this.processRate(this.serialNumber);
+ } else {
+ this.showDeliverUserModal(this.deliverUserForm.controls.packageId.value, this.deliverUserForm.controls.packageName.value);
+ this.message.create('error', data['return_msg']);
+ this.spinObject.status = false;
+ }
+ });
+ }
- // 上传excel回调
- excelUserHandleChange(info: NzUploadChangeParam): void {
- if (info.file.status !== 'uploading') {
- this.excelUploadFile = [];
+ // 处理进度
+ processRate(serialNum: string) {
+ this.spinObject.status = true;
+ this.userInterval = setInterval(() => this.commonsService.getRedisValueByType(serialNum, data => {
+ if (data['return_data'] != null) {
+ this.spinObject.title = '已处理' + data['return_data'] + '条数据';
+ } else {
+ this.spinObject.status = false;
+ this.getRequest(true, this.searchForm.value);
+ clearTimeout(this.userInterval);
+ }
+ }), 1000);
}
- if (info.file.status === 'done') {
- this.excelUploadBtn = false;
- this.excelUploadFile.push(
- {
- uid: '1',
- name: info.file.name,
- status: 'done',
- url: info.file['response']['return_data'][0],
- thumbUrl: this.WEB_SERVE_URL + info.file['response']['return_data'][0],
- }
- )
- } else if (info.file.status === 'error') {
- this.message.error('文件上传失败');
+
+ // 提交excel数据
+ submitExcelUser() {
+ this.spinObject.title = '文件导入中... 数据太多会占用较长时间';
+ this.spinObject.status = true;
+ this.discountPackage.getPhoneListByFileUrl({fileUrl: this.excelUploadFile[0]['url']}, data => {
+ if (data['return_code'] === '000000') {
+ this.deliverUserArray = data['return_data']['data'];
+ this.closeExcelUserModal();
+ } else {
+ this.spinObject.status = false;
+ this.message.error(data['return_msg']);
+ }
+ });
}
- }
-
- // 打开 发送优惠券包给用户模态框
- showDeliverUserAddModal() {
- this.deliverUserAddModal = true;
- }
-
- // 关闭 发送优惠券包给用户模态框
- closeDeliverUserAddModal() {
- this.deliverUserAddForm.reset();
- this.deliverUserAddModal = false;
- }
-
- submitDeliverUserAdd() {
- for (const i in this.deliverUserAddForm.controls) {
- this.deliverUserAddForm.controls[i].markAsDirty();
- this.deliverUserAddForm.controls[i].updateValueAndValidity();
+
+ // 上传excel回调
+ excelUserHandleChange(info: NzUploadChangeParam): void {
+ if (info.file.status !== 'uploading') {
+ this.excelUploadFile = [];
+ }
+ if (info.file.status === 'done') {
+ this.excelUploadBtn = false;
+ this.excelUploadFile.push(
+ {
+ uid: '1',
+ name: info.file.name,
+ status: 'done',
+ url: info.file['response']['return_data'][0],
+ thumbUrl: this.WEB_SERVE_URL + info.file['response']['return_data'][0],
+ }
+ )
+ } else if (info.file.status === 'error') {
+ this.message.error('文件上传失败');
+ }
}
- if (this.deliverUserAddForm.status == null || this.deliverUserAddForm.status !== 'VALID') {
- this.modal.warning({
- nzTitle: '提示',
- nzContent: '请规范填写所有的必填项信息',
- });
- return;
+
+ // 打开 发送优惠券包给用户模态框
+ showDeliverUserAddModal() {
+ this.deliverUserAddModal = true;
}
- let phoneObject = this.deliverUserArray.find(o => o.phone == this.deliverUserAddForm.controls.phone.value);
- if (phoneObject != null) {
- this.modal.warning({
- nzTitle: '提示',
- nzContent: '手机号在列表中已存在',
- });
- return;
+ // 关闭 发送优惠券包给用户模态框
+ closeDeliverUserAddModal() {
+ this.deliverUserAddForm.reset();
+ this.deliverUserAddModal = false;
}
- this.discountPackage.getPhoneRegisterStatus(this.deliverUserAddForm.value, data => {
- if (data['return_code'] === '000000') {
- this.deliverUserArray.push({
- serialNum: this.deliverUserArray.length + 1,
- phone: this.deliverUserAddForm.controls.phone.value,
- registerStatus: data['return_data'],
- errorStatus: false,
- errorMsg: null
+ submitDeliverUserAdd() {
+ for (const i in this.deliverUserAddForm.controls) {
+ this.deliverUserAddForm.controls[i].markAsDirty();
+ this.deliverUserAddForm.controls[i].updateValueAndValidity();
+ }
+ if (this.deliverUserAddForm.status == null || this.deliverUserAddForm.status !== 'VALID') {
+ this.modal.warning({
+ nzTitle: '提示',
+ nzContent: '请规范填写所有的必填项信息',
+ });
+ return;
+ }
+
+ let phoneObject = this.deliverUserArray.find(o => o.phone == this.deliverUserAddForm.controls.phone.value);
+ if (phoneObject != null) {
+ this.modal.warning({
+ nzTitle: '提示',
+ nzContent: '手机号在列表中已存在',
+ });
+ return;
+ }
+
+ this.discountPackage.getPhoneRegisterStatus(this.deliverUserAddForm.value, data => {
+ if (data['return_code'] === '000000') {
+ this.deliverUserArray.push({
+ serialNum: this.deliverUserArray.length + 1,
+ phone: this.deliverUserAddForm.controls.phone.value,
+ registerStatus: data['return_data'],
+ errorStatus: false,
+ errorMsg: null
+ });
+ this.deliverUserArray = this.deliverUserArray.slice();
+ this.closeDeliverUserAddModal();
+ }
});
- this.deliverUserArray = this.deliverUserArray.slice();
- this.closeDeliverUserAddModal();
- }
- });
- }
-
- // 下载模板
- downloadTemp() {
- window.location.href = this.WEB_SERVE_URL + 'template/导入模板.xlsx';
- }
+ }
+
+ // 下载模板
+ downloadTemp() {
+ window.location.href = this.WEB_SERVE_URL + 'template/导入模板.xlsx';
+ }
}
diff --git a/src/app/admin/index/index/index.component.html b/src/app/admin/index/index/index.component.html
index a18c7f9..cfb6ddc 100644
--- a/src/app/admin/index/index/index.component.html
+++ b/src/app/admin/index/index/index.component.html
@@ -105,29 +105,29 @@
-
- 汇联通预充值账号
- 余额:{{(balance - balanceData['payRealPrice']).toFixed(2)}}
+
+ 汇联通工会卡充值
+ 余额:{{(balance - balanceData['sum']).toFixed(2)}}
订单数量:{{balanceData['count']}}
- 支付总额:{{balanceData['payRealPrice'] == null ? '0': balanceData['payRealPrice']}}
-
-
-
-
- 中石化订单
- 订单数量:{{orderData['count']}}
- 订单总额:{{orderData['orderPrice'] == null ? '0': orderData['orderPrice']}}
- 支付总额:{{orderData['payRealPrice'] == null ? '0': orderData['payRealPrice']}}
-
-
-
-
- 话费订单
- 订单数量:{{rechargeData['count']}}
- 订单总额:{{rechargeData['orderPrice'] == null ? '0': rechargeData['orderPrice']}}
- 支付总额:{{rechargeData['payRealPrice'] == null ? '0': rechargeData['payRealPrice']}}
+ 支付总额:{{balanceData['sum'] == null ? '0': balanceData['sum']}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/admin/index/index/index.component.ts b/src/app/admin/index/index/index.component.ts
index 600ff19..a267169 100644
--- a/src/app/admin/index/index/index.component.ts
+++ b/src/app/admin/index/index/index.component.ts
@@ -78,10 +78,10 @@ export class IndexComponent implements OnInit {
if (this.store.get(ADMIN_INFO_OBJECT)['bsCompany'] != null && this.store.get(ADMIN_INFO_OBJECT)['bsCompany'].id === 3) {
this.code = 60;
this.getHLTBalance();
- this.orderByIndex();
+ // this.orderByIndex();
this.HLTOrderByIndex();
this.rechargeOrderByIndex();
- this.HLTOrderByList();
+ // this.HLTOrderByList();
}
if (this.store.get(ADMIN_INFO_OBJECT)['merchantStore'] != null) {
@@ -135,7 +135,8 @@ export class IndexComponent implements OnInit {
}
public HLTOrderByIndex(): void {
- this.index.HLTOrderByIndex(this.code, data => {
+ this.index.hltCardNoTopUpStatistic( data => {
+ console.log(data);
if (data['return_code'] === '000000') {
this.balanceData = data['return_data'];
this.loading = false;
@@ -156,15 +157,15 @@ export class IndexComponent implements OnInit {
});
}
- public HLTOrderByList(): void {
- this.index.HLTOrderByList(this.code, data => {
- if (data['return_code'] === '000000') {
- this.listOfData = data['return_data'];
- } else {
- this.message.error(data['return_msg']);
- }
- });
- }
+ // public HLTOrderByList(): void {
+ // this.index.HLTOrderByList(this.code, data => {
+ // if (data['return_code'] === '000000') {
+ // this.listOfData = data['return_data'];
+ // } else {
+ // this.message.error(data['return_msg']);
+ // }
+ // });
+ // }
public getIndexCount(): void {
this.index.getIndexCount(data => {
diff --git a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts
index 5eb2c00..8b54853 100644
--- a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts
+++ b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts
@@ -7,6 +7,7 @@ import {CommonsService} from '../../../services/commons.service';
import {OrderMobileRechargeService} from '../../../services/order/order-mobile-recharge.service';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzNotificationService} from 'ng-zorro-antd';
+
import {animate, state, style, transition, trigger} from '@angular/animations';
@Component({
@@ -174,10 +175,7 @@ export class MobileRechargeOrderListComponent implements OnInit {
this.isVisible = true;
this.orderMobileRechargeService.exportMobilePartyOrderList(whereObject, data => {
- if (data['return_code'] === '000000') {
- // this.message.success('导出成功！');
- // window.location.href = this.FILE_URL + 'temporary/' + data['return_data'];
- } else {
+ if (data['return_code'] !== '000000') {
this.isVisible = false;
this.message.error(data['return_msg']);
}
diff --git a/src/app/admin/user/user-list/user-list.component.html b/src/app/admin/user/user-list/user-list.component.html
index 5a1fb5b..6e424e5 100644
--- a/src/app/admin/user/user-list/user-list.component.html
+++ b/src/app/admin/user/user-list/user-list.component.html
@@ -33,6 +33,17 @@
+