Compare commits

..

No commits in common. "30a46e6817ee8af6f8bc9157f8f87e5007c00b9b" and "ad7833a3125b8cab016e0215ceea4aa2f33e2b57" have entirely different histories.

11 changed files with 35 additions and 2253 deletions

View File

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

View File

@ -1,7 +1,7 @@
<script setup>
import { ref, reactive, onMounted, onBeforeUnmount, watch } from 'vue'
import { ref, reactive, onMounted, onBeforeUnmount } from 'vue'
//i18n
import { useI18n } from 'vue-i18n'
const {t} =useI18n()
@ -40,15 +40,7 @@
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
@ -92,7 +84,11 @@
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)
}
//
@ -148,13 +144,11 @@
>
<transition name="fade-slide">
<div
v-if="verifyStatus.show || isVerifying"
:class="`absolute left-0 bottom-0 w-full h-25px leading-25px text-center text-14px text-white ${
isVerifying ? 'bg-#3B91FF' :
verifyStatus.type === 'success' ? 'bg-#52c41a' : 'bg-#ff4d4f'
}`"
v-if="verifyStatus.show"
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 ? '验证中...' : verifyStatus.message }}
{{ verifyStatus.message }}
</div>
</transition>
</div>

View File

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

View File

@ -4,22 +4,14 @@ 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('')
@ -82,14 +74,6 @@ const handleCollapseChange = (name) => {
* - 其他用户: 走非大陆签署流程
*/
const confirm = async () => {
<<<<<<< HEAD
=======
const toast= showLoadingToast({
message: '加载中...',
forbidClick: true,
});
>>>>>>> xingyy
try {
const fddResponse = await fddInfo({ phone: formData.value.phone })
@ -116,11 +100,6 @@ const toast= showLoadingToast({
}
} catch (error) {
console.error('签署确认失败:', error)
<<<<<<< HEAD
=======
}finally{
toast.close();
>>>>>>> xingyy
}
}

View File

@ -21,7 +21,7 @@ await getAuctionDetail()
<template>
<div class="grow-1 flex flex-col">
<client-only>
<div class="relative bg-#000" @click="changeLive">
<div class="relative" @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>

View File

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

View File

@ -5,7 +5,6 @@ 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'
@ -48,17 +47,7 @@ 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){
if(userInfo.value.userExtend.isMainland===1){
const res = await signOnline({
auctionArtworkUuid:payment.value.auctionArtworkUuid
})
@ -77,10 +66,6 @@ const goSignature =useThrottleFn(async () => {
path: '/signature/panel'
})
}
}
}
},2000)
</script>

View File

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

View File

@ -1,6 +1,5 @@
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'
@ -30,8 +29,13 @@ 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,
@ -111,13 +115,6 @@ export default defineNuxtConfig({
vite: {
build: {
target: 'esnext',
minify: 'terser',
terserOptions: {
compress: {
drop_console: true, // 移除 console
drop_debugger: true, // 移除 debugger
}
}
},
optimizeDeps: {
include: [
@ -126,35 +123,6 @@ 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: {

View File

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

File diff suppressed because it is too large Load Diff