From 0308ace199740d4be2cbf9d9c6f0519191a913da Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Wed, 19 Feb 2025 18:42:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(auth):=20=E4=BC=98=E5=8C=96=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D=E6=B5=81=E7=A8=8B=E5=92=8C=E6=95=B0=E6=8D=AE=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 lotNo、price 和 auctionArtworkUuid存储到本地存储
-优化个人信息页面的表单显示逻辑
- 在协议页面添加竞拍信息
- 移除签名面板中的冗余代码
---
 .../collectCode/signature/panel/index.vue     |  3 --
 .../signature/personal-Info/index.vue         | 39 +++++++++++--------
 .../collectCode/signature/protocol/index.vue  |  6 ++-
 app/stores-collect-code/auth/index.js         |  6 +--
 4 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/pages/collectCode/signature/panel/index.vue b/app/pages/collectCode/signature/panel/index.vue
index 33ebb19..9ef6d56 100644
--- a/app/pages/collectCode/signature/panel/index.vue
+++ b/app/pages/collectCode/signature/panel/index.vue
@@ -12,9 +12,6 @@ definePageMeta({
 const router = useRouter();
 const imgUrl = ref('');
 const show = ref(false);
-
-
-
 const goBack = () => {
   router.back()
   // 返回逻辑
diff --git a/app/pages/collectCode/signature/personal-Info/index.vue b/app/pages/collectCode/signature/personal-Info/index.vue
index 952b086..0038657 100644
--- a/app/pages/collectCode/signature/personal-Info/index.vue
+++ b/app/pages/collectCode/signature/personal-Info/index.vue
@@ -6,7 +6,7 @@ import {codeAuthStore} from "@/stores-collect-code/auth/index.js";
 import {message} from "@/components/x-message/useMessage.js";
 import {fddInfo} from "~/api-collect-code/goods/index.js";
 import {signOffline} from "~/api/goods/index.js";
-const {formData,number}=codeAuthStore()
+const {formData,number,auctionArtworkUuid}=codeAuthStore()
 definePageMeta({
   layout: 'default',
   i18n: 'menu.profile',
@@ -44,9 +44,14 @@ function isFormComplete(obj) {
 
 const initData=()=>{
   if (route.query.number){
-    number.value=route.query.number
+    number.value=Number(route.query.number)
+  }
+  if (route.query.auctionArtworkUuid){
+    auctionArtworkUuid.value=route.query.auctionArtworkUuid
+  }
+  if (route.query.lotNo){
+    auctionArtworkUuid.value=route.query.lotNo
   }
-  console.log('route.query',route.query)
   if (route.query.zone){
     formData.value.countryCode=route.query.zone
   }else {
@@ -54,6 +59,8 @@ const initData=()=>{
   }
 }
 const nextClick=async ()=>{
+  //扫号牌
+if (number.value===1){
   if (!isFormComplete(formData.value)){
     message.warning('请填写完整信息')
     return
@@ -81,11 +88,10 @@ const nextClick=async ()=>{
   }else {
     router.push('/collectCode/signature/protocol')
   }
-
-  //
-/*  if (formData.value.countryCode==='86'&&formData.value.cardType===1){
-
-  }*/
+  //扫付款
+}else if(number.value===2) {
+  router.push('/collectCode/signature/protocol')
+}
 }
 initData()
 </script>
@@ -109,18 +115,17 @@ initData()
         </template>
       </van-field>
       <van-field label="姓名" v-model="formData.userName" class="mb-10px" placeholder="请输入姓名"/>
-      <x-van-select v-model="formData.gender" label="性别" :columns="columns"/>
-      <x-van-date label="出生日期" v-model="formData.birthday" />
-      <van-field label="家庭住址" v-model="formData.address" class="mb-10px" placeholder="请输入家庭住址"/>
-      <van-field label="所属银行" v-model="formData.bankName" class="mb-10px" placeholder="请输入所属银行"/>
-      <van-field label="银行卡号码" v-model="formData.bankNo" class="mb-10px" placeholder="请输入银行卡号码"/>
-      <x-van-select v-model="formData.cardType" label="证件类型" :columns="columns1"/>
-      <van-field label="证件号" v-model="formData.cardId" class="mb-10px" placeholder="请输入证件号"/>
+      <x-van-select v-if="number===1" v-model="formData.gender" label="性别" :columns="columns"/>
+      <x-van-date v-if="number===1" label="出生日期" v-model="formData.birthday" />
+      <van-field v-if="number===1" label="家庭住址" v-model="formData.address" class="mb-10px" placeholder="请输入家庭住址"/>
+      <van-field v-if="number===1" label="所属银行" v-model="formData.bankName" class="mb-10px" placeholder="请输入所属银行"/>
+      <van-field v-if="number===1" label="银行卡号码" v-model="formData.bankNo" class="mb-10px" placeholder="请输入银行卡号码"/>
+      <x-van-select v-if="number===1" v-model="formData.cardType" label="证件类型" :columns="columns1"/>
+      <van-field v-if="number===1" label="证件号" v-model="formData.cardId" class="mb-10px" placeholder="请输入证件号"/>
     </div>
-    <div class="h-81px bg-#fff flex justify-center pt-7px border-t">
+    <div class="h-81px bg-#fff flex justify-center pt-7px border-t shrink-0">
       <van-button color="#2B53AC" class="w-213px van-btn-h-38px" @click="nextClick">下一步</van-button>
     </div>
-
   </div>
 </template>
 
diff --git a/app/pages/collectCode/signature/protocol/index.vue b/app/pages/collectCode/signature/protocol/index.vue
index 28d0723..8605294 100644
--- a/app/pages/collectCode/signature/protocol/index.vue
+++ b/app/pages/collectCode/signature/protocol/index.vue
@@ -1,17 +1,19 @@
 <script setup>
 import {codeAuthStore} from "~/stores-collect-code/auth/index.js";
 import {signOffline} from "~/api/goods/index.js";
-import {useRouter} from "#vue-router";
+
 const router = useRouter();
 definePageMeta({
 title:'签署'
 })
 const activeNames = ref(['1']);
-const {formData,number}=codeAuthStore()
+const {formData,number,lotNo,price}=codeAuthStore()
 const confirm=async ()=>{
   if (formData.value.countryCode==='86'&&formData.value.cardType===1){
     const res=await signOffline({
       userInfo:formData.value,
+      bidNum:lotNo.value,
+      bidPrice:price.value,
       signOrder:Number(number.value),
     })
     if (res.status===0){
diff --git a/app/stores-collect-code/auth/index.js b/app/stores-collect-code/auth/index.js
index 9055d72..07ea5bb 100644
--- a/app/stores-collect-code/auth/index.js
+++ b/app/stores-collect-code/auth/index.js
@@ -16,9 +16,9 @@ export const codeAuthStore = createGlobalState(() => {
         "cardId": "",
         cardType:1
     })
-    const lotNo=ref(undefined)
-    const price=ref(undefined)
-    const auctionArtworkUuid=ref(undefined)
+    const lotNo=useLocalStorage('lotNo',undefined)
+    const price=useLocalStorage('price',undefined)
+    const auctionArtworkUuid=useLocalStorage('auctionArtworkUuid',undefined)
     const number=useLocalStorage('number',undefined)
     return{
         lotNo,