From 67dd6e617a0c4a1dddff61b2935b3d0d115f8f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Tue, 29 Dec 2020 16:34:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E4=BC=81=E4=B8=9A=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E6=A8=A1=E5=9D=97=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 7 +- custom-tab-bar/index.js | 24 ++--- lib/storeConfig.js | 13 +++ lib/tabBarData.js | 9 +- pages/config/config.js | 47 ++++++++++ pages/config/config.json | 3 + pages/config/config.wxml | 5 ++ pages/config/config.wxss | 1 + pages/shortVideo/index.wxml | 3 + pages/shortVideo/index.wxss | 1 + project.config.json | 171 +++++++++++++++++++----------------- static/tabbar.zip | Bin 0 -> 7816 bytes 12 files changed, 184 insertions(+), 100 deletions(-) create mode 100644 lib/storeConfig.js create mode 100644 pages/config/config.js create mode 100644 pages/config/config.json create mode 100644 pages/config/config.wxml create mode 100644 pages/config/config.wxss create mode 100644 static/tabbar.zip diff --git a/app.json b/app.json index 73734cf..a4fb14b 100644 --- a/app.json +++ b/app.json @@ -1,15 +1,18 @@ { "pages": [ - "pages/user/index", - "pages/user/companyMine/myActives/myActives", + "pages/config/config", + "pages/welcome/index", "pages/company/index", "pages/company/search/search", + "pages/user/index", + "pages/user/companyMine/myActives/myActives", "pages/shortVideo/index", "pages/richText/richText", "pages/login/login", "pages/card/index", "pages/mall/index", + "pages/mall/mall_details/mall_details", "pages/live/index", "pages/ticket/index", "pages/home/index", diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index fb5dfeb..49bf6f2 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -5,7 +5,7 @@ * 碌碌无为枉半生,一朝惊醒万事空。 */ -import { mall, video, ticket, user} from "../lib/tabBarData" +import { tabBar } from "../lib/storeConfig" Component({ /** @@ -15,21 +15,23 @@ Component({ selected : 0, color : "#4e4f51", selectedColor: "#0b0041", - list : [video, mall, ticket, user] + list : [] }, /** * 生命周期函数 */ - lifetimes:{ - // attached: ()=>{ - // //获取模版信息 - // wx.$api.publics.storeConfig({ - // company_id: "17" - // }).then(res=>{ - // console.log(res) - // }) - // } + attached(){ + if(this.data.list.length <= 0 && tabBar.length > 0){ + this.setData({ + list: tabBar + }) + }else{ + wx.showToast({ + title: "获取店铺模块信息失败", + icon : "none" + }) + } }, /** diff --git a/lib/storeConfig.js b/lib/storeConfig.js new file mode 100644 index 0000000..1a7db34 --- /dev/null +++ b/lib/storeConfig.js @@ -0,0 +1,13 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + */ + +// 企业tabBar配置 +const tabBar = [] + +export { + tabBar +} \ No newline at end of file diff --git a/lib/tabBarData.js b/lib/tabBarData.js index 750f2ce..59d23fb 100644 --- a/lib/tabBarData.js +++ b/lib/tabBarData.js @@ -7,7 +7,7 @@ // 商城 const mall = { - "pagePath": "pages/mall/index", + "pagePath": "/pages/mall/index", "text": "商城", "iconPath": "/static/tabbar/tabbar_icon_01.png", "selectedIconPath": "/static/tabbar/tabbar_icon_show_01.png" @@ -15,7 +15,7 @@ const mall = { // 短视频 const video = { - "pagePath": "pages/shortVideo/index", + "pagePath": "/pages/shortVideo/index", "text": "首页", "iconPath": "/static/tabbar/tabbar_icon_00.png", "selectedIconPath": "/static/tabbar/tabbar_icon_show_00.png" @@ -23,7 +23,7 @@ const video = { // 优惠券 const ticket = { - "pagePath": "pages/ticket/index", + "pagePath": "/pages/ticket/index", "text": "优惠", "iconPath": "/static/tabbar/tabbar_icon_02.png", "selectedIconPath": "/static/tabbar/tabbar_icon_show_02.png" @@ -31,7 +31,7 @@ const ticket = { // 我的 const user = { - "pagePath": "pages/user/index", + "pagePath": "/pages/user/index", "text": "我的", "iconPath": "/static/tabbar/tabbar_icon_03.png", "selectedIconPath": "/static/tabbar/tabbar_icon_show_03.png" @@ -43,4 +43,3 @@ export { ticket, user } - diff --git a/pages/config/config.js b/pages/config/config.js new file mode 100644 index 0000000..a589427 --- /dev/null +++ b/pages/config/config.js @@ -0,0 +1,47 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + */ + +import { tabBar } from "../../lib/storeConfig" +import { mall, video, ticket, user } from "../../lib/tabBarData" + +Page({ + /** + * 生命周期函数--监听页面加载 + */ + onLoad(e) { + if (e.companyoid && e.companyoid == "") { + wx.showToast({ + title: "参数错误,缺少companyoId" + }) + return + } + + wx.$api.publics.storeConfig({ + company_id: e.companyoid + }).then(res => { + let tabBarVal = res.concat({}) + tabBarVal.forEach(res => { + switch (res.slug) { + case "video": + tabBar.push(video) + break; + case "mall": + tabBar.push(mall) + break; + case "ticket": + tabBar.push(ticket) + break; + default : + tabBar.push(user) + break; + } + }) + wx.switchTab({ + url: tabBar[0].pagePath + }) + }) + } +}) \ No newline at end of file diff --git a/pages/config/config.json b/pages/config/config.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/config/config.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/config/config.wxml b/pages/config/config.wxml new file mode 100644 index 0000000..ceaa87e --- /dev/null +++ b/pages/config/config.wxml @@ -0,0 +1,5 @@ + + + + 加载企业信息 + diff --git a/pages/config/config.wxss b/pages/config/config.wxss new file mode 100644 index 0000000..93bf0aa --- /dev/null +++ b/pages/config/config.wxss @@ -0,0 +1 @@ +/* pages/config/config.wxss */ \ No newline at end of file diff --git a/pages/shortVideo/index.wxml b/pages/shortVideo/index.wxml index 300e482..276f0b2 100644 --- a/pages/shortVideo/index.wxml +++ b/pages/shortVideo/index.wxml @@ -1,3 +1,6 @@ + +短视频 + _TcA@G6ooTn~k=B;`2-K-?P{E@Tox_j??&$;Ki&VIV%G`m9zm}U6w z;g1hSn$tA?Hyj*p_)40Z9HwE+3d93;-zE`wKtM1v4J{p+mWJlrpRa!la)9Oljj!dO zLFi7<&>a0Uh=iswz}Vm0*ZEsCye=L9n3@6Xe*Y3}K2=r!jns*7tfW(feVK*5#uAgr zK~5=Ct~4c@xHIheQKunqGqRO^=+UioG1Ps>9*Y*}FoO-8R8z+5wR!quXy1Qb^gVEb zhCY|1=Wq0?Bfje7)%P_`r_er+nTiNvR}6b2Zq9j4G{+8o=9^yxO}JCGPK@?q3WX}% zjL=1_z;eYU=LOyaO3~-TBOhUSxfqAJ$}wjrq~aGh&pHaF17k%2AgeDjOVuV;xv}MV zBiG20gMj&hAgf&L>s9wcVH9(uNVOT|L{#oe{?1K%S1rt^*CeiN1YEkZ;FPTv^Psc8 zK4;}q@%gV8G7?jKNc{B`J`c}?S69xGKSV8g_eGrV+<<0{Y>P%MJ&Xr~FYu1JUzXCU z=(Pf%)g>>k#?lPR>nut%4q6R-3aH#V@Y{!?HJa->j0em)?X6^YDcM=~y%`DKp_Y4x z5dc6>qDfJ12Y+`Cf6nel(G~8@o%c_@{9|qa zS4VFzfZr|eAb^yVgpZfYKeb5M(c!Khf0^Lyp#?wORKmD}z5OV8*@tQ0=g`v~&4r%mW8?`U}uHD-Ajo@RY@Tq_u3U_JTn_$Ae z|3I+x-zS*&p9K3RRZ>>2J+U1BM(`OA72o)0N;AB)!}`q237&yT7+Cfl+>od;69a>w zvH@pnT*MpivtAq}@}t0P!4bd2wpHTxM$x8ofm#gknhZMmxhh7kGP9Cg_y*_rnOrZ5 z=GfdKxwH;fsE+fgY|CIDFN5B1zXrVW9^uy~xj}J?Ic)8veTxGf9AopNX@inYejX1i zqeJ6>ZuNK2U_%ynHQvS4oJVYY;TNbih%5snaf(&K09*aez&S|R02K7z3D^hLaY*U0^jTRlfcl#E`jBI48Ee(6$iZPoh{t$)X zO9N8Rn1jEDxo|wRD~&nKPT_Grlg!OqGatOj7KDve_l{)h+&cNSO8&W`XY$Kg$+knV z)!V{Q79NVf*lb$y>pc3bar11P3e33L^#$yCX;fVkQb!?`SGfYey2_|b*i?Y8TbqU4 zdhz0|KdYGtX6FB+cqF*Vf}S2JP6MB%gqtERgkxU|dRs@rQ%`>MApsu5l)?V!L8 zAFH6Ms3%>epa)T+Ics)D>a0!Y>Lo(Vn;&TnedTjQKmEPFN`li;6jl)ZoPohKNZv-c-S2qh1kPgd zk(Nf!O5w$qnB>?f^wXtibQ$(4wHameP7K=B+N0h_{VZr>6L{wmom83h&z5qgFim+>MYO3t-ekXlyd|@yG(aj;c@cy9GL9Y^04`dq}S|zWQ z)}7LtLPU3hIZ8WgNl&eGI$?!%6vuqR@PzNYp-q+JEN{CmN?6AG&i#O?F1weG^`{F8 z3I16KgSb|rt&5BH{ou{)s-Wa%!jq#RkwU`d)|j@^&pEHI%%s{a6B0K+U+C;MLRYV^ zRhB?!`aBvTXf#oZ>i^B(J)4_PlR1!`V!-WoehRN@sct(6TVA@IEex z@7{{m<3_a@ZGE-?3CWuDRM5o54BX?9KFYzAamLt?s?liH=UA*yo`b2uixzMFl;MhP zj2M1!IRurveLnqe5MHZGt45;k?28Fl3evv}`Z|UO8^9eXO69O$d%;dsvNXF>reoY| zjLJSmd{-VN_vVqjwui9R zY?n+ME{p``Hz_iHMbA4ZMJ>DL_j9kna+%9?4Qa`2YDsB=L7ZIy+lXnSyuLZfXKivM z$&wu99;YMGVUtyv2p)-Tl@CK24&m2k|at z+t!@%t*bdmEYTLRLi(X>a4F8$*^hRxvOXS~2q95fIa@-c`8I1tpnikX$@OC^&Wi~G zGsqmEHMOxGrat}UCRHE@LmZ9CB%f8z9UIJ@<-0^~cQX_3>vB;u5N#PPe6T*0gMEy*(}zKZ%5o#I_{q4jw5$n zxwl`R{HG)C{QsL@6QC+6;n$F0<78^$#a*@|PVki;1h@djJ*K*^;tZQQU8=d-5K`yc@GCoCg!?k`wEs|u*ArqmI5>bq8 z1lqw#eOVU7Z9MdF(nYU_y$yH&5*@2PUA>`-^cA7;SL+O^_d+@}tlU?7d-0te5VK7x zbm0Ql1&KZ>qM$4pm>f&E=H^vroi#C|6p|p&eS;S6+O3ErszQ?PyjC|dZ5jC;KRUu# z2I3foqpD)PNyE`H(?i8Cm{u0WSu+uRAc*g(c8)T^)IH{zSC$|~Y?eG|I5&~bLJ=e- z4_j5#g;Xq|(!0AV{3j#bGbCLsgzGPaCWgFd+6hxFc9 zG#=C!Yup_B$nYs!sF4Gfo>el`sd@wM-}4#J>Z>sSRae1eT0X6ysFt+WhVRbeTB_H> zaMP3hmc%7%_*z6LHD%2T$l6i0Kb@-_y2kR;w&oeNUXVXhmONX+C0lw18(8 zSqf)%H<6N(D)=Kc=LY(H_N1p}^NUFdGT7c$P!jGD=PxVJ5cPMC4>6wZkA7!7IpwZ4 zq<#VzxZSAMJEQ?`8{4KY@j1oBTT3+NabbGnK`FidFV+h#fl>A=D=#!S zHg7AS_-w|YZqCI|1W+Bd+{wJ3g}re>Tw5uRRZ$K^;4EEnPlz^sir#Hi5f4Ak?Pvly zGvua-d5x=PE~y%4>{rVn^T5X9`tgp%Z4I~Q*WU1h78S+^y-R}yfF#cwkM-)sWtr`!E&Sq`}FGJ=PJW7W@;5Z)erqb(h*YTo{>JLy}E>ZGA3rca20-m=B);N(`_A> zE}TnD16F0MvAJbAOmPb_z(}}*;E>|+^ShJ#vCKfBD#;KU0AHBUn!#pt4HF-+Xc)zy5k+Uh5 zz49alK5FL;o*u*Cz<|k5$-?1}JxgJ(C-^eg7jkP3xucWAom*25(A`(z$XKwr23aqm zXMW&D#}!zdl@yl~bm7?r!R2>JVe7OChs!y@*+y!5wS6JRxyX=1tukx{?j>3o&%la> z{*6|1^&LDTA`gVSA9Ftd^}21!x<(VMZPm2NGRJsn3o8J4uZ zzCRv7qv`x42TF6@S^H~}_eEn(o!v|j#uF&1^8t*wgq@y-ODVyH&xn&MFNoxwyL+(l zdvQ#a1yqFHy*!$5H>`SvJ7NYb&~b`&$Jvd9_?NdoAQGW=*PYw9 zjw2kde8vuY2!vhX?sr7xGe}I>IR?8O)0(3cQ7UvsFvCi&rQRMMrA;YrjlCBqJ}z!W zOCCSWww-+ozm!HasdLl1R*%SnJ;8T$YzyTC0CKI@<9z67CQ$%&p#P z=|QxUE_Ty5Tv}Nn*v@GQcJ__(lwZ|+{hMQ1ixW!<{-jk&!8LYV4FysfL%|GrlJgg5 z*zAw~vaJH6l=@S4=-s7wZ}JOwr17uF|NE(eQQ5a@cmSi&gu!CFcF32c3A^iY0K@p( zv7?jo6S&z~mSi#uO%Y@Jr5;Ksmzo*`0-=>I16o-PxXsL5q(2t_$#Ni}HI(Ch3f(%r zOn%FjMG(oS>PD2(1EU_T%9>tO#}t;IY4OIfA;h3)QKCr%K9zu%Xv-EBGm*wo+zVNv?R-Ypu%#chITTGVLT(+237ZfHl7bEm*kTc^{+Bt zBpdfl0^+EWm$_&Y>(IVOq}O#c>^KWE1B&l3M$VhsnlunD5wa}V^093O;A5B@*$H5f z=R9Ygw|EYLoD*zmQ$ccrJz0}P*0iDk^?h7{kisGP0-JYhD;pnKSUA*y>C{C8;7c}3 zGzZfA)^<0#65M)*oHHhde`e~yi^=ymEO#l9Q&aqE(%P2sohvZSuOqPr1?AHvY#U`? zEt@K!zq`072xXfAFH}_mLCw{XrisDP%t>d!U81I*urF00X#b7F`wL;yx4SzZO@*a@ zP^Q56q{mn#T#@!$`oWzUojOwm!QEy)JkahnV(ZCf&IY9X0MGeZ9QC|Az=cebN#(Eu zl+P!XBlJ=!{uOyBd7I*h0ZuRP$p#o{<~(oaJ!VNov6ZB(tuKNi%W?g34OL5OLe+~@ zoI=L4%)XK2L@=qk)TFqA0 z65WK@UG%fFD6b|{C)C4L#gkQ6kSvXif(IB3%+*r^^qKT_RL^*T*6prT&W_G^wZ69t zEdEV$@%IZ{qmh5OU?;f{xwUl-FZcw=`t44LZ}Ndxw&XO#zmorLvq$UP$o+!4boaCM z7;%qdF820T5|qn4y~(6iAQ1vV^}6x;o!3WL~UdEMpE1 z9#JNA<9peiwWFhYnWmf~2^|(f*#ZPt>+{&TwK+P~JZnBQ)*_1{Yw!G}RGg6>t0Jom zhgeF>FGQBPT$ck?16Q6>9@aNb)(#3VLnE|%h5)k=&T|$8 zCp)xL$#t8jsnDG(BV^n-sIat?GtyRZ_I+D~X@e2mBNfC}iRM%58BqgFd~RqvS=ay= zP_x`BLf?T`&#!kB=>a^5$Zc08ScPFIGR~zJb1FRwce`*{)F8X$cwb18oZu7#R1GJ1 zFH9RBKODxUtQ%Xa-ZNnrLf9~k36i{owj-q-3p8BXhdV4foyA7rEKWLfGeFh#7Me6r z{5}xa%z##!DXFNz>aCwVW6nBK=Q$nk%wSp(0O13ZS6dCk6S*&=0~8^OzPVG~yd@yt zr^mWq7Kq8S)7u8~i{&ePT0O*!8{AKS?OE);{zNNHS0Jo z-FX-up7Ax%l(Jy<=1PTF`OokiZp_3(bs z!~U{vN4iFV1snCG%p@Rxxvr_UN-F7vvo+Gppw9D|XZTrEneiS*{8m-1rF;JYgbfyq7NLagov#5gD zKX@9b=A!YQy`N9X)GdUw)YND2IaymTM?ufg(RA7pD-~`_Kiv=}Dzx^l!?CZqvCTQ) z`qh4;&H{N@!6gMp`CxeYZIFy!miSaJQ7an&v0ZmmUMFG@9o>A5ZlW*dx2PSfB*}`5 zfk`T#nbJ_smj`V+&?OT{D`y zd%B#njW4l%vu291UWe?C`F0I>U59qx@%{h07xYJ4h-O}6_vtTphW-)sdvEB+9>s2N z==;bIz4B+!y_*qxbc()D`Fr#qdknjMj_)Hs6ti;z|BbH4k3hREiy!a0cUudVEv_{>{qNGFF1b2ie&sZSbu4c{uS%Tn)7EYCFXyF z^_Q}uU$K77!gtfH?;}5y^~j!Bf32qd73Rl$?`If~V|&B=r3C+1m>&<+pJ80t_J;Yd i7VXE);b$0cj=f?2q7LX8cGsVI=XGmG!3R(7{`x;qQPxBN literal 0 HcmV?d00001