From 1db31e0ed7e80e646680fc58e94aac26d0cb85e3 Mon Sep 17 00:00:00 2001 From: 1154079537 <1154079537@qq.com> Date: Mon, 3 Jun 2024 18:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/cart.js | 30 +- api/good.js | 8 +- api/multipleShop.js | 5 + components/goodPopup.vue | 260 ++-- config/app.js | 8 +- multipleShop/images/circle_bg.png | Bin 0 -> 9246 bytes multipleShop/images/location.webp | Bin 0 -> 1422 bytes multipleShop/images/location_small.webp | Bin 0 -> 1390 bytes multipleShop/images/phone.webp | Bin 0 -> 2340 bytes multipleShop/images/scan.png | Bin 0 -> 2533 bytes multipleShop/images/time.png | Bin 0 -> 569 bytes multipleShop/images/time.webp | Bin 0 -> 760 bytes multipleShop/index/index.vue | 214 +++ multipleShop/orderVerification/index.vue | 226 +++ multipleShop/verificationOrder/detail.vue | 119 ++ multipleShop/verificationOrder/index.vue | 191 +++ node_modules/.package-lock.json | 2 +- package-lock.json | 2 +- pages.json | 40 + pages/index/index.vue | 1604 +++++++++++---------- pages/index/test.vue | 127 ++ pages/login/login.vue | 6 +- 22 files changed, 1886 insertions(+), 956 deletions(-) create mode 100644 api/multipleShop.js create mode 100644 multipleShop/images/circle_bg.png create mode 100644 multipleShop/images/location.webp create mode 100644 multipleShop/images/location_small.webp create mode 100644 multipleShop/images/phone.webp create mode 100644 multipleShop/images/scan.png create mode 100644 multipleShop/images/time.png create mode 100644 multipleShop/images/time.webp create mode 100644 multipleShop/index/index.vue create mode 100644 multipleShop/orderVerification/index.vue create mode 100644 multipleShop/verificationOrder/detail.vue create mode 100644 multipleShop/verificationOrder/index.vue create mode 100644 pages/index/test.vue diff --git a/api/cart.js b/api/cart.js index d025b43..e707284 100644 --- a/api/cart.js +++ b/api/cart.js @@ -1,33 +1,33 @@ import request from '@/utils/request'; //添加购物车数量 -export const cartCreateApi = (data)=>{ - return request.post('/order/cart/create', data); +export const cartCreateApi = (data) => { + return request.post('/order/cart/create', data); } //购物车-调整数量 -export const cartChangeApi = (data)=>{ - return request.post('/order/cart/change', data); +export const cartChangeApi = (data) => { + return request.post('/order/cart/change', data); } //购物车-清空 -export const cartDeleteApi = (data)=>{ - return request.post('/order/cart/delete', data); +export const cartDeleteApi = (data) => { + return request.post('/order/cart/delete', data); } //购物车-零售列表 -export const cartListApi = (data)=>{ - return request.get('/order/cart/list', data, { - noAuth: true - }); +export const cartListApi = (data) => { + return request.get('/order/cart/list', data, { + noAuth: true + }); } //购物车-常买记录 -export const frequentlyPurchaseApi = (data)=>{ - return request.get('/order/RetailOrder/frequently_purchase', data); +export const frequentlyPurchaseApi = (data) => { + return request.get('/order/order/frequently_purchase', data); } //购物车-零售购物车预检 -export const checkOrderApi = (data)=>{ - return request.post('/order/RetailOrder/checkOrder', data); -} +export const checkOrderApi = (data) => { + return request.post('/order/RetailOrder/checkOrder', data); +} \ No newline at end of file diff --git a/api/good.js b/api/good.js index 84f653b..a61c66a 100644 --- a/api/good.js +++ b/api/good.js @@ -1,9 +1,9 @@ import request from '@/utils/request'; -export const goodListApi = (data)=>{ - return request.get('/goods/goods/lists', data); +export const goodListApi = (data) => { + return request.get('/product/product/lists', data); } -export const goodClassListApi = (data)=>{ - return request.get('/goods/goodsclass/lists', data); +export const goodClassListApi = (data) => { + return request.get('/cate/cate/lists', data); } \ No newline at end of file diff --git a/api/multipleShop.js b/api/multipleShop.js new file mode 100644 index 0000000..7a4a0d3 --- /dev/null +++ b/api/multipleShop.js @@ -0,0 +1,5 @@ +import request from '@/utils/request'; + +export const shopListApi = (data) => { + return request.get('/store/store/lists', data); +} \ No newline at end of file diff --git a/components/goodPopup.vue b/components/goodPopup.vue index 160e6fb..55c428e 100644 --- a/components/goodPopup.vue +++ b/components/goodPopup.vue @@ -1,152 +1,152 @@ \ No newline at end of file diff --git a/config/app.js b/config/app.js index 840fb8a..58b2350 100644 --- a/config/app.js +++ b/config/app.js @@ -3,8 +3,9 @@ import store from "@/store/user.js" // 环境 // let env = "dev" // let env = "test" -let env = "prod" +// let env = "prod" // let env = "local" +let env = "liu"; switch (env) { case 'prod': @@ -13,8 +14,11 @@ switch (env) { case 'test': BASE_URL = 'https://ceshi-erp.lihaink.cn'; break; + case 'liu': + BASE_URL = 'http://192.168.1.201:8545'; + break; default: - BASE_URL = 'http://192.168.1.22:8546'; + BASE_URL = 'https://test-multi-store.lihaink.cn'; } let HTTP_REQUEST_URL diff --git a/multipleShop/images/circle_bg.png b/multipleShop/images/circle_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..1b19efdca8990ccaf2ffaa5357a3507e5f682628 GIT binary patch literal 9246 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 F{u}07(;EN) literal 0 HcmV?d00001 diff --git a/multipleShop/images/location.webp b/multipleShop/images/location.webp new file mode 100644 index 0000000000000000000000000000000000000000..0f6e146e2b2ca9a6fcee8f09a23e3fd95ca7429c GIT binary patch literal 1422 zcmWIYbaQKCWnc(*bqWXzu!!JdU|=u+Vtp|3baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4K&2Mmlr2nLDC#RU)+RuZV{+ck*V%eq)q;1}dfNi9wWD)|7!Dn&rcfo>83vPIG% zYz+`Q3BtAkvCB&eN`PttK=2?(*InG6iuTNxN6ZXv`}7BDdI zw=ghlJC6`Ugh@eSQ6ktl79h!#md3#FX*mM}ZzKbQ@C612u4u3vkig+K1)!7+&|UdJ zn9h*HkjkLI;K`83kj$V5WElY?)sVpq7{fl(nSoKOe}G$H{<9SmRouH|4$nW&xcmCc zYfTMTJSM4}v{_Z1uW(xa&c3uX#qGT+o{KhRrG5L9`nNnMzT2}c_qIjf#eKiyt}e?x z@J4eNbKn2D98F0|K&+tg>F;mvP?nWlVXtqMt^eK~#(nMoYukxg z^%2Ma$8j`8ifVVs{Qs?Zwd~LP{t)KRtOtWc4>rpDw+?(#X1i1CM6&zE^Y8PSER|mF zJGQegfJyMwpC1=2kL-|ZS=1xj6yagvHEq!Z9mg2{$VI%DN;O#pr5^JrS-C$~aPsUk zx+mw9`tMHwm-Oq`!hu!wnVHQQHz)RdUv74*@W{V^%ObKOj{Q~HCBMl;$8m9S&+kna zcWRyEaN(Sr=$v`@*bY5Mmn22^9^OSEExi}|l(o7hMNBbMNW8u6vw!%PGj7*%Zf`qV ze$S}Ar~b6=?XtD0*JqgCpP%t-@A>!Q7wg&bZXYvDTC@AE_BrVeC^&K9oVkjUp}oDL z(vj=uCO}0CQ>VFCD1xF?q;2Qz6`3>HMHv|u)GR!3zv;Hor<3dqe#+->&p5i1li@(_ zk@JZKo_Y(^jKsWO1~IMZR#NATWpv0r96GVPYpcV?OTM>D9J)QW&vkqp;V`>n=EhTd z7}p-EmeMWW;=Jvp2-8*1>aTH;t^coV4Den3J16vO`BT%JrFo}*>*eYQuWny5S^ijF z?e0rzv&=fVg$xr@Vvgke-E&RnRlnWcyC0&q$$XWqTw7oMt*fo?`Hz6@Z>RfAw9UT6 z{{F2XZ~J`49g2P@m)k|$ld4=GoD}}tqG4n0qt1}ff+Zmy*C)Cy+-+~;dwBX(?O#ha zDG93@$-U0fF1z1-+LkCp4|zm(NieNNi_!fE*p`%@O3Pu8vaEc(1)*P~A@azB+9 z#_SPc-?#1h{?r$osqYv4dluUN>h^zwFDzD@rdPIG=$$KgVlhjkurOFhbncul=|}Fn zzt38Ajn8N0#J9?#zrTF{bgKDGN@nb--nEacoV`~ron>NHGIj0=pP;R$lQS>>J??A0 z!}t8^s=z42sC>6a+dM9{oqWc1%wYa|8jle9n*8IGhfZv)R1^) zbMh5~b6u%_*ycsv37a;Zar-6%?gv*D>(W-elKE~BIam0d;@aXJr6EprbxNE2lo$Y( CAQ&nD literal 0 HcmV?d00001 diff --git a/multipleShop/images/location_small.webp b/multipleShop/images/location_small.webp new file mode 100644 index 0000000000000000000000000000000000000000..d69b6c6c352d9dd9fe12ef11103ecbffdbef4ec5 GIT binary patch literal 1390 zcmWIYbaP8%Wnc(*bqWXzu!!JdU|=u+VsS9?baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4K&2Mmlr2nLDC#RU)+RuZV{+ck*V%eq)q;1}dfNi9wWD)|7!Dn&rcfo>83vPIG% zYz+`Q3BtAkvCB&eN`PttK=2?(*InG6iuTNxN6ZXv`}7BDdI zw=ghlJC6`Ugh@eSQ6ktl79h!#md3#FX*mM}ZzKbQ@C612u4u3vkig+K1)!7+&|UdJ zn9h*HkjkLI;K`83kj$V5WElY?)sVpq7{fm0%nS_r;s;m-ma|!I%e{Op=J%byIs51R zJ8$1Kza@9;ytD6R6x=5*@#tDJFDmVx{GGY~gysmH@mZgGtWCyql9J}8s;rrn^#$d> zybHVxjQ38Hluo+sHtC7N(^)t7sx!_vWaHuBkodsB%*4dRCm|qU@Sq`HA>ly7KL%zt z9tnXDHgz>ItFLo&SR@=^=CMfldvQh3TCood>^v3jmotABRW5$HMWD%NVZyEmnG63) zem(J0z3%UyUAFton})U9ZvQ_oVeioWb(hb=f&()ne_zgA{PIiJ)vVWd^&W`5E?pUu zclvCaL)telub@eC5AMGC&Zuf6IVmc4d-w9oX21XL{QYco=z#_&j`vmDwI`muleS-f znpb4*_L-8N&)=!seDht`eD^MeXq2 zyL>y1Io7J(U(o+^dqlm2v0YEcQCWMB*w+F|XnA@}x{#j>}}>T+&x%e}pA?WVb# z-uLH5`|f)G*FskB<9(tw=<^xpJBik zu%lAQWp)7P%u7x8nm>P?{CwSnm+EUjiLhO^{&=C%bzkp4waaE7toCkQTCj7^CZ{*g zo-?@iciuFrJJ;Tv(be&|{#eu2J5`Aa`Ahx%-rh_zay@Z#uBMdu?vzHWcglumPtFbD zdOh3NzC!+7D9bbb{38c{eY-K;X=SI)Q}>VW-dwyDw4J5v+I{H@3xl@RTR3VwJb8Qi z%t;Sw=B!RS6a3v!Q=C<#C*)_tnxppL&irhD|JL2m>%*T-bIxrNzv%v?S2?utU-qY< z*4&9{`X?r6F?=lhbb4m(N4xlw&YTO1^7JQNpR4k&(0#)0oe^h$HyDXMliudB`Gl=r cc1qiX!bpPz+eNcxn`J(*)5=gh90n|90S4y^=l}o! literal 0 HcmV?d00001 diff --git a/multipleShop/images/phone.webp b/multipleShop/images/phone.webp new file mode 100644 index 0000000000000000000000000000000000000000..0a3479e0636148292f073ecb826feeaa2beefb50 GIT binary patch literal 2340 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 literal 0 HcmV?d00001 diff --git a/multipleShop/images/scan.png b/multipleShop/images/scan.png new file mode 100644 index 0000000000000000000000000000000000000000..f5f48361f4e2a9650ab1fa1c51d723aeb33cb9b9 GIT binary patch literal 2533 zcmVPx;pGibPRCr$PTzhO&=N11Q#|h7dX@x>bAQu{9hgN%NEl?(P>Pkby!%haJ?WDc6 zwc9EIo2o&jZtc+8qE!OaRx9hoR3@z*gT+pGcWg!5I$o1nZ6kIFa2+U*LboQ+Cg9|r z?KrV>o!Iex`H{5WKen&W>-*jFefNClJKrVbsg*ZX&2ej(3C7I~nhIbl^?foRzd^t` z0OuGS`=q|l9v4oX@wFVyhv}3vrN>Y_?Y#GHm&SDf{C(h9Rv!bA5nyNyZRIBp;&wzW z3p2r(Rlp`~n>~KasGeG4)Df^4L=#NdW}K9{oe4WZ)bL@KYu}|6$FCY^Hb)N_po3Y~fb#uJwsht6g;ZhpCUjgGO5GtH9&Jj5bRU>|)%@_VH2%24)wgH zaAm61KuW-rpyv^Qeqk4bWz*_VGi3p4ZoX%bsE6MC8V+4PVp+w!iF5Gk{8t9?i_Gn3 z8nEL`z_RRKM*gnq55F`}$RNOaLkP5j=q9TgON&df`Htryol4iT1z23)@%9izM@KYc zq>#?Ui|*p?iq=J~*YpH~08@hAC;t!cPppC^d~)Z90!wJJ4VdT<&=w!8x84=j)~a;Wdy`k$EnfCW5zomel9NWhr) zsdeG|5+2roz8Q)2`iX?Cqr^0Kr1tK)`|azec%e-L`tA)4ak+8eRBex6f%ZAU?gkFM(@|b z_;r>rN)kKl0fY7sDNR*gXfB%(T|X}RjB0a7IB)qdy&WHV(ma!PQfF-A>?*nL$6K*?V0Rz{n{_x)3eMvb~HL9n>i8W=W zZ8ljE=$n)##cLlVPK&2;^w)()w&>C|SyX3tn~mGm^6(@%llk#RuAyPYLDe6QMb3_w z3g{Q%`6?A~wzeWR<0p#i5`dLARh1QKbcR3~E31dPDf;T2{pSzh;iI{)-jQ-E8Q#+D zRuD0m(d{aWENecWGlpRIUn?t)c4_|dUOViC|uolslL`jsqX2JF_%+yuZ8SPgKbNF0wnEI za-e`*)?VZv*yNbYw1>qQ{tUO$?veM}jOYWVvM5k}p@p^&m$QNvmwV8C=UM;BRwFhU226y>X%X($_5ze#J8nc%LDKNs z*D2~d=R4JA)I3vwC59*Pn_ShD8SRK!ItF%9Y1jSg-D;N^Uekc}`LS#OKQkN;&r7<7 znV)R)x2(%F!CQMu4gr5f!24woUM66ynY)xPS~<@R((bqOh9_$trt7iN;8j4p0YvGG zAM%BeUN3V1OsnIk(yW?f8?d-ySxSL;Q=z@YNM1?=rj?Pp(3@64((^e6SbT1q-so9Q z!1{bI+~v&xOjy&lH2ixjb5%NUodqneCAMv+{Se@_0QH_W%~50Ezr@-)^}72-C*OS- zH$OXo^+}(+Z}Pa&ofB#RT1tc^*?Th-UjoxErk0ZTGkUIDn% zJC`*qCBR3(t#&%az`u#m#DvDklF(tRujn&tL+$_@V42dOe1hC170jf7V{c&T|CH~& vP0m?MS$yJ?h*j>s9#QMn_sw?J3Htv5rcvb1t5bKW00000NkvXXu0mjf4jbqd literal 0 HcmV?d00001 diff --git a/multipleShop/images/time.png b/multipleShop/images/time.png new file mode 100644 index 0000000000000000000000000000000000000000..327d87537771c10d10bc57fa149fdc74b7fca876 GIT binary patch literal 569 zcmV-90>=G`P)Px$^GQTOR7gv;Rl#xFFc7@ML;9+Oq=Lj1Sn0s7z)A(79|HLc{Ue}<=?Y9&5O)xD zV7mglgnWSqE<6sP5ov%FGci8W5ajONVsC-)!3#eaA7&A3x7)8=&~CSTKDDq>f-K8c z%jNQlh&G7Wfrmvz&xqIl%dW*@4=*n9A`MBdAfs`_9B`=LJpJK9%5qP=Yh^W+Bcb)R; z5#)K!_S?s*pXz}3eHZ6i>$4OAo8nSy{TOq^SO>m<3q<^-lsXiC_`^dagm^;4Z&g)w zT1Rw#B%*Uf>vgx31HD2jEv|Jylt7KU*afiI#YqSY}u6SAzM1YW~YiBi)Vo=Yjy z5_y8rL!Kh=bFx-S9b)C3O#$HN(92W6ydP$$b>>adroqdcJt?cE$fT4_dlnbN8JZOp zDe#k{A^?OBTDR2J+M9{6yX90pIqU``oG-+Zweh@n&UJAugjlul-NiM>IU;7W;yRG{ zgJX~l0DKup^g=|9wYK@E3n!-cf4?$MvFFq~vo8H9u-N`z|7t@h7P!J700000NkvXX Hu0mjf!rTPE literal 0 HcmV?d00001 diff --git a/multipleShop/images/time.webp b/multipleShop/images/time.webp new file mode 100644 index 0000000000000000000000000000000000000000..914682aebb5c304492b99f529468dc6b577a5c33 GIT binary patch literal 760 zcmWIYbaVT_#J~{l>J$(bU=hK^z`$St#NuG&>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>fl4;UDM5DXHNiwhtutRzs?w`&l!mvynKz%R&|l3JV$RPq6cRf>R?1KlJ7WQ(Lj z*cu>q5`=97VwaZ`lmOKPfY?PLLC!#S3XrXlj>JwvVkZ|AfzZ zZ((5Ab{-*y2$O=uqC~K9EI^VeEscTU({cs|-be-p;R_55T+v`TAc4be3P33tpu6&c zFr6WXA(cUa!IL46A(=rB$T9*(sv(0JFou1Y7#SG!#SgFwtZ!J6E3JCF@BPRBEo`^8 z + page { + background: #FAFAFA; + } + + .multiple { + padding-bottom: 30rpx; + + .multiple-search { + position: sticky; + top: 0; + z-index: 10; + display: flex; + height: 90rpx; + background-color: #fff; + padding: 0 24rpx; + box-sizing: border-box; + + .multiple-search-txt { + position: absolute; + right: 28rpx; + top: 50%; + transform: translateY(-50%); + width: 110rpx; + height: 52rpx; + line-height: 52rpx; + text-align: center; + background: #FFFFFF; + border-radius: 30rpx 30rpx 30rpx 30rpx; + font-size: 28rpx; + color: #20B128; + } + } + + .multiple-card { + padding-top: 24rpx; + + .multiple-card-item { + display: flex; + background: #FFFFFF; + border-radius: 16rpx; + margin: 0 24rpx 20rpx; + padding: 30rpx 0 42rpx 30rpx; + overflow: hidden; + + .multiple-card-item-left { + width: 70%; + border-right: 2rpx solid #F1F1F1; + + .multiple-card-item-left-title { + margin-bottom: 14rpx; + font-weight: bold; + font-size: 28rpx; + color: #444444; + } + + .multiple-card-item-left-tag { + display: flex; + flex-wrap: wrap; + align-items: center; + margin-bottom: 16rpx; + + text { + width: 90rpx; + height: 42rpx; + line-height: 42rpx; + text-align: center; + border-radius: 8rpx; + font-size: 24rpx; + margin-right: 16rpx; + padding: 4rpx 10rpx; + } + + .yellow { + background-color: #FFF8F1; + color: #FFB76D; + } + + .green { + color: #20B128; + background-color: #F2FFF3; + } + } + + .multiple-card-item-left-info { + display: flex; + + &:nth-child(1) { + margin-bottom: 10rpx; + } + + text { + font-weight: 400; + font-size: 24rpx; + color: #777777; + margin-left: 4rpx; + } + } + } + + .multiple-card-item-right { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width: 30%; + + .multiple-card-item-right-distance { + margin-bottom: 20rpx; + font-size: 22rpx; + color: #777777; + } + + .multiple-card-item-right-icon { + display: flex; + align-items: center; + } + } + } + + .active { + position: relative; + border: 2rpx solid #20B128; + + &::after { + content: ""; + display: block; + position: absolute; + right: -34rpx; + bottom: -8rpx; + width: 0; + height: 0; + border-left: 50rpx solid transparent; + border-right: 50rpx solid transparent; + border-bottom: 50rpx solid #20B128; + transform: rotate(135deg); + } + + &::before { + content: "√"; + display: block; + + position: absolute; + right: 10rpx; + bottom: 4rpx; + color: #fff; + z-index: 11; + font-weight: bold; + } + } + } + } + + + + \ No newline at end of file diff --git a/multipleShop/orderVerification/index.vue b/multipleShop/orderVerification/index.vue new file mode 100644 index 0000000..d7d69c6 --- /dev/null +++ b/multipleShop/orderVerification/index.vue @@ -0,0 +1,226 @@ + + + + \ No newline at end of file diff --git a/multipleShop/verificationOrder/detail.vue b/multipleShop/verificationOrder/detail.vue new file mode 100644 index 0000000..158293e --- /dev/null +++ b/multipleShop/verificationOrder/detail.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/multipleShop/verificationOrder/index.vue b/multipleShop/verificationOrder/index.vue new file mode 100644 index 0000000..e4939e3 --- /dev/null +++ b/multipleShop/verificationOrder/index.vue @@ -0,0 +1,191 @@ + + + + \ No newline at end of file diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index b8a6273..084bb82 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,5 +1,5 @@ { - "name": "purchase-let", + "name": "purchase_let", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package-lock.json b/package-lock.json index a22d4b0..959fbf3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "purchase-let", + "name": "purchase_let", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/pages.json b/pages.json index 1787b7b..dcd2c8b 100644 --- a/pages.json +++ b/pages.json @@ -22,6 +22,18 @@ } } }, + { + "path": "pages/index/test", + "style": { + "navigationBarTitleText": "购物", + "disableScroll": true, + "enablePullDownRefresh": false, + "app-plus": { + // 将回弹属性关掉 + "bounce": "none" + } + } + }, { "path": "pages/login/login", "style": { @@ -56,6 +68,34 @@ ], "subPackages": [{ + "root": "multipleShop", + "pages": [{ + "path": "index/index", + "style": { + "navigationBarTitleText": "选择门店", + "enablePullDownRefresh": false + } + + }, { + "path": "verificationOrder/index", + "style": { + "navigationBarTitleText": "核销订单", + "enablePullDownRefresh": false + } + }, { + "path": "verificationOrder/detail", + "style": { + "navigationBarTitleText": "核销订单详情", + "enablePullDownRefresh": false + } + }, { + "path": "orderVerification/index", + "style": { + "navigationBarTitleText": "订单核销", + "enablePullDownRefresh": false + } + }] + }, { "root": "pagesOrder", "pages": [{ "path": "order/order", diff --git a/pages/index/index.vue b/pages/index/index.vue index 9979a56..676697a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,894 +1,898 @@ \ No newline at end of file diff --git a/pages/index/test.vue b/pages/index/test.vue new file mode 100644 index 0000000..2c4d29f --- /dev/null +++ b/pages/index/test.vue @@ -0,0 +1,127 @@ + + + + \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index a8410d3..a69bb94 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -95,9 +95,9 @@ const showOfficial = ref(false); const navToIndex = () => { - if (userStore.userInfo && userStore.token) uni.reLaunch({ - url: '/pages/index/index' - }) + if (userStore.userInfo && userStore.token) uni.reLaunch({ + url: '/pages/index/index' + }) // if (!userStore.userInfo.supplier) uni.reLaunch({ // url: '/pages/index/index' // })