From 686bf339ae9564836687e546626ec71f945ca850 Mon Sep 17 00:00:00 2001 From: caijun Date: Fri, 23 Jan 2026 11:09:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=93=9D=E6=98=9F=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/common.js | 12 +++++ components/Jnpf/UploadFile/index.vue | 19 ++++---- pages/apply/dynamicModelList/form.vue | 14 ++++-- pages/index/my.vue | 23 +++++---- pages/login/index.vue | 67 ++++++++++++++++++++++++++- utils/define.js | 2 +- 6 files changed, 112 insertions(+), 25 deletions(-) diff --git a/api/common.js b/api/common.js index 3d6cbac..918baad 100644 --- a/api/common.js +++ b/api/common.js @@ -237,6 +237,18 @@ export function getPermissionInfo() { method: 'GET' }) } + +// 获取token +export function socialLogin(token) { + return request({ + url: '/admin-api/system/auth/social-login', + method: 'post', + token, + header: { + 'Content-Type': 'application/x-www-form-urlencoded', + } + }) +} // 账号注销 export function accountCancel(token) { return request({ diff --git a/components/Jnpf/UploadFile/index.vue b/components/Jnpf/UploadFile/index.vue index 443277a..6ae2072 100644 --- a/components/Jnpf/UploadFile/index.vue +++ b/components/Jnpf/UploadFile/index.vue @@ -15,7 +15,7 @@ {{buttonText}} + @click.stop='downLoad(item)'> {{item.name}} @@ -208,20 +208,23 @@ this.$forceUpdate(); }, downLoad(item) { - if (item.fileExtension && imgTypeList.includes(item.fileExtension)) return this.previewImage(item) + const {fileUrl} = item + window.location.href = fileUrl + // if (item.fileExtension && imgTypeList.includes(item.fileExtension)) return this.previewImage(item) // #ifdef MP - this.previewFile(item) + // this.previewFile(item) + // #endif // #ifndef MP - getDownloadUrl('annex', item.fileId).then(res => { - const fileUrl = this.baseURL + res.data.url + '&name=' + item.name; + // getDownloadUrl('annex', item.fileId).then(res => { + // const fileUrl = this.baseURL + res.data.url + '&name=' + item.name; // #ifdef H5 - window.location.href = fileUrl; + // window.location.href = fileUrl; // #endif // #ifdef APP-PLUS - this.downloadFile(res.data.url); + // this.downloadFile(res.data.url); // #endif - }) + // }) // #endif }, // 移除某个文件 diff --git a/pages/apply/dynamicModelList/form.vue b/pages/apply/dynamicModelList/form.vue index 0334b58..f23e41f 100644 --- a/pages/apply/dynamicModelList/form.vue +++ b/pages/apply/dynamicModelList/form.vue @@ -298,7 +298,6 @@ } from '@/api/apply/visualDev' import UserSelect from '@/components/Jnpf/CandidateSelect' import {getOrganizeSelector} from '@/api/common.js' - import flowBtn from '../../workFlow/components/flowBtn.vue' export default { components: { CustomButton, @@ -332,7 +331,7 @@ isAdd: false, showMoreMenu: false, moreMenuList: [], - lc_fire_operation_detail: [], + createData: {}, // 初始值 deptList: [], showProcessDialog: false, processList: [], @@ -774,7 +773,7 @@ this.approvalSubmitting = false } }, - + // 获取布局和初始值 async getDesForm() { try { const res = await getDesForm(this.config.modelId); @@ -782,8 +781,9 @@ const data = res.data ? JSON.parse(res.data) : {}; this.formConf = JSON.parse(data.formData); console.log(this.formConf,'formConf--') + console.log(data,'data--111') this.formConf.labelWidth = 160; - this.lc_fire_operation_detail = data?.lc_fire_operation_detail || []; + this.createData = data await this.getDeptList(); await this.fillFormData(this.formConf, this.formData); this.showPage = true; @@ -894,11 +894,12 @@ await this.getApprovalData(); this.initMoreMenuList() } else { + console.log(this.formData,'formData111') const {user,deptInfoList} = this.userInfo this.isAdd = true; this.formData = { ...this.formData, - lc_fire_operation_detail: this.lc_fire_operation_detail, + ...this.createData, applyDepId: deptInfoList ? String(deptInfoList[0].deptId) : '' , applyDepName: deptInfoList && deptInfoList[0].deptName, applyUser: user.nickname @@ -1042,6 +1043,9 @@ } } } + if(vModel == 'applyUser') { + this.$set(item, 'disabled', true); + } if (vModel) { let val = data.hasOwnProperty(vModel) ? data[vModel] : config.defaultValue; if (!config.isSubTable) config.defaultValue = val; diff --git a/pages/index/my.vue b/pages/index/my.vue index c8b2d63..4f77cfa 100644 --- a/pages/index/my.vue +++ b/pages/index/my.vue @@ -193,8 +193,9 @@ if (!isAccept) return this.$u.toast(`请上传图片`) // #endif let tempFilePaths = res.tempFilePaths[0] + console.log(this.baseURL,'baseURL---') uni.uploadFile({ - url: this.baseURL + 'userAvatar', + url: this.baseURL + '/admin-api/infra/file/jeelowcode/upload', filePath: tempFilePaths, name: 'file', header: { @@ -202,14 +203,18 @@ }, success: (uploadFileRes) => { let data = JSON.parse(uploadFileRes.data) - if (data.code === 200) { - UpdateAvatar(data.data.name).then(res => { - this.$u.toast('头像更换成功') - this.avatarSrc = this.baseURL2 + data.data.url - }) - } else { - this.$u.toast(data.msg) - } + console.log(data,'data-----') + this.avatarSrc =data.data.fileUrl + console.log(this.avatarSrc,'-this.avatarSrc') + this.$u.toast('头像更换成功') + // if (data.code === 0) { + // UpdateAvatar(data.data.name).then(res => { + // this.$u.toast('头像更换成功') + // this.avatarSrc = this.baseURL2 + data.data.url + // }) + // } else { + // this.$u.toast(data.msg) + // } }, fail: (err) => { this.$u.toast('头像更换失败') diff --git a/pages/login/index.vue b/pages/login/index.vue index 48020fa..5523c36 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -49,6 +49,9 @@ 记住账号密码 + + 是否认证 + {{ loading ? "登录中...":"登录"}} @@ -119,6 +122,7 @@