From 6d0e7b3825856f5d8f12fc45142a1bcd0a2be99b Mon Sep 17 00:00:00 2001 From: mabo Date: Tue, 18 May 2021 18:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E4=BD=93=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/assets/iconfont/icomoon.eot | Bin 0 -> 2380 bytes buyer/src/assets/iconfont/icomoon.svg | 14 + buyer/src/assets/iconfont/icomoon.ttf | Bin 0 -> 2216 bytes buyer/src/assets/iconfont/icomoon.woff | Bin 0 -> 2292 bytes buyer/src/assets/iconfont/iconfont.css | 60 +- buyer/src/assets/iconfont/iconfont.eot | Bin 3484 -> 0 bytes buyer/src/assets/iconfont/iconfont.js | 1 - buyer/src/assets/iconfont/iconfont.json | 51 - buyer/src/assets/iconfont/iconfont.svg | 44 - buyer/src/assets/iconfont/iconfont.ttf | Bin 3316 -> 0 bytes buyer/src/assets/iconfont/iconfont.woff | Bin 2312 -> 0 bytes buyer/src/assets/iconfont/iconfont.woff2 | Bin 1868 -> 0 bytes .../src/components/goodsDetail/ShowGoods.vue | 2 +- buyer/src/components/header/Header.vue | 2 +- buyer/src/components/like/index.vue | 2 +- buyer/src/config/index.js | 8 +- buyer/src/pages/Cart.vue | 6 +- buyer/src/pages/Login.vue | 6 +- buyer/src/pages/home/MyShoppingCart.vue | 8 +- .../src/pages/home/memberCenter/Favorites.vue | 2 +- buyer/src/pages/home/orderCenter/MyOrder.vue | 2 +- .../pages/home/orderCenter/OrderDetail.vue | 6 +- buyer/src/pages/payment/Pay.vue | 12 +- buyer/src/pages/shopEntry/first-apply.vue | 26 +- buyer/src/pages/shopEntry/shop-entry.vue | 8 +- buyer/src/pages/shopEntry/third-apply.vue | 5 + manager/package.json | 1 + manager/src/assets/qrcode.svg | 1 + manager/src/config/index.js | 8 +- manager/src/libs/icon.js | 3513 ----------------- .../views/my-components/lili/icon-choose.vue | 221 -- .../views/promotion/coupon/couponPublish.vue | 4 +- .../promotion/pointsGoods/addPointsGoods.vue | 2 +- .../src/views/sys/menu-manage/menuManage.vue | 59 +- seller/package.json | 1 + seller/src/assets/qrcode.svg | 1 + seller/src/libs/icon.js | 3513 ----------------- seller/src/main.js | 6 + .../views/distribution/distributionGoods.vue | 2 +- .../goods/goods-seller/goodsOperation.vue | 17 +- seller/src/views/promotion/coupon/coupon.vue | 5 +- .../views/promotion/coupon/couponPublish.vue | 3 +- .../views/promotion/fullCut/newFullCut.vue | 2 +- .../views/promotion/pintuan/pintuanGoods.vue | 2 +- .../views/promotion/seckill/seckillGoods.vue | 2 +- 45 files changed, 135 insertions(+), 7493 deletions(-) create mode 100644 buyer/src/assets/iconfont/icomoon.eot create mode 100644 buyer/src/assets/iconfont/icomoon.svg create mode 100644 buyer/src/assets/iconfont/icomoon.ttf create mode 100644 buyer/src/assets/iconfont/icomoon.woff delete mode 100644 buyer/src/assets/iconfont/iconfont.eot delete mode 100644 buyer/src/assets/iconfont/iconfont.js delete mode 100644 buyer/src/assets/iconfont/iconfont.json delete mode 100644 buyer/src/assets/iconfont/iconfont.svg delete mode 100644 buyer/src/assets/iconfont/iconfont.ttf delete mode 100644 buyer/src/assets/iconfont/iconfont.woff delete mode 100644 buyer/src/assets/iconfont/iconfont.woff2 create mode 100644 manager/src/assets/qrcode.svg delete mode 100644 manager/src/libs/icon.js delete mode 100644 manager/src/views/my-components/lili/icon-choose.vue create mode 100644 seller/src/assets/qrcode.svg delete mode 100644 seller/src/libs/icon.js diff --git a/buyer/src/assets/iconfont/icomoon.eot b/buyer/src/assets/iconfont/icomoon.eot new file mode 100644 index 0000000000000000000000000000000000000000..5a5b53d373f1261ad6934976642f5d4b111fe746 GIT binary patch literal 2380 zcmaJ@OKcNI82)G9YkPO?-K-yR;`l+FG!BXFT{}FQ2ND7j5?%!Y2q-2t2`Gs}Vx)ko z(sJkvsia4GBkG}Qs~&npJw)Qrs&MM5hgNOHiT0FAJ+(CbXLo^wMEu&B`R4!s`Df;v z*_j!Y0X~-i2r#fw2rLn*89lO5PkmiUJ-B-MWgCDBmtg|xFoUTMv*@70F{r^LT!U$- zz&vWga1u51uzBu#i9eMsHEm`R`EkEv5?-GnKi>$sa#L zrxvUqpR6p*VHw0aEv3on>z5kS(Z^U{1mJ#}s#U5j-^5k{gd=D#PoYA5!2W>s53s&% zYNoLmCV*J@3hT+~`b34j&tQDv5!UsY%HkYGr}f{ceYP@FyE`KP10Z6Ryf;^0Xy700v>?5%g_jS+>-nW7D4Ve2*F`*lp%m8EW5I{0z)h&G*T{}NzwtdH=0_| z=9aAE)dC#sK)nwnTwDfq$tUdE)3r6HRq_cqn5;dHaM*5rTml5Wv~@b%9DO?-mluAo z)-f=JbAOk;34PGOVVBC;jvj(vCM}36!7pNBO3=>=(=u!o`vyo~xo;P-ie(38JH#f( z+i7Mtp^IZcH~bunkRxdtI9uwl%O%u05iwpH5!p+ORgCRQ31|8T&hY77QL9K4O%z&n zUpNqmw~Q4FJ9icfhvM-7Aw-M&HItK?w9^dJzBnqFsu7PHdW?Y;RXr zo($O5h}lFK`-BlX)F0U%*?zPY1AH7C|HO`EmEJvjdX;RqKS_{DY|#HjbO{begmi|FJSWjAhLKireRur&u9>~E zrpZbuq>QP-psJXrB40Uo{&pwI?epiZtiul@?co#A?xJA~<#L5wXXlU^mV^M`)!ts# zf*i~Hd2%*1q-XTwjmGiAH}aYP#+67!3FtbRl2w)V5+Ez8Pf}IMr(O*zs-~$*klfkS zmDlalw?#2`pzUxzw+*|{0)g&CqMad{W~I{|N>m|7`?s-j^}zmWb${o+W^$8;qhY^% z)(PE<^bEsv`s#z!o7(GtgP)^X`1$)k?!PE;l?bj99^|-pUBNcaSqvPFKy#<`thA8a zNUnx9!}=8U!?NwU%?C}8fJY=tzF?-&iAIs|&Y@Qb{ZlrJ3SWDD5%;2TTo}X`JUxrJ z>|qY^H4pQ6bDAC&P=Csg;j_yV^_hBocH=AHWNm)oa(y;g=*e$=^>5i~OXacJ + + +Generated by IcoMoon + + + + + + + + + + \ No newline at end of file diff --git a/buyer/src/assets/iconfont/icomoon.ttf b/buyer/src/assets/iconfont/icomoon.ttf new file mode 100644 index 0000000000000000000000000000000000000000..b63f6d43ced31f4d9052ebfee5e4fe8caf067d84 GIT binary patch literal 2216 zcmaJ?O>7fK6n?Y+YkPO?-K>A&#PJVt(l{ixckS@g{2(D9A%Q}H00N4MO#({nkQgbT zsdvCrO z&j0}cKfDbr_Ta*a6c~8D%Gy9W19fNYp5?Tpg_FOevji1aJ+3{sks&=fLQnv$H~RUT!p>Ipnu^Z zj`gL=+A?~l<6o)1URkQ$nUeno5OGM}TW+j2F;6TK^_K*e{gm7W9)P*SP!G482k}PK4x1_ zS}kW*@-aA=v>rt`oY(G`06{CQO~wF>>~u_?+r3=IzyhxQ9rgx{Koiq0m9u?A1iwsL z5LJR-#KfAQpB1Kk*eZ^Uk&*JqE@BnS4$St69gej#&FnxEM}cPeIT|5H($sOb)MuAV zD0MudzaAp87a6M<+m#YdkB*(@)4QTpktmudbnCuwAQ11GDHe9_EEW#M;{ig57WZo= zCv|A27^Zh^S};{39yjzD8yyZOMNH;q8 zI5zu<9m^`id-e<~*_eHMHmUS?n+Z`6N`txa5SH=WV96&-oq8gt&S-IE_d!{bbw$xN zKO2yg-Y6$=1DSMQRl??UxilW)J5^&j6`796eqQd%66a{){=i+1Fh9c{WY*61*|>V- z08u_&a5+Y@B85mQEl}1{NVmsc0hvRZ#)-pLsj!0-ILsXj$6&K51Z5*G3hVzopsQy~ z>!K7ld?DdaLKx3*gW(v4X9$axA)CAyH{_tO9yg5mx)AaiaY@)j1;evg88oH`j)9)m zFYIsZT|B3=n01;S0!*%b=S#M;lNlmp`%s&}oP|u9Vr)xxc?8#};#Rwd!#N>Vq3C#^ zO@fF82CB0s-_2rq_vCD~9TQnjXky4`c1~J7b|_>g?8(lsFC+%LWkoW0nJ0!m{>s4c z@W8;Bp)h+?75r$SZ zd$|oii1db!M+b|BF_Fs^a{c`iW>^ve{6KGSSqpM3@8`*x(1f1Rk2Rae4qwk_{+(4K z5hbAOWITn6>paDx*8&E${ zTUou-s3!|Uc{l+zSb;hcFcG6kEjJp8L(S2pN I?#(mFe}@n{;s5{u literal 0 HcmV?d00001 diff --git a/buyer/src/assets/iconfont/icomoon.woff b/buyer/src/assets/iconfont/icomoon.woff new file mode 100644 index 0000000000000000000000000000000000000000..1a942db4ebcd025eb0439b3825532b15b049c8b2 GIT binary patch literal 2292 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 diff --git a/buyer/src/assets/iconfont/iconfont.js b/buyer/src/assets/iconfont/iconfont.js deleted file mode 100644 index 9e350850..00000000 --- a/buyer/src/assets/iconfont/iconfont.js +++ /dev/null @@ -1 +0,0 @@ -!function(t){var e,c,o,n,i,l,a='',d=(d=document.getElementsByTagName("script"))[d.length-1].getAttribute("data-injectcss");if(d&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}function s(){i||(i=!0,o())}e=function(){var t,e,c,o;(o=document.createElement("div")).innerHTML=a,a=null,(c=o.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",t=c,(e=document.body).firstChild?(o=t,(c=e.firstChild).parentNode.insertBefore(o,c)):e.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),e()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(o=e,n=t.document,i=!1,(l=function(){try{n.documentElement.doScroll("left")}catch(t){return void setTimeout(l,50)}s()})(),n.onreadystatechange=function(){"complete"==n.readyState&&(n.onreadystatechange=null,s())})}(window); \ No newline at end of file diff --git a/buyer/src/assets/iconfont/iconfont.json b/buyer/src/assets/iconfont/iconfont.json deleted file mode 100644 index df039ece..00000000 --- a/buyer/src/assets/iconfont/iconfont.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "id": "2274088", - "name": "lili shop", - "font_family": "iconfont", - "css_prefix_text": "icon-", - "description": "", - "glyphs": [ - { - "icon_id": "829012", - "name": "QQ", - "font_class": "qq", - "unicode": "e6e6", - "unicode_decimal": 59110 - }, - { - "icon_id": "2450774", - "name": "微信", - "font_class": "weixin", - "unicode": "e643", - "unicode_decimal": 58947 - }, - { - "icon_id": "7010369", - "name": "支付宝", - "font_class": "zhifubao", - "unicode": "e601", - "unicode_decimal": 58881 - }, - { - "icon_id": "10615183", - "name": "服务评价-客服", - "font_class": "kefu", - "unicode": "e673", - "unicode_decimal": 58995 - }, - { - "icon_id": "13090705", - "name": "下一步", - "font_class": "xiayibu", - "unicode": "e600", - "unicode_decimal": 58880 - }, - { - "icon_id": "14510226", - "name": "微博", - "font_class": "weibo", - "unicode": "eb0e", - "unicode_decimal": 60174 - } - ] -} diff --git a/buyer/src/assets/iconfont/iconfont.svg b/buyer/src/assets/iconfont/iconfont.svg deleted file mode 100644 index 5355dc73..00000000 --- a/buyer/src/assets/iconfont/iconfont.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - -Created by iconfont - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/buyer/src/assets/iconfont/iconfont.ttf b/buyer/src/assets/iconfont/iconfont.ttf deleted file mode 100644 index 300049b326fa305b85e0fea171ccfab20644a7bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3316 zcmd^BTW=f36+UP0yW}pH*X3OlNs)>rQz9vm@s+OaNUFIfj-n!&nzj!u=5W( z%QO4UIcLtyxy*0@0l)zpz{BX|iBtQ3)%o>T0Qe$t_fMS|DeS&Ze(6aEcRdSS7(9%btR z{*k(9qd8j@(o&M<|DML?Vs(8PLvWkqK^iBPs*AO~Cp&KgXoCRU;&OAXHI)8V6~Or+ z$zKDq#cynGz;^}PD)si8WLr(PImG>-(*Lj5UAzAc4#AfFb@R&x1Ks!LhJgGA4He)R zmm0Gq!_SGs8slp80Bo`$H73^}4#R*4Ctf*8dR@a^2{!8ItM*)`ha_WCBo2bqn@wW@ z@CJyWaM!uJ#C^Z}#s^S9T9*TnC+;`2qw_D#!M-*;FuMNJ-Zw~%twoJ3^&F9m@u-PJ z%kktGxDFmsqyiq|AtA>VeTEyP}wl zIrtA= za;dx*%lSB30V|Gjo`buchoXq)-MeUtV&~yqRJEAP@C8CRG2U17xX0q-6I?jp*Ugx! zD_&I-ubr!26IIo#IQc4@@wA1<*A>&Bj>|zklyEv6&O}HL%JH<{RP@Ph9%KC`&)r%# zJliI9c82J5(m4keJapd1VFIS;?4Ko%l9De_ER@DFS=OZ_&%At_mug^Kal02m;0th$s%|5Fwea)6%OLDJ!wVY&K*8fMXVlr;U%omT(ai$nY`5=-!HjR^#*J%#8y#{g- zpWJ8plfqAqf3ItfdYn7;USfw!6`g^Ik4IBcBuR7VaaY`h81%$n^v8C_c1g;i*iQaj zCDz|PKbxQP*ZF;rg%fa+qA^|~C$nAmC34%M!ncD{?7CYlP|24vvX5kPCem`c4(Ee#jv=e!}N|b&s{(+I}=nfqFG`=EhhdJX%4ljD`ziH%=$? z7oz@{tT#3gHyU0u9UrR1!n+TvZco_ba!8)gsG>~IB7gImxjk?p9eO#WIz*)}jdXFa zy95N}Zc!Wn$1)?B8R6JD>BD{leF3YV+>LXk3jL6r%a4*WrAy?#HqsIO_J6>0Kr&^EVph3 z%(N;YuV{k&mSL853?J!BtJ`AxlDacH86Q$sT=`f!FLJz+-Bt9vx#*Kh6+6NB$wJUd z?U@}a#iD!Ow#H(}`Fw-ER7?|PqY$d7QPb&ErGj74B+enz{m6-HoI~MN4V~%al%P7% zp~|y#u?(QkaJm>7f`Wpk$(%B!%6^HDCo;$5J`;s-c2TgDaUupH$#Xld?9!x2*wQp!bRd<1p$pz`f1%0fbkm}inhGl_a)xT{P&9fS z9_%N!$BCRdRA$-qz~8$SMc7YdR~PjPjk=hlFQ!-z^Tbd0ut1o;lb8|upL4)i4@<xW diff --git a/buyer/src/assets/iconfont/iconfont.woff b/buyer/src/assets/iconfont/iconfont.woff deleted file mode 100644 index 45836ec623da0040fe61e4c6ff869a3ce6eeba37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2312 zcmY*bXH=8f7X6aYLWf63ihzoRp-L|jIv4^bfV7Yh2q=akptMnXlU`Lo0qI4hg9eNY zQi38S3L+(ffPx4p9VG8_X5No?*4pcwz1O+to^^lhb#J0fO#ui12AmDx_?aF_S z>K-dpfzlBrnGp9ggxoC5k!T3V{0~G0uK8Q-KGn zgz#%mR=2|b{IK;stSLXl2%-L=pv^)|$o75)hW9btrW(nPDPM?UE0dvF8Q0o3=Q`Qd z(1b5g|8r?J^igKUzVR(Xtc}z@w{AWu{pQESt&kfL#KY7VYY~BLvY#Iwd_!$RM*7d) zlVy_YcAYaR6VDPe$0O$;nk*P9o;1<+$XB;6&Q@btGTK)bc)JCqb6MUvcx%GGvL$8+y5(x7!IAt&rJxQ(Zm!rEo#~gW6QPh${GDR?XAbZ%7A57#_H>65Gdov@;4!lI zUE)k@XXlaX;r{51WKIU7=|~FurEt(%J@U`Mz3%bTuCC9mJJ>5PC7jJ`2`g$?sjc)= zsoHUlUs-%D;9|#R^zI@$MnSKh@KG&rz+)&@iqCiL{H}vrfPO$-yGm-}=A6o-hjqK6 zn&;henV)r$n;}mdg6O37=rx&cKO-fC{PLzwcz0T{rB4-CR_@&A(C^au!5KaBLa=#} zo__f>&Z@Ed!tcASC%EQ46DZq*p=DjkRtG+`-9JNud8m?!~ViB1l zNd6>1?`NJ9T=Y!nYVp>K+rD8>F7VqOXPn4~eY_QHX#|Jqhn=XXJ3U3$=1Jg+cFq!|G@s z1j}`Hh#Ntruk1CiRo15rYfcnol^@;|Uw`#PzM)}C@N0HI={T7ADdY>yzViz~rj|v7YsXyvH5RHvvjpQ)+M5oST*+Ibh@N>0t z#vPZL)tHKfjDawzVCiA*O6kJV4Xx9N0pR17rMX72EsuB)>n$;1!ZYLj(W=GG)fW#Z zyZoAlTB)IDvTdQ&$pPldMb<` zZ__j-H(^~^*)I`ITdtF65gRE^!`~A>*JES=*#I7fbfh`YlR0*>u$CIGO*Q5e4?Frp zQKDMldPqY}iZFM6aDA)D#r}c;(~?Qv)7d_O3a3nd9#{(=+@oJpowr+5L>k8(9xh>@ z1GLt@ZAFkw-HLSA&WY`da=;JAFsewr8RPb0X?!|lz=Ax zufGFx7Td{d^LwN&75^rsNXjaM=Q{5ugGI=6kwrQ`CJHXc4xrXJ*8bQ3k7YwWl$8Jr zrBtQ~h?y4jIyegt`nzFY3a=OdnFl1n`G1E8unV~bg+dW9`G4=jdEM=$yab>ZFT7@s z<>X|%j9>voJRxLozGphp8ua}*w|&+!{+cRW!e?f8i2N_UTHniS-{4$utUF6FL>Cvu=K>Ks~Q-mK;hz0aJ8V$+TI8olHF!6`ku`!tKJ3(YJYhGu&be zyyxxOO@1LK`cx~rNkRC~nDKV^?bw@m9*GFHasO1*C+#i8Pb_=R?MXU^>}|sv%ia2m zScmphGsW#bd&NR*^@8E6k^z})tryYvuxnXy^`py$KF&QS(J{qt7U-fY&eP~`<3>v| zf{xiW@LFw)6l(p4<{9 diff --git a/buyer/src/assets/iconfont/iconfont.woff2 b/buyer/src/assets/iconfont/iconfont.woff2 deleted file mode 100644 index 887e2f283ec4e9f213f4bb202ae8ca2578264ed9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1868 zcmV-S2ebHhPew8T0RR9100&F}3jhEB01Wg100#X40RR9100000000000000000000 z0000SLIzdLM^HUcCA919Qt1Rw>3Z3kH!<_gG;kxNdN<^O+4Jp8ktyYEj# z5}C8okW3`vNkl?{(}`9CeF7!y_;=HLB(!OuqM=U3jf!u`yolCd=CFCYISW&xGcjah z{$&TpQa`Q1^1kg|Dg!I=>G>&YJg~^7A8q)&2@P<_TVQ8fK9h7g0Tcy^hn9JDd?4Ti zbwI(sMkN8lWr4?#1EF^aIW!IE9hit@CgUoAH~r`1A5wz=NH9|%?7FsBA&25Id~m_^ z|DR!iiU4VOE-*)d6fgqPARa?K*DzBx(lun*@8IfyG6DlWMz70W4}JamgUkQ_jKQT4 za)Hf7OoI$8m$X0syvPEnDFb#rn+0Q#`DDNt@kxPk8J`4`=;QtmP%&`buDbBeJ~~ zYK$BGmPcHO76~5+u-uvuvrXz8OZI%wZD1#`!2t?U-mu|MCuRnYKaF3ri?L#A)68APO zqmI}k_F1c!?eS+L79!;&ZDO$ilq5X**-~s3j74@^uiL_vHr`oFfTj4RMF7U-zDvvz z8(2l&jny5uDR|j-zMgZ^!e2^uZPuGv-J7Tjc~^=|RK?;(ui+DX#hzrgR&Ur>QCWhw z*H{DX<0F}bbkdNwz-@hoT_W81#>Gp_8#YlQ%0!`1{$ylO88?G|1FL%rGSFE@FQd1& zi89b4+UIilUQ6^*YmWI`RyXT_J??~!zxZN!*L6RdT6W^Xxft`BL4E!(n{D7$OZocn z^z*jd>$WtzXwwBVhogt6p94_`wgng$d0(;$>5VjPFtL#7T+E^s9HWu+p^H%o3?zA4 zd*N}LR~Nn1M47Awx44+(3hwHPUlE0>NNKfCM~pDtczLHlINh132+jzO^CR|Ge2)kzv{?~F|5Ex8kV;(Kpgbz%r?Y0@{R&5J&{*EuaeGxJpc67x%~J47f|S5 z8D6!s!>$5BEaKbBK@J-NY^A)Km}p+0DGU$^Shq!4LaQG=gqUQ-kM zN0g_B0BKto)r=~wSOCq2ZkT5y63Va2T?YBL`2Y8JQTLD!Js*S#Ol=BaY@6T zrhdBVUgo!Mql=GxP>32EJuS2u2Bwey{d=5L;j>-!7e%&V;vp?UJw+-)F z$Z%_nBA84kzxYRw1FKwgTsh@_jpDlmcIR#m+?>Z0Ih9uL58R)-0P|}JY6=i=A#=0A z7l~5mdZJQat+4RvQ&C|{neVr-l(`^Wxcat@e>5_mE=kTXZns#eh7p%DzJ3iW_W~@B0r&`iDsy4G zIJ@lPmP{r|LGubS&| zgy{i}M=hk5UY*u7Doyc~3)Wov-9grdj#MLu1_B)6CPlFaT$O>Q$K~ldsihA9owp4M zM}d$+2uG%|@sPoi4q1dED2h{gbcv@SFevQ=V9`_p5H~x3!Nm!{xVeVJv5$bs$0u;$ z78sC(;dx4y$k32wLllx>3OQFgnyZm%JC%}s7-3;PQy8Dcak$T-^|Dt3oy`Q9W#!E;lJj8MbGlOxppZ zGD9dx3{yGfxTHo4YRG7HQuZH)^nHIX3M#|3lNb`y@e>wO*t;4Htez`HqU03FN=;{~ zj%_I)Y6O*3!_cL~mFtJl>cGWAmqNRk(c;pDZ`4XbW|&0k94Vb#N!U%9R+Cu2u46e* zK#}lDxnLj+;fRSGkRu|1aWdFpq(U=F(@Bg`Ym~#K5-r}Q(90c1X(XdH(&5aAuv7~G G0001c*LI8m diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 2083586b..26cbbab2 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -60,7 +60,7 @@ :key="index" @click="receiveCoupon(item.id)" > - 满{{ item.consumeThreshold }}减{{item.price}} + 满{{ item.consumeThreshold }}减{{item.price | unitPrice}} 满{{ item.consumeThreshold }}打{{item.couponDiscount}}折

diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue index 182a7183..79ef6eb0 100644 --- a/buyer/src/components/header/Header.vue +++ b/buyer/src/components/header/Header.vue @@ -54,7 +54,7 @@
  • 我的订单
  • 我的足迹
  • - {{cartNum < 100 ? cartNum : '99'}} + {{cartNum < 100 ? cartNum : '99'}}
    {{ item.title }}
    -
    {{ item.price }}
    +
    {{ item.price | unitPrice }}
    diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index 4f37451c..d5cc3dc7 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -17,10 +17,10 @@ export default { * @description api请求基础路径 */ api_dev: { - common: 'http://127.0.0.1:8890', - buyer: 'http://127.0.0.1:8888', - seller: 'http://127.0.0.1:8889', - manager: 'http://127.0.0.1:8887' + common: 'https://common-api.pickmall.cn', + buyer: 'https://buyer-api.pickmall.cn', + seller: 'https://store-api.pickmall.cn', + manager: 'https://admin-api.pickmall.cn' }, api_prod: { common: 'https://common-api.pickmall.cn', diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index 53292ba0..b5b99543 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -17,9 +17,9 @@
    1.我的购物车 - + 2.填写订单信息 - + 3.成功提交订单
    @@ -44,7 +44,7 @@
    {{shop.storeName}} - +
    diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue index 284ce2fe..a078e266 100644 --- a/buyer/src/pages/Login.vue +++ b/buyer/src/pages/Login.vue @@ -112,10 +112,8 @@ 忘记密码 diff --git a/buyer/src/pages/home/MyShoppingCart.vue b/buyer/src/pages/home/MyShoppingCart.vue index 0e29dda2..f768dec1 100644 --- a/buyer/src/pages/home/MyShoppingCart.vue +++ b/buyer/src/pages/home/MyShoppingCart.vue @@ -1,6 +1,10 @@