From c546659fbaaaa0949a8586535fd1d0b588d597f7 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Fri, 28 Jan 2022 16:11:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20render=20=E4=BF=AE=E5=A4=8D=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=B5=8C=E6=8F=92=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 不该判断res.id 后台没有返回这个值 --- CHANGELOG.md | 1 + common/styles/theme/default.scss | 1 + components/Render/Render.vue | 23 +++++++++++---------- plugins/p-finance-audit/p-finance-audit.vue | 10 +++++++-- plugins/p-source-manage/p-source-manage.vue | 12 ++++------- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c1f227..b5abc70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252) - | 插件的填写提交，编辑与删除 | [84390d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/84390d5) - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b) + - | 文件上传添加APP的条件判断 | [5d4c1be](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5d4c1be) - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss index 803b2ab..1267114 100644 --- a/common/styles/theme/default.scss +++ b/common/styles/theme/default.scss @@ -1,6 +1,7 @@ // 默认主题文件 .theme-default { background-color: #f3f3f3; + .u-card { font-size: 16px !important; background-color: #f3f3f3 !important; diff --git a/components/Render/Render.vue b/components/Render/Render.vue index e9f229c..9e4dec2 100644 --- a/components/Render/Render.vue +++ b/components/Render/Render.vue @@ -3,7 +3,7 @@ { @@ -98,6 +98,7 @@ export default { }, init(res) { + console.log('res: ', res); const content = document.querySelector('.content'); content.innerHTML = res.html; @@ -110,14 +111,14 @@ export default { diff --git a/plugins/p-finance-audit/p-finance-audit.vue b/plugins/p-finance-audit/p-finance-audit.vue index aa46560..734f97c 100644 --- a/plugins/p-finance-audit/p-finance-audit.vue +++ b/plugins/p-finance-audit/p-finance-audit.vue @@ -14,11 +14,17 @@ const { projectId, projectName, token } = useGenerateWebviewParam(); // DEBUG:打开财务审批详情页 function openAudit() { - uni.$ui.openDetail({ url: `http://121.36.3.207/finance/index?name=财务审批&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` }); + uni.$ui.openDetail({ + url: `http://121.36.3.207/finance/index?name=财务审批&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}`, + name: '财务审批', + }); } // DEBUG:打开财务统计详情页 function openStatistical() { - uni.$ui.openDetail({ url: `http://121.36.3.207/finance/financial-approval?name=财务统计&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` }); + uni.$ui.openDetail({ + url: `http://121.36.3.207/finance/financial-approval?name=财务统计&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}`, + name: '财务统计', + }); } diff --git a/plugins/p-source-manage/p-source-manage.vue b/plugins/p-source-manage/p-source-manage.vue index 2f02b2b..ced1751 100644 --- a/plugins/p-source-manage/p-source-manage.vue +++ b/plugins/p-source-manage/p-source-manage.vue @@ -1,6 +1,8 @@