From 6f49f3d8e0d16e6b55beab24ae5b77b012783852 Mon Sep 17 00:00:00 2001 From: xingyy <64720302+Concur-max@users.noreply.github.com> Date: Wed, 19 Feb 2025 15:14:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(collect-code):=20=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=94=B6=E9=9B=86=E5=92=8C?= =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=AD=BE=E5=90=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加个人信息收集页面,包括手机号、姓名、性别、生日等信息 - 实现电子签名流程,包括协议确认和签名结果展示 -优化登录页面布局,增加倒计时和返回功能 - 更新测试环境配置,统一 API 和 WebSocket URL --- app/api-collect-code/goods/index.js | 8 ++ app/pages/collectCode/login/index.vue | 18 ++-- .../signature/personal-Info/index.vue | 96 +++++++++++++++--- .../collectCode/signature/protocol/index.vue | 18 +++- .../collectCode/signature/result/index.vue | 20 ++++ app/pages/countryRegion/index.vue | 1 + app/static/images/zu6020@2x.png | Bin 0 -> 20374 bytes app/stores-collect-code/auth/index.js | 21 ++++ app/stores/live/index.js | 2 +- env/.env.test | 6 +- 10 files changed, 159 insertions(+), 31 deletions(-) create mode 100644 app/pages/collectCode/signature/result/index.vue create mode 100644 app/static/images/zu6020@2x.png 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 0000000000000000000000000000000000000000..f1c69843e6d3ec67b5f28059bcf4bc1185d3a817 GIT binary patch literal 20374 zcmeEu^;4VO)^?#dZE)O|nFaTDoF@GD;Xr+e)f#=nUtuIikt3!8Y%>D;-XtV)j9u5KmGJ+5e4z@y$Bx)`wVIfKO;!(i$lF>E9_~T6f!Gf{( zFEfF+J^g7Ot!A;;>wg>v&#^hMpCSC)K794vy;p;sA@2|UXd<9tt-)&)|`9AxnAz_sKr|)M7t7vN>f<4iWuTcrf5dZnu zj|=b(nzZVu#m6jz_pTi6Jvq`zQ7u*FF30Z9Om=s56cE??ePC1<*Cb zLLT^%DZ?~!*2KAx2q?CZL7yuY#s@5q3CnRlE@(1p-=!22xQuu zDSQ5(DGKV~9l7zLi@sZVH$_E*>xXNFA)#yJ=RjW)W@Pu@5gDMn@j-=!kU({G86Rh> z85I28<*wL2XXFI$v%CCv`9m!c$)f=yR0g^wJ|K9w5?dR~!!?w-F&4P+jFuqkKiLjSvK*klON-EpF#e*J1|BlJq`3zF0X zw3_5`GKXQz3Q-cAInz9|QZa@S8G(2o(Uy}SgpJ|$> z%5yiy%fv1*X}k@xlxU*)gK8;2sjxTvi~pZBl*w>d@9o4SpvRX4fiT{^f1g*XRShDd zSF^`e$`3rvK*FQ#HHwXmUEy}wdmVvKqu_G5;5BWXSH94nP1dT4Hcdb=dEXAiqVd0~ z)6a^~3y}<)Y~Uh)5{ExR8HSzVG#VN3UQxmcnTR#2EfU=1&)o3+mXifz3dn5d8=Nbf z0N$;Ojb=kokpsbWuXs7IB8C#umNM_pz2D^IR{w4^c9dWc1_9{Cv&Gj}*K{C7a{-T#*5mR3__}25_^M@07oQN35$teEYftUa1m8xN^LybLG~IZ&CNS&! zr}Je86|8qy2Zae5u=M81rfNXez6*{77+=GxYT?~MSG%Kc5&e7tOiTl{wu>##2eCeK zXnl2N0dXCMX&~svPuG!;NI&&MD~V{*m&la%?c35NxOrPF9RJvMwn~bRmP)D4!=TcA zuPZ~tGTp66?MI=Z{Io|qqRHdK{VgW0q!2U}h%Fa}f2?Acx+2!o_sMwK6!!QBD>UA} zY1Gc>)gz z9vhkrO#H#MnHH}`{!XJteQg^cEhr-=FRze}oRAh3i~P^7n$gzk#qE8R!SE^&q8k9< zT)=ZvB>l)l{G`+T>Sz=SRSFzdgrsC-&O|a^8(I+JGAgwbNLQYEmlcp(E?L!WI*@w_ z97F8{Xf8VBe9pKCY_Je2gLRy?P@WFqYtd(jos>ozjqR*tF&)lppYXrS**gqScv*DY z*cDet<3{-VY6h@~I=y@nUJT!7NFW5kS`W~1*7Ursu5oN$> zeqWt`L4GZrgDYf#nVpS)gq-Z4(kP>i6XVE zR+k6ab4&Hy&b}$dIPvN)_vt>0**6p0mlGrfVwEVLY?m>39{&Va8F!*sIO~es7#!eQ zOx3($x^gC{wwX!ZV9^pHs$3c@Mh1-MGxo(RuCoiX>}JX zu>#m=zI({rc3ft(Vub0r`9c=Kr~O;8Pgg&^LHR#)D#JiY^m083ee17FlTyIp9MCzZx2!1*^)Ab${=S}7x?(5wpN}{H)42OEAvZ1i-ZaHlE%d0U&m3#&N+4bq;xL(T& z*GD0G?YwvUb3PjGoQb73af3D*ag+Du2};D{IVKDb8EQ<#BarL9E&tP@Jh9dvnJz@1 za*y>MC8y55$Sb$pYlgjPG0>Z;d>(n_NjyK?n2pQX+*p$xW0a@-NK%@mYRRd1n)fn` zTsa@bTe}5H?qS0f>FtA^K(F`}h3|;?{LmFHPa~nDcL)}X_XwR?Dm{j0znXGC9Td%+ zO-5WQ_zy|gwg^ButY^d?-4B>SGK}&2_}x+I8BB97V=U5>!_lWnbctrF^b*!u9C=z3 z49b<2yRib;8SROyS0OAO9kCdIjhW1C2&XzB=m|AJF>CLxDk;DRVCEE+oE*Xdz=Xvv2aZirO zoAYf^JlKQiJdd8Bo=i$^6JuQK{dXQ6C+7PPu5_Or3_hlCI3j$WDPU*PX-Y}S8PDsK zo>D3zq^q)8r%)+%QJt-@CQ>cXfz~`!r&_2K$#`5+WOWFm?`-J2qf?YEg@8_r3ZPB> z?{&(-)Xg6aanD9sDqIfz-o#LiZ(f0@yEUdIw8*UeaJ-jyvN1Zo_pWcp%*IM&&^yavDhyiTLqu&*D6)A+(wEE(!5Y# zjinw&!Vc7RGIW!yr=a&|J;~c=)6G-L^Rud1?Afc`A{ks!pKM9ueKi4thOUJnLo`{U zh(_-8D7yH7VqXqHN)B{Veh0|S1%+@#(vJx6GrrrSgCZ=2d!C8-(0tA2if|fpunQRh zLwotVJ~gY1NhYN)U0AK7>tuuK%CFOy%}Wd=8eD9oA4zV1oJ7fdFBhB-?UqRvtJU%0 ze))JtLgUhseD(bE)U6URhav9##|)zT!-zK)kBY0U%F5!rF8jH&?1SN8MsD^t@)TG8 z6j9q&r}Xe;lB2dFr%P*KLJ0N1Axy5BJP(~ZJ+s0DL@WP${5$6MI?QI%R{!P@b+y2- ze$+`MT}~6G(7vORa>8X_+*>k#yPfC9GWylN)N~ic1A23R>b^5q1XL~2;Mi?$b-9y$ zbhqVe=E@iNJW=2b4X^y;8zk8CvKo<3d^AdvR5WgYT9Z?$Nw(?j&*1m0Z(aPI+zY$I zyzNQ&CIaBbq)i9$quC><_Rnp2gOqsV#E%3S*2ECC)aUbpon*)zGUO+Es zINkL@cjtKhuj`J@ru=j6DyL2q0^as9AX6&4LixKrbNy1`+;EdHSY~emoz%9U6OTPx z0xoWy0*zwWirAOAD4+^cJ(cxheNy4OB$zc^acy2OWs?a{ud0{M$%qJ~NCHcmLOE>b z#In16B#3IQL8@^K!>VN3%8PTs!)Av9nW8hceN!Xh?5X*i2}DY1TB_rYMS|r}yUh|W zA>`hN=ONpZ9(tKm>CFtOXhtl9zvNq_(_3!qQqCqrg`)>P>ygR4#qq+D-{kQ9*Qp0Tx`Pt0X;r1+aU$xEp(fhN?i{A5Q=3Ew7eg#dbHi;Sd9QNE;*T`&V?+xncOWQ%v1G-ZOY)*q=(&pE{xB9mA@{_j z!d*eb&3?GT_wU~f@|mZFD*w>UTUj+?U+5+F7Qq(thzmX zPVW*p=5(DT0HZv;6jfSo-+7dh3Ui`omz6au)@=>inJ5t^sol!}R~L8TZ-t;%Y<7M`u#O^ase%vCU>QAL*`PnFHEP@#-`xOguVzLMk1lc!9~M34 ztTR03v;dhEh00suhQwk@My)-9^MU-qbOTYV(wiZHNm-})qPuG!Zu^2hmHEh@L%4I( zP8eb?*Q6;#G6FwTpz)#MhwvkN+CzB=?uqw7Jc3Iunb!qw!SaP zu-ALcZ=zUzKal4=<&+g;)RMakcFvF*+fc3@wB9;JUmO!CX@+!p15-=(rc?5Uv_#c) zW8dTD!UPQQgSCu_36>nAWjJ~xyrq9iHRfFw8Jy%Fb;paPKChfDMUe)a zw3_96&M1BISWqGeIO!d8&G&jdUEpFj=@hD{Fv0Kd)6k2oh3P$rqLD{4o=XBcxsO(iT^7rNO&FXtbI>($#$cieGLtCIiC{-<`$i@-F&HX5Y5 z8j0=&tfIQ;FSW5W;iFg4A^BI|)<7oP!!btmz>BLe6?(N#QtUoQ!#MPx3q>cX7k!IV z3nce4^VMPW*0U9H#1lm&7GYJb8E@{Zj$9j#?kdd>+6kPlb2p1p=;oPQeK~AqODeoh zj8+ShrxxCbjJ0Tsa-MDH%k>y$88q({K47#C9kW9cI#$8-u=o+wSi+sd-;ZuGB8i4>E#O%W zGsxdgqmL%|&Wu?+R*kAR2soOo+Z~=>V}D3RCBjZYLI^=SGW$NJO5tT%N6qBWwuAcU z9=dRA%m#-LG+wOsi6>cK?+j7OLxP&A_mIDz?0c$0BAXfa#J)e=Q#I5LaG%XX7Pn4b zF_~{*MW_PtORyZ|R(Y!2ws|bZ*n+s`YqciARi0-8wf|Raw`$sDqon7v%Azz9Jc-VD{NR=|TR= z3mBi#*5cuE>tUEinrw$uLp5KpX2KV4<^f)|8dm9}U! zsvf*k0z}ORPlOjH6T{XW)TArlpQ~7j&m~5h_kK+;a12TOM_HIu<*5#+72V+IXC4p&B~Y{34;?&5?M zJ~4-56C()g#6vX2+#vp?Db)4~;X?nc^-)#zjBz#+_N9gFv9M6RUH5qu_p-0zMWWp? z8zCi84ZnnJgk8ck#U_*Txl-a?3v^JbAR9DSYd)eep}fq6SK_F|RF7zHU$N2|PRkf^ou7LaJL-+&9r<20lqVT^Z;DANGB=J z)J^XdEU>7N*r6Lw;6>Vuol~qGDEa;L)Snn^O z8Z9rDjcBvXORLf+^_6e)*S^X`J!nc{ zwwhS`dS90|wQwyw;VV_519jP(mEc4zc-O~Qm$A?%zfe+m*4xF(5Y2y!5D7j+ujcq> zPJ&VW-84q$BBWE)!lH1$O_@6~6#IUIqTj>tvupPaq%#s4#rOtDWhcrv^YUx;g*^0E zL~I`>Qiz`*KaPI%LH5uqb@Ns^tJ=jsK`0B8%ChTD&BZUhF4iwCfaJPcrE}}n=A+~8 zPM;57ec!!sQYj*J%vIB!3L#oq^*+KM>9E~UI)uZ6LpoizGD=QDLiNR)PxG!4wuK5M zDp8-^_hyzqT`i}^3yyISc=E|xAGljZ00t#wZwj06y6)#@iN(?;Ol3$N z6-emf)Z1kWTa556q)(yK>(%6FS=ZYKq*OV~n+eT(R$qEXm||E{B#rWv#=}NoCGP{oG>g)pn-@c)^vLAr!t_aybY~7 zF{+C0P&++DJD|IufV{ai<}2Q<|1-2T3cuQ5`HaoQ*XzI0XO!DHrye8IGSv{(at}Pr z;tLPw*A3T!%hR~by^}v2wNtp9OHNYk1ozqJSro-)d34;MT7l6;6@+J9EB>(dK})Ul z_wwnbqp(Gvd!ZFj1C@RW$x$)=?vOI?9S`dCiT&g=O)o}94K9=~8%d=mBrDKn)UAz1 zy{t@@#UyJcI8}x9(mRR&&5fj=M}q$h5@K#fsY=Mu5F)kGTgnBz?^)$wiFV-T>a=wG zZI23;fL634+nnUh-Ut3qsECwH*nX=3Ii*eh$GmEi8u5854@vP?UMlW#)3*wlo^NIw ztdqhUm+InX*@u+22R1nhq#34cvhwJhRUjBied^oY``Yw}AUMI2eIRW^{H;OpXGO4E zW@pKifLye|u>5%v=PNc-d7P;aI6@VNZ3bYc-?wK=X;TWnZYBa;j3#CWJ{^rbj$Y#F z3S`Ib%~8nZc-&m}*KA<3$lEOq;}mMNIJKC35^Kjoq`}ojvBNsHItDM#|Lbfl{ z^8=qvxs}_XVv(svoSUc>t7m13mQ&4C5XwU&bIBSn6$dO5wiYjSh^jDkd=JiDyGJE# zA9yWi0i!J`RRT!iQj>Q1ER2MEXbAW3Sr)K(7jWmL;q-<}v?JA=t$r?t$UC;^i_DsOGFy-;@8G6_|n=}-U6agy3^oz zuMaXaL7(zv^6;#7glTMOJ%2=b#IVaM3OU` zM>AcZ31)Oa2dvJMgTm1K^ij7sT?ui)UU3RVguK__9DBA*lmSF(L{DqKpK@@$aSd96 z6KVE^doUw29)|_Ldyi3p#}U=sY2Aeunt|kdhV!};VO9G?7&xy#xs(u*^rL-ZZ|t?l zp%4#)%nuw1o?vlOz%#!UE+t1|<7FHW8a}g*Mi{Q8ez6;n%4_YkOrgv}=bb$pH%@{% zeesylpmPY+*EgZ9L7)bgh}6-r+K9P>!{iLJ%6yl(5Ul1tTW1mis$NeamkPohD>nk< zyB$;Ql*3t^@w2@KWQ%Wj0Oc_05!=OUSHBDD@tz1m*(?A>3%YriMQ+ZR4=LT6teo6M zUS8hKop^TnWs1fpr9i;YMr&=KIp?hMt!K8hQHDL#@k=Bq|=@4MZtQEWHp zCKbAUg@AfCQJHkt4tp&rGTC>thfI4T9vtSAHSzRd^k%BRBQ~-v@W|uykG}hSz{LKH zR@UujyK(nh7fT8&YK=9yHn176JX=Y=8BY}Sqs6~S~dfm`E2;+KOMQ%NOJsyxNd_5Y!bUHEuo7bI&xTE0_NDdkJXiRM>yMq|O(V#Ast| zjU|C{7%NVxprikV5SbB4*j@e|H9(`hT3>9s_%?`VFeQp~kL#jvt%k34!f9tp#Z*j( zD49S6&OTFr+qhJYCP97T-9+avk&-sXLSIIWwkF^QryKK%Y~54j^27z!M>1^Ki3L{7Q$DN%8X7!!|1#2Z73DF<_}B70 z7ei=%xVIct?1%+xUuwG~y$^{>5P!^Hz7a2T7_Ff+0KhNLe1JCHcvRGv*(~qxmwwli zH$H-QreJYeoprYaMEM%gg*_w4o;Qy^VjFmXI$b=R?nb1dheB6qrXO*Rj75ogZ+57J}L%OR~Spi0k$-E9!VxlLqq zS(m4zOlaz;$@w|m)uT(_X-FgXRRAB691gD*>R8mko$0(0hCpKdt5H`)#tP;tR()oZb$TmPw9Z%X~y&KqyXNy^a~t@LZt z+2u>8ts_NMdhbU+>MF}2e&-iSL$zvO=F2TverPpH(ZEiGy&Es~0M#gpA&Dy47Bn^zYQ0G;p*U44+RFd@p`z^_tS1t#U^#|E<;J36zCCd}O!L2qX}nyw6sHX><9j_8h)v1#u*eeT@ORMFO_*v-n1 zJ_SSFsm92_d0~uh07}Uv)&Il-oCE!VQ!uGBb4<&w@aoUpayRd0IBZg~hLw|P zegV!3qFBcbU2lD)P$*?4Qa&|(NejeQC}@@T)|2PdoBKXJc6_|GJ>Fn~!Ct5*VuE^n ziBlT)tBA(&XFVJj^X%pgwi}PwTB^iwmDIKy28#9WoTqL_8mw-$%y}qRzIT4QV4qzs zJa_8M-He;sR9(oPvpo=gxvQpbXnF-(%&!g#e@8RgCb5`>z^N-XkUBZEp=c1}aJXt) zM7hMlq%`jFr9D)+Y9V9H5AH_b`nLg+gx;LWQWqpr? zp=a&sxMYP7$Rjs?Nd(NJn!aHhX`!(3B5u*YYP$Pv|N0KWko6rqi1d1mcowa4T_7wX zrpgRP-_Is7p9ijq#m`^8{FQKtrFyXlwhpuiIsWBgxFr^9LqLmg!GG3pEw!R|F=E4q z{L%5wa=gx9fHW0+lMrL!C#384jq~B)-g#Tg!rexM_@e>gHExrW^OTF3OzjayuPfgb z%K82bv_WSwIEoY~7oc|)it@N?O0V4@TI1-DdP?{shv?yB`1>eNae{awTac2H_&yyW zvFk&2Dy~qI_4HNJN#Z*KI+^Gf?s}@N)*6TX6XBXV$0~_AaufpIu?G}quYiwN)+#MJ zbQ6RgIppAz&&1b**+SfRcYUA~c2_#!aofugs-dJ+Bk_za&f_mVk{?W}5IY(!zMj|r z!9TCIT+93I^{s)7s%0&S!$Wc9I*+hlnyP&aPBxnMkfxQ{%dN1(1P%F_q5H4*H?g|| z+Vbr`ZZC=~sE@rKvDy<#K0QxWDb|RAAomtg7f8d#5ZBv&Qqy+@?&j;vp1w`_aPo%U z2#0i(5_RPSf8=*&bYVgKb%fezW%NApnde=z-Gp=Wh=}WF5wbZG8HyfL0@@Ss(xXp4 zKhN6phVx(sf6REZ5am{WvhBU#H`Sk~Z%^7XT(|1GKlxQ0QUdSR8qazZ(D2jT>$b?< z1qwkGdogx}HYgs7)5@7dM5}u9d$}=FCK$Bi)U|Jw*<(n%_qWf*iaAYeIH3&LC=qlk ztY&qRV^%*ptTy{(=r_dK*o_8+M`0FJ))H1$u+nK%q(72NaQD&p<|HhEh`N@fJG|*~ zHh^A`#@UuOv=xkR7fw0`tX=I{82*_NK z>6oJ&`z$B3Sw0-m(Ip2_9wdssz;u1yc1wv(=SKneVcs8rg*t85OdHE4X3l1A15_?# z>LQUr3BBtDLTQCgcgFOx*B55QXTy2NG#FM`1gX{@y!zmA{Tl>Xp@#Ha$9NXhWa2MyH!VC|e>2mBCs6S?!zm}s$ z7t@e8i~+;-M`$GVHp2xn0w?a$VZZ}cllWr42KMn$1R3&+wzgRm-UK;_4e;}1)%iVY|6WCop9IA_Zu^bTV0vQwbz|EmEA2{htv29siF<+bVX+qMPm3?cPT4tSwk(`k6#nQsPOvMqH z@P{}Zf5)AcWU~+O8i3%(_4eq`Zu%(v0#^kjE-_)V=}?XzrQGZ%YyK(3;+eA(T4g?S z_4U+FZKO?tZPb&+a#3kQXgRXAR;_eV_>}NLj#Jn1dkSdf5C->mW!GbR!-$|;=?P-L zZXFv=Ht|dgxROo>3tWSz>vtDzN69!{bMqp1jd!2dUN0>fj6Zf2Rpi;9k#X^_ceNxb z!X2cANt*rhr(4=*D@zE4%ow(fmwPZ?a_@kayDPZ$cl1hzUv`yBimV)L9=Tli5Hl~^=r4=Pl=*7oaNf}(RL7t( zUL19Z%$Da6%$1{8#=;>VjVW(;@NCH3i}#Gq_BcJa;CWJ@h89~*);2@blL${Y9%4JU zY%Ertm(JG&`#h30Z;#xT)T;U=tZEZ7>&n_T@g^3k{}AM(Dh@ZwMn`~}{#tHsZY~{kLztv$hL}v3-Nj9N)u}b+1 z+3)4P!9F}eCEMQU=LZhu^lY3LMHE|obOMS`ZiHgcy2|YF-nH~L+&cu1$q-c?GI?NO zP@#A3!4)%y6Fz5iC(dVseV1loq}oTP=CEV}+L%9UzslqFrY9{*!C*VNG2Th7H$P{W zS3CEIIOip8n)a5%*6E%X#F7lYy18ZBe~(ZZLrP+$$6K&&xGHJ6ven%gQOlsU0FU6J zqG?;iqi#*k3@->et(nYM3(NcJ?MI(DbVSP4Y#$l(JS0jXGZ2YhIS=W&Y2h1e>1^pa z-18e22OF17XXr3=3>NIiz$fST_yoa7UQfkE?XR%=R%LjhBWY(`*ES7V*wmYD>WSQ& zE;qu_lpl>UV%JxbXP7MN-arzP=S_qM!+f*~%uXvvg(&rPj=i4>=abN~7foV!LGk;D zR+hA!@-Q?UyS^(jdJN_}YtMLa>N{8W)yGEMV_Io_a-~t7o~@y+ zmq2r?+!>y=udg<`C$A;WOSdEE>Mgyp{XcO0H3}P=0Wr9ch_n!S^BnN*c)QPiL*6tD zlaj&2M;Sm_b_Qn+41d#W6^kGQ{<6d!4H$hmdHL;@(6W#VR<)wf z3BLbDJ*LHIM|I85aB9B~(~lx{r3ri&`9N&hV>_Gxc#c}r)LpuzJamOV*B9tSpJSdP}zml#Ge z_cRKV6hRhe=AW?@lb8aVm$|egm<3;&fPZQ=;2NiG+HQ>SATJQU{7)m&$vol^LxHB4Iv4WDCpBwOMairNgjV7Xyu#c0%z z^#SV7Z`J+ZYYGNQGrXD-IL_(-QRbx;#OfQ>U=V)~HednS%#9Bj$ubT7h+NkSCGZGr zY=K8^B@6osY(@)kLd3s9p%XN^tZqBWNh-i-x4FFjtM9Qx^zwb`4?^p`@i~M0+M|xP zU$gvb&lQx}jouF`%}DIea^xbnmM96E96pGEzE)X(7iMWb=e|GPC{Zb~q5~ff3~gNl zZt%KK?dIcLtW!tQQ)|bD;16sMd^BTGD|KybVzRz+Bq8JSj6Z0p4vCRm70&pe+0w&B z@PXlHyh~AVa3Os!1sh%OM!c_Kv_E@Pdj~^AGhh<;fen}|Z@WJ3I-@7g8>P0^b8XD@ zz9@2^KdDV4halDMJX8Ky(AT!jnuQ|2!rZOVOppb9_prO_fG{Y)xt{^IOd}_%B&ya4 zaIR+ZId@eg|liU8o@0o9O(y5xg_u)vai9B$vLCdvVT^@GbCs2KPl5T_;JYz zttc6*8e0Adt)4AzNr$RIh`c_!gM?P(&WcG4NMs;^m@4a+H2cZ09%EqomkMy5fR)ki zS=4;IJvVdWSgY)vuyDGdAmHfd@19RrxzP!iOS_6g1+(PGb;t3OT?4!Y8YAsh2CFU& zyOReX{j(hh9MwVv4rzGU>AT??GLNlUC|QNU>sUGkH~J7Fwl#JSa-Rbc@Y;eUUA=>Q z^&y=4qK!JYP|q!GO)KSN=9@Sjl!#L~*TJi;!=ZhVWXsI<5}Pr#3mn(K&5il2#qXHK zCF;HmMOjO)mY>M}SG3YXnr%tLPGpY2joTF*>3@XlG0^Pk6=WwH?#fUJ(zJP%8xoX^K>|C9k)q5NXrYHV9nNBQViT3t2e-WScu_% zXO*HZ%|c=(bq^+pM(CimQgm?B3HnR-GeT8Ilg)#Bl_IbS%?gTuQ+DCp$;n*$7!c0j z_0O~xzJ~64=z;tMdHzNlHB}`PPMw^exj*^Ic|5OP-@9HRfmi%UNN-DAPHrL?;4r00 z?#D6}6{SvB*S(!Peof5sM99VU1B1pLXkmb1R0K} zKlS}$<6zyhd0(HKch+Y{8VOReA>O%b*PLLfswUX}K5p>3Ts2(jMAQ6QtkE2EM_;8xZqQ~2=9?vIt}I>RIDbavd1 z-3uG`s}2d3l$M268dU5H67f82y`t^{4g3QV)Ki}IOuL=lH5Pac0 zd;7VNzhY;X98!OHqzJ)QoE4L|9-lcbo)Ph_-Q82br*AzHS5a`KRUI3X{KQdLC8C4C z2yoQf$JZ@sY%#2ON(gCqt>Acw5ntHtGzJvyZyW0B1$m_ry2 zRqN+exaZOg9V}=$ei`>DGm{)y%r@XvK`mLlP@vG=<86iY(8lv!YtVWJQ#d?wMjEep z4|s`F4#?AS-aP!{mHvw^-4v&fIwOeGl`(EWwVBYq$cS6Y@|SnNIfZao_r&Zg zY~Rxw&8Hd=ygz|Xtm=CKlQTvxM_}skn+yEOF7Dh!?XhpNOJt>blCO!L0$S1h>hNj# zxLOJ%6)dVY67_o(lzAF1MMuMPI~t){49q+|J7G0?o=r%nglA47WmSfNE`ascidYk^ zp%Jg9V8b``npUXR-~#?%(AW}=hZ%XL`SK}`MuwpJBd_W9Gu2hn@K_PHlG z3B{4?<>d4G$#|1WCQ@-gNLq8ath5|8jwN=tp^@hW+~w6BH~3XB`aiG#3GMB`^s6JJ zwR#8Lu(wDfm)oB}4n}*$FJD%*0wK&YibiccG+x9oOe5E{4S5q74lF-4C@1`k>H6Z3 zW#*HW5rEIcQ|`iLo1-Q#DrA>v0rhWYhF!4WA58p~pIij-y_{mNk`wf%apS0j;@GOG z5z48Ai-(-C`eUdiNHz7~L0_l5z8~T6;Ezt$Pd@t0*_iSj zo_9Ybb_f>Zg?jk4qpYMxD({|^O%F5loxIdSG`fD|Yo=~(69Miptey-^6tvj4o;aqF zOEJ`(zC}yuG1{C~xGhT_8H@UER7DV&D~prBmJnFA@`W+T=x?~U17Zm_t*4{0e2}tb zT^W&Bp6gkg26||97wl-aA-_CP%?v9Vf31g3a%^z+WBuoCIZ06!U#KoUkJ$h1cM(MuVuuLQ@`r9sk`37s3p z0xk7C<;PV@-bnpB3wXSK*^^)zmnig3k!a@;Be=}U*~hmTmBa9Agh>98feZ9H@r)0+ zE$-X|GChc5N*+JVJ6D*NC0;GXi=n#D`Zfb91jz)Z#-dKMY%f@lZ#_VhQ3tH(>Jc5@ zyY+L*RzEph*!Jrv$7&rV5G9_{R0KV-?Ggl+_3q`6azSN`jSnWxWKh$xM9HKqUGQvq z3o}-0iGXXCt*53#t6L#}m_%Vns6kMCYlkNZ0)8K@Cvt)?~@U;LhBx#8iLD|!3Q>+7BaS}SLCPl0*- zky&MH2y-vjMmIW1YSmzj7w$CPQ*`=DfbT96h6npQeGbm|YkK1}pm>D^bVAx?MExHK zi*r4p3aX;LNF_;bpVkkqyGlFTV)hHfCyt87=x{#N@< zL!6c^=Dh3^zp}!C3NG$FsP9`Zh>m|p$7u@3I~1n%LM_i7%>a=xjY2hY2=Ke8}4m}>p$#zwT!ak zYoeO@YP&PN4bS3g+Eiyh?s;CSqBqhh_GMYtlNtnsNOHMkl@f1Le24yo*8AVtmA7Fl z5=vRr%Y+daFWUdj;dtiv0+IEtf&-p}es`M-jOlC|gU~Pt*Z?@8->o^KXh$Yx+IxmV)fn45=xNV3l@fuLr59F8V|?xNp> zg+49|n-8a4RP)o7zZM{nt7&c@Z;B!F?pW(ij*V7GA`Ui*L@(;?KgnWiFaKtHoL+l+ zrwYTXthDs$^}V+q ztzWFVF1}RS`gF8D$>P@ZEhVQ05SR=@Djqt2rqLX0l`p6z#ruj-vX4{t;hdt-Hbw_G z)`hgEfvrEdnJX`kAcUk<#yUtknvfN*1lWZ2HwSBp&rjid9+d(vF76#XBM4)yR`B>8 z0C20MtgH!f6U&&!p?0|_k5C+q3iv@pt&DsJMe5%9S>o{3`6anm8q|(quh-D^=S|#m|O-UC{LfHn??gRV0z3xBK3G}%ZKg%M2Y|s6X2YgJEdBb`0H-F_lUYYWZ z|0Vj0kbyj+2M8XU0VBu1$hn#h$ij@jzr8e*Jq~Q3A&v$TOlGLOvM}+ZB3WE| zN2W0v>%&*pcJ}$HqkA{1ESH#NWa@%#|0#LDdsJ>#H1Y|{2=#$QL#e~-Q zlVT3Oe46jEFlD^th#re_o=h1XIS!pWy@J2o@!ni5OO9X0u~&eD60m3&1p( z_avpb)yRwa7;p!+ncPHofusq_^Aa&%%H|b2%%h- zkB)6V^b8B_yXP@eN#ADld64hCPYOE`?mG^9jKFR3_kP>ru4w;dmq-wsIb!a<#u#v928LUu}Em4~A*g zfLn{ZH7_w;bn>Titc%#xH}qLRZ%vZ+I9&YS&%&+ClYxo%JrL_Tfx7W&vNujL5nHRJ z*f%Fm(P4qQ^b)PmmZie*L-20R!lR4x_V{ZX)A={_XXfMvZG*lDKrrwXO*`N0IM2wJ zh?_6&td0fh2KzdK`yx2f4yb40uJLDnS2X(f76SWHJy+fvm)GnM+K+vk$Rq)VKLV6s z?u*TDE=%{Q#N;<4^~Ma0|FOxGORo?crbLMVd)ua&C*3P7Ct?}-j@l0@gz_5{L$ISq zuL0)m^lc$--~hEiog)UsIfR=P^fZ;H*?1vN`fAKOQa$SN-2QS9?XV{z)q5NLlfGwz zt6IO?)kZqwleKH=NroLIoj?Wc2+X6RJDZDp9_JRN`#)K=ZN`XTyFGI(&_<)LF#oddwKb(#VXCNg+ws-OzSvA(B0<@Za_u^mcML z&G;1ZMc8ES5D$ZKfNM*OPj&F100|`i0u-#!gU$F|sB$*E_b6w{;vYcy%y0VbHzpLZ zPKdFal5x017(uBz@X@lf!=Gu~l*!pg4HVtXm-}l%xic<{oatx9n=v3-Y-Cy=E)eTrPnQ{vyzk~*?1`Yjn@%fL)pkN{z%LWPbco{`1p^9OE zP3t79_unD=y{7u6n$N`WnuFSox!&Nic?GDb3`_xt zf%>#|vpT+653Bw=T{|YfF-^YjXly~@xB%$a0_z$=KLN^8T9wk)-OLHcAK1u0R`A#Va= z6&H1hX!+CC!xAVFgCeSX!n@p=6`CfME)$5Il+C+985&Ih@G=KY(uYpGfFwY}i+?PP z8sbcaD;s8IxnNJq%CQ@rNQT>&so7FYt8f4Vir8fa5&>;uVFfn8rn!psUpub>z?R8z zWBcej?Pv)9mJX_)dvFTh3wH%4Kc#XZ^#oH!a{P7na>Wb&$(O+o|K?%~HsPVEENw2eS0DwfaMg@_Mku9uSExYPW#8-7f8--n0#QgToRGALj~1Ku_zUBMr}ltj_Chd(!+* z%3lW&n|5Os1^6F9oWk`LwEwZqYWHuCACllXj`cM{L;oI*wrY4VhK?op-}V0gdkA!X zy6_?aSX@ta0sgll|C5XVosK7^@V`~~-zxmiUi{B${tr7mq2&Lq!vCXH5R^fWSBA;C z-+K!@Uek{sRA~QH2co| z`cbt=?HtPIJ_%Xu$lnL=?2RZ{jA%mJPn{Fv*8#%sghDK*t9RulU#s|fV3|c=bWj=Fr z^Oo@Q#)HiQGWJe9N%b+lyL?Q1R@6KVF?cB%u?}^}hctj`N>tHgGD@Lou9yAurGK>JeU$X(uLH zN?u;w=X*B;gBibTZ6_=EKUg2)+r2s>Cdwl)Z=(zON0 zP>J28a#+W1lO1P;N{&zrW$1IFh;>M*k%9(N*qaLq3N+z0c&JGk``QB^*@D7qC1a>G zS44?uuxW$!Vz$Wty(1fUK#bAxao*p#-Cfxe(u16is2}a^ibDxreUp`ud0{nMMW^Cx zwSX4i;Jgc#gK)*rD0DbdE#TqMF)DOK7#>3c@g(X#{CgvT7i@w0;?h#7h~|_Dj&!19 z;^6>df5yef<4>0vh~z)hlt9Md%xj{iqoacwbw{Nwi}m2sQh}P_u^9wd;WE2|$@q7j z!Q}tm-UV}zj4dR>65zkwCdX%=hbNfhGiiM)vzVX{<2H~FSB)1X3&`qFHvI+igx6py zxAlJ$ght{GRRyJ1*UpNdAOC>|Sy}d2+vG121 zlXG64dU$T8bmOAxfK9%C3)1|fqGtUP4m_0PDz14+v14k%vV$;(1bkr83ARyr)Z*It zDWGESOW^S%uk?+Rk4JU**3VOAKGb_=or7SY(%aTqpEe#_B~TsuL_tvZp;ha5X!jM^ z{Zv+X)KWd|rS8N3&s02`j?QVBdv9YGpS8-Gre{2kNhiN?mi2kKOq^?%2;BA#9`yk3 zTT)LD6$|^g(4JqEC)<0@6SoCVR4mpM0;k!4XQ}<}=17MsWL(b4A}nrM>EXmF75(?r z+6a!a7=uQoxhLLM=I}CE!w)rkqTM*>h`XQDu`>0=f_w}6&aOP0aW1_&;D#WqbW!l< zcw*uz{L1$BWviE6{pEto}F*HUPnEHe_C|kXGBfKfukDGn@?czBaQs4ue zK(0Pv%oNxuwA@zXp&RE#p*{iVgd%YKNBO}F2~M+;j`kb76)q&h3ZH6Vr@k;hiAMlx ze-iMZBCj_$d2HFBA+Q6ub4TdA+A#)bI4VFl50PZVhx&zbCUL({*&P5Lw8!A->gTe~ HDWM4f%WFh8 literal 0 HcmV?d00001 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