diff --git a/CHANGELOG.md b/CHANGELOG.md index 153967d..2c13e45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d) + - | 小绿点隐藏 | [31f3dc7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/31f3dc7) - | 引导页、广告页 | [4aa76ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4aa76ff) - | 域名配置 | [b68272d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b68272d) - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) diff --git a/apis/finance.js b/apis/finance.js index e0b0817..84d8373 100644 --- a/apis/finance.js +++ b/apis/finance.js @@ -1,10 +1,12 @@ +import { computed } from 'vue'; import store from '@/store/index'; -const fullPath = store.getters['finance/fullPath']; -console.log('fullPath: ', fullPath); +// const fullPath = store.getters['finance/fullPath']; +// console.log('fullPath: ', fullPath); +const domain = computed(() => store.state.domain); export function setupFinance(app) { uni.$u.api = { ...uni.$u.api } || {}; // 根据任务id获取财务条信息 - uni.$u.api.getFinanceByTask = taskDetailId => uni.$u.post(`${fullPath}/getByTask`, { taskDetailId }); + uni.$u.api.getFinanceByTask = taskDetailId => uni.$u.post(`${domain.value}/finance/getByTask`, { taskDetailId }); } diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue index 3c249d4..5f610f5 100644 --- a/components/Plugin/Plugin.vue +++ b/components/Plugin/Plugin.vue @@ -22,7 +22,17 @@ - + + + diff --git a/pages/detailWebview/detailWebview.vue b/pages/detailWebview/detailWebview.vue index 5693e82..9838dd9 100644 --- a/pages/detailWebview/detailWebview.vue +++ b/pages/detailWebview/detailWebview.vue @@ -14,12 +14,11 @@ onLoad(options => { return; } if (options.url) { + console.log('options.url', options.url); src.value = options.url; } if (options.name) { - uni.setNavigationBarTitle({ - title: options.name || '详情页', - }); + uni.setNavigationBarTitle({ title: options.name || '详情页' }); } }); diff --git a/plugins/p-account-management/p-account-management.vue b/plugins/p-account-management/p-account-management.vue new file mode 100644 index 0000000..d0e092c --- /dev/null +++ b/plugins/p-account-management/p-account-management.vue @@ -0,0 +1,18 @@ + + + diff --git a/plugins/p-deliver-upload/p-deliver-upload.vue b/plugins/p-deliver-upload/p-deliver-upload.vue index fce9272..64b5acd 100644 --- a/plugins/p-deliver-upload/p-deliver-upload.vue +++ b/plugins/p-deliver-upload/p-deliver-upload.vue @@ -185,6 +185,18 @@ async function uploadPhoto() { } } +// 拍照上传 +// function photos (){ +// uni.chooseImage({ +// count: 1, //默认9 +// sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有 +// sourceType: ['album','camera'], //从相册选择 +// success: function (res) { +// linkValue.value = JSON.stringify(res.tempFilePaths) +// } +// }); +// } + // 确定修改交付物名称 async function confirmEditDeliverName() { // TODO: 发请求 请求成功后更新task里的交付物信息 diff --git a/plugins/p-domain-source-manage/p-domain-source-manage.vue b/plugins/p-domain-source-manage/p-domain-source-manage.vue new file mode 100644 index 0000000..c571523 --- /dev/null +++ b/plugins/p-domain-source-manage/p-domain-source-manage.vue @@ -0,0 +1,11 @@ + + + + diff --git a/plugins/p-finance-audit/p-finance-audit.vue b/plugins/p-finance-audit/p-finance-audit.vue index e1e8150..aa46560 100644 --- a/plugins/p-finance-audit/p-finance-audit.vue +++ b/plugins/p-finance-audit/p-finance-audit.vue @@ -14,19 +14,11 @@ const { projectId, projectName, token } = useGenerateWebviewParam(); // DEBUG:打开财务审批详情页 function openAudit() { - uni.$ui.openDetail({ - url: 'https://www.tall.wiki/finance/index', - name: '财务审批', - token, - 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}` }); } // DEBUG:打开财务统计详情页 function openStatistical() { - uni.$ui.openDetail({ url: 'https://www.taobao.com', 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}` }); } diff --git a/plugins/p-finance/p-finance.vue b/plugins/p-finance/p-finance.vue index 950fc76..003e19a 100644 --- a/plugins/p-finance/p-finance.vue +++ b/plugins/p-finance/p-finance.vue @@ -37,7 +37,6 @@ const data = ref(null); // 查询任务上的财务条数据 async function getFinanceByTaskData() { try { - console.log('task: ', task); const detailId = task.detailId; data.value = await uni.$u.api.getFinanceByTask(detailId); } catch (error) { diff --git a/plugins/p-project version management/p-project version management.vue b/plugins/p-project version management/p-project version management.vue new file mode 100644 index 0000000..c803a97 --- /dev/null +++ b/plugins/p-project version management/p-project version management.vue @@ -0,0 +1,11 @@ + + + + diff --git a/utils/ui.js b/utils/ui.js index 96aa822..f97132f 100644 --- a/utils/ui.js +++ b/utils/ui.js @@ -67,7 +67,6 @@ export default { throw new Error('缺少url参数'); } const query = stringify(options); - console.log('query: ', query); const path = `/pages/detailWebview/detailWebview?${query}`; uni.navigateTo({ url: path }); },