From fae3728f5a14cef6dae4aad6368c06b32c99f81d Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 7 Mar 2025 19:23:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor(payment):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E5=92=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改支付页面中的价格显示，使用 leftCnyPrice 替代 leftPrice
- 添加用户编号查询功能，在签名前检查用户是否已存在
- 优化直播室侧边按钮的支付逻辑，使用 leftCnyPrice 替代 leftPrice
- 统一支付结果页面的展示逻辑，根据支付状态显示不同图片
- 修复艺术详情页面中的价格显示问题，使用 leftCnyPrice 替代 leftPrice
- 优化个人资料页面中的支付逻辑，使用 leftCnyPrice 替代 leftPrice
---
 app/api-collect-code/auth/index.js            |   7 +++++
 app/pages/artDetail/index.vue                 |   3 +-
 .../collectCode/payment/result/index.vue      |   3 +-
 .../signature/personal-Info/index.vue         |  12 ++++++--
 .../liveRoom/components/SideButton/index.vue  |   2 +-
 .../components/SideButton/tangPopup.vue       |  29 ++++++++++--------
 app/pages/payment/result/index.vue            |   3 +-
 app/pages/profile/index.vue                   |   4 +--
 app/static/images/zu6021@2x.png               | Bin 0 -> 11031 bytes
 9 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 app/static/images/zu6021@2x.png

diff --git a/app/api-collect-code/auth/index.js b/app/api-collect-code/auth/index.js
index 07177d0..ff4ebdf 100644
--- a/app/api-collect-code/auth/index.js
+++ b/app/api-collect-code/auth/index.js
@@ -20,4 +20,11 @@ export async function mobileLogin(data) {
         method: 'POST',
         data
     })
+}
+export async function sessionUserNo(data) {
+    return await request( {
+        url:'/api/v1/auction/sessionUserNo/check',
+        method: 'POST',
+        data
+    })
 }
\ No newline at end of file
diff --git a/app/pages/artDetail/index.vue b/app/pages/artDetail/index.vue
index bb17799..6bd2dff 100644
--- a/app/pages/artDetail/index.vue
+++ b/app/pages/artDetail/index.vue
@@ -16,13 +16,12 @@ const initData = async () => {
   if (res.status === 0) {
     detail.value = res.data
     detail.value.auctionArtworkInfo.userId=detail.value.userID
-    console.log('detail.value',detail.value)
     }
 }
 const router = useRouter();
 
 const goPay=()=>{
-  payment.value.leftPrice=detail.value.leftPrice
+  payment.value.leftPrice=detail.value.leftCnyPrice
   payment.value.leftCurrency=detail.value.leftCurrency
   payment.value.buyUid=detail.value.uuid
   payment.value.auctionArtworkUuid=detail.value?.auctionArtworkUuid
diff --git a/app/pages/collectCode/payment/result/index.vue b/app/pages/collectCode/payment/result/index.vue
index 04cc33e..1703b20 100644
--- a/app/pages/collectCode/payment/result/index.vue
+++ b/app/pages/collectCode/payment/result/index.vue
@@ -27,7 +27,8 @@ const goHome=()=>{
 <template>
   <div class="w-[100vw] h-screen-nav bg-[url('@/static/images/3532@2x.png')] bg-cover grow-1 flex flex-col items-center px-30px">
     <div class="flex flex-col items-center mt-150px">
-      <img class="w-119px h-120px mb-36px" src="@/static/images/5554@2x1.png" alt="">
+      <img v-if="resData.status===1" class="w-119px h-120px mb-36px" src="@/static/images/5554@2x1.png" alt="">
+      <img v-else class="w-119px h-120px mb-36px" src="@/static/images/zu6021@2x.png" alt="">
       <div class="text-#000 text-16px mb-25px">{{statusLabel[resData.status]}}!</div>
       <div class="text-#999 text-16px">{{resData.currency}}{{resData.money}}</div>
     </div>
diff --git a/app/pages/collectCode/signature/personal-Info/index.vue b/app/pages/collectCode/signature/personal-Info/index.vue
index 60a838c..ccaa6dc 100644
--- a/app/pages/collectCode/signature/personal-Info/index.vue
+++ b/app/pages/collectCode/signature/personal-Info/index.vue
@@ -6,6 +6,7 @@ import {codeAuthStore} from "@/stores-collect-code/auth/index.js";
 import {message} from "@/components/x-message/useMessage.js";
 import countryCode from '@/pages/countryRegion/data/index.js'
 import {fddInfo, offlineQrcode} from "~/api-collect-code/goods/index.js";
+import {sessionUserNo} from "@/api-collect-code/auth/index.js";
 import {signOffline} from "~/api/goods/index.js";
 const {formData,number,auctionArtworkUuid,qrUid,qrData}=codeAuthStore()
 definePageMeta({
@@ -93,9 +94,7 @@ const initData= async ()=>{
     }
   }
   if(!formData.value.countryCode){
-    console.log('formData.value.countryCode',!!formData.value.countryCode)
     const defaultCountry = getDefaultCountry()
-    console.log('defaultCountry',defaultCountry)
     formData.value.countryCode= defaultCountry.zone
   }
   if (route.query.zone){
@@ -109,6 +108,15 @@ const nextClick=async ()=>{
       message.warning(t('signature.error.incompleteForm'))
       return
     }
+    const res2=await sessionUserNo({
+      phone:formData.value.phone
+    })
+    if (res2.status===0){
+          if(res2.data.exist){
+            message.warning(`您的号牌是${res2.data.userInfo.auction_user_no}`)
+            return
+          }
+    } 
     //国内签署要用法大大
     if (formData.value.countryCode==='86'&&formData.value.cardType===1){
       const res=await fddInfo({
diff --git a/app/pages/liveRoom/components/SideButton/index.vue b/app/pages/liveRoom/components/SideButton/index.vue
index 8e49d12..7727baa 100644
--- a/app/pages/liveRoom/components/SideButton/index.vue
+++ b/app/pages/liveRoom/components/SideButton/index.vue
@@ -56,7 +56,7 @@ const paySide = computed(() => {
 
 const goPay = () => {
   payment.value.leftCurrency=auctionData.value.needPayBuys?.[0]?.leftCurrency
-  payment.value.leftPrice=auctionData.value.needPayBuys?.[0]?.leftPrice
+  payment.value.leftPrice=auctionData.value.needPayBuys?.[0]?.leftCnyPrice
   payment.value.buyUid=auctionData.value.needPayBuys?.[0]?.uuid
   payment.value.auctionArtworkUuid=auctionData.value.needPayBuys?.[0]?.auctionArtworkUuid
   handleCapture()
diff --git a/app/pages/liveRoom/components/SideButton/tangPopup.vue b/app/pages/liveRoom/components/SideButton/tangPopup.vue
index 3656b0e..827aba0 100644
--- a/app/pages/liveRoom/components/SideButton/tangPopup.vue
+++ b/app/pages/liveRoom/components/SideButton/tangPopup.vue
@@ -7,6 +7,7 @@ import {liveStore} from "~/stores/live/index.js";
 import {ref} from "vue";
 const {pageRef,itemList,getArtworkList,  loading: storeLoading,} = goodStore();
 const {auctionData} = liveStore()
+const {t:$t} = useI18n()
 const showDetail=ref(false)
 const localState = ref({
   finished: false,
@@ -71,19 +72,23 @@ watch(()=>{
 watch(()=>props.show,async (newValue)=>{
   if (newValue){
     if(auctionData.value?.artwork?.index>itemList.value?.length+1){
-      const toast = showLoadingToast({
-  message: '加载中...',
-  forbidClick: true,
-});
-      pageRef.value.pageSize=auctionData.value?.artwork?.index-itemList.value?.length
-     await loadMore()
-     
-     pageRef.value.pageSize=5
+      pageRef.value.pageSize = 5;
+      const targetIndex = auctionData.value?.artwork?.index;
+      const currentLength = itemList.value?.length || 0;
+      const needLoadTimes = Math.ceil((targetIndex - currentLength) / pageRef.value.pageSize);
+      
+      for(let i = 0; i < needLoadTimes; i++) {
+        pageRef.value.page++;
+        await getArtworkList();
+      }
+      
+      await nextTick();
+      scrollToCurrentItem();
+    } else {
+      nextTick(()=>{
+        scrollToCurrentItem();
+      });
     }
- nextTick(()=>{
-   scrollToCurrentItem()
-   toast.close()
- })
   }
 })
 </script>
diff --git a/app/pages/payment/result/index.vue b/app/pages/payment/result/index.vue
index 3440eb2..77ac0d8 100644
--- a/app/pages/payment/result/index.vue
+++ b/app/pages/payment/result/index.vue
@@ -78,7 +78,8 @@ const goHome = () => {
   <div
       class="w-[100vw] h-screen-nav bg-[url('@/static/images/3532@2x.png')] bg-cover grow-1 flex flex-col items-center px-30px">
     <div class="flex flex-col items-center mt-150px">
-      <img class="w-119px h-120px mb-36px" src="@/static/images/5554@2x1.png" alt="">
+      <img v-if="resData.status===1" class="w-119px h-120px mb-36px" src="@/static/images/5554@2x1.png" alt="">
+      <img v-else class="w-119px h-120px mb-36px" src="@/static/images/zu6021@2x.png" alt="">
       <div class="text-#000 text-16px mb-25px">{{ statusLabel[resData.status] }}!</div>
       <div class="text-#999 text-16px">{{ resData.currency }}{{ resData.money }}</div>
     </div>
diff --git a/app/pages/profile/index.vue b/app/pages/profile/index.vue
index 20cdfbd..b1a526b 100644
--- a/app/pages/profile/index.vue
+++ b/app/pages/profile/index.vue
@@ -47,7 +47,7 @@ const onRefresh = async () => {
 }
 
 const goPay = (item) => {
-  payment.value.leftPrice=item.leftPrice
+  payment.value.leftPrice=item.leftCnyPrice
   payment.value.leftCurrency=item.leftCurrency
   payment.value.buyUid=item.uuid
  payment.value.auctionArtworkUuid=item?.auctionArtworkUuid
@@ -137,7 +137,7 @@ fetchData()
                     <div>
                       <div class="text-#575757 text-14px line-height-none mb-5px">
                         {{ $t('home.start_price') }}：{{item.auctionArtworkInfo?.startPriceCurrency}} {{item.auctionArtworkInfo?.startPrice}}
-                      </div>
+                      </div> 
                       <div class="text-#B58047 text-14px line-height-none">
                         {{ $t('home.close_price') }}：{{item.baseCurrency}} {{item.baseMoney}}
                       </div>
diff --git a/app/static/images/zu6021@2x.png b/app/static/images/zu6021@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b08348d838371ae1221bb759c5b91d7b30798a9f
GIT binary patch
literal 11031
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

literal 0
HcmV?d00001