From 022a177455cd4ba3bf7b86fd9ddcb1e31a924c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= Date: Mon, 19 Oct 2020 11:08:44 +0800 Subject: [PATCH] =?UTF-8?q?Add=20#15=20=E6=B5=81=E9=87=8F=E9=A2=9D?= =?UTF-8?q?=E5=BA=A6=E5=8D=95=E4=BD=8D=20=E4=B8=8B=E6=8B=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/ShopController.php | 3 ++- {sql => database/update}/2.5.0.sql | 0 public/assets/images/logo64.png | Bin 4911 -> 8366 bytes public/favicon.ico | Bin 1150 -> 1150 bytes public/index.php | 4 +-- resources/views/admin/shop/info.blade.php | 25 ++++++++++++++++-- 6 files changed, 26 insertions(+), 6 deletions(-) rename {sql => database/update}/2.5.0.sql (100%) diff --git a/app/Http/Controllers/Admin/ShopController.php b/app/Http/Controllers/Admin/ShopController.php index f0e31091..f4a22f9e 100644 --- a/app/Http/Controllers/Admin/ShopController.php +++ b/app/Http/Controllers/Admin/ShopController.php @@ -65,7 +65,8 @@ class ShopController extends Controller } try { - $data = $request->except('_token', 'logo'); + $data = $request->except('_token', 'logo', 'traffic', 'traffic_unit'); + $data['traffic'] = $request->input('traffic') * $request->input('traffic_unit') ?? 1; $data['logo'] = $logo ?? null; $data['is_hot'] = $request->input('is_hot') ? 1 : 0; $data['status'] = $request->input('status') ? 1 : 0; diff --git a/sql/2.5.0.sql b/database/update/2.5.0.sql similarity index 100% rename from sql/2.5.0.sql rename to database/update/2.5.0.sql diff --git a/public/assets/images/logo64.png b/public/assets/images/logo64.png index dda452297f8afa7c54dc4590b2402beb01ccce47..6a5f4f840dd82c22d1eecf4c959b983f018204b0 100644 GIT binary patch literal 8366 zcmZ{KWl)?=u=TRI2X_e`f1hUxTwh0>C;p4qk z-@kk7sb}WbO!rJzpYA?Ak*dn_xLA}}0002@^CubgmpS3T9|P@WM96KmzD#JQ3i2|5 z=l{O^uCinRfFAH!=Dnt8_ECJth`8x^o@9JFs@d(a-T1xZLVLp}dj4eTMa+;8^HiU_bvjHY zCjN{JCJ#dTlYpeQ>#x^q(-Mdkm)vveKLz2m-v9f6&YD=m)!Q90jX1C(9|izGN9gnn za3qGrpY#3w{WONU-I}wE`Q+bIQgGklm;rf=WTG_Ph!gN}&{muZ!viOwdY0tFl<;P4 zB(PrUl;Hkv^6TsC>Bz%QQ5?T&r{s9}G{mcr2`|a|CIV zn)Z|j0fVF?q5k7RjI@EKa{@j8?jPqm>R;VA25N$QCD*H=cO0u$;;bp=$kVsJ-S?VJ z3c0(I@Q`YQwt5ds%RO<>V{HwWg3x9F=Xg6kjHvCtIFRyQtQLs=BCDNZJdnT3sFoW< zaqI#-yY)39&<$}(&bb%0!yQOJJoTI}W@zw(;%jPYr7ke$w(gYg7oMG+^=q2%eUW83 z+UgSve?9ywBIe`h#Nx~%e1r<+Yv_ea*S`CzS2Z6ZH8O!&<{L|MK&Un?)8)zvX9IwJrBkuL*-$M=iyyO(t zczvAH{sG53rNzhVvh65pRO(nLx(Qnpwi;O-?qW##xLQ|Y*C1o`39S(C!A`+I{Fl!n zL}hVk$uOGUt6{T8oPj@O(BPn$nzwpyhhHpJ179#c`Ic$1-<+c?Ools~VGT6IoO`YI}X~?@5lfCctG%keZzG0Ak!|6yYv!mkW zVy2{| z(6BHdB7Slh>#(M9>k_ALUV0-uEDLkE^U+VZJ`nBMw|U&h>-{G~AbMeK_|ff+t2pc5(4*f*D;-l`j6j=2704e;c=kOuFsi3#7!vUll=N0RNtV)`$rZEU$zQ zOmLgm+1V-OA*YwaPw010jkY*F$CN9?>+{&CbP9OcsnmK4$+NA#P$P;o+?$|n`QTDn zrO6Y}X>@Y;vhZAX=Yz2}^b7=pv$M0~9mOH3ay9rj#*B$IsB9t zsXAqOSGAV+dE_N$FnusGT5IS%4V04AE!9uGY=pYEV$V4tb^ZGm z>3E;JUf9rj*v{#+y)?Wl5GR0)<5&hEU#PXgC}$zuyn{%Nyv9D;Ewxb|o1T6i%h*XC zIk@yMfQ|@I4wrnx^zV6|jboYRMUwc}E8VR55WJdK+TSwKeOw)~1tk@F_Hu}8xlRc! zy2d&?F1=jQZtwgk`*k#GpJrV7c_W9)#l>a8&9*;B+TZ^PZGcA^Ao*F=pTSw*#>OUG zH1mjPrYOGjbR!#VhOz*#Iufb5*qhfUswVB448T!Rna&k;6(+jJUwJ#zRr1!e_3+-E zq=A|4>#C;r-97d__qy6+S(v~6H6u57?O1&kT}e3$Wm0OYyPrJarzaLk--Sq>cVK#F z?rN#`T{y=?O&Zjp7kg6O>$vVV4J)Y3eP%*_h@g^seg1HCF%Y9heQEYZ=AZ=GeLin*i(z`X(;b9!sJD(@- z>A-Y^N73Osu8XVTFZ-O>Dq4aqF%%2zHxFlgmcI4h$L{_Ne6}ah@8?A%;j`!WyyA_d0EarH}AnLlD|r zO5Uz_TYGs^(>^P_*>NnXB?G*v0CjmxgT19)p}?d2#qeB1j;S2=@bFM8vol6)?q=d+ zS1^cjv5_-h+M zOCzdC$G-?VH6ojTjE)C=+pRVeCh4=H2l&ljw|-xfo%Qag{FXDlqtPM4L93N{H{s^)HX=$-^39!FMa#EjV{?_1mQ+7mItN;?4X@UELJRqVu+E@QJE zi_}#RlH2?>KTps8U&NNzXvTJIKdZ;Pw_ulcW|r1bJnbG}mJ2%R9E+6hR>3+HVG8SN z&0kdMeycQ}jWp7>uJ6IfQ;s~*yDtc9mV62z1WU(HQN%L8P2!5G3t8$BdAngn|Au(tY*X-JELmAKg-4Kle zQm(fc zK43wv_(v#kG&r2MdmZ3E(=nZ^><(hPxVQ=BHjHkSGaWC8FhCQq`{MT2Hhwp1-Qm+& zW;^u`-d*UyRz*`1pg5WXhDgkN>SN_z>&_n{S(cRwHfSY&htk!I^O1`nab8Pt!U6n)nSNpRium#7%V^7 z>=MxpG$&iMa@lR-X8mp~#KO%D5&4&>@i+RX2sBd_QLlvbc#!YJJ$*_1h$xnPT;I1R z&jUt!VUdX0K93;IV^PCclS1C~PrID!3j8I0;(H3GmN0g_KZ1m&sZoq@*9LTTeRdU+ z*?EJWJdKG0EZRnoo(s7o75Q5?aTpnHA^008#$gBV@zC;no{FX050_q+&wJbE z=SRoCVK9lj#6;dSG**qAxCm7X!l+$^sxhoVUEk_5M$P5EP z9txa~>qz5fk!78oz9@K+=&Ex9MEoVIJ)Sh#d{kvKC)XoKwZp^-CQMSmYACOK zUQ;NpE9-g5$aaM*&!a=+!hs>a@3t|iQ?;NO)~95;pqlBiF{o6S155>mD8AyjhHG(vP)+Uu9>+Nm_`RAq+ zj*#WXiiH}(j%+={x`~6!VIyW|z{d5xHUKl0nl;kW-28%8@T-pE_Ib#HoJx*p6OJd2 z=ht6_vNfNWoEuHZrO-;DP^nZ;fUT`97Vf|gH(#VO!nN>!+cAMm)Och7UNVtpJEzC* zZ!{PLCg!{Gaf9RRL)W`T+CNhN1FFNEKQGpCiS%zeX3dl5sB;Qnv9mC2{q)5ZSP?Iq zUDJL=Fk-|oz~kNGwN??6Wd?Vz#}iC02p;}*k7|E!vJW^ldisv>Nrsvz!G!#c%fxR( zHQ3Et4tSn>)-)Fg=v2{qd z1q||ns_5#pcyZV7@CO1iD;6AKU zn_`M0fbJi#zs=7acI4jjmx7ZSNXcjZ33ubS5%Dc_d0A)z>BF`=s&bdi0lXgd+iyH3 z(Iy{9Em>JvgYA0R;B`Q`jPIo&^*eEB}mZMVifDG zu6KcjrHK9z8?7_qpaWNY>|bwaZeOWHI%buOiIT>$W{X6Q=0pX zWMO4)&a}Jj2_8Oj&x`-KHVXJpiFo%fsNb`)I;b6;FP+45xAW@#-u}%dDD?3nX6IK^o|&#J}RHd3A}iJJ@TnL5ZS}8fau9&1Z`7&7age0 z_RsU97oc~WRyz~ki-M{k##b1cGj$#nL?QNYE_ODyKX=U2a{_ZmEZ~qt_6v=YT9X-h zdvCJ@%-?20p7XEDLFI%6W6evJ7@$7-U5nG2wj-elQiz&jKXdF{M{%t9hX)r_!&k`g8Wd!o*^}XdG&OFqSkxmI) zaG&lAlj;ayrvZQZ>9f~4FvVFhdKwjVP(lI z*^nRBaky{vqpAKB{KR|1?1<+h2D4S}V#{0Z*Tw)d`qGf5o;EhF zMe(BXu4a9=ZdS-}94=@=C}-)MS29KCaa^-B=)ZPVBSKTv)y*Km3S|ed`k|+U4s4#j zI07t#->tahLi;tRf&3fnWt|#6T|)L$QTb3%_oIr4sms zs2J8gU*#;d@qS@zlH23BDuMuVG2}nS5$6(I49`c#f~Y6H>(}68LWz~xuwALbjVbyM zk^ZPF6q&3_c~uPpoYip|K%v>0kj5RNATP`GfMahX^}V!Zfyr>kwX6F?^C4tI9b}~c zGPy>M@o<;CVnFt38UbCZ!MFS zzTMceJ2v4Bm>mW+-?Fo_Tc&0DlhL;dwAda_S7BQZuV$5H zV|cgyw6SEXd%^eBU+cN0`O&YXczm^EXK$|t`B>?_7Ng>v?&_>T^8AG~~~om%@13o#|)9bVH1a_TpWejkotNLEVut){NSRO zJ=VAJj%((91)IFf3kMOO-xnbPGP;(!_7umZx{!Dc|L|TJ{b}v+Ve&7tw^FA}du(8w z@K!|K3lB(0+jWHD$7esy8|tPc^l1r+o`-4G+?#!@E=!u8XRi5(x!55mV1_3K9Pw!m za0C4DA>%us_DHgrht;f9+2(D510%il;*=f;q9ALOiVNYM7DPh3ZnnKMU#>lrw8FM3 zF2o@rAz^&Gi(q9ry7zqZ7zrF6fGv(f*`e^t|$>U;{Ye?^A zs{urzir?v&ixfd$*xi=?^#V)xK_=wjtr>la7z` z?XnrU>HYTR9eo*Nj2gM(K&tl1>lF%bt>vc4;%US2_OE>JXpL$;{OMnjS3-qcE!)9b#pjE&lG4GU8?`FS%0CH7Yi*&2 zc;lFSmY&udE@TjLou=`P?fMwp>n^yIdh<{Uaxr`ioKc!<4Jn3Z?(Xgu1)cWFfF!UB zl_yFwrS=erX9@p0x!k15?|;sFWdViRSe+|;IxQrx0!OynmQJqe7#MO)$(u`tcc2J# zqGn3H7SdO}3G4WHdEy@CwNdsp?(p>x z&dsRX;9GaYfzFE8jw329Nyq9nUM8>L2b2yUQ}x@t_v6z4wr0T=vMM_stC2AloBh0B z3Vk;phUl5j$T;u5)hDi2k0iPuqawRciNjHsHU~+uU@E@!%avD>26LLcD~|huabx&r z2R-6y&&Br&3Q0}W#xJwl1uGNaHweVGm%gDvUW*~Ef@4RZ5*Es=1Ex?G)vUrm zmofxiDQsZ0@r90zjyk%NclR7*LF>8dvdYgGQeM`=V*8mg?;7KWz*Y{X((Z8lzfF*= z!&MpMiGNz)f0!CzI=^;qYCIym@QRw6y_4~owjtkvh9B&01jik~uN@K23-f)!{d1^|8zd&!rMfS32Bgh<%&|u`>Xzmdx`5U`hAcFyu_Rzz4%195R8YL8A_~h8PBapNzH|m z)m5=E{b`B0W}addUl+syn0jy=EEIVXHV3_tb-K^hP*TFB5^6qj>0-(5o8BWkfte4R zzId9v*FhRrYt6#Wl`ph~$)$Zy2Tft==+Wp#Saa%>Befi&dkyKQBuI{~(^01W)q%4+ z_{$CF#O`#tMYr>8a*c*+F7Pc2#OexDjECqZ#M4T4-e`*=!NO^c;Aq{~+T*#5Gu56V zDZvvUsM+DUn`Ja&F=dRE@Lj@1Vb*frQ^6~xw6>Q0$D2rI+Qo1bVsAaIcB?-P7-Y@D z7MPltnY`t-_LgN!84&LH?$AZv&`X1WFC=F2O!EP!5GSWODfDBv!+Ij9*afPVHd(-5 z*up`wAlfVVj!Eg?)+;VY*XiFbYPp3rsGnw3{q>#=;A{KW6i7%R1_npX!Wh=aR7;xV z#TZ%c>5Ugo^s_SthJqED+j7kQkOi%_^xNMv62UQmZI|Hh4|R`*F{*6eXApN*Bu9>y z<-~3Lt#43-SV>NRG&}B2LSqw_@|9nM^FneHnNJH(`2F%F6gBucb95ODlyT@rf%AU~ z3YII-Pxf7|ZuFe*ScQhq3`?@!?%`WL#+6=Is)S9BYgbvB_guvh z9`19($=$q zH+CJIdR|V1`y#uu7%J!Gbt?kBW6kH$@_n8ca0sZDI;mZQhjH>NdASa=#Bu#e_tZ?0 zrVq4edW3mQj}UoTS*!~V41WCX^ELSv5HujhlF~+UIC@Bvq!f!9zj0SnBZzEhBW#0zYq8Y-$6^5L?`#EEX}N@fufb1? z=H&fypm|hzwXy2aX}bU4oHYi(!a!6E^&de^-QE7p0uF&Nu_-@nqz>-AdN)$U6F!tTsJ zAc5ch{=c{XzW=@Ny=O8RmvJe%9(rh^8AcLsm`Rj(eNMJ5*>Uh1%Yx#urhMkhCb#!~ zlZ*bLiJ~7i<`HoJW1U?4n9Zbs_345QlQrniEkxJ+)}a~4O*#MF8FZY1XS)mUCM zEwjR~@rE^4ZHrmn-2K+zlg#`B0Q$s4F`sh)1_Af-hAi-hj6w1!Z(WkJY$Yh!6jNU1 zjk;Yw1vkStNahWj!pTdQx43c?Ec`S8{bSg^+eN{myeNtCga`ht2>ht>d`DqEOH7o1 zqG>KlB6|H)06zsrDsQAHoP2b7i>gy#p`V0>-V9H9&+uT;gMi`&{ysMFW02?a)x)3j zP5Ja4#H^o+;Nu&l@kXk`$w!t)m47ApWcga8fmMcJYaSTzSsC~WqzY}rRwad_a*`1{x_{W!^UdIRjqWo~)08tbPO_~y{I!rgFW z=uai!b8^^m`}42g2*)dD=*%s9af6Fm#2dwmz>2>-I6Y9lNwKb<5CJMxhTwCaLQw^< zhCE4}0;H<}{&#*p`3tG@4=k|e7WNt7OBueS7H9E28i1d|^AuVJ*#Mz0Y&-=>RRjDn zFD<#F8SW0PiLv%G)m(sfK}{2S$OXU#o%ZC^P>l?j-vAh_-e@Wtd;9C5cqL2cnUBS zU!DS3)c}9Qob8hV{4N80RpssEj6<1DBRfw4#CLX{0w@MQW8Npfx8@Y}7~pFl4+ocA zrPs>9Ba^29sSzDN3f;v)@aOLOjWwsB-vCQfc^(LlXG%PJa|)2IWt1?u?Z3M1r`Ftp zO9ohRaT@JoITF!5hM8IiirAZ7GkfC$R!2d=04uKYHkj70w?y$6+BFA%^o;lJvpNc! z4X_d-Zz*;iYY`}t1pfHxdER=R2L?u$vA8;t=VF$t#|d;Z z?-`4$LwP)dFm_I$%Qpd%7y6CG)uB9!`A|70(B)gHx5c>btx7a$LoNE_?nX4P;4E6s zw4e>g+R%==4z#zv1MRAAM!SxkMIRqMgWji4qb0@o|D8d9_@og{Tz{PX`71@4EDq0| zv2y~cig9w%wi2}%Bj2n*zxrN|SSa93YnAL{DrLY^ zO*{JgfhP3LwVxqNo?o9kNp`{ev2y}(Za$&ln_=Lm{KM)tbg8!=MZ4sHFLpJ5ei^MS zzkq(cu?|`D{kj03%}92X^k&W6e3yJqptJl2c=ul<5&Q?%9Y;k?T}bMs6nx=zDsTzC zcHjgW`=*C*8zPvEY|ANJDW4PQqGyl>e#RT+?E75Kr8f9{d957*w6y3Xx@D=4Py@0! zRF|N%E5&tWgmgbJPEd5y6(oT_X8BRXoan2UMEEquR`t^j%T*GK~Y#)kKd{7m!!X=oyEVaHUr9T`>4cAqg!v8p(G|eO
( zP2Y1$GWgA%m(U1zY24wHDo zse~-ZCNKc9I^h4sISe-kz)LDEdk3D^Xo<7M(vpM_g61KS5 zP|Ytphc5T^v#|uC-Ni2Yok;KhpNkba6rL^PG5OI;D`lO_9f#@@zPNZd&_S%AHq!BL z>5y`%;X;S;o&5L}RkEBiTOqP%goveviG4SVdw|2>mPf8V z(22$^uQb4yR)p%eLm5H%{2vPavSrboWrJ$w#(VPk2!-FNa(w%Hz-YAP`wj4;48WHf zssNbz!*7njtCpRp$xg zlF%i4b%I|upa3rKft!PT4ausEgk4>Ab~!%t^(Oz#aH~% zk+b7C1qe61a`_(rm^(Ud=gy*!yr0;`uNA?=Gd0{8AH9P{GM2KJn6L9gto zMPnA15pO^WIDx{v!Nt7JoSxBoG=Oln&eOoo5#|VJNd@P}9xzw%p4HVlO(ADi4JZI^ znXYr|_iNxZdc$)bodIT$*5C`}t%JP7Ti&VCTe;aaJRX2A<4QUDV9wqHYswLIxE>vC zYSkQk?&`kW&r-z1atH}szomji5MSRFS2_(o-v?VX&Jb3bR3ddJIdHO*4Q1@P^_vVo5d*Z4RQoWOX>w`u5LAjS@aNm=lPP1%mi-A~}I1 z$io~%ob}t;(-*S=S#!1xrBTJi(ZWE+J%brR*eDp_j3t~CNRm8EQD5pikNRUgJv{tD zB~jp;ou2+{{`nt4H<3_I07;xc(&Rk|Ngp`#NABq%zqFYsP9TiBA)G+q0(_M;P9TZ$ zFilOYs6?dG!@h=2qBwy`xt^UvIDuKS-?y8cW&I>^0!fvJeF<{>1~_O%5+@M;{)T9s zKu~~M(l~)6%ERm-t}>Yvzd>F5C89Wi7OHf*Xq7P78rG1;2_#h><_Ji28u`HuO%f;2 z>@K@YQ~|)+pGqPv43}dY=`JBknLcd{NcI?Fsu?+)K>92j`w>$Bvy&N58u%Fa!V~9F zQGE-#{oN{Jl(P~djZ!^^IYrInZ~|S-`;qGex_vdIfS>FvLhG2*;l;)E0;cXd$ufcx zIlr5idS$tbaYa*dIDzzY(MrTDC*>VI52|sBE$&`O0=;upb;9PC3$+NOf`1BvLe^mt zRujSrboy_Nq5%GAI>H^)7l{!{NqsEGHnq-rQ%$S zLt3FoiupGQN3+L2Iw30$0GEEnKKsYkRidoC64mB+_d5()S=J~kM2!6e-+HfxtfOt7 z_fBaF;G%y>%DH@OjClZfn?6)~4lOQfMAL!z@emkd_;q22g44qpk@)*jODb4*FXjj2 zfe*i=p+z=70255aO2#JGuTd(!R4ndG?`BStln3yOt@TjkS)FDO_~|?kK^@H6!9}C7 zp>_d2%dHJ8cAbO10uKr*g%RP@8o~gIS}&N+AFziabsrHuj!^9RVK)NdSL8MEfR+JoV%xfzX>`Y99+iH;~Q=9KXbi zUizd4?XEtHIs)+nAD4z-1c@m3M#u~zr#vk4jhK1|+vn~6ww^eFqZXE-$sg4rH_*5a z0rfl3)2ABv*k-`S=&VC$(EV#`BGw-wEReNRQSV@zqhN<#Ie{1?oZkJT4{KQp`0Iti z7INz$l?w-G@GInhkjSy;L_6C;4!fOKls2+iMgQ1aho0Thz&4S-fjWNLSX@1H4QE~zfFEP;;Gx|_erbS3yu50*7Vp6`};^CPY8k_>i>>V7L zHa6J+i!gbV&xf~u9{3}93Xm=vV=3+B46uj+KY)XG0`NHn$Po4TDZRe%;>J{P6PFoa zkx=Y`{*?&$BSTNW`rvanyYA&xcU!ZI+6=G~DbKfT81OSS1)sao$XB=g#F|^!ZGe@C z?qAG~(Q{X)Bn*7+W{`IDgkEY5UqRp(r91X!CLH|m&2Z5n1FU!zc&bWSue$4<&GkGT=xBt#~gP$RCwoHn`D4rf9lp5fxCy%bM z#B$3*g>;Tx}0u?3_Rqj*b(bcr+_*{{9!BKVi24enbaPfr+XZrxExHIDu;U4V=u~ z;+4s-a`1y`c$8^bsZ9g$Rp11w=`>nYodR3jES9`zfFDfVru^TO<#dyWhf174wLFFc zr-Ylqt@-g)41OEyGr{Tj+JUbkCs0lB2N$GxoULDTb@BFBv)$U%Sii^~T$MS2k#CkM z;G#*NJo{Q;{s@ax%N04~auT_6XG)7ECR|?dJ^uk~2dTY&!^_iv6DYpT*aaFF)8t3L zuq-)s!NIB4oWd%8rOQ~$*K%!d!m<(}FBmHSmnomVL+kY$MxF+oz`+Ja25+RRV6bF- z_ou%ekvf0>6iaUL0cBtf^gRfUG88v?l&=N;?G2Vm9q08^L!Oj#CFd_l;~5!d)#bst zm_0Q>99(vZbSH06%D|T-k79b*iX50ZJ-0lWi1pJ5{1o2VGF9QxQJOq9-0Z!dZG0TD zq%E&G0&ge-KY~2UcM;O&_QAZSnHE=$B6j^$1fTO4B=Z~#=D5oX?hMbe7B#Q$VYuy0 zXaq~(Gck`L@^ZbsCYSdJ{M-Cs!0SkwF4s>%Ai>5PR)v#SM;`1BW=H7+i=*@@crVXN za(Y%L<$4RvF3*M7!T0rrnrQ5REq@V^G5!n||3j8+U*;9JeiCnJ5f0MjjV?HBHZAgu zhF#*TPzU+DuucCs)FA73F#ZbPy$q?;&%-(y{~#`^WTre5M$OukuD9RUq}3JD hwj|y#8}jro@BfzPV`ehjFZ}=j002ovPDHLkV1nj+iSYmc diff --git a/public/favicon.ico b/public/favicon.ico index ebe99c8c683fe798b60ffe8aeaa4b7be13550d13..e21f73d6c51ae99282d31db27d4666a0004ae610 100644 GIT binary patch literal 1150 zcmaizT}YE*6vxlna_fVzB(F*(Bo-9}6$EvmMW`W_5t*qK1(EGSy6U12iYz73GHIEF zN<_?1FQhCl{6fo0(gJH`ZSV8woGtP*MQ5|CZb3pvI3-#naLv%LHpmudx&@+8F(XE22*yKdIpCrQV2`m7#lduPH(@t=vV z{kpUx;pfdXF;;wh(pO*3-=CJSaJ%{Ko7X&GxAEAWlU*Zro0X3&h=YIgtX~L0n#XJI z>+YzKt}pC+UWVEe-l2yV?O308x!rA=+Z7N}2DHBZ!pXDiHgJY1QTdfuCq)Q3E@Ur% zYjnI1oQlll1GJW{wAk15cvWxDhf1MoEQIF&QJsH<<7q{ZKMXx;0CeH>)s=1Hy%dQV zw}IW9O7Y|Q2h-)(&+h3OO{>y8{pKKl4D#BvCPa~xl5mf64pSKTFwPY}C33g*8W&=0 zkbeu-Bf6G_sH8cU$^oUR8Hd33hK2^xpEd25*n6+^WJ%dK$Ey~oSNy{-qcOhgqw@tf zwdOs_DWs_Dx0X_YeWs1>RsMPBXJ+HeSNHO&YYzn+HAxe9%cC4u3uxJm;yL~`@H>H; zzY3UVR3b-BGL=49A5q_MuFUzV{dY&Fqr0&sC-zCbjZmjp2`Yf{j)VPR)=o!lL<8PY z^7ao$;0y|-kfYGs!3CW*#DI?4gBkqw&)%pUSOhY_J1_;*GZm_50ay-ZEg?~9I;#=0 zf!b>k*a_5o7UG#Nq3VEoXH0qwDVs18jUcNKI?af!mjRNB7SJr9x1i2IG=YEZ6nq>_ F^as&QE_eU{ literal 1150 zcmb7DUr1A76hHf8>9oA{&_liS*h7!KhNkl^=%qyV5E2phE%3>dCc2RJI>C%=R3dO`F-d64v~$2nnwJ; zpL8eD9wIux#vzVW;_UwUw7T7P!|2|*T}_Dqb+e7e{WO~lP$cHJjq&&CS#RA=GmpKK zjnwZ~K8J_%m*+3r!5(qHt!(mc#0qmh$C)D??Izar^~~RAk#EHzTtS6{7<+t+nwA`M zKD#d3C;FRRTsN<1M0~Igsj)VEoIZ=}R1cOWjv+DZs@=<%mtLpFxGq(9JgDJEZU*^q zFW!ebkPfxs)4~XTuf0Vw*i_4*Gxla}uVOw{oUx9^a2B z>%SrUH#y#1--lAEgyk2PkQ}sc@+O8GYWEI4H__jz_D?kaT3x`}yK$uMwqWW0QLIF- zmUXCkh7LW{yW7PaAJnzjP$M!AParqlgY2Y^#oGrrbtrj-N9T8Fa)+M}Z0i*L%9>Sv zRqVCTamu*=G6NLxI{W^EV}LPo_szL0&jIV`VvhV4I##)7CtKa^^+s*G47I^i*72ZU zlYV%Z;}-ic+YG;tu^)cg;Be{YR>|bq% BDB}PC diff --git a/public/index.php b/public/index.php index 4584cbcd..2b5641b4 100644 --- a/public/index.php +++ b/public/index.php @@ -1,12 +1,10 @@ */ - define('LARAVEL_START', microtime(true)); /* diff --git a/resources/views/admin/shop/info.blade.php b/resources/views/admin/shop/info.blade.php index f64e44b1..134bc8ab 100644 --- a/resources/views/admin/shop/info.blade.php +++ b/resources/views/admin/shop/info.blade.php @@ -93,7 +93,12 @@
- MB +
@@ -204,7 +209,6 @@ $('#period').val('{{$goods->period}}'); $('#days').val('{{$goods->days}}').attr('disabled', true); @endif - $('#traffic').val('{{$goods->traffic}}').attr('disabled', true); $('#invite_num').val('{{$goods->invite_num}}'); $('#limit_num').val('{{$goods->limit_num}}'); @if ($goods->is_hot) @@ -217,6 +221,22 @@ $('#color').asColorPicker('val', '{{$goods->color}}'); $('#description').val('{{$goods->description}}'); $('#info').val('{!! $goods->info !!}'); + const trafficUnit = $('#traffic_unit'); + const traffic = $('#traffic'); + @if($goods->traffic >= 1073741824) + traffic.val('{{$goods->traffic/1073741824}}'); + trafficUnit.selectpicker('val', '1073741824'); + @elseif($goods->traffic >= 1048576) + traffic.val('{{$goods->traffic/1048576}}'); + trafficUnit.selectpicker('val', '1048576'); + @elseif($goods->traffic >= 1024) + traffic.val('{{$goods->traffic/1024}}'); + trafficUnit.selectpicker('val', '1024'); + @else + traffic.val('{{$goods->traffic}}'); + @endif + traffic.attr('disabled', true); + trafficUnit.attr('disabled', true).selectpicker('refresh'); }); @elseif(old('type')) $(document).ready(function() { @@ -232,6 +252,7 @@ $('#days').val('{{old('days',0)}}'); @endif $('#traffic').val('{{old('traffic')}}'); + $('#traffic_unit').selectpicker('val', '{{old('traffic_unit')}}'); $('#invite_num').val('{{old('invite_num')}}'); $('#limit_num').val('{{old('limit_num')}}'); @if (old('is_hot'))