From a3e96e759317bf17b91a9e19b03ff2bb870a9488 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 22 Dec 2018 18:23:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=89=AB=E4=B8=80=E6=89=AB=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8D=A1=E4=BD=99=E9=A2=9D=EF=BC=8C=E5=8D=A1?= =?UTF-8?q?=E5=8C=85=E5=88=97=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/give.png | Bin 10764 -> 28910 bytes config/config.js | 2 +- pages/ConsumeDetail/ConsumeDetail.js | 1 - pages/ConsumeDetail/ConsumeDetail.json | 2 +- pages/cardorder/index/index.js | 2 +- pages/cardorder/index/index.wxml | 18 ++++++++++-------- pages/cardorder/index/index.wxss | 6 +++--- pages/coupon/detail/index.wxml | 2 +- pages/scanPay/scanPay.js | 4 ++-- pages/scanPay/scanPay.wxml | 1 + pages/scanPay/scanPay.wxss | 6 +++--- 11 files changed, 23 insertions(+), 21 deletions(-) diff --git a/assets/images/give.png b/assets/images/give.png index 2c606f30fde8dad60a515b198776348f11ad785f..3885f93cc6f895b1e14ec40763734e3bd338dff2 100644 GIT binary patch literal 28910 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 literal 10764 zcmZ{~Ra{ix`~JOW=pI^nq`Nz0fI&g&?nXjNKtOT`=@`1DTR>XrZV_pa4he(q`p@V4 zdrqH&z4ysp_g-tiR@~S7zM?eLUJ&3?;{pIcpsWPfLOqB7yRb1)_iBThj{pD#l;LtZ zK4yPSaWZIin;z8PeYeT00gJ(qrWlO%p$HYhX}Usa3}Z|_v@@bj8eI`?OKbv4RU`vN zae+h72`aL1LJ`nTX=bNF1U4f(vht%cYjWnkXK+c0c<4 zyZ^n~ddVHOt;~%y$S=fTuT!-O?gyvxAOYq~x+siF11LyIP=*AL8BqQOvkJDLP|`zM zc)j}aIue5fF^&vYYo!_oew>AgMPERk4pcKSf9#DZ;t^QRz-OTXBkZO9J>F+@E)cpYbs) zMr7tqZ4^9^(PkOdNL~$d;@uytbV5vrT;Kw*978hp)d|U>Z{C9b5=jIJe&ASPc_uNeAFoXX0;iu-D;` zG$o{%D9-5`z#Spw%X41i*It)e-Q|S?SevyN&VCX294*Y_Mylsb0sPKq+0jY_M2FV%7Kn_*$2Mb!sl>DQ0peN3;LbVt7X>LrtL z%U^%YeDL$=`@+vk1vDNk1H<~wT1{EAuT|Cz_DfQ7d+18E zD*fl!30n;#p1cWF!M-ETR0#h3r`ZyC@Le=vF3eCu#Pw_bw1T0p*+6_j+ydO!Y;c>N z$esag`Dj3GwH%RHuw~>R;(&uV+8ifTa*&M)oVB1-k%4meeGb4ow`5O?(zPzg8FSiw zkN4S2>j!~sZ$urT+jnNJ$58B&IaQr$w6L}~()w`Ng8bEdn%lkbT`tRdrTLrNRJXT*+PhPl(2k=Y5ELjQ)?^Qpfl z@bPgF>axiqfwogFea@`I-+sRo9uz&{tB+P>UOR-Nb43Ve3vS4y%{PTCMl+h|Wz^4D z%aY`#H6_n@0vjc#<}va=T>)B1RAxpO9(9LLDVlXXkBm3%pcrg{r7?E^FLEWhoGs{; zy`c!jqzqJ>^NF_Xr_psA zAd+v&7Ea{%!}ypbgc5r z#%xjdQTu0dMBP}D9^qlS5h3u079OyP*?Igi939(Es4Td#N+IL7Vr*-~kIK8p56HyN zFAWekE1rFV^OT8VE*uTp?z{+g_8ZdC!BCONL_OOl3h$!M zN^Q7Nh8j^ADE~4~-f0)(4^oLGz(88@Yy5PC{6hb8h+F)p$R0x!b6b5u-T>i|$!*X^ z9`?Sc|LEFAQnQs1L%S%p$`a5TS5{=aKAG$B9gq#(&zVt4*XX%fTrkO*T_eoLf@fn* z&FnB$3=uOt5*!N?!rTV~dgykRV}{4`enKczQvh$C1*!^9K7<%&cBlY4<*mre(wlGq zdl!GBCNQK`;KMCADCd)Z29fX1Yf{W0Jh$C;vHa>4bjt$SbF%1N0qIsdCLf)7I%v)} zfBND883eJS%9`?sfD3eNHmo9Lw24nclxh&oX7Pu3armCIDM;((db2e0f%lQ87)xXEin72ZD7yF%h zrQ8gUR^q|HZ8btF1{YdjlSM*S&p2z4Ss`Bt9x2>Gr20x!FqfL`k;~D*196n})fizH z1!ZXx&MI6Oi#(ms8{sY#l{1QH&0sLRE%8mj9ZFtgK&W?=xW_M{F~3=^FdL1X4+;0q zR#r~#BY0!&;i1;W4Lj16)nbyGTl!F53UCY(+so?EJoD1bpU5=1F89oTEBS;0LkZna z2G^@rPW@qyy(QaB5MM!-9$v`ZKL>q~{c=`SPRjdPDLG3F&cZcoy-aSibf}dryHWlI z6S?`;{C0Yj!6B9}$<~~>%hHQ4>zFIDX(qZAbW5S8{d6!*W_V)5%~R+nuu^i`*qwK*xYRtSQ!6X5 z;WVTM{fmRpItlOgQ2L2y=YGxiFRKer%Q-=}g^F^0ie9couHwh8y$9O; z<78%hiYG&PPp7Xx+K?6uJEBAG=MO|ApA#{AtP>UZ&To$|=kAA>8a}M7&+_L6gg7;c zr%T{X!tEQ@JP0x`f^La1u5%j((Hx@=e0W|<7|%0SJNyAQTmp#fizya|u2>8&j^$!a zNZN zGL?We25PUkL@0?|?cmug^|bqO8KgI4#>i!rI~xCtxR#w zZoU1)^;h__fNaYZBNCQpI6Mn<+>Ho?`>lUpgBT>Sos;N(|;L-x;Vc?mARi--K#21 zH)xLPBn|kp7*4RI`mhpv%!hm{C>fwjQu)@yc3j!<*(e+`LCwg~lp`igsRpfjq_jLs z-{I*Pr`LR$@$F8gKIi*zbHPhW23Wl>LnK^4d66y6Sc{K1Z0_RACz2o2iVZRwF85^i zp1CQ3yb~q#w}t!mF(S0u35fD<`V@W4V`iJLD4z!3jjZ?-g+BRJUH<(oqmH$S4mYsD za_WuIB2!t+e@bs75u~@72z4PxMAp=wy^0V6(|9v_^qnTF_SZ+S7TWX-Pfnbdi?LU4 zl};!=tVps-(j#on^ALORsB2?p%e#2)+m)#^+%O&tNNqDT3Qs?iu|!+XrbIXLTBSbc z6`2YhRYm$U>?{r*5Fn@PB5@vEgj!kRbyEJ$hY+6SM?&$|@|qr%Gys%56Q+*>d+ z-6iO#TZpC9ax7r~<)z#YsgcHX&PlGs8?>+>`Lt6xmIB-UW!rWF4ry9UDEFqjyT>Ya zRudI2f93C92c%cSGL}?raLgta_gjkMk+0GGc{qayxW3zRAHH7AcjxU1;A1sqGcb62 za|frjPAAm-xuh9sEaDi^XBGBE{SDb*d)NK=fwR8?4}<5XatC;jf1(s2ZcNy&sm+E= zkm#k*8b87Fiz*c>mTwYewV3wm9IU^H`8z}pw)T`jo4Lrwl1IkbrwNffg1I@;9g?<8 zwNSGjl_?hte*F$Rg6^lREXO!Dzg*)LXwIv^m%@Ul(Z|ncMG`2W5~eBpH_;(=YRuE| z&4bs)gQ4IskIatlrBuKR?RX5R?&i-Ex)vAMqo^{d&<~=A*Xn=PM@y=YOKEVXHJe}U zP*MxRfaW>djc|{5*hs8sQgb*W?g*e?v)vM{1f74sWy>N2Bdv~*Uf*YMU$$fRO_=S} zVF!bzoN3Vs7%OYYKQ5Sg=FIY8C2lKnQSuMh#tEXmv;j7j?^Y0^AB-06gaqlXi`Eg- z>=2myOyZOCI@5c|4#8!2Ho5H4-wD1E`Q3xmDh?`$WIR}5L4(%qP(R; z4ug-J>{Q3(y3Xw@@>_wCrl;btGbRwp8bkF_jzTHjUHS45IA=Bw^T$O}c=QYtlO$re z)s|9r!Z~B&O`(do#)wZPS7a?EaGEgUu11Ar(QR!u!2%@a9QB66W*pLE6*uC1diEm^ zuq8{r>mM^_Vmh?6Y-8KbW!4QY(G}6Jg5blXTh{lVQ#@8l3Vutrg zHFvWm&(V;d-ZEm#CjNt2p3%)n<$tbCNt6EY`C1>+i4W^4#^`T$_GVa02OffprRBVu z!}Q^wfa42VLsK|y^rke4x+mXyBv8nQmZ*~-|HMhqnX1JZN8u`2SQZxEoH?=Y*7^~3 zj)L+J%s}Hri95rlol#MlLU3B8h=h_i00e_FU|m_z`Ga`zXh#e#^n1vj>ch0IL5?fi zn5McB4~sviCK#zK>Y#`4xklIGDlP+&ixQEJNX)6(Bd$K)sH~jLaNEYT2y?Y&39pI` zmy)Bhc4uIf9(_=9SFV+TX7n4)Ym5zrbLV|EyO$P*eV?GO1n`P(B=`I0$6qAxggs-y zCqlYxq1z+72+9&y>~|#dOw^|iam;)50BqcSIs5%FIri^oCyd?mR%xeAb!TFg00;SU zJ3c%&8-JuF`0ay%lUfl_d_`v!d4hv=L)iLaJUwa0UoW~DSJMZT*&Kq-I5-qD9#zv$ zF*%kZBeUqCAAX22rBW1(k(0C?oAT%KCR!wNjo;f0$MwQKlg5uAXY{fgUctrmMd2>m;IL=&KnH)Np0D zEisQ}da?d|QCNix4Ge`8$);40by1|*voSqYHg$MM{N#hzQN#W5f?|UIzLjLPV=rA?peDckO zunerbPdk^DEi>WTr9Nk37_@o9Xm4iL(8_QckIJf~S#!^sL-6|CP|1_faD)V5YqsLP z14n2*1rUi%y;S9B{;J|bF$nDc1Wt6lq`vicJt;EH35sCfe($x?P|o(~ycRfko;bm| z(KKF*+(ECfrzs6O7;2BZAlPg@41L~JX}}1xVJIjNiy4C(A|hktAMrWvXasYaX!dFP zrE*58dO5V3m-{Y98fEEUgFhI{xrYzq2BxKeiE}xXnslGf+;I(0in`e`U~V3&eno=_ zi2V7eBy(*Xo&4f~wL_<=($#mKEbvL+9$Aki0cvRn3P#qX=U^4c_$h$lT{!ud${b_< zJcjZ9?p7QH5AbRL;`(myf5M~xrv}+HF+*iSh-hHLGJzrnH2dPrs&_+)-xEU1@4_^8 z{dV!iTZJ!KvA?IA)`8+FcUyrc>PXweP1#qR+F@vsFGIp5cMKiL5ySZI5X9Ap^B3~% z{Mg{HOGdICueykm93nX15tBd%W#txLYAyDSG#(<0<6^l%!zrY-rJj1+hZwuz?g};o?973^<3XCMO1ZW~|p}bbjRfj{?V+E0u4%Q|=5OR1DiSDY)Enijf} z`M1E~L{}Y;sZHy!HOtP>)fe&kHjuyLk1Q$t0xn4tcCfgR`G|S()|A6Fc8@S>YNc){ zRAs@+Hf}8hYRI?pEip5_{8YT-Lns<^%Q_Fth-^5~&%_(+U__Sb1udQKG#ay{c0Wf& zGcZEc>vxC#mGJ9OVrG|Sycegg8-ljd6)*jPcZJ`1IZ2POlUH{+y1Zz8Z%%>n%z9*-qS2WQ_8R0gqD5i|F*htu6I*aqe;Gvu~ zLpDnVOSnrt;TVxxsf+m?wZsgk`!*75)tYbCoqh=;y_$6Vp2~>Js~V9bEIL-?E-hh| z+QcLrX#IyrPb(1>f0lWIFM>vQNn$41HDfB@KWPe-6eih6+I(b4a>!#<5T{cWN7%#> zK*!S@bHrT!17gMYOw5it2p=vty+__i$0Qh^e6kuDxku`vL(4Z#2N#6{N1S~?CWBVkce8`Yhk>;M_RS(CsJ*Lv4fIAG#;ni683Noub5#J6e#f|PeTMh7 z&?RNHvEB!pi^u=X9dX2VtSboFQPLi+(&h_p%FE;P+~C3B%@-SvV1sU?V!SbgG5vQot|lKX`22D^IcNS=o# zcbVeWHaD}o8zV!_FXQEFOMPS?D6+kdgs4lURQuFg#TIdudTaFnHJtFN%O3_M3Blz< z(3tU!h?3GZo~*?AVwqLH*jjzlY%EJn{oc^TpW#F>!6)%2g3 z_JOwD#s{7&JcF+C(86TyiNZ7uQuV2z5-9X*tnajo;ivaLcvuNk=;c)77;V3onT`S@ zY}A$qTH*oyM*2f7<+S5z%t z;w0t(^|w5Mn7=6XaO4K|MFl6J2kycb+GY5e*3UOS2>>A`hN0L=B@tMWFEvSz90hYb z-bkRO07swiu1&NDxe+G;_a3_w2S2t+XH`^OgMxdx^hE2xhIO+ z7`(#ul+s1gD2$^taG(+jU$$H|OMb8=)?f0>%Yu~lo+eRrODHf`Q;bxx&<94Vyf_i8 ztN(HY>>GWS(Aw8$7N%#aa0pkV2v!!ZI$4xCCAX2t+x$=JZs*BHUAugGSKmm@RH)Ey z5JWm9TynL;>UU&oBWZWF7-6fAR2~`+bk_~s{q&Xz`>=LYdx(d^E>0?7nmX=q;Hu0< zqP}E=%S%ES)~>v1JW=)O9x2eviT2E;%8^T9Bs0$AMjwz=*Ln!ka?hDHuQ0%f#$!Xy znqP0$%~*hu2WfnCR-dqx=Bn07ZI<+v6@`X!DJE(N z-~KWWJy~4%W=I7(*eq^lPs^z8pY6Yc1+0ph(9v+umCLyKUwaenlv%7M8qu@%R76mj z6Z)s-&ugS%%P|{{-i#ugj5oLzocREy^X6gErYi>7u%h3-m_AoG9cO-=$!FF;u6!h? zML&lHy$OC10z~$i8pEc8(p15vE`=96c+zlXXpoy4!G1mD)3D2qO74mLGO1XVx2{jz zd}Z_`zDG@sl<;hlLvO;0BTw!(pOfLnlzXo~9RFQTx^A;#?ugfuc+^N_BY=<>yq%oe zr$NDgP6UPWyQpig`W&WW`+!JBP^8$1``{_C%3emcrc&w=OY7XO(@xf)!T-Rd8BrU; z=%mp1(X&i@M`5Ll2vw-~8JRx50(QB@o1(HAw44TSJA|9^)OS(Ko}MUg<^WWzmFC zzXF16s`rpzS7N_4?}AlsVaiJe!{TK@*!jo4{?npbPXe$SX9}P<^0)oz?NAUw$TMrhkX<@hzm+pZz^Okw?PCB{wYH%64SBO6Uy_3>M~Ooi97X=ICP{T&Z8IN1V~d@4NeLaeRlRf{nyV}0#lzh2B2pM0 zZz}Qt8*0SW2U&H?4Zg&E|Jm`AU~S+r z{UNtPNueaj?)b2nJjkwx$)55?FQIxv2F1W%fK(#8Dx8$Of`9M~o3O?IVe&&E0^SD7 z{3smeOa4dlw9~Y@S5gwC>pFjEPB(h)I5H+CQav|6@z%!~Jdg)o8{(gQ6ddZp1u`L| z49g_b?R7N6hKafz{npW*v9!MRN*6tJY*fX6{oC(`bTzm7gvK?a!$srwM7E(k?f-WnbeQB5J5c`#( zAl=Ak*Y_16g7k<#(Oym^UD%Varw+nYhz-x3`RdDBnq+`Nv1^1i+VgO)(oTZMlv(4O ztMrxH#8la`q-AvI4)8pH`19eoStUu)@4V2-jqXJQmrO84hcV$d>5xn<;*w z$jhffT}B;Jii8u?mk2i`pR6@D#wE-s^-_Iqo$J#~^NdUkC5bPq;RK7d)q4&}4gQm) zZ!-z8Z}|)_dNjGZCGJ@ft86^_vAKE+(RvrPslRYwPh?>spBQ6b4A-OCiS2%>o4Bk& zdjcfzvb&9W2|*ps#eUt} zqc2df2mQxH9S6A)f9(L`bnx>cE}P1EP9P6#i>o3f`cGi&r@L9L#-~w^V2CR@Dnk!` z?x+?u9;C2jxVKv>u!xz{C;fRhj8%ZQQA! z%b}v7^F{bNPBiZ*`O2`{?0W(rm7YJ`>F@s*XXc8JHI7^wWCDUnr* zchqK${45M7;EY1!+0A7$`kiZWZtk1RD-&VkY4ZNxW#Ua4wXz$(#l_#7WIW=#6Ec#X zkXIKn{DfO6;kkMLx}Ow2Ujf<<*|^M4Pdr7iBC(Qqw=9a=vt5XHSReUoL;h{=v65|P zl8ipDLr~g3=bx44YMBcXR!=VGnEN)lHty5G@J#ONOCeN z{x%WOK5ls8MKO1<{kGoa94&HT)s}#Gr6n(`r(J9`)kfk(4LM4{jIU|b{VJ)4S&d&z zKWR)Fm%wlO<*p@5CwA0t%>U+xXfsGIZ1?rd?RH@N_+87)HA%dY5yIot97`?6LgYMB z_7|#%Yhv^&0L8(mw8K0qH&Sg)EuMYgF7tie?`z~8-tsNCHD2_lLn|=kZMMkskki&0 zXf~`+XT@Q**T%vE+s_)&Jhq-!FO!w!}_X%8%-_+42{>8ajEkc0fW@8Bj z8)8Fhr{b+RPQ23T@tw`(kQT(W4AiN_31d)la_^Z9;hkcp7-sk&C~|mop=PZt?Vx0t z(H~7^H^pdYKH8GoNS@j6{SPJDol&+w3ysy(n3NPl#37KGF9c|)VG@&jG|f2fyy{oQ z>_p=eKP(xVymHx+d+{mwT3S}n-W$PhY^eIZFEbuGZB{c*!=#`9>PH(%il^&YVhHUB zmVR{)LX~Z|VzuMnN@wW_@5UyeVL$K;`%4d=i2Cfr2V+xVs3!ROUM z9632*ZOh=CZ#kG#y^80m(POS~JTYNdH1vm*T%(Bq-8kGBPv2oPd3fA7P8|DNadP^{ zNH+rPr&VO9|7ikY-!&R~D7_Me9m;m$OU_B4`&o)lp}-CEoUnaq4{bW~<~`NlD86%5 z;9r&h*#{T@Y<#6jvi}B*a(p;8fK8vN^2f6~^_fRj#(Tlq#K>v*P@I_T9)Oz`klS5$ z4Udl5JrJ!}h=WwoAVkcHml(v~c?{o`XT80W`%=WFt_Gr>$f+JM9UXTk#Lm+nt&`5B zf)|RlxRIS-MBJ5rs*cOXMRku5#gnFk@HF6y_g7L%ab`Ko*(x_qTrOq2gnN>U*J8I8=)ef3}aTsLDqeAZ{G4jdIjw51TA~6u8dT>y(K;uC&H+=ClyRR0mp=G zil-PrTU#Vw zV|Cqxu)SobRT#EXCFjq8W7y`b-8>(7!*d4?>Fk?$1A1VIbj?q_C%Q=z6aUY6g#Rf3 zh$Z4=J5JuG*?Ja>PgkZjsP^2c!`=uC-7>Cm*@8m&@W@s<#K7tyb@)sQV_D8%H-YMk zt4?u~nyP4>%@kaJFD6M^&I=px`&XcTW7X)zUOw{ssv#w~bXp&KHyLWI8)wf<9l4J}=*nEqD6e2SIHUIO7{qzVt{O<~XAnDQQc z^eGehLRs@OhD?^$wo*-Yr(@wzc$KiXXEiAQ6N5Uu>oRoZdvkBg^H)KkItMxF-M&Ja zmxR0F-rAZUwL&cdX~TxrPl_x8$vz~$=yUqk{^{IhNZ!7Y3syL}vyf-Z{)RF-*p$CU z!S^gjuS?c(k-XUd?p0#+ZYaCX-#!fwN5)fVw}J&V_!tur-rWugBd~Bp^AU~wg)oHw z`gZ(4FD=R{-_)V%L}Vh#RI{l-%td3g919FzHIGTnsRW?qGbtFm4C1VdApAr#@3~%U z&D)W|27~L1t_z|6t`VD6qWO+6-;);M%+5{*3-)rFp0b8I)`OGXj|d*&O?I(=G9 zW|M!E;E!!XKM&6CPoxcIjNU%t9~HT+L?pXyB14T67(Z_4y7=RKybWmG`U_nmfVUy) zun-?c$4OFOx*n<6`pP@Xd3LBT?2xJc8F#seAvq8GW-^NsRyV3mVz;C)dDTQ6|J6 zKZO$)Auo9UCVtSWTl= zQ85Zz92o09pd5|GA25aXU!I|2kaVb$M)BC7!tw}bDC-xtpknMfXDK;7#k-Sj-mU*t U*}CV5a(M#EifZs0d5e($2NH}Jg#Z8m diff --git a/config/config.js b/config/config.js index 5ecef5f..a64b75d 100755 --- a/config/config.js +++ b/config/config.js @@ -2,7 +2,7 @@ var config = { url: "https://ciformall.youlane.cn/C/api", // url:"https://c.malls.iformall.com/C/api", // url:'https://ctest.malls.iformall.com/C/api', - // url:'http://10.100.33.66:7000/C/api', + // url:'http://10.100.33.68:7000/C/api', // url: 'http://10.100.30.172:7000/C/api', api: { /** diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 28c36be..6ac6c25 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -55,7 +55,6 @@ Page({ }); }, onLoad(options) { - console.log(config.api.cardpayList); let that = this; wx.showLoading({ title: "加载中..." diff --git a/pages/ConsumeDetail/ConsumeDetail.json b/pages/ConsumeDetail/ConsumeDetail.json index 96c4fcf..b4079cf 100644 --- a/pages/ConsumeDetail/ConsumeDetail.json +++ b/pages/ConsumeDetail/ConsumeDetail.json @@ -1,3 +1,3 @@ { - "navigationBarTitleText": "券详情" + "navigationBarTitleText": "消费记录" } \ No newline at end of file diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 7f9e81c..ca89b08 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -46,7 +46,7 @@ Page({ wx.scanCode({ success: (res) => { wx.navigateTo({ - url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}`, + url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`, }) }, fail: (res) => { diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 483df4a..dcdaed5 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -17,15 +17,17 @@ - - {{item.title}} - + + + {{item.title}} + + + + {{item.expiredTime}}到期 + 金额{{item.remainingAmount/100}} + - - {{item.expiredTime}}到期 - 金额{{item.remainingAmount/100}} - - 扫一扫付款 + 扫一扫付款 已失效 diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss index a9e9751..806237e 100644 --- a/pages/cardorder/index/index.wxss +++ b/pages/cardorder/index/index.wxss @@ -72,7 +72,7 @@ border-radius: 50%; } -.info view:nth-child(1) { +.info >view view:nth-child(1) { display: flex; justify-content: space-between; padding: 0 2%; @@ -82,7 +82,7 @@ width: 100%; } -.info view:nth-child(1) text { +.info >view view:nth-child(1) text { font-size: 32rpx; line-height: 32rpx; height: 32rpx; @@ -96,7 +96,7 @@ margin-bottom: 10rpx; } -.info view:nth-child(2) { +.info >view view:nth-child(2) { font-size: 26rpx; color: #fff; letter-spacing: 0; diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 6a6fdf0..3db97cc 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -29,7 +29,7 @@ {{sec}} - {{data.title}}电子卡 + {{data.title}}电子卡 {{data.subTitle}} 售价: diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js index 9959f60..c843f99 100644 --- a/pages/scanPay/scanPay.js +++ b/pages/scanPay/scanPay.js @@ -17,11 +17,11 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function(options) { - console.log(options) let that = this; that.setData({ merChant: JSON.parse(options.merChant), - cardid: options.cardid + cardid: options.cardid, + remainingAmount: options.remainingAmount }) }, bindKeyInput(e) { diff --git a/pages/scanPay/scanPay.wxml b/pages/scanPay/scanPay.wxml index 703be04..dc38c3a 100644 --- a/pages/scanPay/scanPay.wxml +++ b/pages/scanPay/scanPay.wxml @@ -1,4 +1,5 @@ + 卡余额:{{remainingAmount}}元 付款给{{merChant.merchant_name}} diff --git a/pages/scanPay/scanPay.wxss b/pages/scanPay/scanPay.wxss index f8e8a5b..28c355c 100644 --- a/pages/scanPay/scanPay.wxss +++ b/pages/scanPay/scanPay.wxss @@ -1,14 +1,14 @@ .content{ padding:0 57rpx; } +.title{ + margin-top: 60rpx; +} .head image{ width: 100rpx; height: 100rpx; border-radius:50%; } -.head{ - margin-top: 80rpx; -} .head .fl{ font-size:32rpx; font-family:PingFang-SC-Bold;