From b083288fbb1e5137770aabaf291546372c1343fd Mon Sep 17 00:00:00 2001 From: luqc Date: Fri, 10 May 2019 18:59:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=AF=A6=E6=83=85][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E][=E5=88=86=E4=BA=AB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/picture.png | Bin 0 -> 3402 bytes assets/images/wechat.png | Bin 0 -> 6908 bytes components/merchantcoupons/index.wxml | 39 +++++++++++- components/merchantcoupons/index.wxss | 5 ++ pages/index/detail/index.js | 30 ++++++++-- pages/index/detail/index.json | 2 +- pages/index/detail/index.wxml | 82 ++++++++++++++++---------- pages/index/detail/index.wxss | 65 +++++++++++++++++++- 8 files changed, 182 insertions(+), 41 deletions(-) create mode 100644 assets/images/picture.png create mode 100644 assets/images/wechat.png diff --git a/assets/images/picture.png b/assets/images/picture.png new file mode 100644 index 0000000000000000000000000000000000000000..95672c31d587f757981415b80f09cd9ee149ad40 GIT binary patch literal 3402 zcmeHKX;YI~7EaPHkgz6f(yR$21lbJ;C}V7>0e1hrkivq!)VnNKaE`H~fF2jh|@uq zU;~A4Hj7}l=*<$=+^wJ>ZZ+bAoVC}$y6k)9TM{e=t!wZym4wH`k80mISA6$ap~uVC z&9KXZY7U-`-$fAEGX`*BB{Yn^g|bHXNun>XV8Ekw7#s=hgCU}TGs2a#@pK6s3{-Rr zRxVV5BLli5S{2DK$oTGnnWH%Z-I1)s*vo+dA+)@R%qRfMRWV%;MZ$}qnvMRqHQ&Gb zbPVND_P39PAgRiQ`s~cCgEG@7-<@wk+YCa~jbs_nZBKsZf*PgfllGo#zaU-#l;7-X zRx~Gkvb<9w#w#nZOOM{{mr*lvZw@AXkV2Fpxh}eW2D1|%T~qgnp@x`N6H^>X95q$? zkMJx&IyECA_H>}qUz?jII%at070mN^H<-+6l_q zIKMC5yC4rYMPL(EFQHjPkGs;$;k!<}e^G$woVp=Ho0Lq^8kJ8!t;v`(W}}5Lc~*qbrKStf zle-mZV>-+A_9TUke%F&dNUZcSrJnDI8AuakfJ)KdqM@ zZA9H=e4YY>6d=b9>a{>d*vMFnQTFlm9OB?ZIF9Q-SR38Y?$c4>lAH~qfB9pfm0Dxg zY8-qxR3>{o$=>N6JkACkr(Q1-^cM4l4G#0Or`~Sz;eU}VfIZj;#tLfte3OT;^S(}} zOs~|4CxlS|P`r@sti;tEJN)RRmay&F7XZ`;|8r;k z+A8H@G4*S95>pi;xa1Ps@+a>m7J0u+5_rF0An`=z#AZ1-Jd}+;R7z;sr0<^(hhw?$ zPwfsYWqpK!&79JbzdKWITG=0HTeYE}=A=c^={>JUBW>s_t zblh{YNUUcvqjm46uS`8j316l<4Ad>6yx}7Usg0qhryo47vQBOSc?hgS^O!U<$4@#lC_1!g?={?vQdM91CKn{Se$Je?3 z67=>&^(mA)WBFTefm?+kmR3>V?!3)#eQ-#nt?PlMBTtnKs))zCTjXu3GmaM!22a_FLX`U0rY`HgQ>(dxLa$(D+eluW0nuW? z@F=!&x@{abeG2h$zW1jV9JiIL4G6yX#BSELY|s5>B{C0!9r&EPL;kt7uH1H3R?7_u z@of1*ycdO^hNcz`w#oF0Tk>bi*OsJ^C&%Z@*4CyLS()``qbUh$C=Qm^g8m)V;-oT<;qm%Pv5Ves!ivC4aMA#$Uio|FEdk2KhYTkhQukIcX00O+4}$F=Q%SgLj9#kGu=t91_mOzdm_L#e|VFmNcH}`+PY2 zD%13}bji!M5;GA;(p%_9j&PfHz=^9g;xWlpbE;fTY?7-8`0>(gE>oggUF3VA4Vc_? z3w*Fss1d16Suj5m9WGJQF=Dc~cBaLd(pfsK>c);`c_f z>oN4ucW+|U)((dVWr%7~esY(atTH)`s_w2Z~ z{kTx0o~TiZbm(Pnw3nt=g>v-MI@iJlF}vVhrqjvOO^Ri^p|N>Fb@mSo=5onqyybx- z12eCK9Qk2)uJv<$o#v{Zgydtby2&K}yfn^->zU58^o=_XuZ(boDH??mm{FFj{(_gG z*RW8dSOg;;H=k(~qIFO@(LH89-6rrrQiD_CIZmSuUd1Buro*#kVRXmxCf58o0!?Xz zA(u_z$eHNNyc`l7nST_<*~k`j%Vx{&gIO@ZRUg*AF*N38+(R7i@Y*Q_xk* zq^jHncwLOO!jxfQnXg6O>=xitA?pim0_oTGDQ@w)0N)|7Et3KjH~AHedMdz3IC>&n z(53(H{(lAkrnUMS>2vw-YxtfR#mO4qzx#;VCX1!X=7bncEacAhJhJB%Oq-p^r^X=i z^pL?aG)ivAPVKNo%zw0{1$#gqFh+3)-uE)=(@aHlz|rL{rPP6l3BO<|L@1yeHZXj& z6tFYbm*^rou6r!8FbaS;3OQ&M`SN2&`JsTv`ja<(#D-LFl^UJZMt!zjbE9tAqwpR5 z0->Dh{|xTr_VZLxKD$N4Mjxm|mWBlnt<8 literal 0 HcmV?d00001 diff --git a/assets/images/wechat.png b/assets/images/wechat.png new file mode 100644 index 0000000000000000000000000000000000000000..fc4a727e83ad871ccc0624aad36cd1ac2dbae150 GIT binary patch literal 6908 zcmc(k_ct6)w7`SK>Z?bzwR#UiR=4`sTCbMLt`XJ$SLdOB)k#E*y{Ja|9`S64Rpr$_!1Ai=+}&aA%h z!GlNraAlZLkj*iQB-2VIZ#ZIJjE#dWHXf)v9mzw9%l0_0=c)28n=XvXPDOzp<`)Km z(OK=5Z)LDUAV*lfeR~*C7=MixQ4+hhnjxaEpbX(6meWg1qvyywSTUT>828h?^7|I( z|Lt}H1DiAo`)2yL>u*o$EekF`9ZsTx65#dV5X6r1SyCit{3j^^Tt~1Sk%KTr;(sQA z0PZHJF)+=$W7%91)=R~~&G;gRfgDHk|I-t7PdVVq3h+{Brbm8?l8walD%&Z}%cC#V zZEz(ZOT~ZrFaFw4+%sb`dW$IUDbdf{wo}Jlv^(k=TeOsmUlKJZePY;n0BA`YSAC3^ zTX@Z-UZ{2gL=N+uFmimxVd>w@8+c)f*Tg=>061`kSVA8`Y0$9VKfPs3({C!g#gWpy z-V`d~RN7f66dmrdW?Ed{Xd+YU4#&o^8xCC}Ge!z<#nyp>uYJ+_J>oK`09Z)`Yvw7? zyMlw`dMy1?)=1Y7{S;EJa8wiW60E)(w&mFS5p)~VWvKFLL%5`u?7X?vkbYU`P&5ZD zU!G4?@E{Zjtwkv$V-{`MZwQc#d1Hwp2d&R>A$BY<4g}SEydr{2(vCtMrXB*!h2KlE zm)A<%LQ^~9c`6{?&mOiZcJdjpv5}_$ z^rYxoHBIL4XL3wGCReg_T8rdh8XdRg)Xap=oN@q9`?QzP+|R@BXP#^1fLRtH*Tpfi zA^;nOGu95PoZOfKUY$5_*wF;|YNf%j%Gz4KEZ^|J-tjq|^qk%q;9&dNXeev$%)5tg zyK1vCC9^y4zZwy)q8oOAkb{x|`p92VJ4dZ}qsuoPIGC!AH57{E_=RLA$>JW%#*1Sz z-Ql1JNpkwY@#h9s>h}Qi!AqI`u-<$Ft2ps_QXEX650pB}Lt^ev*u$tGqUP5aKX+d! zof95q+FHMpjsq9=$yW^$;DB0Md3OP>JoD&xcXTT=k_ZH{igLJo>i0TiPX}w#x&QMgv9Iu#60KcbY^~@8}2E$$rL19XXZ1 z1O-Lm-c64gqFT!K`H6HuMXL(*?qe3&5BOm@=SG|=S8gq0xwepCrgy?4Zt5=J{Vxya z;+A6|ul7R*OmGP)Lkf~NEc4j7Zv+v-jd+0zvin%qr)}PJCq4i}v0p9e_L!n5VX>6_ z{mo_le!h8#F6<0$ca?PinJ$jP)oB&lQuhs(-As@FI}w$vUXR`_6=V=@qIUj6k1og_ zdM~0LX0Vw)_9ve9Jy@B8&H)| zLbis#riL^x@6{&}ThtD0l0}{Tm_pZ4mKkKL$^LR>)AUwUCAjNmF-v!|2V#nr3eDf$ z#$I=mV)}tL`8X#M%00V*pd#nI`C6<4!OLsweUgDa>SF5lW=hN|JEuUELkOg_WWo8; zRVdX7uYkcM{~JuBAa*B0)c5KYw19HCZFoiNjg4mZHa47ddSGvnA?)3qNXn0oNK3bW z)s=U?R&fp&5X1>ZQAcQCKMGvasK~J{*H3aPeR#uOL;P;zF%xPiO_L!X-1Eoj_INyv z_vEb^d41@*6f8?Z+Z3Q?xHFude9MF*MJY&fFf6j~ZZ`^i!ah>k+rxYJ#A70%YAJeH z1Q?!qE7b)}le}ezJvq%yu`_-OYJ%+ab+wongLD#x9r);N`Og)t5 zs7X}s{YVIcKc3s8fBPknIUI>nukW8<@A2ilAliC4sE2O%KP%<_~-oqbnTrFLR?B|4Hpz;;5jy)1838A~+zV;^_s zrFW3P;|e|nqehtwrHR{#uZjIWQH#?<)T-12dsZ7Yv2}3cja*#{;npKlR>H?4x}-#} zA`rMq74X0=jNp4Vht9Om{qxHQ@4v&8%+`1)p!EOw3|v+B$i8ro~Lw{=?fydM>3sImz80c|RL@YS1?*G*f?)`prgfpbfHpx)`b} zWb*YU(dY%aQSQA1u}tp+`Ih67Xs?iCX5}!00%ogZlsym^s}xDh*G+-`O%pr;`n!X}a7y58uLOt(`&pd@0s`4OqLXEM-;utKMZ3~-%pN%KIddKCURH|O2WiFc z*Mxk&!BfoG72#kJDvy^EL&<4@QX#nVhF-O&F2G8)%Aa~0quCV9{PWi2gw{d*Fi~y- z$dg|!mp|pzHgGh9I1^WS3*B?Ua&d?szw8H}05~SuuVtt^Jm(h6LwYX7Vqo9dB`GoK zz_zE);MnOS8$jazceRS5(bVo}rqqo%0vtE%s4ta>;O%Rz*~j_eT+J%&B2av^cUdc@*^-=kJ?RJX*%Y_eusv6+4VA0Z^Pfto~oD8Q+SspXUzqPBgGS zxpGn`6%o1P$>l?E_bb#|94Vwx5VeC$suol=x6bYStv>OkS?5F@QIPVCZRW|i=y5?4 zWu;7FQR?glp$1C-!iNtzrjTR!B}bj5xR<+mB!TrN-d{j@WNmCQd$4om+w>q2*;tLq z#QPq?TWj{8XUqi9oZthMf>aqEzjT2wcjRSV;h4#XJJ(%|^>0gV3L5zN-d^NM7{{wJ zWZcIHebp4M#_DW|YNds{JTA7ZF^3aI9r9vhl}jxjoBnw86h`VFHfyd)XVNnqBuB?b zD;?R+&e{}!Ge=LukAV~ePkjmq%Jno0H1ZB9lXMr7$*1b20{ol6n3KB|JC#*EIn1G| zsCrZeFLnqzf5x-gl+wUF@V?p;HFW2;#n{8E$t+ms3kH%fBIS2kNn`=H_L0MRM+~((_pZ5SoDW><_ndVX2-dS%DroNqKZ%rX+5ncaR!L7)w2{ zt^7JqvJXa=gEpf*(_8oK8gT1cYNHhcr4=NMk=02V7J;9)HN5iat~FNaWaT!G8jCW9 zo;UG3uOCitJ)6L9#zBYESi0B9(!q?vyG9M$XCC3IrHry)UGUye)@iqw8YuVn+k5g~ z4nam_Ht6ekFuxyWJ^SwK{pHm#MvuFjL$Gm9GHFV%b)H!(i^f=%`)aKC+1dzgjf5Ws znX&afGkyh||1=S8YJj@M6zQ`5m!!7~cF(lZMjf-CUpn}TV zP&iV#H~fMI+OWy3o%#zD%C&plkPMu7H`2}sF-y=iTyHmGnA=f787I5ylJBrOGBDMmwpz>3aEosW@Xr?OjEY&Ph_c;uhwOw`o9`SochPv&GSOF zgWoVOCFWHgbuA2TKL@bB2vh7$ueM5MEFrC)G|W% z{HHVh+ZTUU9>I(vq%e-ab&r`*6F}Q`ma%X!%kn^ze~Xx`4C8ah(BDCoJ!V7ve8`35 zliY(tDkINs9r3vUL2_1dU68m~o$Ep-D8WP3m(WuinxaN0c(kzfnDabDre0-V>a)+7 zA+(#T)u8An_R-+Mh$_L-2b-|wg&$x`)cLg(BDHM0Wzz&eQeB;4w#shzP~tqQn@v64v^}wu zFcE8<$WwF=UA=UI-ufqh5?l8Ib)P*QHyQ-{u) zh@?k9lEAN?&++$N1_V4bf5t8Yo9oLy^Ic!zv=u()WLkF&H468Try%iE7KUTR5*PP=O+Np61Gn$U{jS=xI$$VC+?CgF`BPAt zBC?b8%n=~%2VL;$pN{#)XR!4xJ+!lbv7l%de(N2#x<04|!hbi)%CLb0XgD%c{upF! z{L|N#8z(u>aH`47Z>!J9`B6^7={Hzx5wGo-3k#qk5E7o5H)3V8)+S;5e!lwLf*%## zn^||!vh^vNG=t-Kyz#uPLZY^R+Y>Ncz8Co+6N@eo4b({i6W5n(6&D}g7tXNl%f=bb5{)_%l~k0#;{+ty$I=QS z$0+7+GdM>~UWcLh>kRbU-Cs@>4cT8+i(lW8R=)qT=)B&bx*<@Yfpg^tEDu! z&Vuph&^{AkQIV2%6IQ~e*x#BkqKBm2KuAIs!Q-CAx7Q9)qAa%XcSHBp0yVs#i3etE6L}GKU+P(+8$LPO|G_Z*Jt~#z_dDY zV@Qn#v~*j(l(TE~T4LJlwg`H`r)YkqoZ0%@?ab1ypMTRNkI)(}|cuPFwM&keRnoeqCBNcTp|bkmN`lDE-j&YQHIZu!mOLn5HY9aot`GeI~Q3{5SO zYnesj!&W|iY26TgBku1QwvOGnfFI?|=ZWHqOP(K4m94Wj@V)Yt{LsA9jbCWGuXnbyu>qEVZ_16b}-5NQo2#^xNM+AN-BNxT?Z>0 z#ErM}Mm-jif+$3Ug+G1BTGF2fdL*JX{xU18ToM;19(bP!jav0tvA||xhUI|diu=WA z7LFFGAFjTlI@2_A>ZXF_>{%OVM1ClH`xrVr zi8cvCu8)&;<-&sj!GKo;NhFpDhKA|h3@r?#da%a4hRdG^5HPg3nrS-i;vBfuB&0l; zp^|x18=k3Qk^MN&lM9lo9tHQXhpcPaHDV2~Erw17Wbdo$rR7p_@3@Yu=UK&Yk-HsT zVS_yII53)}p-jkXZE$dW`h(-Dn#_diN!_K-Qi#;+-pZU`bt7d;X$ve3qw1ce`I;*! z4=tx_%O2K?h}&4&WU9 ztO%z$;<`X9&vy6C!+GH&zEk<%W=$?13x9t0nwzFoG5LV2)C_PNjMib9og^jjYsn1| z&RvxJ$Pq-LvTk3)*#vMSssKjI2q~Wo0v{dCU4uH9xy?AkHPfzpy=pPTahnwaZn>=z z&p~N27;sD8a2I&V3;}@gA1zV60{hD>mo@Sob*lqqq6g5<{(6GhU>GHd^w&K-jw|+k z;+nn*lBh_HQra%z(t302n$%g!wTB@+sE7YP)--9LNf4XHg#J=NSRaHw zz$QT#lFzCaW9+p@#s>B;=@WsjvEox}rt$2@pxp5u^+OhKWsEypD(}=(sWj8nPgHV` zd;}f*-nasi1D@kY3HIJso2*l&H31SH*z8ngbELD?>NnzJnmPnhG@Cfpt<+=Z9pO}T zo!DSLDf*Pe45raYPIZ}8YVE}LjKtO~+VB)t%|b$*fn9Wmej^}(ak}wV<_++-f%!Ve zliHr{@r-kkLVTtXTclYtr#e+-?7TUKT|dh2SAX@$ybLC*dmx5sRKeh|4FD%z<_QU# zQ1kd4ug)afV&lEQAZd1+{L7GcHGaLi8qV@IEoE3msAgYoH zgPFwqvV9-V{ftWA#~L*O(8L^L`wsAR#p$fuFSf+f8h6}Kroytn*>J61AD*cyh@pFH!#K<{r-uGnXyftc#+}=yl|2t6;9f`G*C}ym%d2Odt zBP)-9x)M_W0JnL4E&)0v`Wc+@d6u4^L;*OOASH>uE_*KAY_Q9Z#EVf7KmbO% z3_Og@1DYXnJB1hcl|YRE5hwOqMiYzMLWd*0BiB#VgLXD literal 0 HcmV?d00001 diff --git a/components/merchantcoupons/index.wxml b/components/merchantcoupons/index.wxml index c1e332f..0a45920 100644 --- a/components/merchantcoupons/index.wxml +++ b/components/merchantcoupons/index.wxml @@ -1,6 +1,41 @@ - + - + + + + + + {{data.title}} + {{data.subTitle}} + + + {{data.salePriceStr}} + + {{data.priceStr}}元 + {{data.priceStr}}小时 + + + + {{data.priceStr}}元 + {{data.priceStr}}小时 + + + + + + + + + 免费领 + 马上购 + 已售罄 + 已下架 + + + + + diff --git a/components/merchantcoupons/index.wxss b/components/merchantcoupons/index.wxss index f148a33..074be8b 100644 --- a/components/merchantcoupons/index.wxss +++ b/components/merchantcoupons/index.wxss @@ -257,3 +257,8 @@ navigator{ navigator:nth-of-type(2n+1){ margin-right: 10rpx; } +/* 限时抢购样式 */ +.xianshicoupons{ + width: 100%; + position: relative +} \ No newline at end of file diff --git a/pages/index/detail/index.js b/pages/index/detail/index.js index 354de10..d5c366d 100644 --- a/pages/index/detail/index.js +++ b/pages/index/detail/index.js @@ -10,12 +10,14 @@ Page({ data: { teljpgUrl: imgurl.teljpg.url, share01: imgurl.share01.url, + actUrl: imgurl.act.url, page: 1, imglist:null, shopVoList:[], couponList:[],//活动劵列表 data:{ - currentTab: 0 + currentTab: 0, + isshare:false }, id:null }, @@ -31,6 +33,9 @@ Page({ }); that.getList(options.id); that.getCouponList(options.id); + this.setData({ + currentTab: 0 + }) } }, /** @@ -41,6 +46,22 @@ Page({ wx.makePhoneCall({ phoneNumber: e.target.dataset.merchantlinkphone }); + }, + /** + * 显示分享弹框 + */ + showshare:function(){ + this.setData({ + isshare:true, + }) + }, + /** + * 隐藏分享弹框 + */ + hidemodal:function(){ + this.setData({ + isshare: false, + }) }, //滑动切换 swiperTabView: function (e) { @@ -132,7 +153,8 @@ Page({ onHide: function () { }, - onShareAppMessage: function (options) { + onShareAppMessage: function (res) { + debugger var that = this; var shareObj = { title: that.data.data.title, @@ -145,8 +167,8 @@ Page({ } }; // 来自页面内的按钮的转发 - if (options.from == 'button') { - var eData = options.target.dataset.id; + if (res.from === 'button') { + var eData = res.target.dataset.id; shareObj.path = `/pages/index/index?couponChannelId=${eData}`; } // 返回shareObj diff --git a/pages/index/detail/index.json b/pages/index/detail/index.json index 0bd72dc..92dce2e 100644 --- a/pages/index/detail/index.json +++ b/pages/index/detail/index.json @@ -4,6 +4,6 @@ "enablePullDownRefresh": true, "usingComponents": { "c-banner": "../../../components/banner/index", - "c-coupons": "../../../components/coupons/index" + "c-coupons": "../../../components/merchantcoupons/index" } } \ No newline at end of file diff --git a/pages/index/detail/index.wxml b/pages/index/detail/index.wxml index 896b0b8..60275a6 100644 --- a/pages/index/detail/index.wxml +++ b/pages/index/detail/index.wxml @@ -3,7 +3,7 @@ - + @@ -17,10 +17,10 @@ {{data.merchantName}} {{data.title}} - - - - + + + + @@ -48,37 +48,55 @@ - -    优惠信息 -    商家简介 - -    -      - - - - - 请您敬请期待 - 我们正在筹备一大波优惠活动 - - {{content}} - {{loadingtext}} -    -    -      - {{data.summary}} - {{"信息完善中,敬请期待。"}} + + 优惠信息 + 商家简介 -    - - + + + + + + + 微信好友 + + + + 生成海报 + + + \ No newline at end of file diff --git a/pages/index/detail/index.wxss b/pages/index/detail/index.wxss index 3c5dcfe..57428af 100644 --- a/pages/index/detail/index.wxss +++ b/pages/index/detail/index.wxss @@ -164,12 +164,12 @@ flex-flow: row; height: 88rpx; line-height: 88rpx; - margin-left: -30rpx; + margin-bottom: 20rpx; } .swiper-tab-item { color: #434343; font-size: 30rpx; - margin-right:30rpx; + margin-right:50rpx; } .active-tab { color: #1693FC; @@ -188,6 +188,18 @@ top: 0; right: 0; } +.user-motto { +width:270rpx; +border:0; +background:none; +height:260rpx; +color:#fff; +position:fixed; +} + +.user-motto::after { + border: none; +} /* 商户活动列表 */ .coupons c-coupons{ width: 335rpx; @@ -205,4 +217,53 @@ height: 60rpx; vertical-align: middle; margin-right: 10rpx; +} +.dingdan text{ + display: block; + text-align: center; +} +.swiperactive{ + min-height: 300rpx; +} +/* modal */ +.modal{ + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: rgba(0,0,0,0.5); + overflow: hidden; + z-index: 10; + color: #fff; +} +.modal-content{ + width: 540rpx; + height: 260rpx; + line-height: 60rpx; + overflow: hidden; + position: fixed; + top: 50%; + left: 0; + z-index: 11; + background: #f9f9f9; + margin: -130rpx 105rpx; + border-radius: 36rpx; + display: flex; +} +.modal-content view{ + display: inline-block; + flex: 1; + text-align: center; +} +.modal-content view>text{ + color: #000; + display: block; + height: 80rpx; + line-height: 80rpx; +} +.modal-content view>image{ + margin-top: 30rpx; + width: 100rpx; + height: 100rpx; } \ No newline at end of file