diff --git a/web1/src/router/routes/index.js b/web1/src/router/routes/index.js index 3ba5200..9943186 100644 --- a/web1/src/router/routes/index.js +++ b/web1/src/router/routes/index.js @@ -49,7 +49,7 @@ export const basicRoutes = [ path: 'invoice', component: () => import('@/views/user-center/components/InvoiceManagement.vue'), meta: { - title: '开票管理', + title: '抬头管理', }, }, ], diff --git a/web1/src/views/pages/index.vue b/web1/src/views/pages/index.vue index 84b40dc..79ebc41 100644 --- a/web1/src/views/pages/index.vue +++ b/web1/src/views/pages/index.vue @@ -1087,10 +1087,11 @@ const previousStep = () => { currentStep.value -- } -import { useRouter } from 'vue-router' +import { useRouter, useRoute } from 'vue-router' import { unref } from 'vue' const router = useRouter() +const route = useRoute() const navToLogin = () => { userStore.logout() @@ -1191,10 +1192,12 @@ const submit = () => { const getHistoryList = () => { const params = { page: 1, - size: 99 + page_size: 99 }; - api.getHistoryList(params).then(res=>{ - historyList.value = res.data + return api.getHistoryList(params).then(res=>{ + const list = res?.data?.items ?? res?.data?.results ?? res?.results ?? [] + historyList.value = Array.isArray(list) ? list : [] + return res }) } const selectedObj = ref({ @@ -1327,6 +1330,14 @@ onMounted(async () => { page_size: 99 }; await getHistoryList() + + if (route.query.id) { + const targetId = Number(route.query.id) + const targetItem = historyList.value.find(item => item.id === targetId) + if (targetItem) { + selectTimeBox(targetItem) + } + } // 使用await提高可读性 const res = await api.getIndustryList(params); diff --git a/web1/src/views/user-center/components/CorporateTransfer.vue b/web1/src/views/user-center/components/CorporateTransfer.vue index b6d0def..6f86d48 100644 --- a/web1/src/views/user-center/components/CorporateTransfer.vue +++ b/web1/src/views/user-center/components/CorporateTransfer.vue @@ -81,63 +81,69 @@ +
-
-
上传支付凭证
-
- + + +
+
+
+
添加图片
+
+
+ +
+ + +
+ + +
+
+ + + -
-
+
-
点击上传
-
-
- 支付凭证 -
×
-
+
+ +
+ + 确认上传 +
-
支持jpg、png、jpeg格式,大小不超过5M
-
- -
-
开票抬头
-
- - -
-
- -
-
开票类型
- -
- -
- -
+
@@ -158,17 +164,13 @@
- - diff --git a/web1/src/views/user-center/components/InvoiceModal.vue b/web1/src/views/user-center/components/InvoiceModal.vue deleted file mode 100644 index 92f9a28..0000000 --- a/web1/src/views/user-center/components/InvoiceModal.vue +++ /dev/null @@ -1,275 +0,0 @@ - - - - - diff --git a/web1/src/views/user-center/components/ValuationHistory.vue b/web1/src/views/user-center/components/ValuationHistory.vue index 3bd09f9..3f3ea76 100644 --- a/web1/src/views/user-center/components/ValuationHistory.vue +++ b/web1/src/views/user-center/components/ValuationHistory.vue @@ -15,7 +15,8 @@ :columns="columns" :data="tableData" :row-key="rowKey" - :pagination="false" + :pagination="pagination" + remote striped size="medium" /> @@ -23,7 +24,8 @@