From 64dba290ddaad5af5957c64b7d8cd5e0500c3f6b Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Fri, 17 Feb 2023 17:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 1 + assets/images/location(1).png | Bin 0 -> 5517 bytes assets/images/location(2).png | Bin 0 -> 7828 bytes assets/images/location(3).png | Bin 0 -> 3833 bytes assets/images/location(4).png | Bin 0 -> 5156 bytes assets/images/location.png | Bin 0 -> 5838 bytes assets/itemImg/arrow-right-l.png | Bin 0 -> 1095 bytes assets/itemImg/arrow-right-l2.png | Bin 0 -> 1866 bytes assets/itemImg/arrow-right-l3.png | Bin 0 -> 1635 bytes components/banner/index.js | 34 ++++---- components/coupons/index.js | 5 +- components/coupons/index.ttml | 16 ++-- components/optimization/optimization.js | 27 +++---- components/optimization/optimization.ttml | 73 +++++++++--------- index/index.js | 90 ++++++++++++++++++---- index/index.ttml | 4 +- index/index.ttss | 23 ++++-- index/searchbar.js | 29 +++---- pages/bannerdetail/bannerdetail.js | 9 ++- pages/coupon/detail/index.js | 3 +- pages/index/searchbar/detail/index.js | 1 + pages/order/index/index.js | 20 +++-- utils/HttpBasics.js | 15 ++-- 23 files changed, 220 insertions(+), 130 deletions(-) create mode 100644 assets/images/location(1).png create mode 100644 assets/images/location(2).png create mode 100644 assets/images/location(3).png create mode 100644 assets/images/location(4).png create mode 100644 assets/images/location.png create mode 100644 assets/itemImg/arrow-right-l.png create mode 100644 assets/itemImg/arrow-right-l2.png create mode 100644 assets/itemImg/arrow-right-l3.png diff --git a/app.js b/app.js index 6645b5f..0eea595 100644 --- a/app.js +++ b/app.js @@ -72,6 +72,7 @@ App({ } }) }, + login() { let that = this; tt.login({ diff --git a/assets/images/location(1).png b/assets/images/location(1).png new file mode 100644 index 0000000000000000000000000000000000000000..2edc6fb982223123774558c64e079cd43de1aa23 GIT binary patch literal 5517 zcmZu#c{CK>`@S<{>@s8DvWz`G_OdfH2qF7YvM-Tji^(=gjO`SsGvSj;CfB$}e+?#B)xOeTY;;K=m*0>rRd1NN z)zzKJL(aZ?EBdE#kdeu9kZ-U_@XXf2LT})h^8WK3QswpiCdBKPg%@$G|AkwIltK&I zwXVU@tbmp9fR??b0crucHpf+Zce`BT|1nBhA6IJe5$irj_bp0zN)IRD$!dz)=ImO9PyL*mv=^ArRDJHvz7gc zA9>@3-6c@va}`uPqGech+%)J6^0-n7gWKJXFWt!;7B@Kn!(#F97RZ= z>Y%MJ1PdfW@khw*aSUqvD0Rx3mXss`D0+`QAhUci*KYEGV@9CXM>HXgj}vS@_%GGX zUAQ6s&H+S^Bg9;va(YdDBEC;5A$8OP+=7z)VjLCDWW5a<>AWlqs+@}``FdXeZVc1f z-QUlL06vDB%ApNDaTU~rH3HYU4d9^Uj?N@T|F-ky|g<|=-6W$Kz%DQxEtp?hm ztCaZub8jBpX`1Zn(OWqYhJ$XuJFd%yJJbi6Znha2^UUc397zkrb5;+{3tI%|jRmsA^>^ikt z_>d244ZV*E#j;mh{hs$`9!`kSxSzgV!Ja8m4%^-NPX+LFf5^=8O}bLU0{R6CEA5IT z<&edr!r-oX9;uD}2I*sQ=7_`vaC=gN4!M;i=4k2QF!NkHe1zTL(4dSF)(XQ~MI~eN zf=ym5%Yx`n&bKG`crXc4TmIRKq@AWepRzObo0Ar5<#s02_z_u=9%=iIwei(ZikU+b zC|XiM)~|;cU~jE<+fCKIFZ<%#H*b7HF|D<3wxTQx5+$>MIxp%7f`(qKewa0|rzZVZ zMa+=@Yh5@6%Ai0$qzQ*FX(Sxo5O^d-2_n7_S1{2{(fHGkDN*b>8D<904V1ScFij&t z-vj8B-$y~o9vI0ye1XR)G7quSiSLeAnxC60XFs?8=dfUc3&fwizqhyFVyU^B@*a_~ z&+a8(nAau+MVgl?v#powqVPs~f)znwL_dDO%~ zwLiLHIzWE_4(=Lu6a^(`$>GhsE`ZPCKZ+2^1I$B=M%zSNKiamU%F4>2>IzoyD-Y2U zi@(yG_>OV;AUe48~ zx{C8W+!m5Pij@_bv^>6(V($!+)Js$JuHDunwv1MU}$9G75s5ogJLxIub) zX3BiVmY!Q0B~HI7H}cDBJO-v4%gYU&*^?!{TFBUBY++i9Df_I(!W5eupN16UPT}!dv<<}w&2Z(_!b#LL{H1tSlX5WpKdJEpHkC_?n5@Hls_*ay-Flv`N zC-K+5mp$u-$cXy0Ln7=+={%Aa-Zu9)CU{zykjaC$dg2qHt#uo0n5(+WuL7mL$(MM8U*%33^mhX;o166>Y6p9SA!VjGUnNsBj$ahf zlr#9a^3h0KI272z_xj0j`HX^EQtn?(m@6=l^ys?$^pfKyi8)gX;nXV!NEMcC+M(UJ~IdlC8l&T$ZRW!0RAT z7&-E#MwKLiU#1!u8z56Zs8h6h02hLigvVQX*HFYu7;uqx- zDuH>4vASb>G>vbJ$Hq~_lYZYxpR#8r*KzMxyeL=36)WZE?KUP9Drsa-B>7t;I+!0s zUL)0>I@^z%8W>UHo=Yw^H#ftKKIw75$UP+tq-37hKg`O&<|*1FoR#j9avy6#!3!6Q zQ=RaU`*Ys61550rAg$kr)aiZ4|M;j$lM-U!`MB`-vxxA%O z1{W+Tf!+6y^Mi4Jeseovhc%jft9-+9d)ACUoza8X^=EyWFJE9E*4MwIpRDsmcivu< zk)K(?=DBKl^L710NhFxg&GM6EQ}r5qZ5cT#tQF{yL@lw#^<-;AC(oU!@#uN+M4R_3GMOH5*t1K>i$2&632X0+V_p)HQ03y{^2(4Vt$1xr z%PoogvW@yr-pc02OhvGsM&`3nl?8wF?gC=#>7Ty8ttIKN;o!^N{-pD&_tu|Y6$vk`nGlN7$)o9=ycxo`j9FZXbw_{)5#vS5AbL64Vz;VwJ<<7ZCVw+?~x{u6cKDyW#` zJav?rif8PtOen7Y{yxpe7L6a+yz#2n1dCoD>Vqsv#>)|Z!)UkepZxg7Q6tnWE8q0@ zRgu+#Sg}xnFpo@4F8*g19cTar8nw{pKN|?oCvI`ummPefPU#cJbgKU3BDq0cB%1PS ztCt;&(f>;P4q}hEvY*&7dL=0@X9kasjy5ql&lq7C8kXeVK|goaYaoll7O0M;0ko(${qoLQ4(Uw$y;Fv29}#z9{C!xDy4y7UHD%3-P2o>;8ekbyJ|}h{$8wr*ZL^ zJ>t$D_fXGM(VA82&&WKCLG(4^#X{=}|3!T<`XZ#26|?JO|D^xo-dyN@;HIFV+dXOi zmNohr0N8odYQU9-Rns;WF8FUR=bnM%~FF{nASD9Tb`M6M2=B`Klr3N$ee$1=` z;~@PG_D|nhq%vEg&*aqoibtm-uv@dFpE=_Ur6=-iH|Ij1nx!c}4^oEVQZYz#@Hvh$ zt&0xBk`zoTE|JV7SRA`ka3IJX=Dj1a;f_Ln?Dw4OQm{^l?l|&}MmjXzjOo0ZdSGs9 zDZe1_^!5%dakEv9V{YCuS^e}!L)*09I>mMr{ehQ%XAVCToW~N@ zl5WYXW~L=V9J>-Yw~R_g2K1&~y7nQaT5#&w4n0u$g!8}^a3o!J%Ys+YJ6~j64;aj@ zy4*!=(}5{5$&YZAWb38L8#{lEd)b2?v}vH7zZOAt-NSP61X;o-bs2;;!SbPA6{8-i z9SPXve(UaH1z)~IwcL_;4wYPPdWV=V(FG<@y z`*Vsxz3nx1yU#)njQd^mySv}kN5{wWs+~VQe(o>#3NC%=q(G&VL-T#Dy|OhO<4yR` zr&eU8j9O|oGo zve`P+XN7>jlvnC$Q#DOdqlnAF*8m}1xu6aH?uERqqkurGYuua1@lc$jCjW*doMH|& z>`QT8{x^lwIqRa~kNtkn7ow8HsUEq1i^m5%9+NEh1k`&lSoRfw3xi1u6*3fi_oNO; zioqm|b3Hw++p;e&<^-8S_?dgmX)fP{OAN2>wmVD42`X+327i{2W{X#6DLWB;$NXkT zO}eCOdvJ93rfDFc;ID@vHCey0oQwy3f7JN8Dsk&U(gJ=vpr=1aEJvQ};!_F`MS9T5 zfN$$?nTq6H_S=3O)-|z|z(OGm!|}7-oK79GIo?7J&8N~@(UK&Ji)89{|D#PVae4c- z-Ll+j$wK+R@i0S5(3a6=szqU1ADnb-QB~t-A9Kxs;a50ljhQu96t%Hp9~c@G7YBHt z<=|vXb1Ef?kat+bPU9z<6LbYsHsAUjX=A4B^>=*=uS@pY*(98{hNhJ*0>o`vcK$*f zzej|KLEjIVkj$6`B@daMkH`ihk?voLNfzepd;WMT1fU2^$IGRG>kmsxg+9h^Y;1`B zZI*8BE93l3%>S)sGJj%lCtVU?%nii99ozE_P3ZPk8ygBStr_U&kT;u$&1B@Ye4|}$ zJFX4Z9}*ANhw+04LTQVaqMeP&fAs-}8h4}SOMWVU z)rQRv4e7F6Di7=H_=HfE|1Igtzn`0u&jbA265n+A_>k*In84M$(PQC>W(N1EHtyJM zUwT*q93e>k#egr#elRfPO0M0;@EHeMFr*ORqEkv)Q(*SfAK>eP?0s#=k1?nh?>vk2 zSrR1x9>vq0)kdsl!f-2uCE?ru`M$=>8?g&3H)}0EFo;Z>z5aj)gU9un*Q~(4H zU7bil(U(f){B?WZpe*c=HV3v~n3G-2>GsdNd{D63Y|o56Pya1qtZu_|^18qfBPd}S zdgTyyfA+|$R4mFp?l8-0H2bE~l$js{WE(AIrHlMV0c zxcGbX=T!0xnktHojau+fgsNGq9P=l^u4FdX3cT4pRtWi>!LU}_RHGM?hfKB#ioYGF zE@Sv4Rzx)guYUskyvZh+N`8eLVWq?6$s1qay4;b=S}%td5ETZ;$M03S*+Qe*dfvR* z4v)O^PsVc-`CBk=L8MI?LRZZ_Npz|W?@J3*2_O48RvwUT|5O!m;T+(6sFD--> zrsVwg>u)lQH%ukwnlwL#qlLK|X>qT|s5}eE;-iw-Yw%B#ym)PH-r5>>0bIBNW0i^s eg8yIR=?q9RU^=9R50m9p0Q7Z?F$8VLsQ&>}{X7T& literal 0 HcmV?d00001 diff --git a/assets/images/location(2).png b/assets/images/location(2).png new file mode 100644 index 0000000000000000000000000000000000000000..d38a829ab008ccf697384ddf5e64871950b7d21a GIT binary patch literal 7828 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 literal 0 HcmV?d00001 diff --git a/assets/images/location(4).png b/assets/images/location(4).png new file mode 100644 index 0000000000000000000000000000000000000000..07867806d99bfe25e1ede634fd993a5319f94e45 GIT binary patch literal 5156 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 literal 0 HcmV?d00001 diff --git a/assets/images/location.png b/assets/images/location.png new file mode 100644 index 0000000000000000000000000000000000000000..ba0932031ac3663046519394fd253c8161168c6a GIT binary patch literal 5838 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 Y9|z$(`407*qoM6N<$f>Fi@4FCWD literal 0 HcmV?d00001 diff --git a/assets/itemImg/arrow-right-l.png b/assets/itemImg/arrow-right-l.png new file mode 100644 index 0000000000000000000000000000000000000000..00392aded83b53ddf4f3a491a1923d71404c3ed5 GIT binary patch literal 1095 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 literal 0 HcmV?d00001 diff --git a/assets/itemImg/arrow-right-l3.png b/assets/itemImg/arrow-right-l3.png new file mode 100644 index 0000000000000000000000000000000000000000..5524fe1db861e025a4eeb3b0fe27fecfd3f58238 GIT binary patch literal 1635 zcmai!=~I(;5XXNZfg~Uy;chS*gB7Vjpph#a5=;snTtYxAU@RC^1X2ly5fC9F3W&6* z1OzQQS|0=jfs!%_PdU_S0CiA2szBrp5D*OrXzb%3(CLfa{p`$l_WNRI_e^l0pP@ck z9{^yu&7Zvsso7rxr-$SY@BIp-pptj_`GUIM)sq0|QMR#JVd>E`l`qd(aZK|bO?v9! z7X`Vc2J5dddtCP8iLBjSF4G<(=hCRNu-Vkz*?dYT8P_^oZ)Phcyw$ONk4bjQ3^v)@ z@B<_D!hRM6=hWs-dxsvU2L z4#dO^Pw*Vw7_K&#*G@M zS$(M8*447m%{n<0pT|O=>Kc&aGP9}e*K4KfCzb`( z-?7FaVKdNd*?n>J8JA1h@mLpU+OzH^<)^Q^2a5xjW8G6k`k?=8cfmcP?KiP%}3Pvni=@$v;A?^eOXqV7)@TyX&2 z{T33v=$3!LpumgLW@sRmzc2kH07puMI3=I9{2Gk`yoyrJh&f+tmxk!YV$Mi7U%NRD z;Zh-2;_2GD#=_O!u;+~PqP!q-^pdGd1J*i#Z*JM4*BCR zwdfmA_GF&e?#2EP-7VmIr@!qyQ~GP~PXnnA&VZ+9#fge_3GUBIaYrl*XH@0Ar%Q7X&hMY1M;{oYdx#Y?sSso9FTKDOw zKvdQEr=B;x6c8P;@{ydbrXGr@@N|l|a;3nEfvlYq!_E$1PQax*r@O8I+B}ufR>BK* zK_un()Id6L-^}F5k$`51?5!=b6nWD$1=B#(Vg04?e zhU`c)71f5yN0wQ`7AMziich1TPE**YJ(h@q7Jdyvhk>*#ngd?4Dl5MiG zvhu^`{v~lwA6m92%k(URZpc9x_ZjE-!nAw;Oe(f6wBp*we&FcWlV0P5MfS5AdA9;} zcJk5$0I(F@J9-Tbz&OF}QZWI5%N|3K-pv0IXisF6U$5JrvlT{0fo+^XcAYOT=U=^e B+5`Xq literal 0 HcmV?d00001 diff --git a/components/banner/index.js b/components/banner/index.js index ce702be..07c650c 100644 --- a/components/banner/index.js +++ b/components/banner/index.js @@ -19,44 +19,45 @@ Component({ data: { bannerUrl: imgurl.banner.url, currentIndex: 0, - mouldType:0, + mouldType: 0, }, /** * 组件的方法列表 */ methods: { - gotobannerdetail: function(e) { - + gotobannerdetail: function (e) { + console.log(e, 'e'); + console.log(this.data.list) if (e.currentTarget.dataset.data.type == 3) { // 小程序路径 let indexOf = (e.currentTarget.dataset.data.pagePath).indexOf("="); console.log(indexOf, "123") let id = (e.currentTarget.dataset.data.pagePath).substr(indexOf); - console.log(id.split("="),123); - let type = (e.currentTarget.dataset.data.pagePath).substr(indexOf + 1, 2)// 2020/7/22 变量获取pagePath中的type + console.log(id.split("="), 123); + let type = (e.currentTarget.dataset.data.pagePath).substr(indexOf + 1, 2) // 2020/7/22 变量获取pagePath中的type console.log(indexOf, id, type); console.log(e.currentTarget.dataset.data.pagePath) - if(type == 'cd' || type == 'sd'){ + if (type == 'cd' || type == 'sd') { tt.navigateTo({ url: `/${e.currentTarget.dataset.data.pagePath}`, }) - }else if(type == "wj"){ + } else if (type == "wj") { tt.navigateTo({ - url: `/pages/questionnaire/questionnaire?id=`+id.split("=")[2], + url: `/pages/questionnaire/questionnaire?id=` + id.split("=")[2], }) - }else if (type == 'ra'){ + } else if (type == 'ra') { tt.navigateTo({ - url: `/pages/radetail/index?id=`+id.split("=")[2], + url: `/pages/radetail/index?id=` + id.split("=")[2], }) } - }else if(e.currentTarget.dataset.data.type==2){ + } else if (e.currentTarget.dataset.data.type == 2) { // 自由图文 tt.navigateTo({ url: `/pages/freeBannerDetail/index?id=${e.currentTarget.dataset.id}` }); - }else if(e.currentTarget.dataset.data.type==4){ + } else if (e.currentTarget.dataset.data.type == 4) { tt.navigateToMiniProgram({ appId: e.currentTarget.dataset.data.goAppid, // path: 'page/index/index?id=123', @@ -68,11 +69,10 @@ Component({ // 打开成功 } }) - } - else{ + } else { // 固定格式 tt.navigateTo({ - url: `/pages/bannerdetail/bannerdetail?id=${e.currentTarget.dataset.id}` + url: `/pages/bannerdetail/bannerdetail?id=${e.currentTarget.dataset.id}&mallTenantId=${e.currentTarget.dataset.data.tenantId}` }); } }, @@ -84,10 +84,10 @@ Component({ }, attached: function () { // 在组件实例进入页面节点树时执行 - if (app.globalData.mouldType){ + if (app.globalData.mouldType) { this.setData({ mouldType: app.globalData.mouldType }) } }, -}); +}); \ No newline at end of file diff --git a/components/coupons/index.js b/components/coupons/index.js index a2c675f..8c0cf3e 100644 --- a/components/coupons/index.js +++ b/components/coupons/index.js @@ -28,13 +28,16 @@ Component({ }, methods: { gotoDetail(e) { + + console.log(e, 'e'); let couponId = e.currentTarget.dataset.couponid; let title = e.currentTarget.dataset.title; let id = e.currentTarget.dataset.id; let targetAd = e.currentTarget.dataset.targetad; + let mallTenantId = e.currentTarget.dataset.malltenantid; if (id && targetAd != 7) { tt.navigateTo({ - url: `/pages/coupon/detail/index?couponChannelId=${id}&couponId=${couponId}&title=${title}`, + url: `/pages/coupon/detail/index?couponChannelId=${id}&couponId=${couponId}&title=${title}&mallTenantId=${mallTenantId}`, }) } else if (targetAd == 7) { tt.navigateTo({ diff --git a/components/coupons/index.ttml b/components/coupons/index.ttml index f2cc4cd..35148ac 100644 --- a/components/coupons/index.ttml +++ b/components/coupons/index.ttml @@ -1,5 +1,5 @@ + data-couponId='{{data.couponId}}' data-title='{{data.title}}' data-malltenantid='{{data.tenantId}}'> 预售 @@ -23,8 +23,8 @@ {{data.title}} {{data.subTitle}} - - ¥{{data.salePriceStr}} + + ¥{{data.salePriceStr}} ¥ @@ -61,8 +61,9 @@ - 免费领 + 免费领 + 购买 @@ -79,8 +80,9 @@ - 免费领 + 免费领 + 购买 diff --git a/components/optimization/optimization.js b/components/optimization/optimization.js index c51412f..6a1aa1a 100644 --- a/components/optimization/optimization.js +++ b/components/optimization/optimization.js @@ -4,9 +4,9 @@ Component({ * 组件的属性列表 */ properties: { - businessList:{ - type:Array, - value:[] + businessList: { + type: Array, + value: [] }, businessData: { type: Array, @@ -18,39 +18,40 @@ Component({ * 组件的初始数据 */ data: { - classIndex:0 + classIndex: 0 }, /** * 组件的方法列表 */ methods: { - goDetail(e){ + goDetail(e) { let couponChannelId = e.currentTarget.dataset.id let couponId = e.currentTarget.dataset.couponid + let mallTenantId = e.currentTarget.dataset.malltenantid tt.navigateTo({ - url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&couponId=${couponId}`, + url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&couponId=${couponId}&mallTenantId=${mallTenantId}`, }) }, - setIndex(e){ + setIndex(e) { let index = e.currentTarget.dataset.index let id = e.currentTarget.dataset.id - this.triggerEvent('businessid',id) + this.triggerEvent('businessid', id) this.setData({ - classIndex:index + classIndex: index }) }, - goLsit(){ + goLsit() { tt.navigateTo({ url: '/pages/liveLsit/liveLsit', success: (res) => { - + }, fail: (res) => { - + }, }); } } -}) +}) \ No newline at end of file diff --git a/components/optimization/optimization.ttml b/components/optimization/optimization.ttml index 6c46bbc..e117c03 100644 --- a/components/optimization/optimization.ttml +++ b/components/optimization/optimization.ttml @@ -1,31 +1,33 @@ - - 优选好物 - Preferred Good - - - - - - - - - {{item.title}} - - + + 优选好物 + Preferred Good + + + + + + + + + {{item.title}} + - - - - - - - - - {{item.title}} + + - - - + + + + ¥{{item.salePriceStr?item.salePriceStr:""}} - ¥{{item.salePriceStr?item.salePriceStr:""}} - - - 马上抢 - - - - + 马上抢 + + + + + - \ No newline at end of file + + \ No newline at end of file diff --git a/index/index.js b/index/index.js index de99a0c..76236f2 100644 --- a/index/index.js +++ b/index/index.js @@ -117,7 +117,8 @@ Page({ currentMall: '富茂广场', shopList: [], mallTenantId: tt.getStorageSync('mallTenantId') || '', - index: tt.getStorageSync('mallIndex') || 0 + index: tt.getStorageSync('mallIndex') || 0, + locateData: {} }, getCongig() { //获取小程序是否开通授权手机号 @@ -133,19 +134,25 @@ Page({ }) }, + mallSync() { + this.setData({ + mallTenantId: tt.getStorageSync('mallTenantId') || '', + index: tt.getStorageSync('mallIndex') || 0, + }) + }, + getsubMallList() { Http.get({ url: '/mall/subMall?isAll=1', }).then(res => { this.setData({ shopList: res.data, - mallTenantId: res.data[0].tenantId + mallTenantId: tt.getStorageSync('mallTenantId') || res.data[0].tenantId }); - const index = this.data.index - const mallTenantId = this.data.shopList[index].tenantId - tt.setStorageSync('mallTenantId', mallTenantId) - tt.setStorageSync('mallIndex', index) - Http.setMallTenantId(mallTenantId); + if (!tt.getStorageSync('mallTenantId') && res.data.length > 1) { + tt.setStorageSync('mallTenantId', res.data[0].tenantId) + tt.setStorageSync('mallIndex', 0) + } }).catch(err => { console.log(err, 'err'); }) @@ -159,9 +166,11 @@ Page({ this.setData({ index: index, mallTenantId: mallTenantId, - allow_load: true + }); - Http.setMallTenantId(mallTenantId); + this.getBannerlist(); + this.getBusinessList() + this.getCouponChannelList(0) }, getBusineData(e) { @@ -176,7 +185,8 @@ Page({ Http.get({ url: config.api.businessList, data: { - filter: 2 + filter: 2, + mallTenantId: this.data.mallTenantId, } }).then(res => { this.setData({ @@ -206,14 +216,16 @@ Page({ param = { pageNum: this.data.businePageNum, pageSize: 6, - targetAd: 101 + targetAd: 101, + mallTenantId: this.data.mallTenantId, } } else { param = { pageNum: this.data.businePageNum, pageSize: 6, business: key, - targetAd: 101 + targetAd: 101, + mallTenantId: this.data.mallTenantId, } } @@ -579,9 +591,6 @@ Page({ // util.barcode("barcode", optionss.quancode, 510, 100); // console.log(Http.headers.token, "?") this.getLocation() - setTimeout(() => { - this.getsubMallList() - }, 1000) }, /** * 获得经纬度 @@ -593,6 +602,13 @@ Page({ // isHighAccuracy: true, success: function (res) { console.log(res, 'getLocation') + const locateData = { + latitude: res.latitude, + longitude: res.longitude, + } + that.setData({ + locateData: locateData + }) if (res && res.longitude && res.latitude) { Http.post({ url: config.api.updateLBS, @@ -616,9 +632,45 @@ Page({ }, + /** + * @description:根据经纬度计算距离 + * @param {*} locationInfo (lat1, lng1, lat2, lng2) + * @return: distanceObj: { distance , distance_str } + */ + getDistances(lat1, lng1, lat2, lng2) { + + function rad(d) { + return d * Math.PI / 180.0; + } + var radLat1 = rad(lat1); + var radLat2 = rad(lat2); + var a = radLat1 - radLat2; + var b = rad(lng1) - rad(lng2); + var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2))); + s = s * 6378.137; + s = Math.round(s * 10000) / 10000; + + var distance = s; + var distance_str = ""; + + if (parseInt(distance) >= 1) { + distance_str = distance.toFixed(2) + "km"; + } else { + distance_str = (distance * 1000).toFixed(2) + "m"; + } + + let objData = { + distance: distance, + distance_str: distance_str + } + return objData + }, + onShow: function () { + this.mallSync() console.log(app.globalData.mouldType, "mouldType") // tt.requestSubscribeMessage({ // tmplIds: [], // 需要填入开放平台申请的模版id,支持最多3个同类型模版 @@ -781,6 +833,7 @@ Page({ var that = this; if (app.globalData.token) { + that.getsubMallList() // 登录 console.log(app.globalData.token) that.getCongig() //获取小程序是否开通授权手机号 @@ -808,7 +861,7 @@ Page({ that.topicShowall(6); that.getBusinessList(); that.getCouponChannelList(0) - + that.getsubMallList() that.getType() that.uesrInfo() @@ -857,6 +910,7 @@ Page({ } else { app.tokenCallback = token => { + that.getsubMallList() // 登录 console.log(app.globalData.token) that.getCongig() //获取小程序是否开通授权手机号 @@ -881,6 +935,7 @@ Page({ that.topicShowall(5); that.topicShowall(6); that.getBusinessList(); + that.getCouponChannelList(0) that.getType() that.uesrInfo() @@ -1054,7 +1109,8 @@ Page({ data: { pageNum: 1, pageSize: 7, - plat: 3 + plat: 3, + mallTenantId: tt.getStorageSync('mallTenantId') || "" } }).then(res => { that.getmemberId(app.globalData.token); diff --git a/index/index.ttml b/index/index.ttml index dac2020..40e707d 100644 --- a/index/index.ttml +++ b/index/index.ttml @@ -22,7 +22,9 @@ disabled="{{false}}"> - 当前广场:{{ shopList[index].name }} ↓ + + {{ shopList[index].name }} + diff --git a/index/index.ttss b/index/index.ttss index a453295..e896974 100644 --- a/index/index.ttss +++ b/index/index.ttss @@ -118,16 +118,25 @@ page { .pickerMall { height: auto; - margin: 10rpx 0 15rpx 10rpx; + margin: 0 0 15rpx 20rpx; + font-size: 30rpx; } +.location { + position: relative; + top: 8rpx; + width: 35rpx; + height: 35rpx; + margin-right: 10rpx; +} -.underlingImg { - width: 30rpx; - height: 60rpx; - font-size: 30prx; - float: left; - /* margin-top: 20rpx; */ + +.right { + position: relative; + top: 6rpx; + left: 10rpx; + width: 35rpx; + height: 35rpx; } .underlingName { diff --git a/index/searchbar.js b/index/searchbar.js index d5ca1c7..a191f67 100644 --- a/index/searchbar.js +++ b/index/searchbar.js @@ -11,7 +11,7 @@ Page({ data: { navigationBarHeight, navLineHeight: ((app.statusBarHeight + app.statusBarHeight) + 50) + "px", - navImgHeight:(((app.statusBarHeight + app.statusBarHeight) + 34)/2) + "px", + navImgHeight: (((app.statusBarHeight + app.statusBarHeight) + 34) / 2) + "px", lists: [], merchantVoList: [], indexId: 0, @@ -23,11 +23,11 @@ Page({ teljpgUrl: imgurl.teljpg.url, map: imgurl.map.url, //商场地图 mapUrl: '/pages/marketAtlas/marketAtlas', //跳转地图的路径 - mouldType:0, + mouldType: 0, }, getFemgMap() { //判断时候对接封了地图 Http.get({ - url: config.api.ifFengMap + url: config.api.ifFengMap + `?mallTenantId=${tt.getStorageSync('mallTenantId')||""}` }).then(res => { if (res.data) { // let initMpa = { @@ -82,13 +82,13 @@ Page({ */ gotoDetail(e) { tt.navigateTo({ - url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}` + url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}&mallTenantId=${tt.getStorageSync('mallTenantId') || ""}` }) }, /** * 生命周期函数--监听页面加载 */ - onLoad: function(options) { + onLoad: function (options) { this.setData({ mouldType: app.globalData.mouldType, }) @@ -112,19 +112,20 @@ Page({ }) }; tt.getSystemInfo({ - success: function(res) { + success: function (res) { that.setData({ windowHeight: res.windowHeight }) }, }) }, - getBussiness: function() { + getBussiness: function () { let that = this; Http.get({ url: config.api.businessList, data: { - filter: 1 + filter: 1, + mallTenantId: tt.getStorageSync('mallTenantId') || "" } }).then(res => { that.setData({ @@ -144,19 +145,21 @@ Page({ }); }) }, - getList: function(page, businessId) { + getList: function (page, businessId) { let that = this; let data; if (businessId == 0) { data = { pageNum: page, - pageSize: 8 + pageSize: 8, + mallTenantId: tt.getStorageSync('mallTenantId') || "" } } else { data = { pageNum: page, pageSize: 8, - businessId: businessId + businessId: businessId, + mallTenantId: tt.getStorageSync('mallTenantId') || "" } } Http.get({ @@ -189,7 +192,7 @@ Page({ }); }) }, - phone: function(e) { + phone: function (e) { let that = this; if (e.currentTarget.dataset.merchantlinkphone) { tt.makePhoneCall({ @@ -200,7 +203,7 @@ Page({ /** * 页面上拉触底事件的处理函数 */ - onReachBottom: function() { + onReachBottom: function () { let that = this; that.data.page++; that.setData({ diff --git a/pages/bannerdetail/bannerdetail.js b/pages/bannerdetail/bannerdetail.js index 1bc5234..fec2c96 100644 --- a/pages/bannerdetail/bannerdetail.js +++ b/pages/bannerdetail/bannerdetail.js @@ -22,14 +22,15 @@ Page({ mouldType: app.globalData.mouldType, }) let that = this; - if (options.id){ + if (options.id) { Http.get({ url: config.api.bannerDetail, data: { - id: options.id + id: options.id, + mallTenantId: options.mallTenantId, } }).then(res => { - if(res.data.type==2){ + if (res.data.type == 2) { that.setData({ nodes: res.data.html }) @@ -52,4 +53,4 @@ Page({ url: '/index/index', }) }, -}); +}); \ No newline at end of file diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 515ee7d..f91679e 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -560,7 +560,8 @@ Page({ Http.get({ url: config.api.getSpuid, data: { - id: id + id: id, + mallTenantId: this.data.mallTenantId || '' } }).then(res => { if (res.data) { diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js index 803597c..47af965 100644 --- a/pages/index/searchbar/detail/index.js +++ b/pages/index/searchbar/detail/index.js @@ -200,6 +200,7 @@ Page({ url: config.api.listByMerchant, data: data }).then(res => { + console.log(res, 'res'); that.setData({ couponList: res.data.page.list, }) diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 1d24452..1234bf9 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -41,8 +41,8 @@ Page({ canIUse: tt.canIUse("button.open-type.getPhoneNumber"), //判断小程序是否能用获取手机插件 ifshowtab: null, shopList: [], - index: 0, - mallTenantId: '' + mallTenantId: tt.getStorageSync('mallTenantId') || '', + index: tt.getStorageSync('mallIndex') || 0 }, setPhone(paramData) { //子组件调用这个方法说明手机号已经授权成功 @@ -79,8 +79,8 @@ Page({ bindPickerChange(e) { const index = e.detail.value const mallTenantId = this.data.shopList[index].tenantId - // tt.setStorageSync('mallTenantId', mallTenantId) - // tt.setStorageSync('mallIndex', index) + tt.setStorageSync('mallTenantId', mallTenantId) + tt.setStorageSync('mallIndex', index) this.setData({ index: index, mallTenantId: mallTenantId, @@ -95,14 +95,21 @@ Page({ url: '/index/index', }) }, + + mallSync() { + this.setData({ + mallTenantId: tt.getStorageSync('mallTenantId') || '', + index: tt.getStorageSync('mallIndex') || 0, + }) + }, + onLoad(e) { Http.get({ url: '/mall/subMall?isAll=1', }).then(res => { this.setData({ shopList: res.data, - // tt.getStorageSync('mallTenantId') || - mallTenantId: res.data[0].tenantId + mallTenantId: tt.getStorageSync('mallTenantId') || res.data[0].tenantId }); console.log(this.data.shopList, 'list'); @@ -111,6 +118,7 @@ Page({ }) }, onShow() { + this.mallSync() this.getList(this.data.boatFlag, 1); Http.get({ url: config.api.checkUserStatus, diff --git a/utils/HttpBasics.js b/utils/HttpBasics.js index 0516240..577a1f9 100644 --- a/utils/HttpBasics.js +++ b/utils/HttpBasics.js @@ -21,7 +21,6 @@ class HttpBasics { headers = { "Content-Type": "application/json;charset=UTF-8", token: "", - mallTenantId: "" // token:"3ab2afa2-f704-4086-b6e5-ad0715c7e2a1:1027:tt-cuser" }; @@ -33,13 +32,13 @@ class HttpBasics { this.headers.token = token; } - /** - * @description 设置mallTenantId - * @param {*} mallTenantId - */ - setMallTenantId(mallTenantId) { - this.headers.mallTenantId = mallTenantId; - } + // /** + // * @description 设置mallTenantId + // * @param {*} mallTenantId + // */ + // setMallTenantId(mallTenantId) { + // this.headers.mallTenantId = mallTenantId; + // } /** * 获取数据