Merge branch 'xingyy' into dev

app/api/auth/index.js

@@ -37,3 +37,10 @@ export async function userCaptchaValidate(data) {
         data
     })
 }
+export async function contractUserinfo(data) {
+    return await request( {
+        url:'/api/v1/contract/userinfo',
+        method: 'POST',
+        data
+    })
+}

app/components/puzzleComponent/index.vue

@@ -1,7 +1,7 @@
 
   
   <script setup>
-  import { ref, reactive, onMounted, onBeforeUnmount } from 'vue'
+  import { ref, reactive, onMounted, onBeforeUnmount, watch } from 'vue'
   //i18n
   import { useI18n } from 'vue-i18n'
   const {t} =useI18n()  
@@ -40,7 +40,15 @@
     maxMoveX.value = img.width - blockSize
     loaded.value = true
   }
-  
+  watch(()=>{
+    return props.loading
+  },(newVal)=>{
+    if(!newVal){
+      verifyStatus.show = false
+        verifyStatus.message = ''
+        moveX.value = 0
+    }
+  })
   const onImageError = () => {
     console.error('Image failed to load')
     maxMoveX.value = 270
@@ -84,11 +92,7 @@
     verifyStatus.type = success ? 'success' : 'error'
     verifyStatus.message = success ? t('components.form.verifySuccess') : t('components.form.verifyFailed')
     isVerifying.value = false
-    setTimeout(() => {
+ 
-      verifyStatus.show = false
-      verifyStatus.message = ''
-      moveX.value = 0
-    }, 1500)
   }
   
   // 事件监听
@@ -144,11 +148,13 @@
         >
         <transition name="fade-slide">
           <div 
-            v-if="verifyStatus.show" 
+            v-if="verifyStatus.show || isVerifying" 
-            class="absolute left-0 bottom-0 w-full h-25px leading-25px text-center text-14px text-white"
+            :class="`absolute left-0 bottom-0 w-full h-25px leading-25px text-center text-14px text-white ${
-            :class="verifyStatus.type === 'success' ? 'bg-#52c41a' : 'bg-#ff4d4f'"
+              isVerifying ? 'bg-#3B91FF' : 
+              verifyStatus.type === 'success' ? 'bg-#52c41a' : 'bg-#ff4d4f'
+            }`"
           >
-            {{ verifyStatus.message }}
+            {{ isVerifying ? '验证中...' : verifyStatus.message }}
           </div>
         </transition>
       </div>

app/pages/collectCode/signature/personal-Info/index.vue

@@ -114,7 +114,7 @@ const initData = async () => {
   if (number.value==2){
     await getData()
     if (qrData.value.payStatus===4){
-      router.replace('/collectCode/payment')
+      router.push('/collectCode/payment')
     }
   }
   if(!formData.value.countryCode){

app/pages/collectCode/signature/protocol/index.vue

@@ -4,14 +4,22 @@ import { contractView, signOffline } from "~/api/goods/index.js"
 import { codeAuthStore } from "~/stores-collect-code/auth/index.js"
 import { useI18n } from "vue-i18n"
 import { fddInfo } from "@/api-collect-code/goods/index.js"
+<<<<<<< HEAD
 
+=======
+import { showLoadingToast } from 'vant';
+>>>>>>> xingyy
 definePageMeta({
   i18n: 'signature.protocol.title'
 })
 
 const { t } = useI18n()
 const { formData, number, qrData } = codeAuthStore() 
+<<<<<<< HEAD
 const activeNames = ref([])
+=======
+const activeNames = ref('')
+>>>>>>> xingyy
 const router = useRouter()
 const pmblUrl = ref('') 
 
@@ -74,6 +82,14 @@ const handleCollapseChange = (name) => {
  *      - 其他用户: 走非大陆签署流程
  */
 const confirm = async () => {
+<<<<<<< HEAD
+=======
+const toast=  showLoadingToast({
+  message: '加载中...',
+  forbidClick: true,
+});
+
+>>>>>>> xingyy
   try {
     const fddResponse = await fddInfo({ phone: formData.value.phone })
     
@@ -100,6 +116,11 @@ const confirm = async () => {
     }
   } catch (error) {
     console.error('签署确认失败:', error)
+<<<<<<< HEAD
+=======
+  }finally{
+    toast.close();
+>>>>>>> xingyy
   }
 }
 

app/pages/home/index.vue

@@ -21,7 +21,7 @@ await getAuctionDetail()
 <template>
   <div class="grow-1 flex flex-col">
     <client-only>
-      <div class="relative" @click="changeLive">
+      <div class="relative bg-#000" @click="changeLive">
         <liveRoom  :class="['changeLive', fullLive ? 'expanded' : 'collapsed']"/>
         <div v-if="auctionDetail.isLiving===1" class="absolute h-188px w-screen pt-36px flex flex-col text-#fff top-0 left-0 items-center">
           <div class="text-18px mb-5px">{{ auctionDetail.title }}</div>

app/pages/publicLiveRoom/components/broadcast/index.vue

@@ -42,7 +42,7 @@ onMounted(async()=>{
   await fetchBuyList()
   timer.value = setInterval(async () => {
     await fetchBuyList()
-  }, 10000)
+  }, 5000)
 })
 
 onUnmounted(() => {

app/pages/signature/protocol/index.vue

@@ -5,6 +5,7 @@ import { signOnline } from "~/api/goods/index.js"
 import { authStore } from "~/stores/auth/index.js"
 import {useI18n} from "vue-i18n";
 import { useThrottleFn } from '@vueuse/core'
+import { contractUserinfo } from "@/api/auth/index.js"
 definePageMeta({
   layout: 'default',
   i18n: 'signature.protocol.title'
@@ -47,6 +48,16 @@ const handleCollapseChange = (name) => {
 }
 
 const goSignature =useThrottleFn(async () => {
+  //先走特殊验证接口
+  const res1 = await contractUserinfo({phone:userInfo.value.telNum})
+  if(res1.status===0){
+    //特殊验证通过
+    if(res1.data.specialType===1){
+      router.push({
+        path: '/signature/panel'
+      })
+    }else if(res1.data.specialType===0){
+      //特殊验证不通过
       if(userInfo.value.userExtend.isMainland===1){
     const res = await signOnline({
     auctionArtworkUuid:payment.value.auctionArtworkUuid
@@ -66,6 +77,10 @@ const goSignature =useThrottleFn(async () => {
       path: '/signature/panel'
     })
   }
+    }
+  }
+  
+
 
 },2000) 
 </script>

app/stores/goods/index.js

@@ -27,6 +27,7 @@ export const goodStore = createGlobalState(() => {
 
     // 获取拍卖详情
     const getAuctionDetail = async () => {
+        
         try {
             loading.value = true
             const res = await defaultDetail({})

nuxt.config.js

@@ -1,5 +1,6 @@
 import dotenv from 'dotenv'
 import process from 'node:process'
+import imagemin from 'vite-plugin-imagemin'
 import { currentLocales } from './i18n/i18n'
 import fs from 'fs'
 import path from 'path'
@@ -29,13 +30,8 @@ export default defineNuxtConfig({
   modules: [
     '@vant/nuxt',
     '@unocss/nuxt',
-    '@nuxtjs/i18n',
+    '@nuxtjs/i18n'
   ],
-  image: {
-    provider: 'ipx',
-    format: ['webp'],
-    quality: 80,
-  },
   runtimeConfig: {
     // 私有配置，只有在服务端可用
     apiSecret: process.env.NUXT_API_SECRET,
@@ -115,6 +111,13 @@ export default defineNuxtConfig({
   vite: {
     build: {
       target: 'esnext',
+      minify: 'terser',
+      terserOptions: {
+        compress: {
+          drop_console: true,  // 移除 console
+          drop_debugger: true, // 移除 debugger
+        }
+      }
     },
     optimizeDeps: {
       include: [
@@ -123,6 +126,35 @@ export default defineNuxtConfig({
         'is-https',
       ],
     },
+    plugins: [
+      imagemin({
+        gifsicle: {
+          optimizationLevel: 7,
+          interlaced: false
+        },
+        optipng: {
+          optimizationLevel: 7
+        },
+        mozjpeg: {
+          quality: 70
+        },
+        pngquant: {
+          quality: [0.8, 0.9],
+          speed: 4
+        },
+        svgo: {
+          plugins: [
+            {
+              name: 'removeViewBox'
+            },
+            {
+              name: 'removeEmptyAttrs',
+              active: false
+            }
+          ]
+        }
+      })
+    ]
   },
 
   experimental: {

package.json

@@ -53,7 +53,8 @@
     "sass-loader": "^16.0.4",
     "sharp": "^0.33.5",
     "typescript": "~5.7.2",
-    "vant": "^4.9.15"
+    "vant": "^4.9.15",
+    "vite-plugin-imagemin": "^0.6.1"
   },
   "pnpm": {
     "peerDependencyRules": {