From 966c5c5dba193494ca58a7f5fb3422f5480c23a4 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Fri, 9 Jun 2023 17:50:38 +0800 Subject: [PATCH] upload --- assets/images/appointment.png | Bin 28522 -> 22738 bytes components/shop/shop.ttml | 4 +- package2/pages/appointment/appointment.js | 12 +- package2/pages/appointment/appointment.ttml | 24 +- pages/coupon/confirmation/confirmation.js | 3 +- pages/coupon/detail/index.js | 22 +- pages/coupon/detail/index.ttml | 22 +- pages/coupon/instructions/instructions.js | 282 ++++++++++---------- pages/coupon/instructions/instructions.ttml | 85 +++--- pages/order/detail/index.js | 20 +- pages/order/detail/index.ttml | 47 +++- pages/order/detail/index.ttss | 1 + pages/paySnapshoot/paySnapshoot.js | 2 +- 13 files changed, 301 insertions(+), 223 deletions(-) diff --git a/assets/images/appointment.png b/assets/images/appointment.png index 055645667c556f2228294ff936ea6b2db3b5fcc2..2b2eaefbccd6e3abee59c38f9c6c59abe11a05d6 100644 GIT binary patch delta 20156 zcmb?@WmHvN+pd%dJb-|Jv}_6KmJ$#FX^`46A`sq)S@5JEf)0 z10Hfzl_*If6!>fW2PC_^PE#r4>b;*G4Nxcb}4?Ia6mQtR+^ zZ~R^ThxcgXt;D;zN_#t#ku%FFrV%#ou;6AR-{$%cC7;P(IMaUl_>pc7Kdg}cp>QQy zEce`JYPzRcfr3t6PW_2-H&tkN{{F`sb%R;;&wuZrll=3ad#wNbys!25Pw38_|Lw?~ zN5%j8lYf2WKL?&0q5Sike}CfN2fUk5|M`Uv#y>y*#{pEFf1UH+pZNCy=-=bI^Y0_* z@VVD<{@NO$!5Jj$s;`TRSNaPYh*y*8K2-hca-8IODTsMrc7k+;GF8N6dpT2bzmoHm zuIvx^96S9gGsa|&jJZaI0@^O~VD4B^LanL>LhdO8SDNRxuKT$L_wT@j+Ws^4SGxp~ zLSDtL+v;@-X<6gGNljs9*o_FZ{Yc(sIV`;KLHMK@l`>>$OTvb9>h5vJ>H;jRd`Ua$!Lw z<-|-qiOPzyh^3ax;Y$Xl>~R-CYq&=BXw!yvO~u;K<6p=4U9Eb53SY8cortq1&ADtq z3nDRi1Q_>N=kMgn8FWcHQKX#3dAL%xz8#={;ieigfa4g`Cbg_k4lC85x7Z9GwG_~f zezO_OzQzn=$>yhHPy8&b7BT>C_0#F}>#|j70GtxF~`4L@ivm=FAq0R%72%~%1XMiG2L!q ze8R==GLszqa8J9Eq;OQIM94FoYVibo|VBe-4R{1APeqyHo>V*E*J^5vtt~KxOn!xa z1{3J25b>8-uasDfUuJM8Iq}B0;g6gLEHGUqcJLPm3z#FbM-lgCyKOyHOB1q+n%q#z z$@TlA&-_LfaaWq0|CW)A zh=N&&7vPrCr#5kTK7SiGknd!C8gEvX3x>ARPZvFqmr+GuNaONlYI;_n2) zxZd;B9jJ7*E9m?0p`ycSl%K9RBa`J`x^~>%p(b8UA>Lq8T*NILsU7Dl4~Hu}*zo4O zaX!ryN$=`RhY^jeuzGSlKP*w;Q(iHdtIpl3tL=sa%l=fdvTm)EYeR+Q+h(D8s;``; z&L{Xqo!w3|-;)maeCufmM&Y?XxP6w^i5`KJF1L6P&L$L#ndX39l1fHirgzxv^>l$#241V8Fsxh-my!DrIN`-M6E*5JK)cV=fAkFUF(W4>xZjld(cy2)^PS#JVb-$n1x$qd3^(r?wNHAVP#vH_FE@CXBbJditYlt+7D;+X@>O()WIDMr z%1h{;V^EC@rcuXzfx*lkFe@J4_nCUdqJ}A=&751;d7~6qEA|=LhZ3~kXUFjD+kR-; zoZM(Hh>nm4#WRo&yaa?4o3&15{&03^Xt-Kc1@<7J0<&lLr*{zNqs4BWMu80M`pHe32ji$8^MIQZmCxz}zf$;8&Ome5kl(`DI5M#yI; z5MiO>2>kR+@2OcQo#Y9Ykv2arG*EKcv-m0Z!hFSEPgsEF;%>9ZD`_cHzw>M;(3x}g zP>Ol5eg&UZO_N*Yd%^%lQ52!m{tBwckYra!!vbtOE~>F2e6T)6iX)pl-=1J2RU{pp zJVz51H9!ABP#cbu^8F34=;>UuFu5%hC0Mw{#~?B!p7FJ|rZ8!0O?Ury&J%QO*K z188iqd2*t42S^02N>SPiXd1(X@=hV$y~BZh;|UniwhuZ(&mg_4KaQSwhD59fYHq-z z;@TD)HoceQ~xMUoKIBsrg5rWkhamTejVG)YLw-di5iXSD0_&o9;Y zz#dlPUuwPQ!M)GNtO^!wH(%!;4lo;ohzxtKa#gz}9`=&QB|IYMWTVf11kgMRm+8O$ zrn)>Yzb6)B7ft9?a6`C4-dl7v99d+R#Q&uSETc&4z$D6;>U*ZYz%uClQl*oDTJ8~< zEb#bi7quulWDRHW+rgUTk@IK|?kzWK@!l5Bi+T;}k)0=l#aEF_*<*xI{SjfnnH6=j z=A1J7%oFb6a*IzVpFri&86Vs@(yvVmvJ6iakf@UmQNJ@ZD{kbHSWAffjKJk;z{zaW z8^A<~){d$Ms6e_VK&l>p7w`(NJJ(cut4>^b9Hpv>AX5(qUkmp$!KQab%k0;d8@k z=brmaVk^|<-`D8ahYsUgOaJ=L2-y-_xS zd~RnSMWRFo^U3&q;dind8};G-of|H$h(rV~Y22e_ljCRYv;9U^*V>K5$rTFq#VaqB zF!^23POv>DGZUm3WNQ2YE)%SuwWl%clKj;rA8DN^zW=SA+yqmC4@U# z0V?_!Q>tv2X5iMxG&~D=iHfnx0s{Vxp?t+NXkMAY(}u~PW$ltzfS+sp#SV~NL)EB z>=0&*Pfu#`eGNd;?X;s0^8ESdiiAi>?#p7v{GjBwRJ4K@Vvr>Ei!0ABU` zn`hQtwAMTM{mMc_O6SYK&luCJHj zZ8a*?Nz;mChScYot$sCp6n*y2b3p3J+9R4;T@9&fikY>cVG6LWj}86H5CN$%!vKD- zQ14D5K0hkf2~%PEomST=_=qd5Qlq|9VTPAEfK;|hL88wVTy{V0;cKRPlQ;^rPZ6Zl1 zC3Gix*dYapefPY4GvcJyC^eLVg$ACjGeOq z$6+(G?#U2}Bw@?;lG?K-<2e6Z79H7F+yIL&^LK4;Ui1zn94+>YEZ$_28k$4!>n^Fr z;3=Y&<*)JC&VnAyx^Y=5vVCF_bhI!UExdaL4Czs-1$(d^YK_taTQZl?mgs~yfdCm) zWMldsp55k4*PZ%AoqXmRh_sxwtn==h)BU2N`0s5PMT^jIGFK38(rf6sV7+*awAPK8 zOz5_dT#&XEzfP2n?b`Xn8Vcy4r`v;#EHg5SC|LAaAl<{cALepZFKHgrTvS#iVaqbl z_!#sTU-yh`5KnTtNcGv0R@QHIy9fsBJ;e$WZQv|Ud;J7o5u38Dm zxkk8tE^P?W!OD~MZL(rM@7oKcE498Ux6saEEg0NYktD2Mdjf;zq98>gi*RIs-%b#q z9Xd6Uv1Z@b_Ln375>r3SQ8iM<;n>EMS6DBvWMds}%0>EB<7{V#a5~4O)O=11Lm*0U zU#d^lcR06VkkNq zKL{JYXus=G3VS>Rsjy@`8RrBf_)oj`joBC!cO1$yi*wYb-OZ? zeytsi)W5()N_rg%PvGAx$V!uawj`pgoM>xHX(Rn~G???|F96^vNvi7Q*bOG)=Oyr; zta1Kn5N@x|rO5Sbe7N^cl5kzPdEnWgT+8md26nFB&4ngpQo@t1VWZP$3m(>(+fOh1 z=WD*oW{eg$7QAk{ecW!WTLIP<9i<8cii?8&2t0rVDmiX4!J)yGk(NV!pOwb)7}>G2 z=DxV%D#rV=88O%Rc8K0tp~Icb{XM6Hw(!b(0;@_8gsaKhy8>ES>=yFVHs&jeuQy3r&}{Y=EvU!hEnx$c1CiB#2t8)oPRS?+QWtIAnShmkrBUtYuAw2h; zWSw+%6S1Yy9n^fR2XSwfodF}OV2qRH$gXK}S*9aw7RHs5WrAut|FBaR6}esoGG~z* zUMC#(C$Bi%U_)0dVEtpVE3;;xH*dvr*FN|l8SJgb%HJc9 z6J*_jUvxZYsi_KNyGAZ~mMJHM7vBS>;^sKY+oQly|3V4#K?A1GaXx@NpPot5{j6Md zmlE<`%kYFgO~<@{bCocvLB5*{LLych#mF;1JXZQA*>D0`y2tpsI?xq5I(#qPbSct0Hl=1f`2~~fDPqhm z_qWNEN)I<3yMl6J#po!(@L#wUu?C(&ON@X_BC#rKGLqAJz)s#R@^!VU`KwTz=k|qN zbMI;if5m-pAD-JDq9-CW7tx>J_xxyB21z3%KtI-fYz+h*~a=qdvI zBPztp{3_=3MF_IDd+xmYFrdSxrp$WplsWBwAYJ?lm*wdbnp&Lt5@EjJiLB|z;G*fr zi_g2-1#hD26;1$ka)^ASwg@Y@!Cs+G(~~H-P>+2-w8>N4L6WNxl~N;J;~!;1$%>6W z7KEnCQg`6UPi>1s@0FY^;G5WJ0f%PeH42|{M^|%-IA)peY(6}$`1?+!cHXcC*}CoA zO-u+6@$&iJ8TKPb2JC*_BGc1)61qk!{IX?vI$3sP9x=HI8Ws25c9LL}krO~5xZaPA z&^NEh3(h?kJMHGx1BLuLt}hQxcs8H3ip{DPbH0zZO!Ob&x^3AfIi~tEcTJOb?ZFDgN$;xT+thX!B=_OO zldR6n2&*UrE|$~h1Z(Kw$us0<^*Cjpo%-DOgU#D9Oi@0Ag4Ni~P^{q+nj}gSAD(JUkxPKW&#^00` zugEFPG!ZLEF7M?C=SHDV^2EnBsAymtX+A1edho&YHNZ%{kcjO>de%8dOejx-<1IbB z+4fSdv(~&>)t?b7v7VS>alX`DtJfz!0kApo$`^r`^UA+Ot;^QaO3I#6w_*9KAq918 z`0&;z`$QO~*3Bpbe4~wTk!k$?3Z+7ynEk|aMUHHuW?e;6En=kc_cg%%cMd3;eyTX> zMmjwbynv+T`5p4D!~>rdsc7~h(SFh?O#l=*(zB72l*HW#$jv@e{t3;)XP$!3V?D50 zD!|xx(|}4!Ap2k=xAJ>Da_%xL5pUV~!Nwy4g-X`Lj-=*`#)ogoh{5y|YO-W9_D2#r z?dZ%`I52j2ZVS`hxIXfSD=EyS>PaYm-nNF|#SQ$4w5(;!+5Fg!pW~PLi6kKjrY zCf)?cXZPkYI}&vB1>PzTwihh@G)l(8pxI^U&1F*GW&QmBLvVs-fJi zTR|khuJ3|Xei2r&xvBL|6H{9A$5D%2zsKu8FQ;ndG$f-DpXpj1_A`i75I}*C{`Abo z{ZP*1;@f>UZGSs$fS$w*ZWN=Ie_?K!WYoxa~(*aEs7VLjJ;N-(n z6UtF2jQ@#B&u)o`mvG}ro}5oYZS&iKDp=`W@{4pyC$YEg8}uubk!sdo(uT-hH$hDu z0y?Dg8;EEey_a+Vr7PtKvdU*%oiz#YyNJ|XqueAUea~=SK1eMs{>W#Yy%GR4UCUl8 zKYTHx?`t~cx`rgtJIsMpE-L*#FQ$jT*6A<}9<}{4UH)l@X`RaR3Ws-xjChqg;pL%n z{c&N_tuBKHlpCSVea#zeRtb6NCG}4ti!E#c{&(lyg5EMOVlT=ngBQ4-WptKa%TJKg zKQ)E3#6?w|HFoVwNJJ?A`E?8z8tTH8uiH7-O zgUY@<_@!-ZiEym?^a5v0$BMaT4ruA;)jW-|t}XO-9-!#N1|6~yY5}<-r6?eLmug|C zf}6+jDcAdSDaAXXa>$gL5Sb6IpQF!y5J??d0SyZVNiXl^`iYf9jL`WcG=%Y#U^|}5 zDmqdzCO)W~?$fv8hL}}hZxfOQhHJ~8-q)%p8-5%P^dtM9zr9?KsSrZzL1n;GSs=)M zYA76?*+Z6y$Po(NC>?4N+tgctALT72Hr%URVJAQyt-n|;f@8CX?^T`dIUQpG2 z-73KIG3mRy?zH$KEYj&d5`C%8;q3x`IxP2H`OQRKqCtoDlgr*KhAsJ?wvF#rK6fe5 zd|cFlq$Ek`SDi04kfML#orreSMg}A)S{iK*i?cy}Kt`t{#sDulAx26H*4%qKCYTXp zSfO-$4ZXt5Z$<1m3r-37RG7p~kGPDvl}s0j9yBeW-a|^VpH$GNrN1$aHe3o*J{QnF z&4=;*cso#bE#ER-))KAT^&?*{ZC3yZR{(Nw;3d_2x4@|e9b!v3%f`xh=ecl^xPJB* z0G2tjfz9CgNx`3ntHCK~W6A|fS3_f2;?x1+&nqpSo{lI4)DGF^h@%Qj6l-ieSSf?i)UHIO7grEeA8REQ$!_6DEHNpfLjc`V{}fz4b!E=q>p&LDcpsD)=I^lzh`+Gm>Be-$%_3JaeOu% z7xNBv!2|gD^`ESt@lTOgtWYt6BIU`c1N$Ego9&UVA}DqGF#-op#8zg-C`kYK^X3T( z04Dl3mZW+)g@3)M@z=Up8CeWD`px30^W{Kaz4XBU8?9qm^()v?-532UM!p-M8Kzrp zeGmW6S)yOXCZL{`6M}6Vr44GHd~Gr zYM@gEdYokM$k~{l(its(elh*HR|Fu9C*uxRg7CE_+NpK(ig4|B!}HTs*0Bc$K)LGg zXyA%i67aKzCZQDewS9Klt;V70jHcjD?%6}OB);cH$K(L#jzQWnx*BxF_88GXgNRtV z>=h|4=|@3Iny>7UXb=f}ZL%79k^KwTX_CFzVWG-&nE;Hibzs_rvBRzI3m>tfocZ{5 zbBL^&mm}mK5k6ze&<_ij;rPy(zZqs`75>Wf!$u}_BadzmD&YQN1n23|{$I|8ku4O+ zNGI=u@%y)o;gn{$@{^VO0kMIUwcRP6et*gJEe|N>y00be zmqfXiRaEsPYtO>R%+ieAAqqzigJSE64}kb~GZ8fG#jHI!57uEKY^v8VD$8AZ)oVhC zUsnSgm&ikxtvGU<0T$GDq*z>{hFO;ce-MZq-s-C92&8*5kP|;=XJejL7kEqCT(H08 zEw7ANv7hkOU0>g$V2BQ%QQ&Co|IyIB5n7wnfIuK!KR?QTTz2W!%9^it#Ir*ATuB-k zXSdkF@8SpSf2AJK=2IBf7$nPrh5J=bpTs<6 z+gzGYp~UL$886KWIk4H5Fl}la$pRT-!Yg|v_n+>Nq5WO7o~+%0Xlkcw*X+xhhU8uZ zrI7y2Xp;gCi$g-A2&%P(1tY>OqtAB|z=C@|n8PL3KxuhJbQik#SRH29(o9lTVlxZV?k? zlOjO5tD1$D)kr}|VTJO}?T9{U`=r#&;eb1r3;G45@EvOL3}3+KeOUaer$$EAh_up# zImw0lCUu=Wuhzf_I{@YeF^5&_il)3g*e*Tx(=jYACzx|K@j&97b7@4( zecAmqOpVOJeJ&|?a>h46$0*d2;&Il7Vm&^{d^pw@wahO`)XQS*ztv^0hfRI>oEnK+ zG11{1%7R_{zD1;3(e#eSiH1Q-Z!g|D*ezM>XVz6>v5GpA9tSru(`(+BjSOd*vD+ae z6{Wu|*~y3vwyDU@ zj)s!kEjfHa8q+K{=1hv!Zm5StQQz*5#~>Xwf7Obw8@`pmlWcy6O#h?bTdNK3+?OCz zbFZL*NDD~zetBdAHJ4fPefBZc+LuI=PL;cvz^3r-B{w+VvkP^pMYUEo*I<*d|KSpx zeXma4s4GsOfwn%Q1kzzF#&+c2Y6P=@KO<&|0Zw6p0`$LU>s*aTQJG^*r}tn~xj#r< zkcVDAQQGfuP;r1$p)4p;ETxr^&9wFiD8E)#ZX?>!@l!2|Njxl2N^sL=30n*GpjLLR z)Z6$bk_GYk%wGmWT7^@v2S|t?)B4Ytc+`6U&G2VBAhR5x1mozv|AN4!9YRhC>ZQvV)4MYeR0qj?z|kA-$@TvX%!`p0r^Ia9YL#xk?8Bp<3Kv>0|pv0e>%7OS{>=6-Mm_GQ6<0wL`*6~Ci3O%G-afcM=BrqapS(v zFHtH}kWj`cu;UmWlqb)3F(Y3-az~ut>#5g|4UfHRcrh(ibNA=z9F8tg-_Bi2@_5dR z2S{`g$Cq90ciilw?zA*jCVb&vUOvf&C^{&wma zp4${KtZu$n6Y)6-HmQS_kX6Aj8}DQ*YCa}*Xm^~zj-am$Oz@)IwYhG~Qa|md9I~gN z0ay-4NlzF_@pY1z8Dku=)m?Xd-&pqXnh1iN(KdS;)nMricj(b?>uFmZrEd_w+N^k* z3b^M?ew~$vI)cD!RHhEf)dik!MA=Qcp6_kVOK_1O&{??@s)@~~;2UGA>Mkh=?j!;7 z-=&n*W~}D(3mY!x)o~iTkbAmNtydD z_}H-JXaH3Vuukb*33a;*7m)ii#Xp3%av%ojZ~n|L*6#q%j|ABIJ|h_#d` z-wh-6rK|L5+Y#`BOQ2F8^8v+JwK@mQ73Tzz{2CBzx_diWfH8+bxT-}9BbSGHI@`QH zqda}d9?wlGihh-ukpW@+AX%EOIbe^5H|z+(KmgVH-L8^Rxm<<@l%S;ME{&Q{Wz3$s zos_X~0kXkuGW4;Mu7Za2na2o*$(`Gp2!vmlNK`!3J}?dTXyAgeNEI!Z4&U{m&xSLd z%D7%heA5ZjE-b#z52ORHxZS&ffAEG1Q{`e8q}nx8u*%=XFkjrp(4ITKo4x8M?@<0 z7UVHD6wpNY9+vE#l~=dD#3S@^O-bCIyzt!=NF4kR*f2%ASC9^b`o}}Gj!5eJT9v&+ zJ#m}O5tbh45FCjG%a)ivIm!5CnduC3#z&%WHBL$$zT*D<<>V7pWc|-YVpe&jLSRz{ zIzL)#3c3|aWnNNm{w{HY04M~pwIL#l5cSk8wEo?1QZPFYVw-Q~>0g;|OMK%EK>FDwY$5s8M?y0VX%b{6MNxr>uvPJRUPvoL{d z3Ke$XTz=a z+%?!3Ubs1w`1_*D2-Y_%BzA2019v)3K%VA82t?(wNew5q`gD*Th0o68E^wXJ*m^pP z>N^w#ol5Nc3h$ScRe5ERSbo6;R5AEpRM9pa2ITc*2%qpD@>eLpio3a~>3gw04(}Ct zubU;VWDh`0{n2KsuYPI~a3B87^=g=A#R^tzlwb9W1734k=I{5ASt<-iPl65*ZIZau zL>*w+N;h`5$O+c4X7gK#y%4OC@o2yGMsDmbzhaP|el`D28qe7DeSyro+-V0-tY zzpte@47kRnzYmBXCnA44ssLFzXPc zV!pWTb(PVh?X_xvBb{OfvLlbfEoU4(?rVvJFwp;_kp+KD6MdldQfg7cjp=k>{OVO5 zL75IyX_?5rxMcTd85oUQrIOJKWI|Q_A*z|NIG+6$fbUQ%zPuh^u57R!hIK{FP96R1 zVd@s?4cM*ZHO>L}Ob<=qXI`Y%1WgtH$|K_$AXlrzEZD(Ew>Le$>qOt19o0>Z!Y%9# zpaK5Pu1Gry>edKnIrra!BVUkxT9cKPZjRw^QN-N<;T9Wtbhs2`3Tig@<=}`}agmZl z*N-;?THL>jH{R{mIW@U~F}hBU6|-BM&nLm}vFf?x5`Q2Tcqfq21H_nak)c`=Dxgb8 zr-54ibr0=roLryn_;qC-2>?N54I!WQV8VjeTck^MoqyV;mh%;l0cw!+lEj;TKZ`)* z62CBvcsmJ+bO-F7Or(LuW!ubs@W%p~Y}L@D^FAOE&wbHGu)-=%V|Y;Mv{V5|tN1Jq&hN`Eo6Oa*(`PET0Mdfn%{Ox7&=Sqj)%h6tn{>ll=3ICoeBzZ?gsCTZ z)ru9;!#_QHL6>IA-&`)#ow;T*M<5&6IX)Bx{m5g+Ml#k}%clvum~;=y5hGP_B6U&| z99D9JJIAOgN_+F#{4EEb*nNurT&ENH2;>D$N-di*eVc^DwNip;*StB$FQ5Jf!dvG? zs-7>%Xae)a^=c{CfaZ6JJwOqTT(w894|TKSH24HBz~1r7N!Lg-2}=ougb4~khe!~3 zi8-T2Aw}ZddrW?oOJ?Ph=9)Mo17Z9Zb1hbwdJf|&$*1VPY-zTnPF4O zeTy_B#2YdkS1D;xI;E6ah4-A4kxujIYaQ3SFMK3j4^W3|if!ePWJO>j-1b?Isz$+KXU zTkrx|Y$J04D6+WGQ8Q=uGCkdVAdU^lQ6&uP zHr{lLlzf=7O}Ll|`CULTB>&w=Tec#bXvZk2@cHZaq&T|Cs|tu(u*#pC&XtIYkY0U| z`6^O>XlfjFY&cm~(nCmLH`5)*Zc%1U^912mkV$fFr8QCiMy2f^8^h5s?s7VMn41tjPjWuH2Q$rfTA4ge!_4DtiPoZ>BPkR4al2Xn%| zMHd+!y3}j9|1c>ie(qn^7+bdO$g`H3Lcp5Wj9hp0Gh;1F&3TVYi+cy20V76WkGcK` zD%7o;{Pl|~pIOWa0y(v+ua$tvh_;NZ09gr!Rg)lGnaplxOosf(d2yCXo%6h-SLDG8 z^=g(~Iq%8N$_jx~)m}pNj$iMblFLRg=fy*$q_&pb0E-npZN+{}(oV8i5H6?mK85X!e(81ue24KZth|EZ(oK%o~SwcxzSbWaAcX@JoXOt8#_BlE+ut& z5tyF|wX+4Yy3gf-WnG=|BHwr3U?iKNpYJwH$kUhV9-bEtv<=6-I}6{gm6uStwW~*r8rP)pQob zsYC~kw8Uc?x7`!1J5boWt=mkeEH8`iLrcD_qWuNT&JD|{yK?x7Qy4%(NftmuYOSeF z{Qf(zWP4abA;AK?VZj2=>v$B#;qj?RKGs)h_~$?z!uG4WvZs= z2y{VA0fcj`|B)(!{l#kwApU?z#`6z9N>;abz*=(F%zdVW6;OkkSCu;HFWId zN8Z3kfsCQd_N*fbeJ2EgH@HjSzQ_t1B9y|)u6qjX6XOIxVkB+4b-g2)QE&dG9kdh@ z9#mQOr8Yi$f67`S3Fp4n``d&G>ov`A=)<@u{#(#VIvvX1GH3>3P6(myE)c+ymW(NT zdoJgrS~~*^Tw<3b1RrE$cE0Ahv5c$zx>^Z{A4r^3H)(W>d`gtu>4v8Z`K=MA32&@4 zN_BsWQM27mw$ldIIgKPl2(mdwVvmaBDGo9~h;mW{dxs+|FmV>>kOeoT2K`Ml>+B#h z)Gau;Sy^5GKmk;JR|{*chD{Phz1v_=q=%%EePY&*mj4^|^6*F5>4X&BQjO-(b6GJ4 z;Ki3?yNuF#n{03`Tz6ekyuw7kI&$f%(WPrXDilhjS?vc2Zq-dBn{wROy29AaiiwBJ z$p=xE7-KbvQ~cP6P^u~P&yV{=Y^Bx`lO@>(KkcC|)eR1@w>%$a8uFRJ=6+Saoh{m& zld+nz{0d@sF$SGSuw*7 z{CF=S!f$hd)FLw#Zu8^M@`4hAP2scUf}`nmAi=vr2`;azBTQi#C9iA`l1?D0t(|%4 zL0F%-iaP$}v^Y`6_cq9929kRVwP>8s7Ujc13LWA`0upUcJhGZ zQEH<4jN)~-5bltH)C+BP1zyE-ux`sO{?g$;QSeNeI{PRCt3N{}^w~1OV)mB7q^U)t zFRY^ytN`(0kT0uv-a3<$2`dGo2B;TD-huzQQH9wU*OA`QmK|67Q<8UE4ghukCD!(< zLHfWs zx0X61GBzE&6??CRFP2;xG%~#{7D4o0D|d(f2oa1wBi`==m_Q26U`cOYAOq9dbJ$y) ze$5X}LR8B~cR{lIHuqa|&6fW9zvp!!jibEQ|KxQA7iI>#L1sJ98Bpv3W(>|x)Dm4_ zV(BM&7#xw;Gxw_sR9}akd@6}pDn`RY-Qvalcffdk3YFH(*zX{DN+YgVf2c0D_IsTf z=Y=#h=EH-_)_6_@IyK@hUO^R_?}f%lKAq}mYi$hs`Hn#U$rT@K0>Q4RjXT&G2va2y zF_8-8d;YK8laeU2^;)GEEXD6Se=|`J2EIu-DaSXs7Y?KF+ zRVI1hrdhOu8`7Z_RhqG}4NRv;{nZ9aONbrN+%`eB%@bn>@>ZZx&*LTN_z}?y>)_=j zPy`}{<*6kS+q)LLVrk;uZBoEu?&gCc^*!byDkQ*Lp??v8zy%vsW*gEkzgVWWL|$h zR#mbG{et_(`N5q>Ljm~@)`2+!!xD9t?rNL&mQ68%v%r4;Oy=qqgknS97v{ajFEm(x z+kyVKwQ~K856dW~$n>@6I^ONPsbp5UZ>USYjJ-nR80_A_b=UwM5qA_9{c0Ekok2q$ zq3|%8;$4OR)^-sGC!E*4TTIA=(*u->Tl4Yn&I{4nyyY?q8ZcC_D%$j4wUZCZK_6~o zlc2w-rW4)c5n3C!b5Ih13HLYduO?d(;?Hs4D=2CnT+uti*&&n4cntcs^0yMK>1oS; z^ZyMmKELO2!Duj??+}OutzfVrAOV0_;LnQs@V~oBrah22dMxy-^F0`@z6$!Fodn$V z_ncp&;#metw?S%X2tahFpB#62`9T|yUw^HR5<7jCJ!sy_Dw4O!*@{0R)2WeB2Hksa zacfvvTk%8&C;o1c2>=1Agczopx8rfa>=u9%zX3vZ5a^_OLXSOC=iKuIr$+$oBaR;1 z(6D}0?VHWgHh%}kJ`kHgAh1*?L6Zd6-yJ{@$Y(h`Hl-)p3T|`g;a)!S=e)U<3CR14 z>i4Qz!ke%@0h}DZ5D-WQ9QK;^7`u(v=9ZZ-kx&b&f0}^eNCdP30o2}O8s`M`>^e7b zc0E|DrBs2QsMVI2Y5bM>aT3_ZtFTb>x43W>l?oT%V*)q|V#Bw6PSC#^oxYPJ{}TH$ zyanHbC*6r>g){%RPN&66%@`-DXHQvHmS1!Kz9&c(>BL#~`);_3cS;DcL^tCVgJsldrOgcpyvHR|J93M;Z4Awtrf@nxUmH z$A%J^ISPm3gmxpTe~=tPB45hE{*ndWP!QCGkXa5;Y>Qn zE+ee^3i7fi8GdoQWF|s7KqkzXe%!fX>6 zqO3h5|FiWi`O*JV>)YaM7tn=QNcVTQ&xIvn%4gx4CXHo?@;M!VC!|&NI|Z;OgtDT6o)i(as7F0-dBw591N|*(52TLqtQPy!RKfz_}H3qCuh~AaI3z z5O#gq0Ei-$yP$qXHi%=N%@h7Vv{rspa7~r^^RiD3bWSG9gz=|>w$`4OQUj%`BCH@Y za*fQ?)yl&Xdx2nZi+|X`$YcD71(NW1e}SGg7?A=?80pY%Sb_oA&hL*;l(8*aqdp>{ZctxGLPWZMlZGK0Ga zX0Jk3^iLxVy!sSpCMe*bWArhBB0QL~{4J`^#t<=x4gazxSK(eLb}Kv6w(=I zDP@{3*FO^FAMw!)ipwfmM-;(I5$+O;Egy>Yt6fe^oOL|LT4CfC+dH=ly{4R{@ zBvIU>{ox#-h4ftSAA@Ncm|kkd2gT82%!`rheFTmku>LoK%Bn{a>zNsP#ro{S5$^gi zWw!mkDBeOr<^P8caL8rjwgY^t^ii?*k|kSN9yzfr+aPFLGww+O0j6FN;30$F;PxBu%9Iq?GSwfmj1_hH zQDUn#Tlg1!Fv0Y}pp06ny3zN#n4`oVzvkSe{QT^EU^1K5X1JqtTYZGoB}_VLsZk*L zAR=%Y>Mptdf-M^I>|A+7aCVSjzsK-=<(mr)$+|?Pr`u!YYod3*Q`AR58$>*GK+$+v zF;;uF@(sy&Q-Z1Dk>vxfllfub1iyrBPX7{bf#oh|<`KzL7uVgspp=hE9=<8df&FEX zvy%`|!2_qUU0Ynnl>-*QShgo*X)}uG5Th;L6vn{!907m^Uc{zELj*OKfM*`WH=(Y2<&k@$E?aA^sH?^DkVE%QZ}W z-G(~M(6Fn<7BNGw3&XQu6a_p#TMMtq&S=ByT0@FoFR5L^_HJyMH}gYS$aN49Q@u-I z1 zs>~)Dx>sSZCtSwNJZ@Cod&X=p7|VQDqf)R7u2zF%-kd5wJrVZd(@E{u!PDft2)(S< zocX#TPKd30aTzkVz1~92EsX`);ML^J^PCj{M6&psSorj11Wtu&J2eP!uLK&@o!Ebd zW#Hj&jf>*)UD~$to7{|wtAM5?(Y9IK@=#2B{`sh6|1m!*_njA!J1gK*WVJf^DOQ@g zwi}g(i`idAJtW$^(7>F?`BZ75Zqtmhq3Xm}zQPEM_w7>4L#v+u=Of)nGOM@Zcglh-y4nMd#>?QsLK8C0?8CT{2B)HLh-O#jB2 zJyM&277ie=hjS}Dd;elaU8OG7RbA6n2@JGEvMqnwx!`=+m% zuU}C}WbA?!cCxFy^F`3^1J0oQ2zy}kkZz^l@~dj&#dC2Su@f3@bT z#mrq-!Bq<1lb1TtZy~-M@CL=yc{fy?5J`rgaPNrQQCg?_zU*5N)Y4M=)tYDg!9MA0 zUXu2{0d|G~Sl6$%6@w>3l03?wciPKvD+$WXrkf+^*^csY9|7O+Pa2!`JSwaOF2jVq zQb?osguFxOE55UEML^ogR)TL9w(i)70eI9WQ}4jLqoH0s5^eic>tF)W2Y*r7lKx>p z(vE(Uvg2mrTPQg@^Sp+I?#XB<=_LbbQ27Q6Akw>-VXaJ@v^nyB7aV|7;0rGv6UAM4 z9}b<9Hrk%=E{;}Q`M5D}PW_%KO!D5&7V_*x1&ozQ*rk=4Q9!mha<*lZbO$3%eI&q5 zYg_u-d2|iDjL9Zer_$sMHT=D{-xA(#t5~dC%_L$9YF!l+k((nf)r}TjQ4H`_hG}9y z!+YuwR#W(;*dJV>f+nc&>Pddy+odUL$nBznfSSQ&5B>A2sp2g-DxRzZ%5x*C#R#ZY z)gzLv#TQW=cB~$+*L2W+jT;R{tI}-IXz-HwwzV;|LM=k?Lxfaud0wBIpg8#$n0nls zll9!)iwLrvsO3pY)=QRWSfl18AXTYrqt+2pQE_2e@jIvT$?K$_liJGyYY-YHU2e|a zz6~)YAtgc}f6UJMaD{?hbis1AAFZ{qqDNvrYGd+;Adn@^7F=*nDq-huirn=XNDMqh zbE#kaF9vu(yg|m5hGTbR=^C5L%Nv^@BW&;(s-AZb41mYZT`M zF!fZRmI_A+AZodYT&8L*0TL;SV3BZKqTH_jt12GqLPF!F~Hg_3CA3w^*ARqv`U-J%_;HN{$gQhYc*fkbx z7g2r8rd`vt&W$;!4k)ul+|Q&_Yk~`Ji4P(-QK@s>z^C((z`y8W@|f~l;~X**_UPc_ zUc3pQ$FiQ23VeXzy(`gAo`uJ(xTf1D5qx)oYt>41DBjCW_29%b&YY`6Mim>HB8?I4 zg_vES_F%ViB>A^I$30*g@6^!znG{=Do#ox#2(;w!xyv;YbZRf<&8;cOL0uT zB=1FOu-6bt4M2mme9mgI)4S8$L2KoZ z&^{Yp{O1&JmB&xCGGAbGFCAf318!-9nw06BPXDFrz?gs?u4oKZd3+iW4(`F8J>y3t zZpYMGa-=~Lg?B_wuj5{W4dLL|6AhjqHRYZB)km`UW2ra$DT#CSQyC~Eo$2bF_!TYR zrci{9&t9_YB}seQWW-CI(5#Ul1@E;QH|d+p;eO;JbkN7o^k1O}fNK#?&k4)Q{4fJc z!I>8Zj8&Gj6Imu)&K=Teh*2I$(fV{HJKS`nOBDIt;y&k+$AmkzZAqK=>6dnb*mu6; z$2YhZ+d9A|CFd1mvTFUBSecrIF_x2acig|6SqV<$Sh|@lD@b}bQWt>0s54a}AiZb>f)=+Rebs3laoW*E|NeO*GQr%489!=XQ*6;+@Rsx0J@cWrBaxm%^=OYv?%qt=7pb?xjjV0 zC202t%jv)SsBQq!XDh`WKR;Ia4aRc2mv?;sxzaSN4QtG>#xlI|h?hUaMAxFJ=Mmjg@UAwSP!#wkCVxKx_>hv32^TZdn*22oyyP6|-KtiQa2nueZP*ve(JS%wJSo3q?X?YJqDKu zK=E9qq6|HK&%P*D?Q#NOb2jSf+zjCWPaabKE@9?NFDOqDX9E*ncT}lqwuLlHVtVbq zgr5apMDa@*TX8RjD3x=VqNc2GHs#8HU77xEv|wMv)$3eA64figLl1Ea+FCCS1s=A( zxB1SvIgL;y=bR_Mqyevk%`9Y#HI-}f8;7h2cV%BLi_)?U`2Z!xLbieW`jfF{_WJKv zPD6CHdtei3JAtAi#j{U5(Io3eBW>1TF1}`kh^YBm9mbB<0=lbT4#el60Wte_}fKp*;|aRS+eyBl1z6>V&TO?KbfVp(^U`;%2{VtnhZ ztE{e9-z&F0;ydjb-|otK9fu53y>I)rxMg5L>@f@-8`CH!Wfva#<6FOy{(wO&)s)05 zDJEk!LA#FoW#kdw$%iR(V8T4HFxMBr*jwP{ zyLG*%(EmR)?eEOAx0=iUqP_ivax?pr?e@{zEVsX&V2ez6vkMc<(!~oQ&2QRQ*wKh1 JJ)b5P{{bz7EUW+k delta 25985 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 QhYWo5wT-mOuh>Wa7jw`40{{R3 diff --git a/components/shop/shop.ttml b/components/shop/shop.ttml index 0d7e7ee..6367ae5 100644 --- a/components/shop/shop.ttml +++ b/components/shop/shop.ttml @@ -46,11 +46,11 @@ src="{{telJpgUrl}}" mode="widthFix" /> 电话 - 资质 - + --> {{item.addr}} diff --git a/package2/pages/appointment/appointment.js b/package2/pages/appointment/appointment.js index 60f1891..647f58c 100644 --- a/package2/pages/appointment/appointment.js +++ b/package2/pages/appointment/appointment.js @@ -17,7 +17,8 @@ Page({ pickedStartTime: "请选择", pickedEndTime: "请选择", describeStr: "", - status: "" + status: "", + isShowBtns: false }, onLoad(options) { console.log(options, 'options'); @@ -41,6 +42,7 @@ Page({ }, chooseAddress() { + if (!this.data.isShowBtns) return let that = this; tt.chooseLocation({ success: function (res) { @@ -228,15 +230,21 @@ Page({ } }).then(res => { console.log(res, 'getOrderReservationDetail'); + const status = res.data.status that.setData({ pickedAddress: res.data.userAddress || '请选择地址', pickedDate: util.timestampToTime(res.data.startDate, 'YYYY-MM-DD'), pickedStartTime: util.timestampToTime(res.data.startDate, 'hh:mm'), pickedEndTime: util.timestampToTime(res.data.endDate, 'hh:mm'), describeStr: res.data.describeStr, - status: res.data.status, + status, appointmentText: res.data.status == 1 ? "重新预约" : "修改预约" }) + if (status == 0 || status == 1 || status == 2 || status == 3) { + that.setData({ + isShowBtns: true + }) + } }).catch(err => { console.log(err, 'getOrderReservationDetail'); }) diff --git a/package2/pages/appointment/appointment.ttml b/package2/pages/appointment/appointment.ttml index 678a22a..a108828 100644 --- a/package2/pages/appointment/appointment.ttml +++ b/package2/pages/appointment/appointment.ttml @@ -15,22 +15,30 @@ - 选择服务日期: - + 选择服务日期: + {{ pickedDate }} - 预计上门时间: - {{ pickedStartTime }} + 预计上门时间: + {{ pickedStartTime + }} - - {{ pickedEndTime }} + {{ pickedEndTime }} - + - - + + + + + \ No newline at end of file diff --git a/pages/coupon/confirmation/confirmation.js b/pages/coupon/confirmation/confirmation.js index 4752728..3ae234f 100644 --- a/pages/coupon/confirmation/confirmation.js +++ b/pages/coupon/confirmation/confirmation.js @@ -302,7 +302,7 @@ Page({ } - if (item.key == 'Description') { + if (item.key == 'Description' && item.isRequired) { tempObj.Description = JSON.parse(item.data) } if (item.key == "can_no_use_date") { @@ -323,6 +323,7 @@ Page({ console.log(this.data.data, "data"); } }).catch(err => { + console.log(err, 'err'); tt.showToast({ title: err.message, icon: 'none', diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index e62a7c6..0d17cc0 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -100,7 +100,8 @@ Page({ mallList: [], imId: "", goodId: "", - IMorderId: "" + IMorderId: "", + use_num_per_consume: "" }, /** @@ -863,16 +864,26 @@ Page({ if (tempAppoinObj.need_appointment) { let subscribeSing = ""; if (tempAppoinObj.ahead_time_type == 1) { - subscribeSing = `需提前${tempAppoinObj.ahead_day_num}天致电商家预约` + subscribeSing = `需提前${tempAppoinObj.ahead_day_num}天预约` } else if (tempAppoinObj.ahead_time_type == 2) { - subscribeSing = `需提前${tempAppoinObj.ahead_hour_num}小时致电商家预约` + subscribeSing = `需提前${tempAppoinObj.ahead_hour_num}小时预约` } else if (tempAppoinObj.ahead_time_type == 3) { - subscribeSing = `需提前${tempAppoinObj.ahead_minute_num}分钟致电商家预约` + subscribeSing = `需提前${tempAppoinObj.ahead_minute_num}分钟预约` } tempObj.subscribeSing = subscribeSing } + } + if (item.key == "limit_use_rule") { + console.log(item, 'item'); + if (item.data != '') { + let tempAppoinObj = JSON.parse(item.data) + that.setData({ + use_num_per_consume: tempAppoinObj.use_num_per_consume || "" + }) + } } + if (item.key == "Notification") { if (item.data != '') { tempObj.curLsit = JSON.parse(item.data) @@ -896,7 +907,7 @@ Page({ } - if (item.key == 'Description') { + if (item.key == 'Description' && item.isRequired) { tempObj.Description = JSON.parse(item.data) } if (item.key == "can_no_use_date") { @@ -916,6 +927,7 @@ Page({ tt.setStorageSync('mallTenantId', mallTenantId) } }).catch(err => { + console.log(err, 'err'); tt.showToast({ title: err.message, icon: 'none', diff --git a/pages/coupon/detail/index.ttml b/pages/coupon/detail/index.ttml index 4a33e9d..e1d5c50 100644 --- a/pages/coupon/detail/index.ttml +++ b/pages/coupon/detail/index.ttml @@ -150,26 +150,30 @@ • {{soldStartTime}}至{{soldEndTime}} - 可用时间 - • 商家营业时间内到店使用 + 可用时间 + • 商家营业时间内使用 • 周末不支持使用 • 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用 - 购买限制 - • 每个用户限购{{data.useLimitQuantity}}单 + 购买限制 + • 每个用户限购{{order.useLimitQuantity}}单 + + 使用限制 + • 每个用户仅可用{{use_num_per_consume}}张 预约消费 - • 无需预约,高峰时段可能等位 + • 无需预约 • {{data.subscribeSing}} 适用人数 - • 该团购劵最多{{data.rec_person_num_max}}人使用 + • 该优惠劵最多{{data.rec_person_num_max}}人使用 - 温馨提示 - • 团购券不支持配送或外卖 - • 该团购商品{{data.pack=='false'?'不支持':'支持'}}打包 + 温馨提示 + + • 该优惠商品{{data.pack=='false'?'不支持':'支持'}}打包 • {{data.besides=="false"?'不可以':'可以'}}外带餐食 • diff --git a/pages/coupon/instructions/instructions.js b/pages/coupon/instructions/instructions.js index 15a8eda..5a992bf 100644 --- a/pages/coupon/instructions/instructions.js +++ b/pages/coupon/instructions/instructions.js @@ -6,14 +6,14 @@ const util = require("../../../utils/util"); const imgurl = require("../../../utils/imgurl"); Page({ data: { - couponIds:"", - couponChannelId:"", - showPage:false, - data:{}, - spuIdObj:{}, - priceAndStockObj:{}, - validStartDate:"", - validEndDate:"", + couponIds: "", + couponChannelId: "", + showPage: false, + data: {}, + spuIdObj: {}, + priceAndStockObj: {}, + validStartDate: "", + validEndDate: "", }, onLoad: function (options) { @@ -37,161 +37,163 @@ Page({ }; Http.get(parmer).then(res => { + that.setData({ + couponId: res.data.couponId + }) + /** + * activityStatus==0 活动未开始 + * activityStatus==1 活动已开始 + * flag == endclock 说明倒计时已经结束 + */ + if (res.data.endTime && res.data.beginTime) { that.setData({ - couponId: res.data.couponId + begin_time: res.data.beginTime, + end_time: res.data.endTime, + activityStatus: res.data.actStatus ? res.data.actStatus : '' }) - /** - * activityStatus==0 活动未开始 - * activityStatus==1 活动已开始 - * flag == endclock 说明倒计时已经结束 - */ - if (res.data.endTime && res.data.beginTime) { - that.setData({ - begin_time: res.data.beginTime, - end_time: res.data.endTime, - activityStatus: res.data.actStatus ? res.data.actStatus : '' - }) - if (res.data.actStatus == 0 && flag != 'endclock') { - that.countdown(res.data.beginTime); - } else if (res.data.actStatus != 0 && flag != 'endclock') { - that.countdown(res.data.endTime); + if (res.data.actStatus == 0 && flag != 'endclock') { + that.countdown(res.data.beginTime); + } else if (res.data.actStatus != 0 && flag != 'endclock') { + that.countdown(res.data.endTime); + } else { + clearInterval(that.data.setInterval) + } + if (res.data.actStatus == 0) { + var beginTime = util.formatTime(res.data.beginTime, "yyyy-MM-dd hh:mm:ss"); + if (util.timechuo(beginTime).indexOf('-') == 0) { + that.setData({ + beginTime: "活动已结束", + }); } else { - clearInterval(that.data.setInterval) + that.setData({ + beginTime: util.timechuo(beginTime) + }); } - if (res.data.actStatus == 0) { - var beginTime = util.formatTime(res.data.beginTime, "yyyy-MM-dd hh:mm:ss"); - if (util.timechuo(beginTime).indexOf('-') == 0) { - that.setData({ - beginTime: "活动已结束", - }); - } else { - that.setData({ - beginTime: util.timechuo(beginTime) - }); - } + } else { + var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss"); + if (util.timechuo(endTime).indexOf('-') == 0) { + that.setData({ + endtime: "活动已结束", + }); } else { - var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss"); - if (util.timechuo(endTime).indexOf('-') == 0) { - that.setData({ - endtime: "活动已结束", - }); - } else { - that.setData({ - endtime: util.timechuo(endTime) - }); - } + that.setData({ + endtime: util.timechuo(endTime) + }); } } - tt.hideLoading(); + } + tt.hideLoading(); + that.setData({ + data: res.data, + }); + if (res.data.type == 10) { + that.setData({ + salePriceStr: res.data.salePriceStr, + pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"), + pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"), + priceStr: res.data.priceStr, + tailPriceStr: res.data.tailPriceStr, + origPriceStr: res.data.origPriceStr + }) + } + if (res.data.validType == 1) { that.setData({ - data: res.data, + soldStartTime: util.timestampToTime(res.data.soldStartTime, "YYYY-MM-DD") || null, + soldEndTime: util.timestampToTime(res.data.soldEndTime, "YYYY-MM-DD") || null, + validStartDate: util.timestampToTime(res.data.validStartDate, "YYYY-MM-DD"), + validEndDate: util.timestampToTime(res.data.validEndDate, "YYYY-MM-DD"), + pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"), + pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"), }); - if (res.data.type == 10) { + } else { + if (res.data.validDays) { that.setData({ - salePriceStr: res.data.salePriceStr, - pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"), - pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"), - priceStr: res.data.priceStr, - tailPriceStr: res.data.tailPriceStr, - origPriceStr: res.data.origPriceStr - }) - } - if (res.data.validType == 1) { - that.setData({ - validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"), - validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"), - pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"), - pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"), + validDays: res.data.validDays }); - } else { - if (res.data.validDays) { - that.setData({ - validDays: res.data.validDays - }); - } } + } - if (res.data.itemGroup) { - let tempObj = this.data.data - tempObj.itemGroup = JSON.parse(tempObj.itemGroup) - this.setData({ - data: tempObj - }) - console.log(this.data.data, "data"); - } + if (res.data.itemGroup) { + let tempObj = this.data.data + tempObj.itemGroup = JSON.parse(tempObj.itemGroup) + this.setData({ + data: tempObj + }) + console.log(this.data.data, "data"); + } - if (res.data.productAttrs && res.data.skuAttrs) { - let tempObj = this.data.data - tempObj.productAttrs = JSON.parse(tempObj.productAttrs) - tempObj.skuAttrs = JSON.parse(tempObj.skuAttrs) - tempObj.productAttrs.map(item => { + if (res.data.productAttrs && res.data.skuAttrs) { + let tempObj = this.data.data + tempObj.productAttrs = JSON.parse(tempObj.productAttrs) + tempObj.skuAttrs = JSON.parse(tempObj.skuAttrs) + tempObj.productAttrs.map(item => { - if (item.key == "appointment") { - let tempAppoinObj = JSON.parse(item.data) - if (tempAppoinObj.need_appointment) { - let subscribeSing = ""; - if (tempAppoinObj.ahead_time_type == 1) { - subscribeSing = `需提前${tempAppoinObj.ahead_day_num}天致电商家预约` - } else if (tempAppoinObj.ahead_time_type == 2) { - subscribeSing = `需提前${tempAppoinObj.ahead_hour_num}小时致电商家预约` - } else if (tempAppoinObj.ahead_time_type == 3) { - subscribeSing = `需提前${tempAppoinObj.ahead_minute_num}分钟致电商家预约` - } - tempObj.subscribeSing = subscribeSing + if (item.key == "appointment") { + let tempAppoinObj = JSON.parse(item.data) + if (tempAppoinObj.need_appointment) { + let subscribeSing = ""; + if (tempAppoinObj.ahead_time_type == 1) { + subscribeSing = `需提前${tempAppoinObj.ahead_day_num}天预约` + } else if (tempAppoinObj.ahead_time_type == 2) { + subscribeSing = `需提前${tempAppoinObj.ahead_hour_num}小时预约` + } else if (tempAppoinObj.ahead_time_type == 3) { + subscribeSing = `需提前${tempAppoinObj.ahead_minute_num}分钟预约` } - + tempObj.subscribeSing = subscribeSing } - if (item.key == "Notification") { - if (item.data != '') { - tempObj.curLsit = JSON.parse(item.data) - } - } - if (item.key == "bring_out_meal") { - tempObj.besides = item.data - } - if (item.key == "free_pack") { - tempObj.pack = item.data - } + } - if (item.key == "superimposed_discounts") { - tempObj.superimposed_discounts = item.data - } - if (item.key == "private_room") { - tempObj.private_room = item.data - } - if (item.key == "rec_person_num_max") { - tempObj.rec_person_num_max = item.data + if (item.key == "Notification") { + if (item.data != '') { + tempObj.curLsit = JSON.parse(item.data) } + } + if (item.key == "bring_out_meal") { + tempObj.besides = item.data + } + if (item.key == "free_pack") { + tempObj.pack = item.data + } + + if (item.key == "superimposed_discounts") { + tempObj.superimposed_discounts = item.data + } + if (item.key == "private_room") { + tempObj.private_room = item.data + } + if (item.key == "rec_person_num_max") { + tempObj.rec_person_num_max = item.data + } - if (item.key == 'Description') { - tempObj.Description = JSON.parse(item.data) - } - if (item.key == "can_no_use_date") { - tempObj.can_no_use_date = JSON.parse(item.data) - } - }) + if (item.key == 'Description' && item.isRequired) { + tempObj.Description = JSON.parse(item.data) + } + if (item.key == "can_no_use_date") { + tempObj.can_no_use_date = JSON.parse(item.data) + } + }) - tempObj.skuAttrs.map(item => { - if (item.key == "commodity") { - if (item.data != '') { - tempObj.itemGroup = JSON.parse(item.data) - } + tempObj.skuAttrs.map(item => { + if (item.key == "commodity") { + if (item.data != '') { + tempObj.itemGroup = JSON.parse(item.data) } - }) - this.setData({ - data: tempObj - }) - console.log(this.data.data, "data"); - } - }).catch(err => { - tt.showToast({ - title: err.message, - icon: 'none', - duration: 2000, - mask: false - }); - }) + } + }) + this.setData({ + data: tempObj + }) + console.log(this.data.data, "data"); + } + }).catch(err => { + tt.showToast({ + title: err.message, + icon: 'none', + duration: 2000, + mask: false + }); + }) }, }) \ No newline at end of file diff --git a/pages/coupon/instructions/instructions.ttml b/pages/coupon/instructions/instructions.ttml index 05c42d1..4ba77a0 100644 --- a/pages/coupon/instructions/instructions.ttml +++ b/pages/coupon/instructions/instructions.ttml @@ -1,39 +1,48 @@ - 购买须知 - 有效期 - • {{validStartDate}}至{{validEndDate}} - 可用时间 - • 商家营业时间内到店使用 - • 周末不支持使用 - • 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用 - - 购买限制 - • 每个用户限购{{data.useLimitQuantity}}单 - - 预约消费 - - • 无需预约,高峰时段可能等位 - • {{data.subscribeSing}} - - 适用人数 - • 该团购劵最多{{data.rec_person_num_max}}人使用 - - 温馨提示 - • 团购券不支持配送或外卖 - • 该团购商品{{data.pack=='false'?'不支持':'支持'}}打包 - • {{data.besides=="false"?'不可以':'可以'}}外带餐食 - - • {{data.superimposed_discounts=="false"?'不可以':'可以'}}享受店内其他优惠 - • {{data.private_room=="false"?'不可以使用':'可以使用'}}包间 - - 使用规则 - {{data.remark}} - - - - - - {{item.title}} - {{item.content}} - - \ No newline at end of file + 购买须知 + + 使用期 + • {{validStartDate}}至{{validEndDate}} + + + 售卖期 + • {{soldStartTime}}至{{soldEndTime}} + + + 可用时间 + • 商家营业时间内使用 + • 周末不支持使用 + • 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用 + + 购买限制 + • 每个用户限购{{order.useLimitQuantity}}单 + + 预约消费 + + • 无需预约 + • {{data.subscribeSing}} + + 适用人数 + • 该优惠劵最多{{data.rec_person_num_max}}人使用 + + + 温馨提示 + + • 该优惠商品{{data.pack=='false'?'不支持':'支持'}}打包 + • {{data.besides=="false"?'不可以':'可以'}}外带餐食 + + • + {{data.superimposed_discounts=="false"?'不可以':'可以'}}享受店内其他优惠 + • {{data.private_room=="false"?'不可以使用':'可以使用'}}包间 + + 使用规则 + {{data.remark}} + + + + + + {{item.title}} + {{item.content}} + + \ No newline at end of file diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 9cd8fda..4b5cb72 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -65,7 +65,8 @@ Page({ appointStart: "", appointEnd: "", appointmentId: "", - appointmentStatus: "" + appointmentStatus: "", + use_num_per_consume: "" }, imCallback(e) { @@ -207,6 +208,7 @@ Page({ if (res.data) { const appointStart = util.timestampToTime(res.data.startDate, 'YYYY-MM-DD hh:mm:ss') const appointEnd = util.timestampToTime(res.data.endDate, 'hh:mm:ss') + console.log(appointStart, appointEnd); const appointmentId = res.data.id const appointmentStatus = res.data.status that.setData({ @@ -462,15 +464,23 @@ Page({ if (tempAppoinObj.need_appointment) { let subscribeSing = ""; if (tempAppoinObj.ahead_time_type == 1) { - subscribeSing = `需提前${tempAppoinObj.ahead_day_num}天致电商家预约` + subscribeSing = `需提前${tempAppoinObj.ahead_day_num}天预约` } else if (tempAppoinObj.ahead_time_type == 2) { - subscribeSing = `需提前${tempAppoinObj.ahead_hour_num}小时致电商家预约` + subscribeSing = `需提前${tempAppoinObj.ahead_hour_num}小时预约` } else if (tempAppoinObj.ahead_time_type == 3) { - subscribeSing = `需提前${tempAppoinObj.ahead_minute_num}分钟致电商家预约` + subscribeSing = `需提前${tempAppoinObj.ahead_minute_num}分钟预约` } tempData.subscribeSing = subscribeSing } + } + if (item.key == "limit_use_rule") { + if (item.data != '') { + let tempAppoinObj = JSON.parse(item.data) + that.setData({ + use_num_per_consume: tempAppoinObj.use_num_per_consume || "" + }) + } } if (item.key == "Notification") { @@ -496,7 +506,7 @@ Page({ } - if (item.key == 'Description') { + if (item.key == 'Description' && item.isRequired) { tempData.Description = JSON.parse(item.data) } if (item.key == "can_no_use_date") { diff --git a/pages/order/detail/index.ttml b/pages/order/detail/index.ttml index a1272ee..e3328e1 100644 --- a/pages/order/detail/index.ttml +++ b/pages/order/detail/index.ttml @@ -128,6 +128,18 @@ tt:if="{{ isAppointment && ( appointmentStatus == 1 || appointmentStatus == 2 || appointmentStatus == 3 ) }}" class="fr" style="color: #d4a971;">预约已取消 + 预约派单中 + + 预约已派单 + + 预约派单中 + + 预约派单中 + + 服务已完成 + + 已评价 + @@ -222,27 +234,38 @@ 购买须知 - 有效期 + 使用期 • {{order.validStartDate}}至{{order.validEndDate}} + + + 售卖期 + • {{order.soldStartTime}}至{{order.soldEndTime}} + + 可用时间 - • 商家营业时间内到店使用 + • 商家营业时间内使用 • 周末不支持使用 • 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用 - 购买限制 - • 每个用户限购{{order.useLimitQuantity}}单 + 购买限制 + • 每个用户限购{{order.useLimitQuantity}}单 + + 使用限制 + • 每个用户仅可用{{use_num_per_consume}}张 预约消费 - • 无需预约,高峰时段可能等位 + • 无需预约 • {{order.subscribeSing}} 适用人数 - • 该团购劵最多{{order.rec_person_num_max}}人使用 + • 该优惠劵最多{{order.rec_person_num_max}}人使用 + + + 温馨提示 - 温馨提示 - • 团购券不支持配送或外卖 - • 该团购商品{{order.pack=='false'?'不支持':'支持'}}打包 + • 该优惠商品{{order.pack=='false'?'不支持':'支持'}}打包 • {{order.besides=="false"?'不可以':'可以'}}外带餐食 • @@ -308,11 +331,11 @@ • {{order.subscribeSing}} 适用人数 - • 该团购劵最多{{order.rec_person_num_max}}人使用 + • 该优惠劵最多{{order.rec_person_num_max}}人使用 温馨提示 - • 团购券不支持配送或外卖 - • 该团购商品{{order.pack=='false'?'不支持':'支持'}}打包 + • 该优惠券不支持配送或外卖 + • 该优惠商品{{order.pack=='false'?'不支持':'支持'}}打包 • {{order.besides=="false"?'不可以':'可以'}}外带餐食 • diff --git a/pages/order/detail/index.ttss b/pages/order/detail/index.ttss index 8a597b5..2cf41eb 100644 --- a/pages/order/detail/index.ttss +++ b/pages/order/detail/index.ttss @@ -834,6 +834,7 @@ radio { background: #fff; overflow: hidden; padding-bottom: 10rpx; + margin-bottom: 20rpx; } .groupTitleBox { diff --git a/pages/paySnapshoot/paySnapshoot.js b/pages/paySnapshoot/paySnapshoot.js index 1ae3349..51d6a3b 100644 --- a/pages/paySnapshoot/paySnapshoot.js +++ b/pages/paySnapshoot/paySnapshoot.js @@ -683,7 +683,7 @@ Page({ } - if (item.key == 'Description') { + if (item.key == 'Description' && item.isRequired) { tempObj.Description = JSON.parse(item.data) } if (item.key == "can_no_use_date") {