From 48a7d1e5dd80bdf2cd73ee875c92c6b0b0d3f1ae Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 20:18:05 +0800 Subject: [PATCH] fix bug --- .../components/config/config.component.html | 98 ++------- .../components/config/config.component.ts | 206 ++++++++++-------- 2 files changed, 138 insertions(+), 166 deletions(-) diff --git a/src/app/routes/partner/system-config/components/config/config.component.html b/src/app/routes/partner/system-config/components/config/config.component.html index 413ced69..c57af325 100644 --- a/src/app/routes/partner/system-config/components/config/config.component.html +++ b/src/app/routes/partner/system-config/components/config/config.component.html @@ -13,14 +13,14 @@

提现手续费配置

- +
按照提现金额收取 %手续费
- +
按照提现金额收取
-

合伙人提现配置

+

合伙人提现配置

- + - +
@@ -57,7 +57,7 @@
-

客户定义配置

+

客户定义配置

客户 @@ -67,7 +67,7 @@
客户 - 天内没有交易订单的视为“沉默客户” + 天内没有交易订单的视为“流失客户”
说明：交易订单指从司机已接单开始的订单。 @@ -76,8 +76,7 @@ -

司机端配置

-

图片配置

+

邀请合伙人

+ +

邀请客户

+ - -
可输入字符
- - -

短信配置

-
-
- -

配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容

- - -
-
-

通知配置

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

客服电话配置

-
-
- - - -
-
-

证件提醒配置

-
-
- - 距离到期时间 - - 天开始提醒，每隔 - - 天提醒一次 - -
-
+
diff --git a/src/app/routes/partner/system-config/components/config/config.component.ts b/src/app/routes/partner/system-config/components/config/config.component.ts index a7501487..bbac9eb1 100644 --- a/src/app/routes/partner/system-config/components/config/config.component.ts +++ b/src/app/routes/partner/system-config/components/config/config.component.ts @@ -1,8 +1,23 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFUploadWidgetSchema } from '@delon/form'; -import { Observable, Observer } from 'rxjs'; +import { NzUploadFile } from 'ng-zorro-antd/upload'; +import { Observable, Observer, of } from 'rxjs'; import { ConfigService } from '../../services/config.service'; - +import { apiConf } from '@conf/api.conf'; +const IMAGECONFIG = { + previewFile: (file: NzUploadFile) => of(file.url), + action: apiConf.waterFileUpload, + fileType: 'image/png,image/jpeg,image/jpg,image/gif', + fileSize: 5120, + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + widget: 'upload', + name: 'multipartFile', + multiple: false, + listType: 'picture-card' +} as SFUploadWidgetSchema; @Component({ selector: 'app-parterl-config', templateUrl: './config.component.html', @@ -10,6 +25,7 @@ import { ConfigService } from '../../services/config.service'; }) export class PartnerSystemConfigComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('sf2', { static: false }) sf2!: SFComponent; formDate: any = { isAudit: false, isEveryDay: false, @@ -62,21 +78,23 @@ export class PartnerSystemConfigComponent implements OnInit { i: any; schema!: SFSchema; + schema2!: SFSchema; - imageConfig = { - widget: 'upload', - action: `/scm/cms/cms/upload/multipartFile/fileModel`, - limit: 1, - limitFileCount: 1, - resReName: 'url', - urlReName: 'url', - data: { - appId: this.service.envSrv.getEnvironment().appId - }, - multiple: false, - listType: 'picture-card', - showRequired: true - }; + // IMAGECONFIG = { + // widget: 'upload', + // action: `/scm/cms/cms/upload/multipartFile/fileModel`, + // limit: 1, + // limitFileCount: 1, + // resReName: 'url', + // urlReName: 'url', + // data: { + // appId: this.service.envSrv.getEnvironment().appId + // }, + // multiple: false, + // listType: 'picture-card', + // showRequired: true + // }; + constructor(private service: ConfigService) {} ngOnInit() { @@ -155,105 +173,117 @@ export class PartnerSystemConfigComponent implements OnInit { this.schema = { properties: { - sysMinLogo: { + roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } }, + roadTransportPhotoWatermark: { type: 'string', - title: '系统LOGO(小)', - // enum: [], + title: '分享海报', ui: { - ...this.imageConfig, - descriptionI18n: '小尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸32*32px）。', + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸 750px* 1624 px）。', change: args => { if (args.type === 'success') { - const avatar = this.getImageModel(args, 'sysMinLogo'); - this.sf?.setValue('/sysMinLogo', avatar); - this.i.sysMinLogo = avatar; + this.sf.setValue('/roadTransportPhoto', args.fileList[0].response.data.fullFilePath); } }, - beforeUpload: this.uploadBefore } as SFUploadWidgetSchema }, - sysMaxLogo: { + share: { title: '', type: 'string', ui: { hidden: true } }, + shareWatermark: { type: 'string', - title: '系统LOGO(大)', + title: '分享图', ui: { - ...this.imageConfig, - descriptionI18n: '小尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸32*32px）。', + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（ 建议尺寸 856px * 688px）。', change: args => { if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo', avatar); - this.i.sysMaxLogo = avatar; + this.sf.setValue('/share', args.fileList[0].response.data.fullFilePath); } }, - beforeUpload: this.uploadBefore } as SFUploadWidgetSchema }, - sysMaxLogo1: { + take: { title: '', type: 'string', ui: { hidden: true } }, + takeWatermark: { type: 'string', - title: '用户默认头像', + title: '受邀海报', ui: { - ...this.imageConfig, - descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。', + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸 750px* 1624 px）。', change: args => { if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo1', avatar); - this.i.sysMaxLogo1 = avatar; + this.sf.setValue('/take', args.fileList[0].response.data.fullFilePath); } }, - beforeUpload: this.uploadBefore } as SFUploadWidgetSchema }, - sysMaxLogo2: { + complianceRemark: { + title: '分享文案', type: 'string', - title: '企业默认头像', + maxLength: 50, ui: { - ...this.imageConfig, - descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。', - change: args => { - if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo2', avatar); - this.i.sysMaxLogo2 = avatar; - } - }, - beforeUpload: this.uploadBefore - } as SFUploadWidgetSchema - }, - sysMaxLogo3: { - type: 'string', - title: '货主PC端登陆页海报', - ui: { - ...this.imageConfig, - descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸1920*630px）。', - change: args => { - if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo3', avatar); - this.i.sysMaxLogo3 = avatar; - } - }, - beforeUpload: this.uploadBefore - } as SFUploadWidgetSchema - }, - sysMaxLogo4: { - type: 'string', - title: 'APP开屏海报', - ui: { - ...this.imageConfig, - descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸375*773px）。', - change: args => { - if (args.type === 'success') { - const avatar = this.getImageModel(args, -1); - this.sf?.setValue('/sysMaxLogo4', avatar); - this.i.sysMaxLogo4 = avatar; - } - }, - beforeUpload: this.uploadBefore - } as SFUploadWidgetSchema - }, + placeholder: '请不要超过50个字', + widget: 'textarea', + autosize: { minRows: 3, maxRows: 6 } + } + } }, - required: ['sysMinLogo', 'sysMaxLogo', 'sysMaxLogo1', 'sysMaxLogo2', 'sysMaxLogo3', 'sysMaxLogo4'] + required: ['roadTransportPhotoWatermark', 'shareWatermark', 'takeWatermark', 'complianceRemark'] + }; + this.schema2 = { + properties: { + roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } }, + roadTransportPhotoWatermark: { + type: 'string', + title: '分享海报', + ui: { + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸750px* 1624 px）。', + change: args => { + if (args.type === 'success') { + this.sf2.setValue('/roadTransportPhoto', args.fileList[0].response.data.fullFilePath); + } + }, + } as SFUploadWidgetSchema + }, + share: { title: '', type: 'string', ui: { hidden: true } }, + shareWatermark: { + type: 'string', + title: '分享图', + ui: { + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸 856px * 688px）。', + change: args => { + if (args.type === 'success') { + this.sf2.setValue('/share', args.fileList[0].response.data.fullFilePath); + } + }, + } as SFUploadWidgetSchema + }, + take: { title: '', type: 'string', ui: { hidden: true } }, + takeWatermark: { + type: 'string', + title: '受邀海报', + ui: { + ...IMAGECONFIG, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸750px* 1624 px）。', + change: args => { + if (args.type === 'success') { + this.sf2.setValue('/take', args.fileList[0].response.data.fullFilePath); + } + }, + } as SFUploadWidgetSchema + }, + complianceRemark: { + title: '分享文案', + type: 'string', + maxLength: 50, + ui: { + placeholder: '请不要超过50个字', + widget: 'textarea', + autosize: { minRows: 3, maxRows: 6 } + } + } + }, + required: ['roadTransportPhotoWatermark', 'shareWatermark', 'takeWatermark', 'complianceRemark'] }; } private uploadBefore = (file: any, fileList: any) => {