From 91d93484de64c7bd6c170c99952a475f60f58252 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 22 Nov 2023 09:37:30 +0800 Subject: [PATCH] 2023-11-22-1 --- package-lock.json | 11 ++ package.json | 1 + src/assets/iconfont2/iconfont.css | 14 +- src/assets/iconfont2/iconfont.woff | Bin 2200 -> 2472 bytes src/assets/iconfont2/iconfont.woff2 | Bin 1720 -> 1972 bytes src/assets/style/style.css | 5 +- src/assets/style/style.less | 5 +- src/component/Detail/habit.vue | 17 +-- src/component/HomePage/MoodboardUpload.vue | 2 +- src/component/HomePage/collectionModal.vue | 2 +- src/lang/cn.ts | 3 + src/lang/en.ts | 5 +- src/lang/fr.ts | 3 + src/lang/it.ts | 3 + src/lang/ja.ts | 3 + src/lang/kr.ts | 3 + src/lang/ru.ts | 3 + src/lang/th.ts | 3 + src/lang/vn.ts | 3 + src/tool/guide.js | 41 ++++++ src/views/HomeView.vue | 12 +- src/views/LibraryPage.vue | 50 ++++--- src/views/versions1Guide.vue | 154 +++++++++++++++++++++ 23 files changed, 303 insertions(+), 40 deletions(-) create mode 100644 src/tool/guide.js create mode 100644 src/views/versions1Guide.vue diff --git a/package-lock.json b/package-lock.json index 1d80b144..c3a21f93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "ant-design-vue": "^3.2.12", "axios": "^1.4.0", "core-js": "^3.8.3", + "driver.js": "^1.3.1", "element-plus": "^2.4.2", "file-saver": "^2.0.5", "html2canvas": "^1.4.1", @@ -5445,6 +5446,11 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", "dev": true }, + "node_modules/driver.js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/driver.js/-/driver.js-1.3.1.tgz", + "integrity": "sha512-MvUdXbqSgEsgS/H9KyWb5Rxy0aE6BhOVT4cssi2x2XjmXea6qQfgdx32XKVLLSqTaIw7q/uxU5Xl3NV7+cN6FQ==" + }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz", @@ -16565,6 +16571,11 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", "dev": true }, + "driver.js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/driver.js/-/driver.js-1.3.1.tgz", + "integrity": "sha512-MvUdXbqSgEsgS/H9KyWb5Rxy0aE6BhOVT4cssi2x2XjmXea6qQfgdx32XKVLLSqTaIw7q/uxU5Xl3NV7+cN6FQ==" + }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz", diff --git a/package.json b/package.json index 4fabaf1a..04a4ba0d 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "ant-design-vue": "^3.2.12", "axios": "^1.4.0", "core-js": "^3.8.3", + "driver.js": "^1.3.1", "element-plus": "^2.4.2", "file-saver": "^2.0.5", "html2canvas": "^1.4.1", diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css index 840700bd..85d5a44b 100644 --- a/src/assets/iconfont2/iconfont.css +++ b/src/assets/iconfont2/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4292253 */ - src: url('iconfont.woff2?t=1700017557054') format('woff2'), - url('iconfont.woff?t=1700017557054') format('woff'), - url('iconfont.ttf?t=1700017557054') format('truetype'); + src: url('iconfont.woff2?t=1700554220413') format('woff2'), + url('iconfont.woff?t=1700554220413') format('woff'), + url('iconfont.ttf?t=1700554220413') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-bingji:before { + content: "\e620"; +} + +.icon-bingji1:before { + content: "\e668"; +} + .icon-biaoqian:before { content: "\e603"; } diff --git a/src/assets/iconfont2/iconfont.woff b/src/assets/iconfont2/iconfont.woff index 82644975a56a28b1f504d7544c2c47d49a8244bd..a306b3463264443314606cde13677043debf6d65 100644 GIT binary patch delta 1976 zcmV;p2S@mr5vUUscTYw}00961000T701E&B000h1krYdRg#Z8n^iK}$;%97mW&i*J z5C8xLRR917Orusd|7c}lWB>pMXaE2JF#rGnHYOr))o5sCVE_OJoB#j-AOHXWBnRCC zi)d|hcmMzgyZ`_I7XSbNARq(({%mh!VE_OJ)Bpeg5&!@I5(n@GJZ)ikZ~y=Y=l}o! z9{>OVAORaH0LyM+ZDjxe2nYZG0YCr%0%s7TJg{(Yb94Xz2}l3{0A2t90Dz8%aZHm4 z0fc`+4udcZ1UF3pfqLKxoH+GOaOr^qFX@R_uJ{FA+m$LLp1@iY$*Uxm)&MF1S-eC6 z(uM@nM{aUIqjSGtQs1j|pP4NOj$F9z^Ko1`CnbORFPmD+t?)qOlWW|1`uYBKjinlR z=53(dz#*_5aSUviTmq#Eu7Ult&jHF8>?MCE4*&oFc$|$?O>7%Q6rMM;JG*0h|JS=o z8auJw>^fF#C$?kL79}N35TZ?NXn{0Mo1lVdr6M7<37ksdNPiAc(F3&V0U^Nwq=KqK zB?RFLs7S2}XHJwOCqUWoHfb6aE?tjj-|T!d@7vk$djtqx5~076EFq9LAjm6R;jVx0 z`Ch%&8i~7RtJw&HFrXhFoQ9`vcG{I{wbJe!d7(Xh@W|$f{!)TcwLH_g*_kOe?D1>>v6QamgSlk#TZ>JVzGEi*h*d)cywr( z1(z!o+8hTsFyEdoS1RS{_E($1;r4&zM2OeK}kXP`Ody_wOZcSxv`0x zM_f=W28i2S(EhZ2=ums+5X`lK{uqO9JhW{1KKjA3pg8?o& zhy41fjX{=jMTb_H=dM?4HUd}+yQ5WIV{$*7NN8|avzdr4=1TlP^r6Y904hw^f}?Ep z3r*ZH49aql5k0nuelr1*w}lN0{-Bl1dAoKF8HQ(;w(m@5v!zU?+6_!EdZiqk5R$D$ zA8Co`V!sUZ_vo_anj(q>WhQ^T1jDQQ6Ss{)ubhKkVfVy4r|sk&(c{3JW#*6MJi{2; zxyv)H$4+EQ@!lw@wY9Z3CBoh!U1XAcv#zEr#2V2d7D)v*-nZ2Rl!y)?&r&~Z)`QXe z`UwgspTasYmegniBV3Q0@Nivd8^0{HYRxb}wc#M`dTE>sgDM2^Eku9A#OZLGLK>%h z{MS*5^$jj@x6!;NigaVgrjMj_2wFkBYbzK7zd|WFwlIGomg9x_g^jIstZ@+f+^0Rk4TWSeVGASPN;@z zrDV!9#r8FcVx(9}0APO!*-8sdS9^F;SNoKd!KlO}w_8mJBb^kfgz@SpMQgjmouEY7 zL1Bkx{?sLQ=D$=o!sr!=N`{=6yLNF=m*n2Mzs>I-+@=djQoVj z*iwLF$wDsaojA_bFl>qxqJm0 zV>nV`Q;b8i5t~S-ULWN0I-H(bo`S2oZR^ouW43_}?w*Tvx+261H?5Q;^9xZJqjo>J zH0AU-joD+fjkABTNmc~HxGbeClb@ej+TuV-h=UwftpE!zchRM_IB%|o^-Bljgj|r{ z7&IzCzm1CLh21T_7udROaSrZoFo_m5$I;*_=ABxiyU#z!8S^{4&I9>OEuCA!0}xnO z-e$|}G$~^po+i(e1#*m>Ag_^=$YmE4>b}>qYunPHL)ER?unjQzG zH8Ktcpy*kBv~Ja{#yA=+955)x^>m$~omkC7M+A*#>wkfxAYAE#R>7ys04PHI^u^KK zurdm%#BxeRhp+~nOll2Y&hIEP4j?IwikFo}W~--IdauNwRHT=FuFej#OnODvG(DkX zd-#6z~EDX$zKrROZ6G#*Q zS%C~Q0001ZoMT{QU|??e-@p*V!u0y5d?8~oMT~NU|<1ZrvLxJ zGy{x=U;s!+1RnqZ00000G62j0UIKUmx&rtErT_qVoMT{QU|`^2*w4Vp00K-v%msuD z4F3qhdVZeApE~IIW(Cx_3^4>p0 KA4v%tzyJWR1Aegp delta 1687 zcmV;I259-H6POVccTYw}00961000P>01E&B000bVkrYdRbN~PW$bwymt!Hd`W&i*I z`~Uz1YybcSw4^g=muO{SWB>pLXaE2JF#rGnHYO4fC1_}6VE_OIoB#j-AOHXWBnRCC zhiGkdcmMzfyZ`_I6#xJL7#INm|7>q#VE_OI)Bpeg4gdfE4h32R*ll5WZ~y=XOVAORUF0LyM+ZDjxe2Lu2B0YCr%0%s7TJg{(Yb94Xz2t)t?08;<}0Br~h?3a@W z0fc|S4TLZZ1ji&f9f&%3Q3<*pXn;2_>b2+s>==;f;no^UyK?fdfdV9BG&0DB;94z} znkTxNXD0JKUmCI|ZFSIPpN|9H?vdE^UGB2|RqQqL;jg~--{p#LG4Q=>8~9Ch2>edE z1U|pd0nG^^cpUzCoMlwcZ`?!_o;PEUJ-dJY{WH7GZq{~VZ&t~sU3+bspllIc4wOn2 z1r$O{A{9g{1qrE5;8Y4nn)Uz{JpfV z%zJ+CoALJzq6i)Ak)QEj$U_lYMyJsW=w*b&Fo8Z4c>#GU4m{U(B%l(ttIh|nau9zA z7azwAyorAXJcmLUCvjG+KpRs@gCYs3;|=mGhJ&P0?rSO$JFr<(;eu)rR^ASJ^riB1 zgJ1@j8IB1T$^N%0d!Xx>1khqli$qpRLJSAhbH}w1|PqmM$_Zx10q_!Lm3FAJc}R5ziH|#vGM0BH433 zj|8zj)0!2MQYPNr?%2^WKL=jDHVS#ff67@a*s#y z;et)XI-M37sZ1)?>uRTNxBXl&nx9;@3}(c$N9Uh@rm>(}XWktnP7(eh@*@#Y41G0Cn92ZFrnxVPIfj0ptJw zS>S921^^sQ0v7-P00000005E!tO4!4MIsL h>Xs*FmL%rKCubz)rDvBW=0W&|h7}A90N2zOhX7?u;9LLz diff --git a/src/assets/iconfont2/iconfont.woff2 b/src/assets/iconfont2/iconfont.woff2 index 7cf007e364c871865d3de8a75cebeba57b7f2580..547b03cfeba1f6b9325b510bb500262f9b47d691 100644 GIT binary patch delta 1966 zcmV;f2T}OA4YUs!cTYw#00961000NH01E&B000h1000MPkr*C-bPA44j28hm0we<< z3labXAO(bH2Y~<^KMXUY!o~rBq*s#tR|R%6`6r-a!L6?5Zr6c5ar{J&d;4wF!6>=N zT`k|Rm=(bb-|)0zK7F&Q1BGD%YsD{T$H(=I4A zNSWxDnm*L-K_Lx)KoB7IYHct1=R?Ho_C93OU0hm$Zqk{K$3kRqPSejdn=2iN-RSDR za0VeUwTVsfL?le%aOv8zg`OwOPgy%X%kt|oKG}ci&^U!s6%vQVDDHo))zt(ZlHPfv zmp|+CS5T8g(oks^5~3a|A@T@`9H|9`;grDUmzvpg5TJ>FeVoCPQ?rX9@7$p83M&M- zl>%mWb?(rv0m5enA|ytrPL6vl4NXJ>Hi|q8@Th*j-XMq&0z;y}-ROKGr5OjGQ!nc% zBWDEoU6}G4h3yTH01nu$8I+`i7u*2Xaa%Q;er*F+0QB>}(ZMhET=d-Gx!d#h&pW@Y z<2ct?m`XK&3R{CCLr5@`QvY~-aAq6gbz=d)lt@u65z@%89FT@!xgm`Nt3A>%Se+3> z0snRC>@%x;Og~@-SPkI5;OrB%L8!>%-&SbY>vV*$zl1QCSttpSrB6R^4?neB#Cp** zWq{sT<^s|1_-Lf~<&bEMWQ2&;)gXPA_)ru^v7PFFzO$6Lqhc)*J9=-e`o7VV1MV|# zl!?Q*YQkL0Uaz0D;4nD^-H01|XrY5+GbPH88{&TXWRHHdpoTMvG;$dB5md5y#Xtv> z_^IqoPaOaM?%Uj`pbs7D=mT^}j`gFtiYRyGuH50?cZ?#Q-Uyx_)LO8h%Tyilz4UC$ zWN`_96(1(JM`gIqRT*6{_a^yW-f#}ekYsbTgmO6V;cYpw1XJ8Ey+~4k9Dq2QWmXA9 zi4)ASJq*zxi~U$&0F=225VXqoAtA;glO?z_4(?~#$L0v|RA7Bx>D>02+cPM~W*8-}C^m%%yFSyq{@osG5JgU8 z$OYw=ofD}GG7?(CGl})8DU2qyvSlL)VBb9}>m!bxVs+ipwEOkSWl5zzsm?O7vKw}P zBSj^__52b?1~I3vK$MM<5g&K3Bt)LQu`dVSA6|tBp;l;|9ip)gV-esBh=n8<`I~_& zIs}SA7Of9Mjm(0c%js{=wFbgtvEFLgecwjODvvKnb)!?o2{u9Ejv*H)Mt6+|sc&gSoV z^}2+c*dEbIch~El*Ez4VaG;FsYu&5d#*K5Ua<9E85QP|PSGm=?U-bD;XlF8iBs1RS zm9oNZQ~N2i>ndcut~y3B$A531Ju_{Ee4*wEPh`$s2=%o-KqP72$DO+ae3mBxqa(s>K9B zQUcn+StyRDQ$(_By(Skfz0JOVY2NwRRTJbC5gUcAEtUV*FBKXFb(Os2)=+H>% zVkKXxJpp+orP)9Mm(T z?w4K)3Ggp}?Y~~Xndg#_=^E(d8E#NdA3XBXdjHqu{@!kf(+)}HCr-%4_q6v!tR8k> zgU8(j*J|w5ydW>h@Y5xK+nk{vGd+{VV8ER(V7E99{115^=v|c0lD|2!^Wfkn0Dg#~ z)uANlwM7inpbN-Wyzgh1)+wUDRY`C&A8m&UnvPCiRM`<>a=FOAj4W;5_^pE4i6ez7 zrlu;Q96Pak)~GYkX z3-YAf=vDiHagwNpDleVQJG2^lIRQ*x<)=U8lhvj4mnh)c9qjLClFMH7=~=%A7-W3W5Z#u~RKeJ6Wdjc6VN zB1Vcvx3|A}Nb?O2@cvtkP>Pu5LTox**ottG?+Zr{1-qb1zUNdCm5}Z?i)ysdb+Xy=X00NmA_fRdt-r0H5Q{ A6aWAK delta 1712 zcmV;h22c6454a5&cTYw#00961000KK01E&B000bV000JQkr*C-ND7NIi4y@f0we<% z3l0DTAO(bH2W=a43Q?3UQj+Y4BuSu^4GJ^hA^>0#Cg1>o0syu{GRMR7`{B-gHn*nQ z*M>Yc1a0rR}vS19u z|EBhU)F4EWnnJ~YNhjuny8T6V=Wt44b4b!m#Uf`S|Np(JnG{OsW7f^KxV)GB@-p`7 zocMv-a;+Aij=4b#*i(@LQq}vAu4*rwgy#tK+jnC6_~z+Vte+qkV$&>cd0>u?6QfZq z-h)brIP`j2++&M4RY|YYUA$4hKmIw4MUt9vH@g1#Iu>7lUH-d+h@D7&?^S;DaQlRc zjP06*<7s&Ei5Z=2tF+(mH_W<77}P5%KXcdDt#;WL(f=JbJC_ZEyrp&j@Ukiq4bedq zUT#%>&WHwrpGyV`Klh!&Tp1du{EmVW^R^skP7?8+bPk2vw2kLE!Y3urc%lVLNGg7& zD8JNZO5i?!(_lbal)_Hm`jic2U4E=Z-34kyqWz>pYibW9YGj8_?_j%X-3sLl=Zy8M zyTaZ}OAL^_F7E77PBZ7Fv3qV@JGW_LzIJk=Q`sr*Quj!^pH=yASYX6Op%9}uBN0Xt zqS1-%nn-F#sZjXUOZl-NRJfZTC#Cp(sFJIR52J#AyBVc4=!7K7x4nzpM(Tq*88Itv2N#3Z0LW_;g_-=&=!u^4xPo$i<8V-x0P%_*TIExLUQ7IC6 z7Q;}i0_&6f^kbLOYIKc2VNudBDn1H9*N5shTp2o305na|5L|GPW9#0;Y7D{*Sd2uM zIek>yIAW1yBMe}*!Tn6VIv7Z?vg8-E_o!QcBusP`kDo4}{C}ma48!l<$eaE{Uta*P zM{p|+*Wm;7-ezsy!Y|rdf5^#@AxQr5(A?Svm(ALX4}_k4_XSxDQd8t)YqFf0`hSVt zPeSm%w#FJ-G((Mm-@pFMmtXP!pAH?~N4`_|ZsEPcy8sZeyOFJ9mM&%L*v5wfQjoEK zb{*5mKJ@uZ5CIP6mgRnFsbLOvuMRfV;I2^CNbdSyXD<}YNQ;k+w|^XyKzkkxDM`5i zO&~DO#4{`F=e_>_#9J_dn`wLF)vC)2Ue4>y9cYiSBXQ%SpWmN8*%&uFw$$hO=vm{D zsg~@E%|r)YWgl^JAw>a(gCC-e|HV+e{lB z0>=s646&jksw!QTxO7RDF2?_YoGG8nFJ1EHWY45YZg64j8%vf1N|NNu7)erp#HFed zO+IlWo}HYHZ=B+e>{ucor2yEr7b^YLTQjpccJ4Uz*ZYo{2^Us)_a&Sax1o3954f=V zC^vn<^^}*`xlqm`030-P1MfK>Rh5@je^s{MeK;m}{EWPc?1Eulo9{*W(f+cps>_O) z%Tq5IO*d|s(07S<6Fj=;Jv+I7?nZduR#*Fmxf8vAMbXLG#nQdp9r=U(;dL zx>-QioklFUWGnofLg$&5bTc&X^syn5em+Y_*>RJ++!L`a$E|z9grvuR0%W}wxkb1M z)qq22dL2Q(E!QUxm{6G!r4Oq<0K%wGNQS+IY}7Zm2!EiO_6yCZf9Q83@be8=4S8t^ znPTXT!N{^uf``?9pGmhFTCdtW*~VZ60@rtTZmA%f#R1Jghs+9;EpxcJ-i)%WgvyqE zlI$kT)q&?JzYDvv%*7>tiy%f~pl2)_8&avD*xCN`o)N8;K{h7$J#ID3ME!$+%a6gm zrA4eoYcjDhpoN&?3W&r~I|pv=2uXHpmO$lS?<4Y)bR{Y3l>;8nrs7h!e0M&HS3y7S zTrE=MC{d$DkKX$R%UY}zb5FNp*|*e*!(~EAYvz^xx6m1)VJssLnP8#QR - {{ workspaceItem.sex }} + {{ workspaceItem.sex.label }}
  • -
    {{ item.label }}
    +
    {{ item.label }}
@@ -334,7 +334,7 @@ export default defineComponent({ let arr:any = [] rv.forEach((item:any) => { let obj = { - value:item.name, + value:item.key, label:item.name, } arr.push(obj) @@ -548,7 +548,8 @@ export default defineComponent({ }, setSex(v:any){ this.openType.sex = false - this.workspaceItem.sex = v + this.workspaceItem.sex.value = v.value + this.workspaceItem.sex.label = v.label this.getMannequins() this.setMannequinsSex() this.getPosition('sex') @@ -563,11 +564,11 @@ export default defineComponent({ // this.workspaceItem.mannequinId = item.id // this.workspaceItem.mannequinType = str // this.workspaceItem.mannequinUrl = item.presignedUrl - if(this.workspaceItem.sex == 'Female'){ + if(this.workspaceItem.sex.value == 'FEMALE'){ this.workspaceItem.femalePresignedUrl = item.presignedUrl this.workspaceItem.mannequinFemaleType = str this.workspaceItem.mannequinFemaleId = item.id - }else if(this.workspaceItem.sex == 'Male'){ + }else if(this.workspaceItem.sex.value == 'MALE'){ this.workspaceItem.malePresignedUrl = item.presignedUrl this.workspaceItem.mannequinMaleType = str this.workspaceItem.mannequinMaleId = item.id @@ -577,11 +578,11 @@ export default defineComponent({ this.workspaceItem.mannequinId = item.id }, setMannequinsSex(){ - if(this.workspaceItem.sex == 'Female'){ + if(this.workspaceItem.sex.value == 'FEMALE'){ this.workspaceItem.mannequinUrl = this.workspaceItem.femalePresignedUrl this.workspaceItem.mannequinType = this.workspaceItem.mannequinFemaleType this.workspaceItem.mannequinId = this.workspaceItem.mannequinFemaleId - }else if(this.workspaceItem.sex == 'Male'){ + }else if(this.workspaceItem.sex.value == 'MALE'){ this.workspaceItem.mannequinUrl = this.workspaceItem.malePresignedUrl this.workspaceItem.mannequinType = this.workspaceItem.mannequinMaleType this.workspaceItem.mannequinId = this.workspaceItem.mannequinMaleId diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index 828c6923..4ac56347 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -18,7 +18,7 @@
{{ $t('MoodboardUpload.Generate') }} diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue index 0e28b904..c37aefc6 100644 --- a/src/component/HomePage/collectionModal.vue +++ b/src/component/HomePage/collectionModal.vue @@ -1,6 +1,6 @@ +