From c68b9d3a26a430d757076c5ac263152bd357daca Mon Sep 17 00:00:00 2001 From: Kiyan Date: Fri, 28 Apr 2017 17:05:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.json | 18 ++-- .../order_status_money_icon_current@2x.png | Bin 0 -> 1865 bytes .../order_status_rider_icon_current@2x.png | Bin 0 -> 2212 bytes .../order_status_service_icon_current@2x.png | Bin 0 -> 2074 bytes ...er_status_service_icon_fail_current@2x.png | Bin 0 -> 2146 bytes .../order_status_shop_icon_current@2x.png | Bin 0 -> 2172 bytes .../order_status_user_icon_current@2x.png | Bin 0 -> 2150 bytes .../{ => tabbar}/Shop_Tabbar_My_Empty@2x.png | Bin .../{ => tabbar}/Shop_Tabbar_My_Full@2x.png | Bin .../Shop_Tabbar_Order_Empty@2x.png | Bin .../Shop_Tabbar_Order_Full@2x.png | Bin .../Shop_Tabbar_TakeOut_Empty@2x.png | Bin .../Shop_Tabbar_TakeOut_Full@2x.png | Bin app/pages/order/show.js | 92 ++++++++++++++++-- app/pages/order/show.wxml | 22 ++++- app/pages/order/show.wxss | 36 ++++++- 16 files changed, 149 insertions(+), 19 deletions(-) create mode 100644 app/images/status/order_status_money_icon_current@2x.png create mode 100644 app/images/status/order_status_rider_icon_current@2x.png create mode 100644 app/images/status/order_status_service_icon_current@2x.png create mode 100644 app/images/status/order_status_service_icon_fail_current@2x.png create mode 100644 app/images/status/order_status_shop_icon_current@2x.png create mode 100644 app/images/status/order_status_user_icon_current@2x.png rename app/images/{ => tabbar}/Shop_Tabbar_My_Empty@2x.png (100%) rename app/images/{ => tabbar}/Shop_Tabbar_My_Full@2x.png (100%) rename app/images/{ => tabbar}/Shop_Tabbar_Order_Empty@2x.png (100%) rename app/images/{ => tabbar}/Shop_Tabbar_Order_Full@2x.png (100%) rename app/images/{ => tabbar}/Shop_Tabbar_TakeOut_Empty@2x.png (100%) rename app/images/{ => tabbar}/Shop_Tabbar_TakeOut_Full@2x.png (100%) diff --git a/app/app.json b/app/app.json index e354b0f..2695222 100644 --- a/app/app.json +++ b/app/app.json @@ -1,17 +1,17 @@ { "pages": [ + "pages/order/show", "pages/order/list", + "pages/index/index", "pages/address/list", "pages/address/add", "pages/address/select", - "pages/index/index", "pages/order/quasi", "pages/shop/show", "pages/mine/mine", "pages/index/address", "pages/shop/category", - "pages/shop/search", - "pages/order/show" + "pages/shop/search" ], "window": { "backgroundColor": "#f8f8f8", @@ -25,20 +25,20 @@ "list": [ { "pagePath": "pages/index/index", - "iconPath": "images/Shop_Tabbar_TakeOut_Empty@2x.png", - "selectedIconPath": "images/Shop_Tabbar_TakeOut_Full@2x.png", + "iconPath": "images/tabbar/Shop_Tabbar_TakeOut_Empty@2x.png", + "selectedIconPath": "images/tabbar/Shop_Tabbar_TakeOut_Full@2x.png", "text": "首页" }, { "pagePath": "pages/order/list", - "iconPath": "images/Shop_Tabbar_Order_Empty@2x.png", - "selectedIconPath": "images/Shop_Tabbar_Order_Full@2x.png", + "iconPath": "images/tabbar/Shop_Tabbar_Order_Empty@2x.png", + "selectedIconPath": "images/tabbar/Shop_Tabbar_Order_Full@2x.png", "text": "订单" }, { "pagePath": "pages/mine/mine", - "iconPath": "images/Shop_Tabbar_My_Empty@2x.png", - "selectedIconPath": "images/Shop_Tabbar_My_Full@2x.png", + "iconPath": "images/tabbar/Shop_Tabbar_My_Empty@2x.png", + "selectedIconPath": "images/tabbar/Shop_Tabbar_My_Full@2x.png", "text": "我的" } ] diff --git a/app/images/status/order_status_money_icon_current@2x.png b/app/images/status/order_status_money_icon_current@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ed9c1ee1493a47b0fcd69433e13b8b4078cff6ae GIT binary patch literal 1865 zcmbVNX;2eq7+x(P1_gu^0!6zlA|B*eOvs@Ta~VSAFhqk4Ae&?p7DzTGD+H)5f*@Xa zAf<>0+DVHCj-cQ{M{x$Q6sdsLgM!urj}Fyh>qQT`5wZQ@IGygy?)QDW@AJIRd(Ezo zi;+*J_)`D?n5>ADD#al5*Z&uI}Qb>!kl$P$QnTu)>p78DTaa19D7jEDhMqKGbM zWji__0N%^OR0%{v^kRV)H!={14Z~(MlV|{#A7L{i+6HOuuMKn8 zE3zXU+c%>?9^MQSY9c4dLXOG|`H5n30x^YDq_Xw)?Tk(H7E#-7nv4|epgovQ5m#Ss z^l6Q-Q}#qvYh=L_&h6Y;Sg<3GKJ#{Z}3^GBGzIO~4J<4)bPPD^v-9IcR%>B1U@1@Jc`wKVtM z;KFS!k*O{4J(j*Vq{1uo(M6c{^_E5Q@`~kcu4P^0TbE8W)2e{t3D;(Cm?EuqP8NAq zPpxXA`7T@`Y&*GT;hYO1PYtbV)+YTme>>dfd2gb(r_)j7S3pZm|H8A4Hy%CYA}X1& z^Mt9UR-;=0UAP!s7+0dE$io}Wqz)^y-ln=eMII!{Kg|O zmr^r#pQq*}dN~DVA;(S@eRTLU`zc@KOnFr8MDK;b)H`eU2N6HO9`}@ckMG_#&#Q}Q zA9gX9E-t*&^?iMEj=|%2|DM_!+|QY!-1tb-U<8bto2L#sH$C?<_H$?&0B?hfcinzzKphxT-w_i-xE&6Bh5 zU%>L)d|DUKA7zNER{tf=H@FmB8SMTgPF4N!@SM9TZBq5KmrMI2nSBP%t$C5TQ{<&} zNsF%B-1xA^{N%EWnlMXxfY`ltl@A~HdfhcdP|B`%bM~M3VEb@R;>^^8s=+;7y}}e^ zxlbQ&WqjJFa_DeB_|sjiq40p^=Ka7CWQn=;#=!gi&GyP$QAQ#Hxz^f;qk-EMS67z@j7uDF_oG3or1fg2ef|@MPIjbi=&mzvZP;=nZNoN?N&YRB zpZl+!T{1~u(`GI1%Zr>W<}^^1of|u+(|#)&cc$l1k6TvZi`=3c(DMgJsG9gv>M8A` rigapzQtG{{yHwTb&u(9j80P|{PMT4mjE%bE__--$G14RA)PlbOGw;7U literal 0 HcmV?d00001 diff --git a/app/images/status/order_status_rider_icon_current@2x.png b/app/images/status/order_status_rider_icon_current@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..391abdbc318d68a387625484fbb7ac4b8a3bea60 GIT binary patch literal 2212 zcmbVOc~Dc=8jslWP+7!<0!0iVjv^*E34|~QruSfbW|N(kjEhJ_HCCj+CQ5C{|} z#n(gLDAepkX=u1QoF7OR!7@B((!pzG3IvTpdHZM;pePnnqlHkkRL;OWzf_GuOT`S# z1~Q+(S1_R%DR;XPTDM&gD%u_^qKPp+-=Mv7AIHHwG7OAUOFP1jsXn% zy^1=Pf%)K6I6oN8gq0AQj3?tn1fnOJLcDv?sEP)lJs+QbM7;RH1UgLwKO1et=*|3oZTeM}URGC&I|03x0M$YiFt-fOGW zA<%!^_^h@nG)VygA&?4AP>PUxNL**YNbdgGkVz5oh90DpB1Hk?SgM&R}_Rl^T?bpc&gz#P&xl`ya7%rV;|xurd^e<7T=bI0jb3 zsu);-W-?7xC!<$vkjlldM&)KI(}$>8kW!imiT#zZ4E;XObm?b&_}}9HfEWM2`2!HA z08_L4SM$sqAsuNFKaB#i`7}(B9GM^`GAgmYD-0;q7dLn;-%xF5_of|j>((#&t7`n) z+Y(#zvrLw)FX`v2`uj!k2JZBpW%m4Z63N2sdxr%JAp3jvY^KG*%vGs<%ME)$?8U#( zM+Xi%?DzbwrY5Usk8pQN`tI4|yhz5xv-6kFKR<}aytOt(rjoN@KrQ>dRmCnL2hns}aiXVg#^ar?(qbQ3G&z;q3OZFDev z+pN2H)%%4mC)#dg@6qdhyDPo1vzmUUyJe(y6wR94Up&+i*tBtZCnr9w0osOdD)Fe# zKi6Q6MZdYoZ*x8Q^!4KLYoaox{}aP5=wWS;Jr48T7a5rpiN2ZcuHE{;rr?a{SwY1Z zw(?4f6kFe2Tm0|{r#Ncss(agqj85YVgP%w4IytsFrc3>0e^Bc{^{cbDDknnoVs1)0 zmHYtsP+VlsTQAJc3*zp^Ope4&ay{Uf%@wPCG0rd1)BU3rSo@Uc?+zW+eShcX{vh7o z>;NF>(LkI2Rcuo2n{S=8j)EiK*Vtu)$|$2Z*eP6n!?~-15^?zO8rY}Axhtoo zV1&EYii?>prmi4-*;Wy~%Zy?^u@q%KrMj)}CUm(7RtJK9Bbc5oKCkxV3!0iI5_qLA zh<=s5mIUTvj#puycBsEU*y4hN`-9=Nb^7pMUO8oQ6M2F0M@r5{JbTUM7`N7)es*~W z9qu@^vc;G9_P5q8#UrQ1w0Kvu^mY9&vZ7A^J92~U@su6aE-Y%`kBQ&MuG(I~a|J~m z?0qZrQeOszU30+K)O6%71X3;YjDr?)ANtq?<~p|VO0S#ibXAm! zADp8d3^)Ij6rNe$o?D(-Io=Vb-dXO<=-qK3|1Lp(Y_s*bIA`@pyral4L1)YM-Yc<_3ptPKvRHrv&7}>DE^q=I#T|?_^2;YU+FW zI=VbjJzw1M=2VMEDxBOElResCz4E(_b9&uQEnzefBZLis3>}b?x6+qW99n+M+I^5& zmY{o(+kRvu%^jC}vaWh|&SBVWYqzCUYyP!iV{HOvtRZA7J1`Mj#<^4`9BY+!jAS=b z=}`sKEq!6>g(up>HYBHw;;?XcsqKl-mz%s@HrgwKj!W-u2OF9Mt_JPPEV^~TH&StJ zrmpTE%$Ms8?Bk(#N4(aH+>}Qq`xt}?K<7EH?*GO zWVd52E;qg8;xc*FGDF!!L$H;@RBuk}(T1l}HER|)O!-_hu4c-(9 ntc0+5ZrXY#t<@&yEl`6}oP6WVTYS9V^xwc^3s@z7QM>;J2OyYp literal 0 HcmV?d00001 diff --git a/app/images/status/order_status_service_icon_current@2x.png b/app/images/status/order_status_service_icon_current@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9b5dbbf222e95d29d60dd8da60c307defb154931 GIT binary patch literal 2074 zcmbVNdsGuw8V`i01rZ|eBE!J$K_QQs5FinVc>!4-LZF&ev<%4*0!bz$0|aC#veY96 zaapv5s#QTi1m&RuwMw@jHdcI8+oB@4qE*YHB85`yF5QWW+dn)#Jv-;j+dFe5W8G$S0Au^I59o;UG%Ojr~mBgYE#E6rtk8MP4ADf3Zzv<_1PFY?S$zQKpz7ynDX{Qu1#op6e7 zZkAs)&!ULvNb~mfC=iF&!-Q&x3DOax5-(IAC6TN+Vj(ZpaO?Jljj^dbkA=DWe+Y`Z zG+JyQ;>{UVAOj2NG zW|GtCrhmO3yy?_`a3SgI)SHuq8iY;+Me%tL;R@Udz zbA1Yz{#5TcPqLo<6Co&1&-JadzgF*DNVeXobuR;H>CbKqJ#4foY}O^m2f6zN{=?Ro zecx5;{WbVQ^3^lf`AOwmHy@LgbR+J+wxQPZD}L?vFjM%HL-CqF-lF)2YnzukxmdK( zecG^AO8;1e)l@`4N8ho@4XXTXi!0HmXH`udoryD_=I+Qtv#a2D6>XbZB{pE`Z0EHH z+dDc0_jFU;EUVoUoYKg<-9a;spG)aE80KeT~;+}-M%~E`R-G!3o~6u$0?=5HdozzY-;zPRGnB!N}U@c z2M3pRr?(#}NpyGZnHqPEKXcap;IPq^65VZi-Z|N*e(bv+TZZhMpWov>azvnV-kS&* zyA@pcT=$Q0iH+Z-#WCZRU&arA81s)+VWz)$p^8FyV>hB)_3qrjV)S4S=-7h+b9c4 z6Yf!Xk?ITn3JM2VKe`;Aoay>vTXpI9Rf~NMd5m=j250jv->UeethZ_+!`o3DziTqK z#m}YoKjhDj!iCm5n>s$WtNUk^SBZDa&w(j9k4&nu1LP>h^{h(P=90SOtbGvAP55`? z=-~B<8#QqUgNrqG?{uH^u1A(1+9I_xHuyGb?;|isK6A{a$M1S=ckDBsrm?dp~`O4v2G!CqO$Q)lU__ma-HK0i2r z{;2po|D&O~$xHQn?*+>p*oJbdTj=237O|baJu#Ou=G496PJV*Jai)c>k*eCUruo^U z%irUFE4Yzs7u+^J;eUF%HKREzg=6Ae|H(o4c5^ax!P-Ok^l%-edChJ682<1(e(QwZ zJHoN*r7)!{O42mBE6sB#^^B_=e4ASL(!@3oB&(50v)?!hj@Hjuc F?7w22DFOfh literal 0 HcmV?d00001 diff --git a/app/images/status/order_status_service_icon_fail_current@2x.png b/app/images/status/order_status_service_icon_fail_current@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0db93626ddad5f378d8c838f2214a7d892259852 GIT binary patch literal 2146 zcmaJ?c~leU7Ee?x1x5Bkl@ekrqD(R~Ss;M`*;phj4FM5cm?RU)BguqhkbqVYsiGE& zJ`h(9Xi*;)iXd3Pf*YcOqKHrBS;2w}f@no6=(E0wim!ioI_J!M-*>1|q{IrFU(4yl_lv;1BgEp0i{tSaOogW-29(5CVsexcrbSkwQWQ~U zq@G9pNu;T{YFRuUA0go?Ff9!+>(ESEJ%J{X`~yvTM3I8x6gj$5t>aN2H@8wLY9)`l zm=ys==!IyqIyBRO#$-my6qzXsj*=P}K=C(m2?JUbM<^z(MrY)jc+|Icxy0Tqrc)_z zRqzxZ^&P4Bh-iusGoTa}jRhz`h)MC`&>$AX^o6`BFbFZ|AcGDu00`!S94^G7ynm>K zH-l2em5PGj`yx&}YBG-NxpaDZdO9tgLBk9y=@5s*p@T3Th5+%9?SV#ELUhi5gaqfFibPq1<}bEjv13NJw+%q zSDi(fzgVqPV(CUNbD7>nEkX_IRj4x9fN3dj^UPI$gad;Os#I(i8(=UP9DuE4Dgi{n z_66j=pxl?^3!-efg8Ck>{7e4c^(i4C;?Pgh;esldg>oPc0QrI}0D@39z~Lx~lq#4^ zB~uQ8pi)Vt6BOy@*7-{-O^S&AG;co)266Z>TBwegCj&7!`iedm5@{MyN50I|du!Jc zi38uI{mrt3VGBnQbNLZ_@pp@<&{@;|fHG13JS!(waK8POB!Bs{wuPl+*>CGMh&Vl- zOqUf!F5f&kS>&0&IWPId;n2h-NeMdoMIJcfX8kku)_k_V!)!Vf1zWXax^- z{PDw;qE657dEsAP{b$>@q4BwKFk^|^64uVGBXuDL>g%I<>8mt$(b zZAqFII4b)>VB4SObw6#`)$*}}mnE;_Nz?0J>&G9+He8O|a6kFLQ#k7Qe>Vy>pwPH& z*neOsVFDqMm$$F^2{?7yMsfLMVo&r8_EPe^FHKqfV&L;|pZ#@r>*fTVzob7~FSePU zkgAGo19$_ob2g2(0UcvISM0NCs<-@J-WR$+u%AD2Yap5)?$lR1B;RG?1Uz;vE67&& zN%{|7<3(k;{T3BK?tKK_l^Fb6s|2|zt;SjRLSB(~M=bcR6tLI>$P0J*84L|mPsM1p zSzRM{UE`b=GDuYpV`J_q757F<8l;lMjzw2A{#Vm}8JkEsbRa7Ac!s;Y%NK2Gvbu7< zx%?uShps(*p*X=Q?#1aT=?jOp?Bhf7Zp{yeZvVSCt#N3SoG_I=ektU|nU#C?9hbY( z&_zA*4O|p}JrAXxK7G*78$&KEnP0mCZxL-BjFN3`Am}5|0!NyDzwRiUN@`>&^@tW{{k0U?UW>sx`ek&7? zZ!PP}y=jv->spPoM%13Zh5EQ)-Hzh zSAOsBI3Bk)!lmmWtJ?bTHgLLE>ax0$MVBHwV%wS3#U75An@YSQt~Uq$y!zMe?EY(h zIeQx0bJmyFx9ZN4kHKF(Xc&7y>wiSaUu$QvZYBEME_^id#>3H1j=BvtUNt$`7hDzX zI6B8_U&v-ZPx7Wlhx*(KYSe-=Ku-KXgWKSgr&*evPiHSdKq;D0N?)~GH9<>9EQOAl zev6+u(QEeBUa-wQG?+Gg;LWQC`OPjJHJ~WrK(~AD3fs?i^ei7`jI_qQ=8vZV^lImB z_ZiPjsVA%@IRj%>6|tT7H_hfWr{?2>mzkZlFQdBKS%K0A|{8-ok literal 0 HcmV?d00001 diff --git a/app/images/status/order_status_shop_icon_current@2x.png b/app/images/status/order_status_shop_icon_current@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4225cc36a484b9e58882c8d4be0332acb7f3e755 GIT binary patch literal 2172 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 S-$mRtz5EtQTiV+5L=S~ literal 0 HcmV?d00001 diff --git a/app/images/Shop_Tabbar_My_Empty@2x.png b/app/images/tabbar/Shop_Tabbar_My_Empty@2x.png similarity index 100% rename from app/images/Shop_Tabbar_My_Empty@2x.png rename to app/images/tabbar/Shop_Tabbar_My_Empty@2x.png diff --git a/app/images/Shop_Tabbar_My_Full@2x.png b/app/images/tabbar/Shop_Tabbar_My_Full@2x.png similarity index 100% rename from app/images/Shop_Tabbar_My_Full@2x.png rename to app/images/tabbar/Shop_Tabbar_My_Full@2x.png diff --git a/app/images/Shop_Tabbar_Order_Empty@2x.png b/app/images/tabbar/Shop_Tabbar_Order_Empty@2x.png similarity index 100% rename from app/images/Shop_Tabbar_Order_Empty@2x.png rename to app/images/tabbar/Shop_Tabbar_Order_Empty@2x.png diff --git a/app/images/Shop_Tabbar_Order_Full@2x.png b/app/images/tabbar/Shop_Tabbar_Order_Full@2x.png similarity index 100% rename from app/images/Shop_Tabbar_Order_Full@2x.png rename to app/images/tabbar/Shop_Tabbar_Order_Full@2x.png diff --git a/app/images/Shop_Tabbar_TakeOut_Empty@2x.png b/app/images/tabbar/Shop_Tabbar_TakeOut_Empty@2x.png similarity index 100% rename from app/images/Shop_Tabbar_TakeOut_Empty@2x.png rename to app/images/tabbar/Shop_Tabbar_TakeOut_Empty@2x.png diff --git a/app/images/Shop_Tabbar_TakeOut_Full@2x.png b/app/images/tabbar/Shop_Tabbar_TakeOut_Full@2x.png similarity index 100% rename from app/images/Shop_Tabbar_TakeOut_Full@2x.png rename to app/images/tabbar/Shop_Tabbar_TakeOut_Full@2x.png diff --git a/app/pages/order/show.js b/app/pages/order/show.js index b006552..4fca748 100644 --- a/app/pages/order/show.js +++ b/app/pages/order/show.js @@ -1,19 +1,99 @@ // pages/order/show.js Page({ - data:{}, - onLoad:function(options){ + data: { + info: { + "order_id": "1370", + "order_no": "2017042815510158201158862546", + "day_sn": "1", + "seller_id": "2", + "user_id": "4", + "state": "5", + "add_time": "1493365861", + "order_price": "42.98", + "pay_price": "34.98", + "goods_price": "22.98", + "cut_money": "8.00", + "coupon_money": "0.00", + "packing_fee": "2.00", + "delivery_fee": "18.00", + "receiver": "test4", + "receiver_addr": "龙华大厦", + "receiver_gps": "120.69101,28.002974", + "receiver_phone": "13000000005", + "receive_time": "1493369461", + "distance": "7.177", + "remark": null, + "is_reviews": "0", + "is_delete": "0", + "delivery_order_id": "0", + "title": "鸡腿饭(大)", + "receiver_city": "330300", + "take_time": null, + "remind_time": "0", + "pay_type": null, + "sys_settle_no": null, + "settle_no": null, + "commision": "0.00", + "user_coupon_id": null, + "real_delivery_fee": "18.00", + "cut_delivery_fee": "0.00", + "service_money": "0.00", + "seller_name": "鲜极道", + "seller_phone": "88888888", + "delivery_phone": "13906641410", + "goods": [ + { + "goods_id": "29", + "sub_id": "50", + "seller_id": "2", + "detail": "鸡腿饭 xx", + "sales": "46", + "praise": "0", + "state": "1", + "commision": "3.00", + "goods_name": "鸡腿饭(大)", + "price": "22.98", + "packing_fee": "2.00", + "stock": "74", + "is_delete": "0", + "pic_url": "http://test.storesystem.cn/Uploadfile/Img/seller_goods/1461034075146103407535640.jpg", + "num": "1", + "price_sum": "22.98" + } + ], + "expire_time": 0, + "left_time": 0, + "flow": [ + { + "time": "1493365861", + "state": "1", + "status": "订单提交成功，待支付", + "remark": "" + }, + { + "time": "1493366164", + "state": "5", + "status": "订单已取消", + "remark": "" + } + ], + "localphone": "13906641410" + } + + }, + onLoad: function (options) { // 页面初始化 options为页面跳转所带来的参数 }, - onReady:function(){ + onReady: function () { // 页面渲染完成 }, - onShow:function(){ + onShow: function () { // 页面显示 }, - onHide:function(){ + onHide: function () { // 页面隐藏 }, - onUnload:function(){ + onUnload: function () { // 页面关闭 } }) \ No newline at end of file diff --git a/app/pages/order/show.wxml b/app/pages/order/show.wxml index 5a1f259..c629335 100644 --- a/app/pages/order/show.wxml +++ b/app/pages/order/show.wxml @@ -1,4 +1,20 @@ + - - test - + + + + 订单状态 + + + 订单详情 + + + + + + + + 详情 + + + \ No newline at end of file diff --git a/app/pages/order/show.wxss b/app/pages/order/show.wxss index e34ca80..f74402d 100644 --- a/app/pages/order/show.wxss +++ b/app/pages/order/show.wxss @@ -1 +1,35 @@ -/* pages/order/show.wxss */ \ No newline at end of file +/* pages/order/show.wxss */ + +.tab { + display: flex; + flex-direction: column; + height: 100vh; + background-color: #fff; +} + +.tab__navbar { + display: flex; + color: #999; + border-bottom: 1rpx solid #e8e8e8; +} + +.tab__navbar-item { + position: relative; + padding: 5px 8px; +} +.tab__navbar-item_active { + color: #000; +} +.tab__navbar-item_active::after { + content: ''; + position: absolute; + left: 0; + bottom: -1rpx; + height: 2rpx; + width: 100%; + background-color: #ff5801; +} + +.tab-swiper { + flex: 1; +}