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()
@@ -109,18 +115,17 @@ initData()