From 196aff2f750313c3412f02ace7512aff4b5957e7 Mon Sep 17 00:00:00 2001 From: meo <958484406@qq.com> Date: Thu, 30 Aug 2018 14:29:42 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E6=83=A0=E5=88=B8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2][=E4=BF=AE=E6=94=B9]:=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=20=E5=89=A9?= =?UTF-8?q?=E4=BD=99=E6=97=B6=E9=97=B4=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/img/success.png | Bin 0 -> 8492 bytes pages/coupon/detail/index.js | 38 ++++++--------------------------- pages/coupon/detail/index.wxml | 2 +- 3 files changed, 8 insertions(+), 32 deletions(-) create mode 100644 assets/img/success.png diff --git a/assets/img/success.png b/assets/img/success.png new file mode 100644 index 0000000000000000000000000000000000000000..945dde70c14d74241ff3194a83cb8fb5bfbc4ca9 GIT binary patch literal 8492 zcmb_>S5#Bq6K?1wQU&R~2}l(PMF@m0KZ=M25m7-1U_v$Y-VqE{6r>5#6i^AF6Ph#y z=}1BcrNqz#Lgya-Z};K8-K=%8*U33Ev$OZi?D@V)u(B{_V&r86fj~^ACI;5P*n4rY z(gNS7z1}mxK<%Put_K2rL4!}8&;a)oKGw!CP}Ly+8gL`*Xku*+0tHHfK;h9K&=K%c z_$mnWLJqlnX+j%mNzBwRHgS#T>M@qR?vt#&O=r##IYW6SGdlhoMJ`~8w)^>#cqQ5|I(sF;(E!HK}Z?i_?5Dbn68%7Bq~5o(2BS9O`759CUGBYW?yf zhc5R9&rvs@zvJPW6p260sRIP7prJI%QKRRE%*KZ+JqDfO-^ZZNOkQ~E+Xn;;c`aF0 zjg~GYe`tQF6(>Hc7@pF?E*QB!$%13%q0}ZnEPHlpYQ_jIRKQ&dISXhm|78C$_d2`6 zFA7%2Brta}pV;GRPpZ(Ce-`lXuknXs*%_G&1Iv|lDT3O(9#`{2D{`;D2UD5EvOj_- zJ?GxtClulyu;}&bcnPfu1=3SIYo{dfr^26r`dC>Nc~xQS6Ly7SM!MMhn8*ETPG5!yjIvS{Kc2d3=czTbl%IJNmP;eLY7&C23bX558Cmw4{9R>k)D=mlNuSfySij!bpo9|g- z_EzD(dK4qjlW^Z#Y$JSX^L_sR{$$Vcq_Z$<(oen!a&Or2^a$(`pnDPI^ZU=@nSkc} zc>^bziO(%)MC)l+ZzAXCpsmN$X>YIB))>0cQklT?<~_lCc>%Q9Nd4PYj`>ibb?lZW zc(L_Fc}@0Hr+#v!U6G^qsqaax9i)t~_`5j0U}HdPEne3lfF^L#p8hHy#BC)h1=G>u zsw-vr8dLC|vhgv+ZeiS(L0C6WrtEZr(x0pWiNe#PcIZ;K-elFdeBapC68iII9d3Ld zBH~KHd$;=0kg7W-$A7>x;_3eLRRKTU88u=twk^N(9c9R$xBbi-snis{fA7O-FOk^N z7>6FOkF}@&D!aA7tS-&Lp}UC_Lh<_~VI8g~duliSRW2^Iv~&(RS_J=Ez>=h*qjmNB z`tY{T$aMuM!X1=l-2KN(8qt94(WJzTzAW{1`{>ClV8USZn)(u2wQ zHEWBZKh#>`M}(#NM+J^FYpf5vQ5ve(rVlwr9P~QD*lA_H)((~CPav(I0Qu+@H^uKj zu=RDTutwhq`3J@JHJzUx#OQi=FyKQ)i*MF5^BnDb$D5a>=~6N{|Im%pzb#%Hjmw?( z6I!3Dvd51L*2la?e&>cgrIjh;s|egSBuP?D8+$_RVn*FfRSE=r|HcPqejWR0xSO;(uU02+z~DQEhE~mp zw~dweTBb|lLq(iC3i6nFsb{|ESC&VYNcorvuq&1MBQ2%mrXwqYHX^+BI8A9++bp#? z_fUIowUQhr!tE>hO*EN+tShtIj6{}hZHYo7=fXYv4rFYd&?k`(E-{Fw%y;tvZ?WI37sZ{oTF5$0Hl^AnMeO~_I|T^HshTKiN|@Njo8y@C-#MX9Y3U#k`q}Ogg7=$ z)N7v&4RYc%H86-}nZ)L#{6|YtgmCeW*QH9B)k`~Ohf@v=#$Mqvz8&E_5V>PVC*lPn zZ66VfT+ci9MAu*#$3jA#&!!A)5sY_z^ho8j9Sw!?sSIIrY|^(*wgz%qCNqKM+i0~T zAYr|&dRmAn_GHxe*Ko?dp+Y<=-7PXvInY;yQyiM_m=`ThhaoI<7Oe?Q3;HGVx)RKp zbq@x_Dx&fSp$>q&$+#ZWYpWfO`<`VyYPn@DzF$xv=r5ejsPv)&+Y+6U9fg`MwNyEc z(JF}$6i zx|bM5vnlfx^$4@YR8Tc{TG9kl;MpO(K3CH#NnN!Ky|>BaOK(-A-}%zj(Q8kd;Wlyse@)AVx}5{-P8@hRhqHsCLt9o>c zVqhBG^7(ur?(}HNe6X(%Fi46h;!}%0n*APY{PQm7fow&~k-DP5eIbXogHRvb%;y-OY;5yEoiaS7-K;O{~V**1fXUebUX2 zH>fMV{2|xn1*?43iC_QCFw93^e%~@D5~qv4VNLM1mo(o&xhg$fZvMw=vOYP9#Z-u^ zgg^96tuwQ8Ob%IMLV(j_CTut31S=2?%n!~62Pd!(nUtP7?Kp||f4?0X;{NGNGVg-U z%DW;2@{Z|$AU&szA&T;7uYURYEyKQnhap!nWp0w9V&Ver@6=810x?yDj)n_kw+@`^SHnXLBdakbXgP7+E=7Y z%S(!>kG^r?_t{}-9Y5aA$|Ek!#G8>4LO>B>As#zw9)fw-3@`%{(c&>0J|~aPGj3z# zZm@2%2zPTkT4?rd?yU@tV^dhuRGfeA2c25vUOZ)B5EjrnYB`If!CwIscYl3m1)ElJJ({Xi2Y!v{91NdSLEAju`F(uxIZ@5#Jr-R448`P;}Wt*DKvCES^)* z^RGDD2dFRFByk_E%Ob9iMnzJ>Sq)HTz<#`a5IPsaMLJD;!oOqNm)8Dg0mttC$*dty|eoYRKH@8^c zO3(vy2P#$r+qd~S{4X-FZxg6SC-VaPH!0+`1L1_X$j3XK?R5G*XiIaAN(VGi!X<}T z79K{+9KA7Zs|9VMYTsxyBUBYr-~dl3&9{D2oaQ@UpK$qX zAZXaBs`cq{QKy#_18R*DDio?dA|Zj?XGJTRus!WE@lrbZyKn@ocaEz5Vrf2R;6>Ms z@cLKZxPWrm?u~0Sn(b7 znS%(X0vvnMy)1zu8W0K&TLuCXFkl|6aZOgX3hYBK!XTaoNjV5cV)zn-> zaWS~{_%eDl+TG*_ReVq8;)TX)U#Vy(W(|#5dD7j+o+Q9W0XGn=yU!|SbmNM;ho!wRF}r`TCY_YjZEJhg>>6kZ=QUTAyGRH<9Qr zq36tjtA!>S=BnE>f0cp%$?f=KeLS>UXs$?F}ITU$u|B8U4X*Su&Na@n%y2fg)D9RzYl-n>v_@)7V9VxCcXHGbJ~8%yGNQosc80?p z7LZRp)u*HVaje*buo=Jnxlp%XiU_UCVE%fqqPnjanhn8#hRA<(?`}VQsI{VV{0XaF z>=r$z?mYO(J_z5)nXoG)8k<{<+o%j8p8TGh%YmE^|9k7p=;s@uwxXkO3+h= z1iXb=Gf7P)9CuQt6PceQrV#K8qM!KVsa{F75ldP$4c_XCK8&9mx1 z;^N`UD?v>dK*y-%Bv$d!y8vgmYKR+$W<>;5t(;hpuu;;DqpR%q9CGo*5|5^ioYz`P zwFo>8RhFE1^k&on7~e0+2Fm21l@pYJgw8STEjxk0MJCFLf6#%=i~!-@Z)@ zTJlU69nzZ#smpJ=V*@7;xyS{X>-&ob>$0EDx9ZJ<($3x)QF^p@m#3zjP1geniwc95?!rgD%gp4Dx_9 zvyb))k+0+EC>g|80i5v&AyZ09G}&`;80R26v*RvLrZJxoov*i^hpPNuDc~Jk1ApET%B$R1wTLV1a^n=#0%g!gtv%(Jy{OU`+<>T6k(07zuYGb zZihCZ3Qy$gbqS%kPy~Qwwj=Hu7~nBLiGa}k7JTA`qfzrI!RC5Vg&qUp(C9D~e_ zVXu=sNB_*v+c%x4#S^PWu@GdN!V6-D>Fv@Zgf878sjg5!6MihQ zezq`W)c3*rnSXB;3v_H>#ebO%ac=NPP*l`=``hqA-3xa_(C8I){{v4P&FZXYFyiOC z;CZ3CyvMt%aNfIjY-=P>20q#4Lz=;CLw(5rwY%frzc1_=MEwdzUKlPE*)AMvj?bBXEq6cF!G>B(4GE-3NZfd(E^>tWywx6lR1B6q~#QKj1S!Yn%6 z1L?n{OMwzwWoYY_7V}w-s%*BmXzkMYy<5mQ{`dA_i91%aL2ND+_nHH=*&4mJ7Z>-_I`7 zm$Xhsrb~X?`|%G$M?0f(wJ- z#sZGmO9>?uXM5Fv7w{p8-~$L0n(h5VczSmZfFJ%F0}r2 z^XzC#*gr$BFHQN_nKdK-iL@Z$`?dWZ0VT3RVedAAtPd&A{B z77|W*G#>@$#cDBTz@v6NEmNZC;^ywFAreb;#$N9cW&a5PsUV!iV3#I6A?9oDM_FXcNr@|$nq{AA_6Q5L)sP&)NG^ajA{oBozBpT2bG z`HS{{3<)Zpp|mL_;q_RwF0JQn5htr>?PqRP0bE_E`^0?cOD-`I_EYcAIC=ZTqko+& z__KbMp)XCLi|=2a%#vy+740FXbuE_H%2<);lJirAY^k1dplp#0rO&TPO{YT4G+OI} zC2MNzPe%tKQ_!oWIw9`?T$*y!C*@8sub^lAK|T}-8Yx9%XQER=qEPtHB9!NeoM(=7 z6X|e*xf?yB=h+FIvKL=_BPB8AU{U9(@u-lEjVJ11hn}8MEgHAfuz~>q=?SIg&Zvd{ zagrPF0rb2a0WoE}I@H_@mwCnauX&jr(ZtZ_G{ig;AnOn&V17JT3nptVP+tId-FB=8 z%bvFV&o4*;nURG!_Y3$RxldkvIgIgRtJ5(hAQu@jc6@#s-YqmRa60mZ-|g^&N{aK; z`?$VGti;4@fMgKI2~t)=NXA8$@#^HY3jNuTVs%6cwSlP^%yMRLnGpuTyU z?GA7ioSZ{*rxt`z*a$;i9S43gO=6h#6Qqh$M>lcq|2_x2{PI@SWBeMl!(YwMo+)kqXQ0G$wji9}Er8M^~-a@2Z=i8v1|Qc9$m z7R<5;UP?Yn?o{%T#M{p_Ua(MfoNj;b&*&<0Zny^ zIvV>dvYTpLa4T2i(H+461A=Ar7`^XUu2zv~wO#24oaVEV6;ZNc;)!1KTIoxlfGGzOn2Wk?0Evr{q^xmd!dbsB}} zA&4oafUQ0&z6^bo+E@so|L0_tw5sFZ`*l*eSO_a7V(a;0uRsIX^pi`Am|92SN+XHPR3N|{D}V7URhqkdoNL%oP5 zghMH~p1^KInDe4L^A@V}XywsF@Y)dPYiyPVaSOv=yn5VR!fjYoJ|kz6xRrKB%(?+k z1JLk?H|3xwpj?g1nl8+Lfo9jfyuDjx?F4NE%HlRtKlxzkNj2fw;oq7kerQ3HQi9qU zK;Q$-AI(6O{<`-tEf=SA#c**BUzLqALeORmz>b@fl@0n@_iAU3<}TDR@uhHUu%Gck1taVYw1SGAFZxlL;E%vrqjP*M z6fu5N%RxN-szO}rE<0s!3whDJlZHLb7ck6!>4oa^__2JTFd)jq0bc!3Y%Mw{{f!!v z=2Plf#nwY3Etf8qOTs*~l!<(fxKq?>t{;rY%0w0DN&yXk#k`=c*e{-iD6EN!Vz`q! z_qy9KWqF~#(z2=({RnXU9*TK&gn+Yk1ddjV{5#)h-P3Y0prd7Fr=<9uqMy>ZKueub zsGo|ei8FEj>?1X+C~0A!?Z0EnY?|uO34-l|W1GKz9ZKC@k8z-5F^U_hQy5v(L8wy! z*s%4G_V-c0EHalZwm2~nQ)9fyKt*59Mt{wiKjPINy!$pW^WJ+Z%{?2^N$M$Z#Q64e ztac^%*Svu`Xt{{n0^P(6>xMKu01Ac9KrM@mtJ0;qHD59R-tv612ZxaDSBp)DY-{RA za*8Q|`7#_}y?;IN*KgQ@o#2}w7#GXcTgI*{*KMEAy@IqI{#%$N&lzhfu;^PJ9^y5` z*O;j26KIg>ZT;E>z$P?i?jlV->C=_jO{P`VPg%@`v79b~SDOR2e!kN%2|LrEG_-w- zdS&Viv_#qU4jj+6d*aBiG#9ALawPuToo)g$4Q%G`*Rrc}F;}?s!Hfm6_hLtBXck(U zUteoy9nG`*$jW}vfHevi!36FN>8&gmbPo3E;YnV5A0d2zW0~hHl0RK5u0t9&e!ApJ zW@<-ltnQD=$am*N9OwT3>4K-!Z-wb7ZAvo{@7V!eeFt8>8rTY%LZa}5x%xv=1aa?yPH z#OImZ3vXADv+MI`nhFXEa1X>Yg(pr3SEPcgqX$yX*#qgT;EVA5-vRF_a!k$|bo0}4xZO_u@vAX7sNgDTkL$o~T$)KG~4 literal 0 HcmV?d00001 diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index f172f1d..303d84e 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -27,10 +27,6 @@ Page({ console.log("couponChannelId" + options.couponChannelId); console.log("couponId" + options.couponId); console.log("传的变量的名字叫couponId"); - /** - * 首页banner detail couponlist传过来的值 - * iambannercoupon - */ wx.showLoading({ title: "加载中..." }); @@ -58,31 +54,12 @@ Page({ console.log(res); console.log("details"); //当前时间与优惠券下架时间做计算 - var startTime = util.fmtDate(res.data.endTime); - console.log(startTime); - var s1 = new Date(startTime.replace(/-/g, "/")); - var s2 = new Date(); - var runTime = parseInt((s1.getTime() - s2.getTime()) / 1000); - var year = Math.floor(runTime / 86400 / 365); - var runTime = runTime % (86400 * 365); - var month = Math.floor(runTime / 86400 / 30); - var runTime = runTime % (86400 * 30); - var day = Math.floor(runTime / 86400); - var runTime = runTime % 86400; - var hour = Math.floor(runTime / 3600); - var runTime = runTime % 3600; - var minute = Math.floor(runTime / 60); - var runTime = runTime % 60; - var second = runTime; - console.log(year, month, day, hour, minute, second); + var endTime = util.fmtDate(res.data.endTime); + util.timechuo(endTime) + console.log(util.timechuo(endTime)); that.setData({ - year: year, - month: month, - day: day, - hour: hour, - minute: minute - }); - console.log(that.data.day); + endtime:util.timechuo(endTime) + }) wx.hideLoading(); that.setData({ data: res.data @@ -235,8 +212,6 @@ Page({ complete: res => { console.log(res); console.log("支付完成"); - // var url = res.data.url; - // console.log("get url", url); if (res.errMsg == "requestPayment:ok") { } else { wx.showToast({ @@ -261,7 +236,8 @@ Page({ that.payOrderUpdate(orderId, "0", 1); wx.showToast({ title: "领取成功", - duration: 3000 + duration: 3000, + image: "./../../../assets/img/success.png", }); } } diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 9ec4616..8b8f0f3 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -7,7 +7,7 @@ {{data.title}}限购{{data.useLimitQuantity}}件 - 剩余时间:{{day}}天{{hour}}小时{{minute}}分钟 + 剩余时间:{{endtime}} 剩余件数:{{data.remainInventory}}件