diff --git a/CHANGELOG.md b/CHANGELOG.md index 33da863..28c6702 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ - | 手机号登录 | [a198527](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a198527) - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da) - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) + - | 刷新页面store数据清空 | [17869db](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/17869db) - | 刷新token重新运行api | [02fb4bf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/02fb4bf) - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) - | 添加财务申请详情页 | [e69d233](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e69d233) 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 86d6261..9497c11 100644 --- a/components/Render/Render.vue +++ b/components/Render/Render.vue @@ -3,7 +3,7 @@ diff --git a/hooks/project/useGenerateWebviewParam.js b/hooks/project/useGenerateWebviewParam.js index 6d1698b..614a3db 100644 --- a/hooks/project/useGenerateWebviewParam.js +++ b/hooks/project/useGenerateWebviewParam.js @@ -3,11 +3,9 @@ import { useStore } from 'vuex'; export default function useGenerateWebviewParam() { const store = useStore(); - const projectId = computed(() => store.getters['project/projectId']); const token = computed(() => store.state.user.token); const projectName = computed(() => store.getters['project/projectName']); - return { projectId: projectId.value, token: token.value, diff --git a/pages.json b/pages.json index fcb7318..c680ee6 100644 --- a/pages.json +++ b/pages.json @@ -74,7 +74,43 @@ "navigationBarTitleText": "404" } } - ], + ,{ + "path" : "pages/audit/audit", + "style" : + { + "navigationBarTitleText": "个人管理", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/uidispose/uidispose", + "style" : + { + "navigationBarTitleText": "ui配置", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/exarresources/exarresources", + "style" : + { + "navigationBarTitleText": "域资源管理", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/projectVersion/projectVersion", + "style" : + { + "navigationBarTitleText": "项目版本管理", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "TALL", @@ -89,4 +125,4 @@ "theme": "@/components/Theme/Theme.vue" } } -} +} diff --git a/pages/audit/audit.vue b/pages/audit/audit.vue new file mode 100644 index 0000000..c8bf47f --- /dev/null +++ b/pages/audit/audit.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/pages/checkLog/checkLog.vue b/pages/checkLog/checkLog.vue index 11cd7cd..931084d 100644 --- a/pages/checkLog/checkLog.vue +++ b/pages/checkLog/checkLog.vue @@ -17,7 +17,7 @@ 已通过 已驳回 - + {{ item.score }} diff --git a/pages/exarresources/exarresources.vue b/pages/exarresources/exarresources.vue new file mode 100644 index 0000000..70675e1 --- /dev/null +++ b/pages/exarresources/exarresources.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/pages/project/project.vue b/pages/project/project.vue index 8ef7203..72f82a5 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -61,7 +61,7 @@ onMounted(() => { }); if (!userInfo.value) { - let res = uni.$storage.getStorageSync('user'); + const res = uni.$storage.getStorageSync('user'); if (res) { store.commit('user/setUser', JSON.parse(res)); } @@ -76,7 +76,12 @@ if (!userInfo.value) { watch(roleId, newValue => { if (newValue) { // 判断如果allTasks里有就不用加了 - if (allTasks.value.length && allTasks.value[roleIndex.value] && allTasks.value[roleIndex.value].global && allTasks.value[roleIndex.value].task) return; + if ( + allTasks.value.length + && allTasks.value[roleIndex.value] + && allTasks.value[roleIndex.value].global + && allTasks.value[roleIndex.value].task + ) return; console.log('当角色发生变化时', newValue); store.commit('task/setTimeNode', Date.now()); diff --git a/pages/projectVersion/projectVersion.vue b/pages/projectVersion/projectVersion.vue new file mode 100644 index 0000000..1f4d527 --- /dev/null +++ b/pages/projectVersion/projectVersion.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/pages/submitLog/submitLog.vue b/pages/submitLog/submitLog.vue index 41ef2a1..e33d853 100644 --- a/pages/submitLog/submitLog.vue +++ b/pages/submitLog/submitLog.vue @@ -29,7 +29,7 @@ 已通过 - + {{ checkItem.score }} diff --git a/pages/uidispose/uidispose.vue b/pages/uidispose/uidispose.vue new file mode 100644 index 0000000..3bfa558 --- /dev/null +++ b/pages/uidispose/uidispose.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/plugins/p-account-management/p-account-management.vue b/plugins/p-account-management/p-account-management.vue index d0e092c..e4990cc 100644 --- a/plugins/p-account-management/p-account-management.vue +++ b/plugins/p-account-management/p-account-management.vue @@ -1,18 +1,19 @@ diff --git a/plugins/p-domain-source-manage/p-domain-source-manage.vue b/plugins/p-domain-source-manage/p-domain-source-manage.vue index 2e4605f..2139d04 100644 --- a/plugins/p-domain-source-manage/p-domain-source-manage.vue +++ b/plugins/p-domain-source-manage/p-domain-source-manage.vue @@ -1,10 +1,12 @@ diff --git a/plugins/p-finance-audit/p-finance-audit.vue b/plugins/p-finance-audit/p-finance-audit.vue index aa46560..b49dfb2 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.detailId}&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.detailId}&pn=${projectName}&tn=${task.name}`, + name: '财务统计', + }); } diff --git a/plugins/p-finance/p-finance.vue b/plugins/p-finance/p-finance.vue index a5ec877..76bdc95 100644 --- a/plugins/p-finance/p-finance.vue +++ b/plugins/p-finance/p-finance.vue @@ -3,10 +3,16 @@ - + 预算{{ data.budget / 100 }} - + 奖金{{ data.bonus / 100 }} @@ -14,15 +20,15 @@ 项目采购{{ data.dailyExpend / 100 }} - 日常采购{{ data.dailyExpend / 100 }} + 日常采购{{ +data.dailyExpend / 100 }} @@ -51,7 +57,9 @@ getFinanceByTaskData(); // 打开详情页 function openFinance() { // DEBUG: 假数据 换成财务条详情页的地址 - uni.$ui.openDetail({ url: `http://121.36.3.207/finance/applicant?name=财务&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` }); + uni.$ui.openDetail({ + url: `http://121.36.3.207/finance/applicant?name=财务&token=${token}&projectId=${projectId}&id=${task.detailId}&pn=${projectName}&tn=${task.name}`, + }); } diff --git a/plugins/p-project-version-management/p-project-version-management.vue b/plugins/p-project-version-management/p-project-version-management.vue index 9b93ee0..4672626 100644 --- a/plugins/p-project-version-management/p-project-version-management.vue +++ b/plugins/p-project-version-management/p-project-version-management.vue @@ -1,10 +1,12 @@ diff --git a/plugins/p-source-manage/p-source-manage.vue b/plugins/p-source-manage/p-source-manage.vue index 2f02b2b..e69f3e4 100644 --- a/plugins/p-source-manage/p-source-manage.vue +++ b/plugins/p-source-manage/p-source-manage.vue @@ -1,6 +1,8 @@ diff --git a/static/exarresources.png b/static/exarresources.png new file mode 100644 index 0000000..b3564c7 Binary files /dev/null and b/static/exarresources.png differ diff --git a/static/personal.png b/static/personal.png new file mode 100644 index 0000000..8025042 Binary files /dev/null and b/static/personal.png differ diff --git a/static/projectVersion.png b/static/projectVersion.png new file mode 100644 index 0000000..9d30c8b Binary files /dev/null and b/static/projectVersion.png differ diff --git a/static/uidispose.png b/static/uidispose.png new file mode 100644 index 0000000..918a196 Binary files /dev/null and b/static/uidispose.png differ