From e44fbb46d898ae9e007be198cff591e055c8f499 Mon Sep 17 00:00:00 2001
From: Phoenix <64720302+Concur-max@users.noreply.github.com>
Date: Tue, 29 Apr 2025 13:28:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=8F=E8=AE=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=AB=9E=E4=B9=B0=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E5=92=8C=E6=8B=8D=E5=8D=96=E7=A7=BB=E4=BA=A4=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E4=B9=A6=E7=9A=84URL=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96PDF=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=B0=83=E6=95=B4=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectCode/signature/protocol/index.vue  | 32 +++++++++++++------
 app/pages/realAuth/index.vue                  |  4 +++
 app/pages/signature/protocol/index.vue        | 20 ++++++++----
 app/stores-collect-code/auth/index.js         |  2 +-
 4 files changed, 41 insertions(+), 17 deletions(-)

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=()=>{
             <div class="border-b-[1.7px] mt-[8px]">
               <van-field v-model="form1.realName" :label="$t('realAuth.name')" clearable :placeholder="$t('realAuth.namePlaceholder')"></van-field>
             </div>
+            <div class="border-b-[1.7px] mt-[8px]">
+            <van-field v-model="form1.userExtend.address" :label="$t('realAuth.adress')" clearable
+              :placeholder="$t('realAuth.adressPlaceholder')"></van-field>
+          </div>
           </div>
         </template>
       </van-tab>
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:'',