diff --git a/app/api/goods/index.js b/app/api/goods/index.js index 1369891..32d7a64 100644 --- a/app/api/goods/index.js +++ b/app/api/goods/index.js @@ -93,7 +93,7 @@ export async function orderQuery(data) { method: 'POST', data }) -} +} export async function contractView(data) { return await request( { diff --git a/app/app.vue b/app/app.vue index 8c2c324..6d1f661 100644 --- a/app/app.vue +++ b/app/app.vue @@ -24,6 +24,8 @@ router.beforeEach((to, from) => { if (to.path==='/'){ hideMinWindow1() } +console.log('路由跳转前', to.path) + // 如果是返回操作(在历史记录中找到目标路由) if (routeHistory.value.includes(to.path)) { slideDirection.value = 'slide-right' diff --git a/app/pages/signature/protocol/index.vue b/app/pages/signature/protocol/index.vue index 0404cec..402c076 100644 --- a/app/pages/signature/protocol/index.vue +++ b/app/pages/signature/protocol/index.vue @@ -20,11 +20,13 @@ const router = useRouter() const pmblUrl = ref('') // 存储拍卖笔录的URL const jmxyUrl=ref('')//竞买协议 const pmyjqrsUrl=ref('')//拍卖移交确认书 +const jmxzUrl=ref('') +const pmggUrl=ref('') // 协议列表数据 const protocolList = computed(() => [ - { id: '1', title: $t('signature.agreement.notice'), pdfName: 'pmgg', type: 'local' }, + { id: '1', title: $t('signature.agreement.notice'), pdfName: pmggUrl.value, type: 'remote' }, { id: '2', title: $t('signature.agreement.rules'), pdfName: 'pmgz', type: 'local' }, - { id: '3', title: $t('signature.agreement.buyerGuide'), pdfName: 'jmxz', type: 'local' }, + { id: '3', title: $t('signature.agreement.buyerGuide'), pdfName: jmxzUrl.value, type: 'remote' }, { id: '4', title: $t('signature.agreement.buyerAgreement'), pdfName: jmxyUrl.value, type: 'remote' }, { id: '5', title: $t('signature.agreement.record'), pdfName: pmblUrl.value, type: 'remote' }, { id: '6', title: $t('signature.agreement.transfer'), pdfName: pmyjqrsUrl.value, type: 'remote' } @@ -43,6 +45,8 @@ const fetchPmblPdf = async () => { jmxyUrl.value=res.data.ViewUrls?.jmxy1 pmblUrl.value=res.data.ViewUrls?.ppbl6 pmyjqrsUrl.value=res.data.ViewUrls?.ppqr5 + jmxzUrl.value=res.data.ViewUrls?.jmxz2 + pmggUrl.value=res.data.ViewUrls?.pmgg3 } } catch (error) { } @@ -51,7 +55,7 @@ const fetchPmblPdf = async () => { // 监听折叠面板变化 const handleCollapseChange = (name) => { activeNames.value = name - if (['4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) { + if (['1','3','4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) { fetchPmblPdf() } }