diff --git a/app/pages/collectCode/signature/protocol/index.vue b/app/pages/collectCode/signature/protocol/index.vue
index 277398b..f66c526 100644
--- a/app/pages/collectCode/signature/protocol/index.vue
+++ b/app/pages/collectCode/signature/protocol/index.vue
@@ -13,8 +13,9 @@ const { t } = useI18n()
const { formData, number, qrData } = codeAuthStore()
const activeNames = ref('')
const router = useRouter()
-const pmblUrl = ref('')
-
+const pmblUrl = ref('') // 存储拍卖笔录的URL
+const jmxyUrl=ref('')//竞买协议
+const pmyjqrsUrl=ref('')//拍卖移交确认书
/**
* 根据签署顺序(number)返回不同的协议列表
* number = 1: 买家签署阶段,展示竞买协议、竞买须知、拍卖公告、拍卖规则
@@ -23,42 +24,53 @@ const pmblUrl = ref('')
const protocolList = computed(() => {
if (number.value === 1) {
return [
- { id: '4', title: t('signature.agreement.buyerAgreement'), pdfName: 'jmxy', type: 'local' },
+ { id: '4', title: t('signature.agreement.buyerAgreement'), pdfName: jmxyUrl.value, type: 'remote' },
{ id: '3', title: t('signature.agreement.buyerGuide'), pdfName: 'jmxz', type: 'local' },
{ id: '1', title: t('signature.agreement.notice'), pdfName: 'pmgg', type: 'local' },
{ id: '2', title: t('signature.agreement.rules'), pdfName: 'pmgz', type: 'local' },
]
} else if (number.value === 2) {
return [
- { id: '6', title: t('signature.agreement.transfer'), pdfName: 'pmyjqrs', type: 'local' },
+ { id: '6', title: t('signature.agreement.transfer'), pdfName: pmyjqrsUrl.value, type: 'remote' },
{ id: '5', title: t('signature.agreement.record'), pdfName: pmblUrl.value, type: 'remote' }
]
}
return []
})
-
+console.log('number',number.value)
/**
* 获取拍卖笔录PDF
* 通过拍品UUID获取拍卖笔录的查看地址
*/
-const fetchPmblPdf = async () => {
+ const fetchPmblPdf = async () => {
try {
const res = await contractView({
auctionArtworkUuid: qrData.value.auctionArtworkUuid,
+ phone:formData.value.phone,
+ registerType:2,
+ signOrder:number.value
})
- pmblUrl.value = res.data?.viewUrl
+ if(res.status===0){
+ jmxyUrl.value=res.data.ViewUrls?.jmxy1
+ pmblUrl.value=res.data.ViewUrls?.ppbl6
+ pmyjqrsUrl.value=res.data.ViewUrls?.ppqr5
+ }
} catch (error) {
- console.error('获取拍卖笔录失败:', error)
- }
+ console.log('error',error)
+ }
}
/**
* 折叠面板变化处理
* 当打开拍卖笔录面板时,获取PDF地址
*/
+// 监听折叠面板变化
const handleCollapseChange = (name) => {
activeNames.value = name
- if (name === '5' && !pmblUrl.value) {
+ console.log('handleCollapseChange')
+ console.log('name',name)
+ console.log('protocolList.value.find(x=>x.id===name)?.pdfName',protocolList.value.find(x=>x.id===name)?.pdfName)
+ if (['4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
fetchPmblPdf()
}
}
diff --git a/app/pages/realAuth/index.vue b/app/pages/realAuth/index.vue
index a9bb161..d106223 100644
--- a/app/pages/realAuth/index.vue
+++ b/app/pages/realAuth/index.vue
@@ -102,6 +102,10 @@ const goLogin=()=>{
+
+
+
diff --git a/app/pages/signature/protocol/index.vue b/app/pages/signature/protocol/index.vue
index 1173479..0404cec 100644
--- a/app/pages/signature/protocol/index.vue
+++ b/app/pages/signature/protocol/index.vue
@@ -7,6 +7,7 @@ import { authStore } from "~/stores/auth/index.js"
import {useI18n} from "vue-i18n";
import { useThrottleFn } from '@vueuse/core'
import { contractUserinfo } from "@/api/auth/index.js"
+import { ref } from 'vue';
definePageMeta({
layout: 'default',
i18n: 'signature.protocol.title'
@@ -17,15 +18,16 @@ const $t=useI18n().t
const activeNames = ref([])
const router = useRouter()
const pmblUrl = ref('') // 存储拍卖笔录的URL
-
+const jmxyUrl=ref('')//竞买协议
+const pmyjqrsUrl=ref('')//拍卖移交确认书
// 协议列表数据
const protocolList = computed(() => [
{ id: '1', title: $t('signature.agreement.notice'), pdfName: 'pmgg', type: 'local' },
{ id: '2', title: $t('signature.agreement.rules'), pdfName: 'pmgz', type: 'local' },
{ id: '3', title: $t('signature.agreement.buyerGuide'), pdfName: 'jmxz', type: 'local' },
- { id: '4', title: $t('signature.agreement.buyerAgreement'), pdfName: 'jmxy', type: 'local' },
+ { 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: 'pmyjqrs', type: 'local' }
+ { id: '6', title: $t('signature.agreement.transfer'), pdfName: pmyjqrsUrl.value, type: 'remote' }
])
const toast=ref(false)
// 获取拍卖笔录PDF
@@ -33,8 +35,15 @@ const fetchPmblPdf = async () => {
try {
const res = await contractView({
auctionArtworkUuid: payment.value.auctionArtworkUuid,
+ phone:userInfo.value.telNum,
+ registerType:1,
+ signOrder:1
})
- pmblUrl.value = res.data?.viewUrl // 假设接口返回的PDF URL在data字段中
+ if(res.status===0){
+ jmxyUrl.value=res.data.ViewUrls?.jmxy1
+ pmblUrl.value=res.data.ViewUrls?.ppbl6
+ pmyjqrsUrl.value=res.data.ViewUrls?.ppqr5
+ }
} catch (error) {
}
}
@@ -42,8 +51,7 @@ const fetchPmblPdf = async () => {
// 监听折叠面板变化
const handleCollapseChange = (name) => {
activeNames.value = name
- // 当打开拍卖笔录时获取PDF
- if (name === '5' && !pmblUrl.value) {
+ if (['4','5','6'].includes(name) && !protocolList.value.find(x=>x.id===name)?.pdfName) {
fetchPmblPdf()
}
}
diff --git a/app/stores-collect-code/auth/index.js b/app/stores-collect-code/auth/index.js
index 938fde0..795fbcf 100644
--- a/app/stores-collect-code/auth/index.js
+++ b/app/stores-collect-code/auth/index.js
@@ -19,7 +19,7 @@ export const codeAuthStore = createGlobalState(() => {
const lotNo=useLocalStorage('lotNo',undefined)
const price=useLocalStorage('price',undefined)
const auctionArtworkUuid=useLocalStorage('auctionArtworkUuid',undefined)
- const number=useLocalStorage('number',undefined)
+ const number=useLocalStorage('number',0)
const qrUid=useLocalStorage('qrUid',undefined)
const cpayment=useLocalStorage('cpayment',{
price:'',