From e26d57dd7674966ba1d47b6ad3d43af103d34854 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 26 Sep 2024 15:43:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=B2=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- src/assets/iconfont2/iconfont.css | 86 ++-- src/assets/iconfont2/iconfont.ttf | Bin 8288 -> 7688 bytes src/assets/iconfont2/iconfont.woff | Bin 2472 -> 4852 bytes src/assets/iconfont2/iconfont.woff2 | Bin 1972 -> 4044 bytes src/component/HomePage/ExportModel.vue | 90 +--- src/component/HomePage/Generate.vue | 2 +- src/component/HomePage/MoodboardUpload.vue | 9 +- src/component/HomePage/layout.vue | 35 +- src/component/HomePage/scaleImage.vue | 26 +- src/component/modules/liquefaction.vue | 556 +++++++++++++-------- src/lang/cn.ts | 6 + src/lang/en.ts | 8 +- src/router/index.ts | 53 +- src/store/uploadFile/uploadFile.ts | 2 - src/views/emailVerify.vue | 254 ++++++++++ 16 files changed, 743 insertions(+), 386 deletions(-) create mode 100644 src/views/emailVerify.vue diff --git a/.env.dev b/.env.dev index 8727a59f..7d633ff1 100644 --- a/.env.dev +++ b/.env.dev @@ -6,7 +6,7 @@ NODE_ENV = 'development' VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # VUE_APP_BASE_URL = 'https://www.api.aida.com.hk' # 佩佩 -VUE_APP_BASE_URL = 'http://192.168.1.7:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.7:5567' # 海波 # VUE_APP_BASE_URL = 'http://192.168.1.9:5567' diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css index 132e5da3..c67fa179 100644 --- a/src/assets/iconfont2/iconfont.css +++ b/src/assets/iconfont2/iconfont.css @@ -1,6 +1,8 @@ @font-face { - font-family: "iconfont"; /* Project id */ - src: url('iconfont.ttf?t=1711431581952') format('truetype'); + font-family: "iconfont"; /* Project id 4292253 */ + src: url('iconfont.woff2?t=1727254748810') format('woff2'), + url('iconfont.woff?t=1727254748810') format('woff'), + url('iconfont.ttf?t=1727254748810') format('truetype'); } .iconfont { @@ -11,36 +13,40 @@ -moz-osx-font-smoothing: grayscale; } -.icon-a-waitao_changkuanwaitao11x:before { - content: "\e66c"; +.icon-IC-yehua:before { + content: "\e61b"; } -.icon-fanchehui:before { - content: "\e626"; +.icon-shangyiceng:before { + content: "\e751"; } -.icon-chehui:before { - content: "\e609"; +.icon-shangyiceng1:before { + content: "\e604"; } -.icon-yuyan:before { - content: "\e85f"; +.icon-xiayiceng:before { + content: "\e68a"; } -.icon-biaoqian:before { - content: "\e603"; +.icon-shangyiceng2:before { + content: "\e68b"; } -.icon-bingji:before { - content: "\e620"; +.icon-shenpi:before { + content: "\e6a1"; } -.icon-bingji1:before { - content: "\e668"; +.icon-yonghu:before { + content: "\e617"; } -.icon-dianwei:before { - content: "\e685"; +.icon-usetime:before { + content: "\e601"; +} + +.icon-xiala:before { + content: "\e634"; } .icon-bianji:before { @@ -87,47 +93,35 @@ content: "\e62d"; } -.icon-shenpi:before { - content: "\e6a1"; +.icon-dianwei:before { + content: "\e685"; } -.icon-yonghu:before { - content: "\e617"; +.icon-bingji:before { + content: "\e620"; } -.icon-usetime:before { - content: "\e601"; +.icon-bingji1:before { + content: "\e668"; } -.icon-xiala:before { - content: "\e634"; +.icon-biaoqian:before { + content: "\e603"; } -.icon-shangyiceng:before { - content: "\e751"; +.icon-yuyan:before { + content: "\e85f"; } -.icon-shangyiceng1:before { - content: "\e604"; +.icon-fanchehui:before { + content: "\e626"; } -.icon-xiayiceng:before { - content: "\e68a"; +.icon-chehui:before { + content: "\e609"; } -.icon-shangyiceng2:before { - content: "\e68b"; -} - -.icon-renwu:before { - content: "\e63f"; -} - -.icon-caizhi:before { - content: "\e647"; -} - -.icon-shangchuantupian:before { - content: "\e61e"; +.icon-a-waitao_changkuanwaitao11x:before { + content: "\e66c"; } diff --git a/src/assets/iconfont2/iconfont.ttf b/src/assets/iconfont2/iconfont.ttf index 25207e73be5faa1b0bab0da9d290f41f9ae218ab..905838aadd171adc23f5f53baa8c57c73eb4b99e 100644 GIT binary patch delta 1452 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%0A9o!g4?OU)&W5{6NN z)qt1>l#j83p%<CzFSZqNPS>bdjE=t2sQeaATo$d=YK(v{vW(6E?|MzI>^C~#N@6jfH^k#F#cT0!E*}4+wR#1d5C1Xz zu^@cq)rZpWOT!m%>RcS`@E*Hvf5J|}&{@F{zKWCSzE6FUeB>Q*b*$Z--FIo&shR^+0)cGG$f_+%^3{OS!fT)X9?0y1Ygz#TP9hdd^&hs2%8Dj$0 zKn8CEvWvCdvt(DKM5%i=dWL_TC%fk7yJzR;--U|& z9UJTuY`QX0iU`j}>ygidi$RJ z{WtQnAs8ANo|<`aW@>n3XlSH5HS@v^+p8m(lNT4!NN|2%!mEz?uC!0a@T?=zz3u3ENsiF$dN zUs?N}sA%1uQ&=$4BY=*#3!Tnc?@45R!uv>7K916Cn3&#wy@uMMKedZgp4Lo|hWiu*Nh~ z*3ilgPCh@B%Z;P~>xI;i2S*h?u804i$HG&C0+9aHF;}IA zJ;*BY4CCy?)r(3d0kgJM-0!7KbIpdalx43wnj2!gulBnw+&ACF?^ssG@$F$yTwppfSOA@M11!MAeWBSZPqgQ$CrNV~XjhiWW2P`h3M+nGh5H5TSdNcwiOp zee#`xPI!nXyeY(HzkKR|!3){CJKzqk8ZZ=|ms5k%n!(LURpd3;2eM@jCTKmIP_WK_ zp;!t!F#(B)EO$1Dnv@r-2yHEwlo8Y*h$0{7MGBNk&S*)F1`D(Zkx4XmAKu+~ zm^sOL1<6E#*KA9CWOD9`4g_!f9C#SDdn5jD4 zcJ3y;86D=1a>uxPP?s?%)!kHqB3u)Q)so%&pGRPq@K%Jkg${8#Ahkz3VB&Q_qV;AS z>mjV6&=1Nc!G7JTQ*jcqRQmorHwsQUTf}mmCK`5aQ8Sn%-Ke30my9ri8a( z47x|v8{%+reT9mw_-#~Ed46<%_sG4}*~(KGs*optG_rdw%{k`{T{mI|ey@HWynUwf zKZ&3@_rz9u0zt#i*lMd3el=!6xI@uFQ{YQx46ZM=wZse-+^7lsttk~#;f2?`HMSD~zOZe8mbgfvsyK47m5{E$wo-nK^lX{C@$%V2%9% z0C=2ZU}Rum0Adb_e_rwYHeVUISr|azv1DTmjQ;=Ue?7|?=0+fwgMkSo3IHdD3!(r3 z0C=2ZU}RumZusB85W{l%|DXT=SUvVPIfj!G-mZ*eo#i|35(d zA4T11WPKnxs5}!)9jba^01O15^Wi1JVQd1U3Yu z1j+>d1tbMB1zrV$1^xzH295_P2f7H<2^I-d3IceXV_;-pV31|l&%nt50!%>61%wO? z|G|6)03Oc){IdrLL;-(~%T~fL5Qh6>Nm~k{;vMk~x~Q+<%BSE=YiI^ag0_*yrzf== z&(T@TCG*YvlVB7KHVOW>6-GEih%p2r#7HnfiYaC|#~c^9#1$5}#tm+9hkHEW5lcK_ zh36oCd(E6wmeNL%t{j(ASJPj4o^(uqpI=0yq&~24Mpw#4wvm1<@8#ITHHm^rZ&{T5 zS=KUb`hrZyx)QDJr^CJZl5@}M>cDHSUXacgZI^AhuCvw}XG!;b^sTtZ!rskFCCgo5 zJZ9@U8dl}eyKfyOdr@6&IT}J9`y0%MZ;hRGq>~M4Kd!95>L)BII}*2K)@A>zofjPH MJnw?w1W#0F;63^~vj6}9 delta 2024 zcmVq004ym z00Hz*4(;M+Y7cXk}pl z00*1^001BW001Nh-2;ngZFG1500+DP000*N001B$1ONVPZ)0Hq00-0n000sI000sP z@CH0>VR&#j000N*0000V0000W0UH3zZeeX@000OG0003%0007K5TiV>aBp*T000R{ z000190001hj)!qflL!Gp0%2g2O93T+zldjU_}{?5zpUf125@`SFZR4UE7r^B%Z)p6UnP2mev3&09m|50n&y9 z(?@P{KcjQMU{c?!bf1|m2aa60?(=b6IVUB5`7fJV%dPN0Y?oXDr3$Wr{j<*j$`|YH#6a0i=SeLL~&@ z3aCh}3TIA~BPT%F@HS~06)s(Wk7wWPd^7Lc+3$M<2woDQzmhB=kT)R6D_r5O@A+Q6 z)*6YsW~ zGt-qSA?n&1A?zRe6LHBPDUoq~fUo5A7sK{3%jFLU1M@ToJeSJShJakF6K)7K=h%>r~oQV*Mg&L^$Shh zF$~IbkP$t$h<-BxlDCBo3;v*$%XzzY4jG1LmbULqXS1bDrrHgEOfPz+9Gno6twkSc ziRfa#4D|QtvgMj0iUegQyadCm`xCc~L9d*HUSapdJE!gB9ns^!oMq;ZEVOFPFhI58Ankf-oC||01o16I!^G)un?f3=eEio@ ziS-RGaktUDCW>@p$EJ^@bO>5OylX2M1HVEkIkqr=A(rEX`Gs3sVf2S2iGpE;$3K`; z^_-OHPxs0cxM~}+plZe~+bOEbz3?vYHg)EuWvUBTw(Qdj$wl)osf6+BCq-+!!=0c+*+F54 zX8zPAcILlSH^S%@iAsi?n7ejyQJ3W2y1&iuAKa!3Nm9LjWvG9To8(do4ufhM{SK@5 zI)Zb?B%VxvCu9UsRUO~SQ%aUsP}-@CtD>ku=3KHR&VVr`JyKBDA2>`-@?Kf6IOK9N zsr4tFtlyN(p7)O1rZ9tn?L&`0(OuT;>DQ;wSL^0t-!Td65OLfr)N`=~3b}j*8e=$8 zVpEJmvk{v}r(PfA@;aQJTAqTdx^3&xVq>;}4ep+Qi*>pp#0od9lqB;DQ5d6kKe;sJ z^f-;#W3!F3u}M}0!niD@ER&y~TH4}3Nr;0SR;>UFFL%+UwK#9ChV@Ga@+EVV;!C*&yxjmjGQ2^k(0<}7ZmEg*T+z<4r;YvVHwR~*{}-vVAL6dahe_nr8P1R z2B7F!eY9@Xt;RSSEgUc?#`Scap`BRGLq`OSX6t`}qaa-AgI2+(%K#`s{Pe}q+^{kV zsl;+hM2D~jolI&CUe50*G7caqjf$6*MrNyjr&xNg#Gq89mwv9!4zo;pMb|Vvp<{da ze)Q!|@h>MFU3z~nJB^}|I##k-h`vmi5bYNlqy&6!B;e^nE9G=Rl936#V<>qqx^-{$ zS$a*D^8sZ$TI|f~8}ze#Fyt51)jzwsbXQ;Q>M|VcecjRF)YZw>z`$tFx#fQW1YJ9S zQ2+n{c${NkWME(b;>-I=m&Ehid}ZKfVE}=LO=3AP`v3p`^(+j`jX*930~1IT09kVZeApE~IIW(Cx_3^4>p0A4v%t GzyJW6+LGY_ diff --git a/src/assets/iconfont2/iconfont.woff2 b/src/assets/iconfont2/iconfont.woff2 index 547b03cfeba1f6b9325b510bb500262f9b47d691..5fd17c13b44cbb064cbbeff357a1f186a0e28cdf 100644 GIT binary patch literal 4044 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 delta 1967 zcmV;g2T=ITAG8k`cTYw#00961000NH01E&B000h1000MPkr*9+gLDdxOpF%+HUcCA zAPW)z1Rw>3X9s}*8$S#)qr%1kfTUNF{Z|EcGx;Z=V!^Gh=5E)4J#qX*k9+%V)WImZ z$XzYpu$UFW3*YdxVm^JdssoF;JPZE&A8Yr`%$HTfHA=`N5{E=f-ZDv35-V*Dz|$@$ zHAtE0mzqA*?m;1c4L}ee_G)b}`R7B#?Djrn(_LIzfo{^7j>ke|a8A?DHJd9Ph~4Pw zzHkO1F|~CiZZQWX-1#VGE7t<}{89+KX9 zqnAJH^H)%lMAA@c7ZRc#Dk1U+i5#f~h2fOI=9ik;a}c0^iG7^Gl2fybA@AIv?+Pmf zxRnBCcXjU2t^vYl1|lRzs7{W1EDcRW0yc^~3-G9Zzuq8-5CTJ@z}@J4BBdDzpHnaE zC?jVC_+6Ot8-?u+kN^(Yt{If1gcsZZ*Ku1ln|^HrR{-?$ztO=j^<4Da;kn!M_Rl-N ztm8P>SeQzGH40mUBST0qlv4kAd~jwP;&o#Izm!N(EfLblupE$vV7VcU1gkyLFj$=t zL;?SG>g+SCd`v%J23QT?zToT=wLz%Jb|p-xT9h%5<7Ztt@^&vlLPKE zZ&%U-XawBRr~1l@=mduXA9V>2bnj~n8C`DBlNw4jDFi8OK;_7POFdBs2n zllZCZO-~&E|L)t|sGtuW>gWS>NRIWRxr!)v<*wY}-gk^5p56$aAJkf~pvzPp@xAnH z%VcqX2^AkExJPBU&Q%#*F!v_;UEXjG%8+Dpw1jdv@8NAZu>@1xFTF@ofE<80nq^iA zM2Qp3vONsZAdCH2U;vc42@tf(_aPz1A(JJzGY;-&+Q;S&B)h=kYjnWD&7OD`f6L$2 z-1Ga)K518ld|wi4#D;8ibP$-rP!cPq%_09)YK~F#y8-$@L2>L@PmQ-MUUg_NSncFic$7UEMuP8Q!2)jPhyZ+rCY7j+E zWXJ{OmYox+3o;T~!ZV5Wsws>nwX$U+31HtnE9)bUonm#}(zN^a%4JEVKB>+!v9cR~ zb|Xb4!S(zSM+PycuRxTIkr5wvup~sDy|FI`-XC6t2%%PJoE@UE4r3AE3y6gz7x|lk zD>?*<%M8)oNoC>7Tt;HtOn?_b+umn6@5irLr1nW5c!8SFV!xRo7OS8x=$?O3vo* zdG)%4o7f)FNq5)lp4U0Avv8n{?Q7ku+{TS_t8%ZsC=i7hYgf6|x?lA9PiSXC)&++VsSP3d&7UfUuI(IjYG1**ja zK~e(R!C5Gdr&C0-YrQ5HF1^ivzG>e1*i{qc6cRkT-`okW6W0yjHswQS%axPe+Y@mf zb*{xzti8+QN7{7$0%{csXYOCCF924N@0_e^*E5YId*JdtmVkV0JMy_e9Y(@$@?ypIaxV>$rh&SBO7A{ zqLjnEX;7uVdZU9AS$B|0$CuuinsxJ-OTxS^NiyqL)-JZ|0Qo<}$r102*d zqwbep3JLHpf9=0sznSNfkm(xeHpESTSJHCm%BoXW)0WN2 zEknEussXI}A};Co?J`|Y=ziiE1LBV>8TE%5;=iluVzTqKtgc^0YzYVGP9S?{nc$Eb z>I?Fu+vrvMfpLMz^=Wc}VjO4)Fe4jZlx|M2b3Zsi5<*xMp6yZ6>qHw40DSu+HQPC1n*=4Ql60 z%SU;mw61PD*}5Rs+N-|lB&XiBqH`}$BzevDzi+ccE2(u3pS@@;S4mRr^;LD8%>ba; B&Ak8s diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index ad5171fe..d4580c9c 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -179,7 +179,7 @@ T - 液化 + \ No newline at end of file diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 1bc41689..363066f4 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -66,6 +66,8 @@ export default { requiresCredits:'执行超分的图片需要消耗{data}积分', Scale:'倍率', Cancel:'取消', + size:'区域', + density:'密度', jsContent1:"您是否已经保存画布内容？如果没有，请再关闭前点击'保存'。", jsContent2:'我们只支持对印花进行超分', jsContent3:'您的积分小于一次超分', @@ -75,6 +77,7 @@ export default { jsContent7:'保存成功~', jsContent8:'是否继续编辑', jsContent9:'是否需要自动裁剪画布多余空间', + jsContent10:'请选择一张图片后再次尝试', }, upgradePlan:{ BuyCredlts:'购买积分', @@ -562,6 +565,9 @@ export default { jsContent5:'是否删除当前作品', jsContent6:'作品被作者删除', }, + scaleImage:{ + overlayOrNot:'是否覆盖当前图片', + }, account:{ personCentered:'个人中心', myInformation:'我的信息', diff --git a/src/lang/en.ts b/src/lang/en.ts index 907b8471..08665808 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -66,6 +66,8 @@ export default { requiresCredits:'Performing upscale image requires a {data} credits', Scale:'Scale', Cancel:'Cancel', + size:'Size', + density:'Density', jsContent1:"Have you saved your canvas content? If not, please click 'Save' before closing.", jsContent2:'We only provide super-resolution capabilities for printboard images.', jsContent3:'Your points are less than one SR', @@ -75,6 +77,7 @@ export default { jsContent7:'save successfully', jsContent8:'Whether to continue editing', jsContent9:'Whether you need to automatically crop your canvas excess space', + jsContent10:'Please select a picture and try again', }, upgradePlan:{ BuyCredlts:'Buy credits', @@ -519,7 +522,7 @@ export default { }, works:{ all:'All', - FavoriteWorks:'Favorite Works', + FavoriteWorks:'Like The Works', MyWorks:'My Works', }, Publish:{ @@ -562,6 +565,9 @@ export default { jsContent5:'Whether to delete the current gallery', jsContent6:'The author deleted the work', }, + scaleImage:{ + overlayOrNot:'Whether to overwrite the current picture', + }, account:{ personCentered:'Account', myInformation:'My Details', diff --git a/src/router/index.ts b/src/router/index.ts index a98bc920..d90a7495 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -241,11 +241,21 @@ const routes: Array = [ name: 'feedbackSurveyCN', component: _import('feedbackSurveyCN'), }, + { + path: '/emailVerify', + name: 'emailVerify', + component: _import('emailVerify'), + }, { path: '/404', name: '404', component: _import('404') }, + { + path: "/:catchAll(.*)", + redirect: "/404", + }, + ] const router = createRouter({ @@ -308,7 +318,7 @@ let setMurmur = (id:any)=> { } router.beforeEach((to:any, from, next) => { - let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问 + let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问 // 系统维护 // const toName = to.name === 'upgrade'; @@ -366,30 +376,27 @@ router.beforeEach((to:any, from, next) => { } return } - if (routeExists) {//检测档期那页面是否存在 - if (isMurmur && murmurStr && token) { - const toName = to.name === 'login'; - if (toName) { - next({ name: '/home' });//机房用户 - } else { - next(); - } - } else { - if (routeList.indexOf(to.path) > -1 ) {//指定也买你必须指定用户可以进入 - if(userIdList.indexOf(userInfo.userId) > -1){ - next(); - }else{ - next({ name: '/404' }); - } - }else{ - next(); - } - // 如果页面存在，正常跳转 - } + if (isMurmur && murmurStr && token) { + const toName = to.name === 'login'; + if (toName) { + return next({ name: '/home' });//机房用户 + } } else { - // 如果页面不存在，可以跳转到404页面或者其他页面 - next('/404'); + if (routeList.indexOf(to.path) > -1 ) {//指定也买你必须指定用户可以进入 + if(userIdList.indexOf(userInfo.userId) > -1){ + }else{ + return next({ name: '/404' }); + } + } + // 如果页面存在，正常跳转 } + next(); + // if (routeExists) {//检测档期那页面是否存在 + + // } else { + // // 如果页面不存在，可以跳转到404页面或者其他页面 + // next('/404'); + // } }); diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts index ac002510..3f4c4e2b 100644 --- a/src/store/uploadFile/uploadFile.ts +++ b/src/store/uploadFile/uploadFile.ts @@ -71,8 +71,6 @@ const UploadFilesModule : Module = { state.moodboard = [...state.moodboardFiles,...state.moodboardGenerateFiles,...state.moodboardMaterialFiles] }, addGenerateMaterialFils(state,data:any){ - console.log(data); - let file let arr let maxImg = 8 diff --git a/src/views/emailVerify.vue b/src/views/emailVerify.vue new file mode 100644 index 00000000..cd85df7c --- /dev/null +++ b/src/views/emailVerify.vue @@ -0,0 +1,254 @@ + + + + + \ No newline at end of file