From 0d04bfc3d2b3e825129b4e4575aaeaaf6b7a877a Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Tue, 5 Mar 2024 14:35:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ dist-electron/main.js | 12 ++++++--- electron/main.js | 15 +++++++---- package.json | 28 ++++++++++++++++++-- src/assets/logo.ico | Bin 0 -> 20795 bytes src/views/home/components/settleAccount.vue | 1 - 6 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 src/assets/logo.ico diff --git a/.gitignore b/.gitignore index 62d0178..cce5b04 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ pnpm-debug.log* lerna-debug.log* node_modules +release +dist-electron dist dist-ssr diff --git a/dist-electron/main.js b/dist-electron/main.js index 3d00bfd..fb3d5a9 100644 --- a/dist-electron/main.js +++ b/dist-electron/main.js @@ -1,6 +1,6 @@ "use strict"; const electron = require("electron"); -const path = require("path"); +const path$1 = require("path"); function printUtils(params) { return new Promise(async (resolvePrint, rejectPrint) => { let subMainWindow = new electron.BrowserWindow({ @@ -13,7 +13,7 @@ function printUtils(params) { enableRemoteModule: true } }); - subMainWindow.loadFile(path.join(__dirname, "../public/print.html")); + subMainWindow.loadFile(path$1.join(__dirname, "../public/print.html")); subMainWindow.webContents.on("did-finish-load", async (res) => { subMainWindow.webContents.openDevTools(); console.log("网页加载完成", res); @@ -28,9 +28,10 @@ function printUtils(params) { }); }); } +const NODE_ENV = process.env.NODE_ENV; electron.app.whenReady().then(() => { const win = new electron.BrowserWindow({ - title: "Main window", + title: "银收客", width: 1200, height: 800, fullscreenable: true, @@ -46,7 +47,10 @@ electron.app.whenReady().then(() => { if (process.env.VITE_DEV_SERVER_URL) { win.loadURL(process.env.VITE_DEV_SERVER_URL); } else { - win.loadFile("dist/index.html"); + win.loadFile(path.join(__dirname, "../dist/index.html")); + } + if (NODE_ENV == "development") { + win.webContents.openDevTools(); } electron.app.on("activate", () => { if (electron.BrowserWindow.getAllWindows().length === 0) { diff --git a/electron/main.js b/electron/main.js index f5f0c65..bb05ed3 100644 --- a/electron/main.js +++ b/electron/main.js @@ -1,9 +1,11 @@ import { app, BrowserWindow, ipcMain } from "electron"; import { printUtils } from './printUtils' +const NODE_ENV = process.env.NODE_ENV + app.whenReady().then(() => { const win = new BrowserWindow({ - title: "Main window", + title: "银收客", width: 1200, height: 800, fullscreenable: true, @@ -19,12 +21,15 @@ app.whenReady().then(() => { // You can use `process.env.VITE_DEV_SERVER_URL` when the vite command is called `serve` if (process.env.VITE_DEV_SERVER_URL) { - win.loadURL(process.env.VITE_DEV_SERVER_URL); + win.loadURL(process.env.VITE_DEV_SERVER_URL); // 使用vite开发服务的url路径访问应用 } else { - // Load your file - win.loadFile("dist/index.html"); + win.loadFile(path.join(__dirname, '../dist/index.html')); // 打包后使用文件路径访问应用 } - // win.webContents.openDevTools(); + + if (NODE_ENV == 'development') { + win.webContents.openDevTools(); + } + app.on("activate", () => { // 在 macOS 系统内, 如果没有已开启的应用窗口 // 点击托盘图标时通常会重新创建一个新窗口 diff --git a/package.json b/package.json index 902a133..29ef93b 100644 --- a/package.json +++ b/package.json @@ -5,14 +5,13 @@ "main": "dist-electron/main.js", "scripts": { "dev": "chcp 65001 && vite", - "build": "vite build", + "build": "vite build && electron-builder", "preview": "vite preview" }, "dependencies": { "@element-plus/icons-vue": "^2.3.1", "axios": "^1.6.2", "dayjs": "^1.11.10", - "electron": "^29.0.1", "element-plus": "^2.4.3", "lodash": "^4.17.21", "pinia": "^2.1.7", @@ -22,6 +21,7 @@ "devDependencies": { "@vitejs/plugin-vue": "^4.5.0", "electron": "^28.2.3", + "electron-builder": "^24.13.3", "path": "^0.12.7", "sass": "^1.69.5", "sass-loader": "^13.3.2", @@ -29,5 +29,29 @@ "vite": "^5.0.0", "vite-plugin-electron": "^0.15.4", "vite-plugin-electron-renderer": "^0.14.5" + }, + "build": { + "appId": "com.example.app", + "productName": "cashier_desktop", + "asar": true, + "directories": { + "buildResources": "build", + "output": "release" + }, + "win": { + "icon": "./src/assets/logo.ico", + "target": "nsis" + }, + "nsis": { + "oneClick": false, + "allowElevation": true, + "allowToChangeInstallationDirectory": true, + "installerIcon": "./src/assets/logo.ico", + "uninstallerIcon": "./src/assets/logo.ico", + "installerHeaderIcon": "./src/assets/logo.ico", + "createDesktopShortcut": true, + "createStartMenuShortcut": true, + "license": "LICENSE.txt" + } } } diff --git a/src/assets/logo.ico b/src/assets/logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..ed18ead0ba07772efabfb6b98d992a953126eb41 GIT binary patch literal 20795 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�{%ndk3I*pb~cwnW>? zm!{k$JJb#|9%60UV8b-GU-S6|(#8dUZ19n^z*wq@1Pa^&Ojw4~w+bkl@Bk`t5adS< zt`w4*I(1K85IVO&H=OHrMOW5@5&sQ*H$Q$Inm7d@i6|cSg3K57r86v}>O(k!c?H7KvX!!a`E@i|dwQI@^-1}V`< z$9SHGIqfz(0)O0Bwzhn6&=uYQb8Zge;g1Ha!;s$avC8w;NNLa9ECirrAARNoq#qA` zM<()(h`>t4xYPUE@fbyMhB%v1(8*Uqdi69lMAnOt_-}{&!2ej{)jY&iT> z?lM2ORAFe2A3&z>s~!bCc&^91TPxg)2bvC-(9>xSNlVR@Fon7T?bFK3{<`X$g{mBp;9C@1Gl;3kQu2}a=Ig;S z9CmT(h1MO+;IG#Ehpg7wSs@9O6;}N^n*6v)p<2p;L_tU{^HQn}+GU()O_q6bu6CL@yf4n$KX7 zW1e_$+s>{34bsCz5|PiodeFa|k?j%+3;8jRNY-AGy1zof)H%wfME!d$S8*gHLd#^p z;g)4=?&1K0(G)rnCj?qy*hz|-ZeA**BY69I@o@c@IKbDpOD-;C;`AknAF+A>Du z>jq#J0q$98;SX!@g)#sdO?9t2lNlBRBCJDyW%SvO$j79k)++ZR?Q?``eLDs6X;f=R z5G#joo|MsUY@XB-d>OjM6JTC+aY`Cqr?@x3Eqe}V#9YWtmbAlSo3->4sC3KVa9z3gYr+iS}s`HRUT@nslYn>g6IKd7a>kvaAN@_8{`2B)9IX*l}%Ipjs0> z(0|>q=9%{I_Bmw;H;6ePu!v>#<{NHTIhPFz-Hzj>#80RD4WI*v>qJDe(!SrxEBguw z)P*Uf;wAaz8)h+geT68dqSKG-vMo0^MWIhceNjKIC|UhC-FuoJ=C5f;L9zQ58RRB! zYm+4r=oW(VjN+1-;RnNbYq24&Y=SVEUR1h+a%1zp)qHipATW4o2}F|?!Z{S)y<9LU8fEhafGWEX}^B24H`{fz`xk0->RW`Vf4}h`Jlq-U!i9q2 zg?>Q)fAd_FRf5)K^3zvxv{Q-sK(*fuy}bg#`B6evKDc+-wcgmV!*TE(+D80NFGJ|; zgk#XnfBN;K7(|ppv{TK22qN(vQLxaM2I#g1rXq{^kw0d_#KqMICo|e1?~pZ7s1vz*t)?R1 z>mh({%1b~E$p=E7DfEhjbCP*3fe@B<)tJc4+oMMJ`vQu6sf3yW?sC1px$pGq|YJFzkL z)p|GCvd_YHzVuhm{Mv3tIm&1D-F0K5KrE>A05r0Cs zyN8>N#)1pe5&Le0RPlizt>N3dXWVD zPmMdQntvL$kX{|>wDN!r8vISTTOJ`sb4~UV?c4u}_k0_XV!Q9%W%zdro!CerAl5&5 z7B`CsOeVq>(D!r9x3-77DOFiINL#dSv8ON*4JIRm!jrTFO5~KqS=LajLrUgmy8~vQ zl}x~8bijPw=?R}NzkL43kRp4sM~P)yT2M%NOl z2McEkF}L(*OQ^x~X>CPI^hO)4Qg0Jt=efJra6!tsDn{*zd`UF!D0;&!{wJ}LWQnij zQpGYvS5qyC3UyMS+Tw@dnXHumh&3MY^#8)fA!=!8`A2X&Tb0>me`(_<(l;=Lh)Uda(4u(Y^z<@_Fn;SodO?4Q1I$5UO%h5&G_aZJr zg2`3bW41G8pdf*Hl0`2GiWTl5hGVS@GhPOboax*`0<+r`sDH>r0^%<#L9bP{gS_eDddolDYfPTL5kqQ0R^~ec zpYN+kl8UsJta1TYdo8}b&Zj@>3!kJ}Z$a+V}) zn6#Q$ZO7!G)$ZzsS4+R3oF5YoxH~0L^{l&kpEgLk>Y-6YndM;qoh4(~hm4o7))AR; zU!*(Z@HUAGDkt(zilgT}>VMT_Uwt3-$M{pUDG-b^hRCT?Gd{2i+a^K1XA3q-V`698_ zwTGwN=<}h)4dKx2<8ZPGoZk{+xF!lxUTP#g^>i#rKM}LUcX4a&*bUE?bea&!Tci!01|Vn63aWAmd78RPxkiCZnjaq3%O0c0WHPoXRl0@UOvrqaHKKMEr3uVrmmJ-qE*P+)V6gO z1XKL&cYR8MCVjp~`A@Zrg|QtzKVfc}^Y}Bt4yzAG+Hp$R`O(-&Y&d;*_MXkSQMfI^ zndPsAlxmogCD`Skz|#FKl35H$a#dB@Zf*g)bX+`sC>Z=WPEXEg3fv8J3bw&5|8;fr zeo{B9eezMk?8xsuEcmWuc0Wqqyp3Qb^W!nA0jPsjMT8yed$R~NOAk@>4+j(JCRlD#vX;eVB$Kl?YWi!F%Y&&}NO-*F; zob6o}0Dh5kt*vIwro)Z1q4(J&G^;E(aR>eJi?uF4{q3sGq^U`T3xs^X!CVsLPbuQ5 z`}0w+Y|?$M@)TKKND}c>2Le}QlY4UWkoA_8e_<1*mS)K>a2Qz>WFXIaU_TVDKMKcI zk|lKwi+Q`DizjTH(m}272q-@WS+p6P`A2$8hw;^B)gID(694rmclLfi0xeThI7nLc z``=uTVrN~lxZ?U2-ptDb6=Mf>qWZ>cWD(~1E_V_Nm2-gRsS0guFv&7C3`iRyzGAC5 z&;MmtE7URn)a!ABlY=Ho*x?@-Bw=XrKb|ml!Bh<`@kyHg-E~?>94vyGmH5!c<&(%7 zsXLS$EGcF?=lXkcv*`CJ^)$w}&K{>q&y5amg}j;%jC2gm^Mz+eQ9Y)G@_(D62hld*1^?zcxQpALHLwE;#++59sz7b}&& zcz7Un=OqdnegeZR{n?x<%T65}$v!#^N|1TZ%?EUs^@9mM?1 z$y2WSWKF8I4mM@#H7GZPkW}T>9`IKFq%f7a3d)gv{tx;l zF2P!60<$OM!2{iDV;ktq3WrtW3pO>Rcrj>t55Z|CB56DUPsY1cK)X=Z{}ejQdr^`a zsZ8o)@U)M)*{vhk6X+hsm0{sQ(5rhjklhLvE){h;Ay z)~DPW#N)JT`2pTYD1uhUmm2o>Y8lA|$B zf*77ASakWQojU1~-qiGH0Ha`H7ORs>>)8ATTBAp_riSBcG#`mF=5X)Vt$rBB9#Lvb z3owtr>ANA3{PT3a?^x187IZEaQ*N6Zw|H?(-A_u}AnKx>z?tl&Ec%4_VOmPJL_3WQ z*kCr~9mRQp+0+g`_Wd#VwHK*#tIW0k7%*cj#u2cmBLp#jH2ke}{=;i!Ad;P=BV(!v zv)-1oJUjIRKw#mA9Yqn*?G>8kDM`9NpbLUj^^MX1@w}_+bcGtPTX;xL|};mG}?m+lxMX z4&*woVz15F4@9Q0d+zNU=j0>cn)9npXo z;g(7F7qtiQZI z5*lT^z&HV|cWRy7F0H}MBEU)K7JM4~q5a=o!)e9^C@Xx*MsHX=D-lEe^mQ(X>;tsk zSr?99ZJ6!L5jixQ2`cA;yEhl-CPKY-Y80_E;eB#|lyEpZKBi6O!gJn~nc+mQ0%Sy6 zFbx;qVA>u4F*ng`7gitCW%3G=H0qh+KiLv+>P^mCT{D6eQAimicbKbeyoimrrEe~K z4A`fDbPm^9m#Bq`FObE1;m|IcFjFms%wHN)&KPTYRjYtnj6cRJr>pP>Y{!u}>p8Zy z>!Ec9y@%GsAti`JNbG@>J#kj+W*^N=>f+J1{n;+mi{u8GHo#kB?I|A23hO{Ax@Z@l z`(KB^>Ai>!%oiy2DQ8^=fJlXPWwtp{-4?P+X7rAuv7-$op+7yh*|s{0&{5HHhEpNp z+=+Ow(85;Pfhgxtc^@--nWamVZHMB0NsQDV>IXFI2nBE4^A54P&SUOLD8NYtzA5x2 z+sXggM1l`zKd@hdN%= z#GxFWFvQ@Q&0!U(F7KzVK$bCIjygJrR!xgBSkyGg4r!f3@ax z1B^S`mY4z>BqZfKh1rqW?^9wbMEE;5E!NJOC@`*{NHDL$UXmNDBqA6lH_PTRG=aUR zG*aI*r}&WRx%_h*Z2DI-D>q_`7kYQyAJVF*co;d`w&Ais$q{sn3(5AnpYv(gf%Yl) zCkU^2+%SusiC9v4WYaElot)M_bRBc9H%=EXicr{Z3C~k%kJUk^UkXi}Xja*E((cp4 zWU~KtiFlC}RYJ!}PY!&=J9mIA5lvC@Td*ugf*fQa_W)IOAB{(V1wZcR_+}ft-;w?0 z{r;_>%bXcx_Jhm#^x`j?xZa88vd!A<_xf`dZCLpRfP1Y7iy`XZx~~^83rID`S!P7o zkQWZ2<2}jg%{SjjLPJN_U1AwWHr}#m>9`7RTH=55woy%2Pj5Bom%`_U8X0I-p2DKn z*fuhnRB}@e3`{4r!g^XIe|eWKKOIPDbuPEO}Zh1{lM z=_6$TvQ}?9&f*xpQF)2UKQ<8F%i#)(sKXAp$H;P27?^vJss6=jBIPyAT53u#SjqA^ zWdZ%jKDL6=;XLt0Jk#L3bNSFMi^;u)Lw$U>=?==4D!c07@I$YV={1q7;9tQx@=QYq zpk$bZ2bz~a@M2*MFqW66X$gMdVj|mA`1Q1}=UsItIcMYw(uaL!5vFiwLv;s>Q^Z($ypc~;Us&c!W_*ubEa!$A5uf{=7dmg z9)Kh!#A}*`+iAVy@PZG#>34!GNp3>pck<21MV5dD@%^E1$|vF@xBR)6sKn9{8CB)) zJn`s=`B8r+@!alqmr=T0^$N`P``7Tj2~pc|Jsu$GS$yjNqR%Bs%jbPu?av0r_J`Hr zPzRP<`sRQbT>4ZXl-z2bFDRl9&Xc>ducP4fr2l%x(8-EW=~DJY966luO!Usuyft1r|j zCK~a#QpjhN0#dE@&F6>c+G4@ZmXOz4Sif*y!w@&s0Hgv?i*cssd?`_7Tas)e~`4vJv@J{gukk&8=CsZ~*g{ZPcqwQp{!%~gGqx|AIf z$@oK9biP}&k()&e20L}o)f19H$Xh@*QKMWS@jIWmU5YPk zddBcA#olxrvvGiz5GFI=a^5&cL+asNgLvhB70m_&z&KR&fy2(Dl(483#&) zG#s#wS*>ERRT57T;+U@UUcTZkEFO`}#|Im-+%@huywCPBE_2^(+*Hz=%PDJNBd+f~ zZt>fCDky?uX$_ooty+(PO(_Q4&AK$+fg)=Ft7(8=lp+yV8>0F< zx{CUZ$gI1|lvx4#387Ilz;XiND^NT6?t@=KM_sX^$a?|IywQfRA|8=63IPb&xVv|; z*2h?9rR(qG_S&S6V#d8Q?qd41*pqB@Q=|8m6Z(@wbF+JDhq@e!WxA7#E^ZQb9j zx#`Xfg)e%v+~#*t42u931{j_lwX<5XV5vV_-Ns>m2w^-foUv|Tn}cQ4Mmt9*zHEz& zra|9y4HeSY@U8x<+$ORc2q}Yi_maBrAQFGfJ9sv3S#70Qpc39p#5gx{u5;>!srImX zmAjrLSzG%z4y0$PB5OkSY z-yH2%Dd{ccvyv%GYGzG&u_CwZ>@q!Nu!~gn(J^Kxu`wuV>&&xU7=D-c zq4UriN+p40rIU_{X|q?Vqh;h#I%z}$2|Ay%hD zH3QekrMTo^{6tZaz4K<#3yd4YRFMw^cKZI<8kVdRFg)Z!RdtTMH!3IHp7UdxL`6tT%m z^<(YC*X^-YQKs!m!+pmjK_SLxBrH7jIgeKUxGu58nxn$RlA z`n`zX(Km`d9(bNDmO#`HKZ&Lpr+62ph6#k_Eliw@B8=4wPt`Npv9@sGqwzZ`^Xoq- zgYK9tEem|L@Z#EApQBt+2Z)S#_~5c^>Kq?$O}F7AH)>XbY!~4U*KhpTgVeu=oRO^F zLrY8=jJpeYs-1`XNJei9!YVx68p-&p9-~FzAXnVCoG<}5;k41#mS=rAZzm!9EZo9I zMZ{ws{`Ioc>>28+cfBOgZLo{%L+(8lZo@bCKxx0sFn4h`k<0V656h1c&Dj<2rinJl z5Go(CTv~Pt)?m{+)kU%0;*ztsc0p1#9PoZIJz$+X!6EPo@^ zcr;uHv5$0D>AC0>S2xr?j`^&#txT=8s!C1Mo(?ReHm|s<$+L7Du5zFLx}Q+eQZJ$R zd?f3+pU_XR|1@_pu_&|?iEVAjTpp`ZlOU7I*P7^6*QbP$qIoh7W&YXRgZaM{c%|g{N9?udDuqO~LdAXTtaFF=un8uL z*Ev>ALN>MW8krEop<3obUW9*?>4S%7GBtVFS}C(Bw^M8+U*0^vxhe2kQlyX; zx+K>6pm3{O49jE*U&bITH|^v&@fGFo{_@B}PCLBC4f>mo)o5J-)jaaJ=7DHCj>5>H z-3HIt_NZA++YzR82_P3xNM79v*%vmUQ2sIrUXU#qOl*KyGr_COu!R1t${a-))3!Vu zl8~nZ1nHqwqjMcK*4Xdh`Q!D67vTTb!nwyY_5X2vE+w(ta$6yiO5{2wlWU1`C%NRB zT!w~3?$?#vzLi@cg>sA0+^^-DWV2#&8Ag&^W@6N^-$#$%ANzCXoX`90vCrrIdOu$; z{{{d?WWT8WgO_pbQtoPNSlpaUyGT)pl39M}R8)5f`!4F&Am+6SH(^D1kFZ;R@JK4^ z>dh+xNv*(Ahr0E)!UDx86Q`I(y-nWb@vm+4DRX6tQrxGLfnOLmGitx~0g3^82!bfT zL*(&0l6nXj8)@y(@hQISu)O#AWc|(pvZo3{Heyz2aChsk5xCM(im!8F#czhXh<``- z?5*^*)7tOGg6#P_?~Y(**hYV3&GZhZiOX(ZF{~GMDT7)+2ByG z5T*&JNGOk0|t69 z{U)%wt#f8v?)R1%08#DAmCL$jRlfxL66o1b#uYSsPp1X;&c(Dvl*d_3NXQ;GL&}6@ z?EoV*SNb@254i*jE!&y_)9uIAfc`#Qa{p=YD|?yE?;n(jdvLFbCyCizYdHJCZLLQX zC6A@Cl{H$f-eeuA`gif#p9iX}itj(GwH-k4W0(=+w-<~8`X@@`(0xhAEfdYm0sH{S z+W&SXVPC>{+yBH>`=q({$aPJSMA|oMt9>u*>}_J`m!ac-$R=v8npynF56$8?!w|AvcSA;zp?Sz|?Gqnm0n15k`Gg*YCEKQtx4KtSI-g-i)3}_Y?5!+E zF>bHk`zBo?2d|cIrT>fuejai*>|P%4!ONLT)MXH35-FZjp5%=XIbxu^(4abuh)!R!05iukVWaLII&&`PmT zF3GpI>&YgxPgP z(x(N@9zSvCxb>ClI12+hM}aEDc{K7F7|i!dflW@$7HnNE7z%dEO{wCN=sHtNa!yxs zPBa+tR)DOmsPT8~S=9EJP;R;-DquITOE5WeZ2TBJ?Su}YI!uVvt-wp{p)^jzRE1pw zOHrO8e;?QkbsH)HEzB>KI3v=_$s**iylcTSbUfShB}$Pdm3rP^e+E?gytRIEn@3aeikHE^*?#+GJ3fKifEL^RK^wr9MVu5LGpLNrttdQq{3ZdL(_c z|8>apIW^}qkcuADhFs(7YtDvgg`2iesMFp}Fcx{P z7nAZkzp*E)FjiZf7BebN7Psge5~?x30meY<)TLObzoUX48hcL~mNjcv7HuFRewBMd zOZ82xcGTKC^t{^$#J}-8(;D}L)wD0yp zghh_b6at{mB41dbG43wQhW|Uk}wxE`)c@@xccF#`Y*68%RFlyD89d6=kr&B za*Y-1LWkbTBjL{_&NA0tt4=$Y<;9#}k(!pMIOU2x#~E&_s~@F7LIaMWy!>XoMMYa| zen|pHy?3XvVQEU@h=Ah#c8px=$`(EtqmKP@vg^u*ag99Q&Gv`*J6SGH#pYdjop$Ewo z(htRpll?BrA?pnL7RgI+c+1m>5z$e6Y&Wg?QsQ&@@rJik(F>dmeHI6Z^C`zf-~(Yt zMXHh0d;E2_G;Y4edDbESa0V|u(lmwg7VN$m| z+F`&EA+HqO+37WoLwA!uE~Zpk-MIt!7xptvcW{Gs1Nx50KA;qGJ4ZO?9QCX?WcSO* zSCovEHcNdWX_U)3W}Be_4v-gE1^NCQR(>FclK05iD^8LtB&}f(Y@(%qm%I*;<7-sB z2TDuGW)0tVqSaC6_;yNZjjYjuLw1U%K79san@Wh?*~^vQ#Kx#_Q!YbIc=>-%1<-Pz zNSyRXyw_eFC5I)zZ#4msdILw7*&Y^ql@Y#^hC%=IUB>GfV(H~|e0%gN^G~FYMj`D> z8JLUe=XX)bS;y)H>I4VgR~QbrkayD&bRomxd95bT#hbCdd zTS3wzpFc{u#%#GjnEmtfj^9rPp5Ntzb$2GuSdUB2+_0st3Zb3wV@h=83xl_9Nb#Y;@qdw$9&bn{_a|Eb@# z3jGbLb1234VAiTt@x^9K${-k!-p*C3>?DBG@4; zzGa=v%+C)g6wn}>bfDLrNOe4M9zAI*Qg}@n{|f#sr=6|q!!~M9{0Pe%J;q4!yMO zOflM+xf;qrr8Y`_e;0#;UOSWAuRi5K_^PR~p*f!^*WqyHEXHkpE{o+{#&)8hapbr& zs?`wS>VJeSZ%7a(tRT}enC}|_EIbD_4hbCB2-^_!pi;ZSqf!h__j#cC*kv+4+9mEd zqjg1IBl2+{a$O(_7tI^aMC4_|bcTFfiR?Edso5=S8x@fr_`TN{PZslgARX+Ct~*G$ zT1@`r&a}L-H^;PVg6W(c`+b{uKxyk;vg&O>2swq& z;4wP&yr;bMC3~)qOL9SrVT7QpSD|@K{eaqh9 z8Quu{v5I9s(JEEm&^qQVz3rklmz)*-0r&p$FRGs-&^?*N-=54uZtu+90oXG*K%ayg zYUUsAH++H&#`T8IPwOwR07qK%Xx^5M+l`F=x?udMfA8W($M`k=l4 z$oGpZ$FxtsS`uamb1txfxHAD)BDh3%urMw>c7Nh%YxmDN3e@If;InZlb2onR26twz zh;-Bb4XaC!(iOfp0VnIW_J9@2p z2w6tB?!T@3AouK9JEG&8Hrlh5d;a>{e`#H#H~n|z)EJC0I)B!)j{O14)W5Z^=NLvw z@zk|vEEjCn$?;ehALLbK2(RoKSGG+4wX0f|V2|+kiehz%!$tpRGT=mKcZpW8$>&+7 z+WZ8x?JHJz%zLPehI%nOHM^PG5Y!$M)8zA0q0@$q}e>3{~ym_#5S8i|9(LLJTEny(F8Vd0 zpVgxJpt&_&p>6^jZ6hQsc%ov!Ef1+$^<_+3bZVdd;W9i+j$-p}V5k6RgHtksXQ5bn cm&RlZQQ*J~X2c*s{2|2XlBq$Jo=e>S0A3{(UH||9 literal 0 HcmV?d00001 diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue index dedac33..4eb8410 100644 --- a/src/views/home/components/settleAccount.vue +++ b/src/views/home/components/settleAccount.vue @@ -107,7 +107,6 @@ function printHandle() { // 订单已支付 function paySuccess() { dialogVisible.value = false - printHandle() emit('paySuccess') }