diff --git a/app/api-collect-code/goods/index.js b/app/api-collect-code/goods/index.js index 30e1fb0..1b09d13 100644 --- a/app/api-collect-code/goods/index.js +++ b/app/api-collect-code/goods/index.js @@ -29,3 +29,11 @@ export async function userArtworks(data) { data }) } +export async function fddInfo(data) { + + return await request( { + url:'/api/v1/contract/fdd-info', + method: 'POST', + data + }) +} \ No newline at end of file diff --git a/app/pages/collectCode/login/index.vue b/app/pages/collectCode/login/index.vue index 7065d7c..8c181fa 100644 --- a/app/pages/collectCode/login/index.vue +++ b/app/pages/collectCode/login/index.vue @@ -138,8 +138,8 @@ const goLogin = async () => { -
-
+
+
{{ loginType === 0 ? '密码登录' : '验证码登录' }}
@@ -166,11 +166,15 @@ const goLogin = async () => {
+86 {{ phoneNum }}
-
- {{ $t('login.reSend') }}({{ countdown }}) +
+
+ {{ $t('login.reSend') }}({{countdown}}) +
+
+ {{ $t('login.back') }} +
- {{ $t('login.login') @@ -179,10 +183,6 @@ const goLogin = async () => { $t('login.login') }}
-
- {{ $t('login.back') - }} -
diff --git a/app/pages/collectCode/signature/personal-Info/index.vue b/app/pages/collectCode/signature/personal-Info/index.vue index 37969d2..ce615a6 100644 --- a/app/pages/collectCode/signature/personal-Info/index.vue +++ b/app/pages/collectCode/signature/personal-Info/index.vue @@ -2,21 +2,82 @@ import {useI18n} from "vue-i18n"; import XVanSelect from '@/components/x-van-select/index.vue' import XVanDate from '@/components/x-van-date/index.vue' - +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() definePageMeta({ layout: 'default', i18n: 'menu.profile', }) -const {t} = useI18n() -const showPicker = ref(false) -const showPicker1 = ref(false) -const onConfirm = () => { -} +const {t} = useI18n() +const router = useRouter() +const route = useRoute() const columns = ref([ {text: t('realAuth.male'), value: 1}, {text: t('realAuth.female'), value: 2}, ]) +const columns1 = ref([ + {text: '身份证', value: 1}, + {text: '护照', value: 2}, + {text: '其他', value: 3}, +]) +const goCountryRegion=()=>{ + router.push({ + path:'/countryRegion' + }) +} +function isFormComplete(obj) { + for (const key in obj) { + if (typeof obj[key] === 'object' && obj[key] !== null) { + if (!isFormComplete(obj[key])) { + return false; + } + } else if (obj[key] === "") { + return false; + } + } + return true; +} + +const initData=()=>{ + number.value=route.query.number + console.log('route.query',route.query) + if (route.query.zone){ + formData.value.countryCode=route.query.zone + }else { + formData.value.countryCode='86' + } +} +const nextClick=async ()=>{ + if (!isFormComplete(formData.value)){ + message.warning('请填写完整信息') + return + } + const res=await fddInfo({ + phone:formData.value.phone + }) + if (res.status===0){ +if (res.data.status===2){ + router.push('/collectCode/signature/protocol') +}else { + const res1=await signOffline({ + userInfo:formData.value, + signOrder:Number(number.value), + }) + if (res1.status===0){ + window.location.href=res1.data.fddVerifyUrl + } +} + } + // +/* if (formData.value.countryCode==='86'&&formData.value.cardType===1){ + + }*/ +} +initData() diff --git a/app/pages/collectCode/signature/protocol/index.vue b/app/pages/collectCode/signature/protocol/index.vue index 3573d12..3c044a6 100644 --- a/app/pages/collectCode/signature/protocol/index.vue +++ b/app/pages/collectCode/signature/protocol/index.vue @@ -1,6 +1,20 @@ diff --git a/app/pages/collectCode/signature/result/index.vue b/app/pages/collectCode/signature/result/index.vue new file mode 100644 index 0000000..2033ec6 --- /dev/null +++ b/app/pages/collectCode/signature/result/index.vue @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/app/pages/countryRegion/index.vue b/app/pages/countryRegion/index.vue index fc4efd5..58308b0 100644 --- a/app/pages/countryRegion/index.vue +++ b/app/pages/countryRegion/index.vue @@ -38,6 +38,7 @@ function groupByPinyinInitial(data) { } }); + // 处理其他国家 data.forEach(country => { if (!frequentCountryCodes.includes(country.code)) { diff --git a/app/static/images/zu6020@2x.png b/app/static/images/zu6020@2x.png new file mode 100644 index 0000000..f1c6984 Binary files /dev/null and b/app/static/images/zu6020@2x.png differ diff --git a/app/stores-collect-code/auth/index.js b/app/stores-collect-code/auth/index.js index 1882716..9055d72 100644 --- a/app/stores-collect-code/auth/index.js +++ b/app/stores-collect-code/auth/index.js @@ -4,7 +4,28 @@ export const codeAuthStore = createGlobalState(() => { const RefreshToken=useLocalStorage('RefreshToken','') const userInfo=useLocalStorage('userInfo',{}) const fingerprint=useLocalStorage('fingerprint','') + const formData=useLocalStorage('formData',{ + "countryCode": "", + "phone": "", //手机号 + "userName": "", //用户名 (第一次传) + "gender": 1, //性别 1男 2女 3未知 (第一次传) + "birthday": "", //生日 (第一次传) + "address": "", //家庭住址 (第一次传) + "bankName": "", //银行名字(第一次传) + "bankNo": "", //银行卡号(第一次传) + "cardId": "", + cardType:1 + }) + const lotNo=ref(undefined) + const price=ref(undefined) + const auctionArtworkUuid=ref(undefined) + const number=useLocalStorage('number',undefined) return{ + lotNo, + price, + auctionArtworkUuid, + number, + formData, userInfo, RefreshToken, token, diff --git a/app/stores/live/index.js b/app/stores/live/index.js index 68614cc..b4143e6 100644 --- a/app/stores/live/index.js +++ b/app/stores/live/index.js @@ -234,7 +234,7 @@ export const liveStore = createGlobalState(() => { }) } const changeStatus = () => { - if (auctionData.value.artwork.isSelling&&!auctionData.value.artwork.isSoled){ + if (auctionData.value.artwork?.isSelling&&!auctionData.value.artwork.isSoled){ quoteStatus.value = !quoteStatus.value }else { if (quoteStatus.value){ diff --git a/env/.env.test b/env/.env.test index 4da997b..a366189 100644 --- a/env/.env.test +++ b/env/.env.test @@ -1,7 +1,7 @@ # 测试环境配置 -NUXT_PUBLIC_API_BASE=https://auction-test.szjixun.cn -NUXT_PUBLIC_API_COLLECT_CODE=https://auction-test.szjixun.cn +NUXT_PUBLIC_API_BASE=http://auction-test.szjixun.cn +NUXT_PUBLIC_API_COLLECT_CODE=http://auction-test.szjixun.cn NUXT_API_SECRET=test-secret -NUXT_PUBLIC_SOCKET_URL=ws://172.16.100.99:8005 +NUXT_PUBLIC_SOCKET_URL=ws://auction-test.szjixun.cn # 阿里云播放器配置 NUXT_PUBLIC_PLAYER_SOURCE=artc://live-push-sh-01.szjixun.cn/live001/86180cae-1e07-4b8d-b45e-50d8ce800110?auth_key=1739255918-0-0-5251017e725a860570a59de7e4e2fd98