From 4f7e3808ca383d08c514c4e98bfa7a7a60e55864 Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Tue, 28 Jun 2022 17:45:23 +0800
Subject: [PATCH] cxw-010203

---
 app.js                                        |  77 +-----------------
 app.json                                      |   6 +-
 components/tabbarComponent/icon/icon_home.png | Bin 566 -> 0 bytes
 .../tabbarComponent/icon/icon_home_HL.png     | Bin 814 -> 0 bytes
 components/tabbarComponent/icon/icon_mine.png | Bin 695 -> 0 bytes
 .../tabbarComponent/icon/icon_mine_HL.png     | Bin 1096 -> 0 bytes
 .../tabbarComponent/icon/icon_release.png     | Bin 729 -> 0 bytes
 .../tabbarComponent/icons/appSearch.png       | Bin 4930 -> 0 bytes
 .../tabbarComponent/icons/appSearchActive.png | Bin 6497 -> 0 bytes
 components/tabbarComponent/icons/home.png     | Bin 629 -> 0 bytes
 .../tabbarComponent/icons/homeActive.png      | Bin 596 -> 0 bytes
 components/tabbarComponent/icons/insight.png  | Bin 576 -> 0 bytes
 .../tabbarComponent/icons/insightActive.png   | Bin 636 -> 0 bytes
 components/tabbarComponent/icons/mine.png     | Bin 893 -> 0 bytes
 .../tabbarComponent/icons/mineActive.png      | Bin 976 -> 0 bytes
 components/tabbarComponent/icons/varComm.png  | Bin 413 -> 0 bytes
 .../tabbarComponent/icons/varCommActive.png   | Bin 404 -> 0 bytes
 components/tabbarComponent/icons/路径.png   | Bin 2910 -> 0 bytes
 components/tabbarComponent/tabbar.js          |  64 ---------------
 components/tabbarComponent/tabbar.json        |   4 -
 components/tabbarComponent/tabbar.wxml        |  13 ---
 components/tabbarComponent/tabbar.wxss        |  63 --------------
 custom-tab-bar/index.js                       |  52 ++++++++++++
 custom-tab-bar/index.json                     |   4 +
 custom-tab-bar/index.wxml                     |   7 ++
 custom-tab-bar/index.wxss                     |  69 ++++++++++++++++
 pages/index/index.json                        |   1 -
 pages/index/index.wxml                        |   2 +-
 28 files changed, 139 insertions(+), 223 deletions(-)
 delete mode 100644 components/tabbarComponent/icon/icon_home.png
 delete mode 100644 components/tabbarComponent/icon/icon_home_HL.png
 delete mode 100644 components/tabbarComponent/icon/icon_mine.png
 delete mode 100644 components/tabbarComponent/icon/icon_mine_HL.png
 delete mode 100644 components/tabbarComponent/icon/icon_release.png
 delete mode 100644 components/tabbarComponent/icons/appSearch.png
 delete mode 100644 components/tabbarComponent/icons/appSearchActive.png
 delete mode 100644 components/tabbarComponent/icons/home.png
 delete mode 100644 components/tabbarComponent/icons/homeActive.png
 delete mode 100644 components/tabbarComponent/icons/insight.png
 delete mode 100644 components/tabbarComponent/icons/insightActive.png
 delete mode 100644 components/tabbarComponent/icons/mine.png
 delete mode 100644 components/tabbarComponent/icons/mineActive.png
 delete mode 100644 components/tabbarComponent/icons/varComm.png
 delete mode 100644 components/tabbarComponent/icons/varCommActive.png
 delete mode 100644 components/tabbarComponent/icons/路径.png
 delete mode 100644 components/tabbarComponent/tabbar.js
 delete mode 100644 components/tabbarComponent/tabbar.json
 delete mode 100644 components/tabbarComponent/tabbar.wxml
 delete mode 100644 components/tabbarComponent/tabbar.wxss
 create mode 100644 custom-tab-bar/index.js
 create mode 100644 custom-tab-bar/index.json
 create mode 100644 custom-tab-bar/index.wxml
 create mode 100644 custom-tab-bar/index.wxss

diff --git a/app.js b/app.js
index 248db54..7dc7a55 100644
--- a/app.js
+++ b/app.js
@@ -1,79 +1,6 @@
 //app.js
 App({
-  onLaunch: function () {
-    this.hidetabbar();
-    this.getSystemInfo();
-  },
-  //自己对wx.hideTabBar的一个封装
-  hidetabbar() {
-    wx.hideTabBar({
-      fail: function() {
-        setTimeout(function() { // 做了个延时重试一次，作为保底。
-          wx.hideTabBar()
-        }, 500)
-      }
-    });
-  },
-  getSystemInfo: function() {
-    let t = this;
-    wx.getSystemInfo({
-      success: function(res) {
-        t.globalData.systemInfo = res;
-      }
-    });
-  },
-  editTabbar: function() {
-    let tabbar = this.globalData.tabBar;
-    let currentPages = getCurrentPages();
-    let _this = currentPages[currentPages.length - 1];
-    let pagePath = _this.route;
-    (pagePath.indexOf('/') != 0) && (pagePath = '/' + pagePath);
-    for (let i in tabbar.list) {
-      tabbar.list[i].selected = false;
-      (tabbar.list[i].pagePath == pagePath) && (tabbar.list[i].selected = true);
-    }
-    _this.setData({
-      tabbar: tabbar
-    });
-  },
   globalData: {
-    systemInfo: null,//客户端设备信息
-    tabBar: {
-      "color": "#727272",
-      "selectedColor": "#F46368",
-      "backgroundColor": "#ffffff",
-      "list": [
-        {
-          "pagePath": "pages/index/index",
-          "iconPath": "/components/tabbarComponent/icons/home.png",
-          "selectedIconPath": "/components/tabbarComponent/icons/homeActive.png",
-          "text": "首页"
-        },
-        {
-          "pagePath": "pages/insight/index",
-          "iconPath": "/components/tabbarComponent/icons/insight.png",
-          "selectedIconPath": "/components/tabbarComponent/icons/insightActive.png",
-          "text": "洞察"
-        },
-        {
-          "pagePath": "pages/brandSearch/index",
-          "iconPath": "/components/tabbarComponent/icons/appSearch.png",
-          "selectedIconPath": "/components/tabbarComponent/icons/appSearchActive.png",
-          "text": "品牌搜索"
-        },
-        {
-          "pagePath": "pages/varComm/index",
-          "iconPath": "/components/tabbarComponent/icons/varComm.png",
-          "selectedIconPath": "/components/tabbarComponent/icons/varCommActive.png",
-          "text": "对比"
-        },
-        {
-          "pagePath": "pages/mine/index",
-          "iconPath": "/components/tabbarComponent/icons/mine.png",
-          "selectedIconPath": "/components/tabbarComponent/icons/mineActive.png",
-          "text": "我的"
-        }
-      ]
-    }
+    
   }
-})
+})
\ No newline at end of file
diff --git a/app.json b/app.json
index 2b82fab..a8acf72 100644
--- a/app.json
+++ b/app.json
@@ -15,6 +15,7 @@
     "navigationBarTextStyle": "black"
   },
   "tabBar": {
+    "custom": true,
     "list": [{
         "pagePath": "pages/index/index",
         "iconPath": "/components/tabbarComponent/icons/home.png",
@@ -49,10 +50,11 @@
   },
   "sitemapLocation": "sitemap.json",
   "usingComponents": {
-    "ec-canvas": "../ec-canvas/ec-canvas",
+    "ec-canvas": "/ec-canvas/ec-canvas",
     "van-button": "@vant/weapp/button/index",
     "van-tabbar": "@vant/weapp/tabbar/index",
-    "van-tabbar-item": "@vant/weapp/tabbar-item/index"
+    "van-tabbar-item": "@vant/weapp/tabbar-item/index",
+    "tabbar": "/custom-tab-bar/index"
   }
   
 }
\ No newline at end of file
diff --git a/components/tabbarComponent/icon/icon_home.png b/components/tabbarComponent/icon/icon_home.png
deleted file mode 100644
index 6fdb11ad244b03740ca6e44502898d8b484defb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmeAS@N?(olHy`uVBq!ia0vp^V9db`WPSKlyb?$m2l#}z0_o|~r;>#1S1rr}Y7;04
z@(X5Ya7Z}tL14iJg9i!)69P8OZt*|Oz`(f3)5S3);_%xW(UY1L1Xu$q_g~rY|LQrB
z%Zru?AA9s^@|5qVy<Sed(c9uvzE5FwK~%S8@25$|Gap?Q2o!M7XmI>};<-d?m)+)s
zv{gx0ZuJ-(Ue*!vYTfG2E<>B?S?@$dJMYQaDPR8DIkR(t=C*9lBfiJi9XS&#(wqKf
zmsE_YwPSS1lV$s}+B`PTyd`MfoT!v>>g^LF_Qc8NKmO;7$m@08iql)fDa*?@!>7gf
zcfxwT3pwT$)go@&v@))(o8FjZZjn_aX!>&&!>pQ9Us4`EtBDX^keXF_^}zzqBYW;M
znPyIl*lf>n$7EVxVPSdJ&TE`~tGrj~xr?diHkQaPJ>nVZzOty7uXcvP?u9EJMJokK
ztg`r;+UxS2-T3Uh!X>Mf`;$+s=({S!r?OaJ(pCnCAp1J`nJJyJZl@xuj~r5&FO$hK
z^OIo}%gaxii3~5#FOhKgch&V@nu_NI-+NDd@2RNIO}M#mQ(VQtNB1WvZnpV<<>F33
zw`qnZlU{Id%R9B%>|DIsEsZ_CTh`i&^)LH;n0xcyuT%PKxc*PK+WDiXqkHbV8jm`L
Yw*TQ8H^llJfHBG7>FVdQ&MBb@03@0Q%m4rY

diff --git a/components/tabbarComponent/icon/icon_home_HL.png b/components/tabbarComponent/icon/icon_home_HL.png
deleted file mode 100644
index e0d89d5e723d5df2368d3e74ff7e1c6d66bada3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 814
zcmeAS@N?(olHy`uVBq!ia0vp^V9db`WPSKlyb?&w5AX?b1=2vk$Os}0wFN*F68Qfp
zG}K!LC;()@g&}Mp2}ckGG7_8+DH~G}Ru)De+ty4(MS({~lGEBmWZ7i%U@sYDE%k+3
z^LtJCd0F3I3E02VL0?PY{C3y)5QY24yw=aQ%1=`Dcaw5qys`#px_U{FUoeA1gTVWQ
zj|(muG#q$%;Xr}HhY1D(3lahx{yf<5`|FOn2RAP4ST>;`Pw3A-1_mZ^PZ!6Kh{JDh
z+%B4JAkdKLDblimY09?3IZHgxpZKU)cKdt%w!D^v#e!Ft=$N1V5MS81|Kfop-VIB`
zFGQW#Bob;nJ^b{U9iK|X0%tsb+Qp-0eoWtcWl~;KMw)HMu0MNb9}b!6>~gki+uzD=
zwZJP~8~NV`N2iAgAHC99ndExA+4!l+MV?2$xi7p}_M*O9>Ee_hr^~M^1p11wcH~=g
zoxRIqe6lcVU6o*UN!m;wA^kwEvwxN@yL4=trby<pQvrYaxDGz~+i>0Dfyia~54+7S
z{gn9Ac<ksUzKSh-jg7w^VsxLFvZ#aE&#2IUMS#l8e+`Qz%<HWuAOF^pBg<2<MtGgF
z*#rBijvSC0gTuCs8Ew^v?7wT9Xy^OSxX{czYa=83#3Zl!USIPECYv`2&)dn}sC4kp
z42GGHmbT8FkaMs3@{Pr&GO>Y2?!_>M+*;h?_fGdqT7>HI$?b_#S4!@xozs?Eo^j`~
z?Dkv_<|}tU=IL!*e?3?%a|73WIq`IX#wll}zN++?Yt+N-sbcO_@a#Beihck3ejE9m
z-#1SjKDNWJT1(PSX7^{ACpT^02M3CXhkQ!eBQmGJQ>EWdQ=-IO`D}2!MN5hy^UkCT
zPI^zA^in*$7<2bdxWaadb<3x77XMm9)UKJcO;r<`G{bD-t9QS{R1BTgDL*&oi5EF`
znNxbDVd6h^HPfVH@h5)ve&pI8bUmnFZ=>gpOZAuJ7v`$uMVv_e1xn7Iu6{1-oD!M<
D4iaB%

diff --git a/components/tabbarComponent/icon/icon_mine.png b/components/tabbarComponent/icon/icon_mine.png
deleted file mode 100644
index 06d7264eb4ca93328f083e22bd23aef05b4fe595..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 695
zcmeAS@N?(olHy`uVBq!ia0vp^V9db`WPSKlyb?$m2l#}z0_o|~r;>#1S1rr}Y7;04
z@(X4-Akg6O;lTof3kd-V8zvOwtU7Uwfq_Zc)5S3);_%xUo|6tM@VGJ>`ak=({H>OA
zyI0Zyp_g$_^?jd4Hmfe#u>N19)4X32`Vz6TVz&LZVN_q=eL9vqv{Lx~#*i6Bs!w0K
zgtHmlc40R%N^`z8cc-h*Hv2F80~RP0bKmi9TWHAHIsI(<$Fcx>Cfy4jcRTerbv@g)
zKCb(vq@Stz!(Rr0XSQthV_Uw_O}M=!?TN$IRRygl&u8>{|96qocrr6&v&DIhC#SgL
zoO>t4igq|EKjq?_@BXaI<@hE4Bu|%TuIwH^-d{2_)0I~+Ic;%<Z((ZN&(a0ig%6jc
zr7^wy*LZ2M<%@%2og!HoodtV83!c$QbJ3Z&@M_)6Bi+|$)xCBrHC)G`5jrO@#d|W_
zZ)>qt-%fP?-Pl_kXM0cS+m6z&KY~;*u?EQIcu(3d<eRd4l3VG#X0AKaz9v|(b4;w=
zs;GGIgZsq~H8*VISjs=fs_C!zRvGSQG>M7D^gy7vy*<Mu@%=wS+GeFQXfiic>iH{_
znx@v&tXrZiIP1>ETJGtIc3&R%exGA*ZuH=5bEm?qO0S1@m#1rO=9*k;K68`c-?P*9
zpPLxa+tKkW>738pj)b<Yx8)3PtrN@ao%`uX*2Hf=p4#e&Www{>cK@%CduEBNm4B~_
z?xkJ(`S+fD+Q~ih+wrd1Poj<7KGj@`mWWz7%gBw(<kI>Hl1Jb8>iKcS6i$iBzOneq
zMb^doJvzE=jmNTT8Bb1qKZRGB!CmWM`JI2pe;HiP`}8VW?OP8_N(`Q^elF{r5}E+8
C$v%$&

diff --git a/components/tabbarComponent/icon/icon_mine_HL.png b/components/tabbarComponent/icon/icon_mine_HL.png
deleted file mode 100644
index ba4e6388e684a5b81fc105cd998d4b9f0669f571..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1096
zcmeAS@N?(olHy`uVBq!ia0vp^V9db`WPSKlyb?$~3GfMV1=1ve|Bph^kN_VmP$bw>
z8X|6HAOvA>aWb<oGb+h(8|exHMQqJPauZd6Tt_QWAlJrJ<m@&VaS;v`1)i-7Y`D2t
zWF$Eqt;DR1h52|`Qz8|4xLLw|Wq~UBd0C56)qsqXo1FbzrGN~egY7Lu_pfw#e<fgk
zuPGl7OMHkzeW8}VmVmr8*ZpH&>t|c#C#m+=8~D3Po!{>2WH@&UP>*#<kY6yv0f7$=
z4GRn&UQAF3*f61>Awl57g9{%H>|0P^YoPG!%ZK+HRutrCJN*9q^ue8*HxBOFwPX6E
z2_4}9K6)uxy0#1qOgB7T977@wznyWj?6QG?gX+ysV%BXXi!Zc_Y5d;zxbw1#ulTS3
z|DAPKUgDhirbo8oRPCk9w#L&;78~CDF#jWKPVBA?^36(Imr9SgCpLDJ_iS}f<Xj)T
zq?6sO>02Y)1BJBM-oXEFd;?>qUGDDlt5f$maWG7A=ij?WUpBW0XNF8k7N|KU9jUVY
zy84p<DN*IAd+!_N>d(>t&edG_Zc+1;<LWc@-)m1TJauRORxYE}({3NVALDp5c}Y;+
z$$1<_GZjN@4#m1udart#8EA2+rYY!IfTCV;VlrE?U%;t-0b#43hdpI^))VLz*pRWc
zDkJos1FPRk`=_?6H;J5jpP`x`Wap~=`*nEG_D?YylDk6O-pTGimd}5EdU`@=+=Kij
z{8ja3I>)?MRQLx}EZSmt{NNmpr;?lAzcApBb(9m7S-A2*{Pg`xR!MoRco)^In|;fj
zXZ4%LvVR*SA4b2PC*9h8ymra0chQ%axP;D~*tgSc)pNP_+$lO?e)=A%+js1p+2|yF
z(a*QUNM_yRkH?HQ2(>P;-I;Ef)>E=@`xk{Jb}zm3`+LuGFWIo$^y!>S4eE+FFSHuG
z53cRcIADD)L+7MTgwna{+}1h<y+=#FE_r^;nZHi4Rc(<-Y(1~O+U1v_k$%gsAHI3$
zZpzwKQQuxZO)9sU-{br3-zv{)tL=ZDZ+jb?>y_SQ?AH0h%FIib*TBt>?RV?sqGfYe
zOFf>zQ`RNrHd(Yded4@FbKO3lh{>FF#>Y(Sb=q^o)yB(iWyIy2J=f2Bctus9yvXW;
z#X<RVX3VTxX{I#ac>S!VFGmfs*sVRD_jT_4S-j89=giqNuh?E*xYM?G(Sg>V3-k7T
zJ^EYb;Ereh?mExaeeR{L`IUM%|3dR)%|k1moz#E#QFH3=UPdjsh^fogE$C5RS(0z@
zwv*RgV*OpOqHs;kTJxB>hF4^K_}<<uop%4)k9TT~OLhht-SU$7x%F;Ox(KKL$+r5V
Z@;B}ndG#+kk_RdeJYD@<);T3K0RU<1=!pOT

diff --git a/components/tabbarComponent/icon/icon_release.png b/components/tabbarComponent/icon/icon_release.png
deleted file mode 100644
index 198d9506d6f53b5f8da104496bbf66a8384b760d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 729
zcmeAS@N?(olHy`uVBq!ia0vp^V9db`WPSKlyb?%F3-AeX1=9cjm;HYn`u}klh<p<E
z|9Low@d%87f<OjH7A6AcK7ojbgS0#YYXNBoGk{W$LV+efKjSMQ%Hi)OwPCgu7YFmN
zyTN;w*}c8we`KxW%yy&Xa77bc!Mle&Pi}HvIn`o*k7-4ghP%DEiad|l|2MCI`ejRk
z{DK)+KA+lLuJHB4vzu4;ZrQM6etTn4RFI>QuCxWG<-`q^8yOfFuX?&ThD01bd$TjI
z$w7kU0i&4chgIge?O9jvJ^#HwCijwuNn}~0;mhv~ljpzLbbNmS$F$8SHM}NINSx%h
z_+*acg5Iko0-s_mW~{s5BbUDA<Rh7_vC?72*H@%oTpnG|m_JwXFOT&Hp(C-sUL9-n
z?-YF9ai{fM^_u18?pw95mA7&ooZ;KUeB+LUS#n;Esgzl&PHErGJ2y;?78%akJlFDE
zX;seh>z4AfI&xjpokce9{qbe<?xqv(PA=zPY2cFS*y}2JbGh68JLxNm?)3BAjhk;T
z|03m|P;u1{y)NFnMgJ`;!$pqXs?SS1bb@Dpn21|ZYx7EzqORsflOhHMj-?Y58FVyz
zp9sz9R8BwOB4f$u_UMG5K&P^@!qT&c|NVRMSYYQ~{kP>?JQ|Ng-PpC_L(*xVh6!T+
zu1n2tA7RP(95Hjp-o>u2Q)})|*;f~Aw)DCCt<^q9l;<(5v@qIxV$YTTw!iBCC}~fu
z+k0jGt6zJc3t2CzlmBj)`(|7F*Pgt{-r`@E%l3Y^7k>I><Kq53Ht}6EyyrH3O)vf1
z>s0^#;{9`9%02%2hS$qqFX#QTm$#PP?Y{b@^37jt&1=&G?(e@+9{F`|LhbRW`{Ccq
oU%&hJzuBDYpm*1&z3%VX%`Mz^eim+U0;U88Pgg&ebxsLQ02M=S-T(jq

diff --git a/components/tabbarComponent/icons/appSearch.png b/components/tabbarComponent/icons/appSearch.png
deleted file mode 100644
index 3a801c436cd82d7bfff622fe05ce8232ba7f51a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4930
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
AiU0rr

diff --git a/components/tabbarComponent/icons/appSearchActive.png b/components/tabbarComponent/icons/appSearchActive.png
deleted file mode 100644
index a74330b98f33497cc26f5a2489a26993415d618a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6497
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
Hu0mjf+=_ga

diff --git a/components/tabbarComponent/icons/home.png b/components/tabbarComponent/icons/home.png
deleted file mode 100644
index afbf26006e03f3009983e42d37da89449632137d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 629
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*1?oyYK1Z7?Q#I
zHp1HPu!BIathu8`?^OSZ(NEY!0@|z_7H~dd3OLB?(afT2YUz=sH{np(6Sb}>$5i$>
z<~;wJo;Fz{Ln(6it-I!*@6DF=_FKHrzSKcBfSvDU!}irrGH3B^(%HS}hoiur_C$;O
zu6oazw%yJ(?t8rPdFA;T^Mx|cgwL@5Qni=!*?qlM3(*Y`I&HJhJ`+u8uT*iYd-nTZ
z?()kspS~@=HiyGwQp=n=rjOP(XO)yf7;W?|KHqp-7Vet9`b{UROP~qULe38URVpUw
z4KtaI-+liby!n{qO{RadrgZdMbn>z}Ez9_1xcy|U@QPO+;VkR!Kj!_cs_Jj4$#!(n
z43XVh{Kf0SSWnHm!t%6lh1*-T^(qVeCKsKQmT|d~^(lz)j+$x9j^wLq+qok2ra!FO
zTX%Txo+pzE8k;Aa4_jS&H*fppJr$1kl-4%>VLvhd_P6g_{n(mLbAF0_@>Hjad+t+4
zzAb4_lSCPwUVHT>+C@-&bwlmsC(nWzW1h!6+`_bO&XZ%7zqmT$r~dGHGV6Qy;pfXa
z>c5BvFfRIK&Cp%#P}ROv>I;{r?371anS$7tR;+Ef;;0#?txy`!^?$$U0{dx8-t9Of
zUbr!gVZm&r1=>Zag&oX=n%2vIziO~rz$bI8QJ!hprh}_{crJpX+|$+1Wt~$(69Dci
B{Yn4;

diff --git a/components/tabbarComponent/icons/homeActive.png b/components/tabbarComponent/icons/homeActive.png
deleted file mode 100644
index 82e6afff1db89ad02fede7eccddf690a01e9b003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 596
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*1?o+vn-x7?Q#I
zHp14Q$x)z|Ib2eRJ36YK@&5rQ?=^pzrF4$mS`pDHmA%p6;<ZCwbsYN-OuKfdB`Bi3
zzs2~b?YFXb%#(ILIh2-`{(P_b_r50#dqWsQ9Yi&P8BeYKxp?Jc@#C96EAM&O)K>ZB
z)Vu@jD<5&^N|Z<z<T6&VII-`3@v!4qq|nJ}2bwbzn#9@eZ)j5C2{@>!mzi*uon^D)
zhn%b*2X&e4pYNX4(QNQ6(<V{c++uOyqqzPha~!UlNCxybUbp?FyIr6y=CWJ+uhR*?
zLM<A1dM-aO`{nIpS{$`5J}MWUyyU#$E9ES*g~zPYifOfvREuqxNJ5c4Q>Ks9Vc{)4
znV+t*IQdGo*o8gGEHZDb-h7y?_UUhfvYe0Jht&5!^(%0_zwOyXU5jqt59jv(K35ai
zxw3&R`p&xp*ES__>m^ll?pze?r{l?T=dz}h-H-W)3RMLQrmP8%;GAO1KexfpVMW8|
zuTQGi?fiB(^S*oew;lN*whvZ^#Qip_V@l%pn4kDE1<3Mp_{HJzx|Au1b?H|t#+6N%
zs^&I?IA-pxX1dJp{kljsp-`A1>W|~f8lhsIwWSw>3Rf_#YS8)+-)OIKE!O^-_i7DL
OjC#8IxvX<aXaWG=S?5gv

diff --git a/components/tabbarComponent/icons/insight.png b/components/tabbarComponent/icons/insight.png
deleted file mode 100644
index caa7c01643c6c2397366f408499c7b9e1525ee6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 576
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*1?oTjlBE7?Q#I
zc3NOovx7j}^{7egtqLr)nfzC}p9Jjn;J>oxMfZY5g2HR}ziqg?BVg{-mJ%_u*Sm~g
zfB(NYaq1*Bz7FO`4Hh5f%NCS;^qjP(H1_+w@8Y#@rxhPB?5nkJN&I2>Y=@A*@sH2<
z9uzikaS8n5RovtMm~-8G(R)YAR2{@i-WLlNyyo&`UBcwU{zNoM>V#kXQYJ?Mjr-qw
z3vRy+d;7im>8^E#&(?EaV`Zq@d{g86XEj%by6v}lKXg3p+Mw0&;G}IV%favIvlLlA
zoOrk;-S3k{c>8kG4u|YnX$A8h6t1@~U%5!5VCRlV!GtDttqz7YeDhOhTFvzn*_M&A
z-zoS*!S3AK@ebJs9y97Ns{JtW72T!B#P6b-W6{6&LIl&f=byjp+3zoqd(d!Xmfj&V
zn`no5&sXW3W~}G&Uv*6BTEp?;8}f!OF?!;mp;sT+9K7tI^kI7Bb<?}s%r>z$w5&>4
z)Wq?{RO+>K1aro_c}fZElD9ox%Ct>(?(X>^V2=EHroSscX53bd{_VRlHgo~Ml@IH!
trifkqGY)JsiT`wjvCu(AfL-o#qrS%EEw4^x=pF{eo~Nsy%Q~loCIHaP<bnVI

diff --git a/components/tabbarComponent/icons/insightActive.png b/components/tabbarComponent/icons/insightActive.png
deleted file mode 100644
index f269cfea85111c36300ab4c2dee8b79bd45b816d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 636
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*1?od*<ol7?Q#I
zcE(<BW=Dae_cIUlJBhpz*|Oon{{w!CX48@uYusQxc*$tmt()8%Lk`|L)bHexE~=t%
z@SK~VtKw9lfb+6?&DA@5RjQ?nj@?Xq|E#RM?)}+&MKTJ$G6L*J7z-cRTR(6;^8UwX
zt!d5u7f)<1W3#!l`io@BUSrwC-uqX^sq@b}z~o%Kbx$CpXK|dm*#=kE7sCGzY~{!(
zpSXl6sBs402{9wd8<%st+LC*FIL{m0w_NW~&$T0ht?cr%7LnLFEP2-(I~V>+ma2Ue
z!f<fD9;0#cfoEGHSq{qUGdyl~s59Nik<L_7QMNve<?!-Vk?w2_r$ra|b8gQyT=s8?
z$-&RTLXK}=DHhCosQK+F^G%x%{~XK9bhkC!e<0cE@`LNzWxIQvb#GZL_B;$Mt6ifT
z!oTka%btC$jZuvLl51GMtXe!NK0<cu2aYpx3@;b2;E;NLs`6Z>?t)L8Q{pOSE>Qnr
z$r`tg;pp=f9M?Zgxf<1Q>(C7g_HSH)KNN(-E^<|z5`L|kCRm=D@ZSpPf}PL3e0Wy}
zuQ(D|zPC&-MEvfu&q@b#z3usuauzP}*iy&t(xA+~gsHD*OPrflLhjtfow5;)5A-)E
z*URW9Cm4q+Fdud}u5niX`2Op&=W7}RL*D@y305~6^EX>nwCdH0YJ+0l)78&qol`;+
E09H5m00000

diff --git a/components/tabbarComponent/icons/mine.png b/components/tabbarComponent/icons/mine.png
deleted file mode 100644
index e79692efab7f09050c5fa7ee36734c3e58ccf0a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 893
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*5QUV0!N9;uw;_
z`Zm%w|F(fZZ<n6wqpNJ2mYtZQYrjN3<Ko8M6a8M!QQN&+^scoSr__`7lFv8R@IATO
zxb<c&zXJ2+a+R|Y+cJ)@u++)Ezo*=<RC??7?WK2lY~D+1yjm1L?WtnP-h;(Pv(NH%
zEwXT!$$wcO*Le$X;J@zY+it(Tw=wzZ7NN$E6?bO(s4Zvs&gal4e2~ZC#j>kee>1k<
zUVLO@|091T1F7C`jK6rI_9@-3zw)hx$-^cgLjLD>zvYLEg1poi!Ylc??HTvXPSI52
zVN!LeDp+eT7`Xg*YcO{R!w!ZY`2suFN!y&2ntOeVV>F|N-}RuTfFE3WpSgd!r+=BH
z7167`<8u0w&@(Pm7}A*^)aP^UVa@TVakAT-8zon&*kFI(q=IRw@2zVN=eM(lAIORL
zRTGdGmpC`o__w^1^lfgQH$PYXX<vSAyRVkx1dWe-zU@ugtH<&n-M3jiGD$&9zOa<_
z3}<zFqqc02-QtyRBO2M~+-Sem`8OyyEcEJhiHaXfjYWPRU3vS|rlPR8)19s1VqZFa
z*Y3JdVpY3ZGiwvCO2vI4Pk{qIpTcHV847n@zfh2~!EzNV<CjlfbFzhQm@ujDT*R)|
z=qu2${$~G#Hx(H-SQz(g+N8Q5QJBTx?M<Nz8!}m%w(oEI>y>bs<BmCxQA%8bu)3ic
zmomG%qVAi|bN6&Vo;EdFX8BcKv*q4v7|gghQ)ZgvG%-vt&YKLjU^~=;18*k^Zgy-_
zVPl)k>?@F<U-S0Z#8V3%9p3U)-sBb64E_0aY{L19U$(9{EL)|0pl|K}73P5ray9-k
z_f>XursRCD5#&q?h&|DCcwPE}ua~Y#pU~%JTc5d}`=+49zU|gqPNbSNUeor@x@(zp
z>p|X?+Gf3!MyEtpA)YO96DH)Yw_cui%V680iJ7<hcU@5OxTClE*TIQC4J~K1%dG1S
z&#vcip3w7Xrb9%Q&dQzhYd)*w++>++_HXvpTlb&tmaJH3{6YSHiAP4+tAshAr0?nK
K=d#Wzp$P!`OLJ8K

diff --git a/components/tabbarComponent/icons/mineActive.png b/components/tabbarComponent/icons/mineActive.png
deleted file mode 100644
index 74fe2e133df8fe83ca6dacf988551f23cdfffd57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 976
zcmV;>126oEP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFI!Q!9RA>e5S-)@7KooxGru<U2
z3L+}DBBpHoA^Z@Ck-dTim>{AK3L7vXc18pO@rSTwq#J4#P`3yQX>+{Kv7>YD*=MIt
zeO2Sdcjx!+ecwBu@9s0v@>*u#bZ0<SMgMF^Z;UkEP@1ljqIIol9rvhzO*=}_4)I+p
z`nIa*>))Q*t|Io42sA@|Y5#y8jK_3~!L&;P>IVURIoF`K!%+P!={q%_i@?QDH~0S0
zW6tms&T4bo+dKtDL+<0%+8KKND^$a>U6dxU($Tl|nBH-qR@q<<`+*8*^RTBrJM2=A
zgH$c2qP14RQ@zFDKe1WW;1RinzM~i%D+fyIQ6a-CZ}j=yJ$la*^KQy}K^30xA1|-b
z{U49iA6E$H2q5#v2_Arvs7XxsNH__sJfr8wm3cGUh>6%{n^ewyh2jZ|cRtrn>bRmd
zo_KU8Z(?Txi$9g$8OS0gY#Dw7{={C*`ow0wLeY1=e()gLim`~K#Sy>?`+G#&M_#1F
zkaINhVs~McHl!81A$7MuqK7W<hcDBfJmJKvsGaDXH1cYXEeltzNiDuYV@)>`UtjL=
ze#?Sm5x}mJt=g7l{SECHTMCIq09)deg+~<$n?)en&wB*ggd$<H2uu$lrl&9E<bY)0
zu?X-IJ~>4hM!pm!Y!-nNKLY&y*S=)j!XaR@M}TP8a`dOc!e*_+P!ITByXL~2wersT
z6}6l7lj@POG4sG40hT^yZ2YMT*en9jZTvx;Mj~Oe2tag7yZKX-uvr9R#jNiS>?xAI
zq~=)!U=GD>>gGuy3zJ9yavv{frB$+pab+wKCLw@GAUgT5+$Y%A)5KV$(-^>r1n>Y_
zCEo@p*L>kn4=m!9NdPJUv`Y4>b87)vWiv~W0HaI-co^$3U6gCOx_O!qFo~*!2^P{~
zqeCB{l$q^|E<+zZ=+Ql;_!yIO<&FUS&;f*2bePjmrH>G65;Grsgs*61j6|$eZn2MZ
z<cjt?V~1>aS&Dh#%6#Hi8pw(L!I3b=q=Ht-^{|q~Zn9v8=+iY}6Ab3P^az;F(N8{B
y@nRvYtd>;YPd<}GQm*SaYZ8BXUuNL6X5c?GW)+nyPJy-n0000<MNUMnLSTa5R<T<E

diff --git a/components/tabbarComponent/icons/varComm.png b/components/tabbarComponent/icons/varComm.png
deleted file mode 100644
index 912792cf76b8c8b196c8fff21924cfeac835e79f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 413
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*1?oWA}7%49Q@9
zJJXS`SwX;c=|`Ronfy;&Ekg7!F>jUL!P45=DREiR*je|bxgwXv;XnU-CRzAeJUCEq
zouKj4@R;h-lJjr9?yk1X@2PzHZ0**5|4L6r#g^yWyW_d_l;#v~-&$X?Plh+|_&Ke8
zS1xQa(@fBQCca+rL5`LJ1CtZ`2M$hNk#>In1hMD~GZgYUS6P1+Tl%Wl`mk^VgI?8I
z3xNwolV-EC>^PTsbY(4j)!yft3oBYQ+N;htJLI>o{G;Gtd8N9pf+_1hV^+QY*<w##
ze+H%<FSb5%a5(LmCnxa0YPl#oQ<PuP=LsyQ`pxo+GGk8P(q*dgR?6J?`^ToVygK_n
eJDCRNt<3plCR*9qm!3ZX1&ybxpUXO@geCx*QHaU_

diff --git a/components/tabbarComponent/icons/varCommActive.png b/components/tabbarComponent/icons/varCommActive.png
deleted file mode 100644
index d6930042815f257adf36363caf8338d3dc34a352..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 404
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*1@5|2$nBLo!(3
z&O9sFtRT?p7~ICYbfQS&xs4qrliG3)3m90wV4T01Tj<zv&a|8R-y2#nA1jz}U?*q9
zmAc!zR~tWj`MoqFKk4_2?%lr4wYf)gxAhzhTk&JUuHR4jKEG(-tvJ8<q<(kn&hI80
zcz%=@n*~G(X*sY?VX0`D!f^H7RqcX6<r|U-Rcp+*eg7J@YgHVhnZi`Nsq&&8u0c}m
zTplNve)9e%f8y(0_ufw&icUM<hA5aPip=Ly05Y#?GrV`3eeb9AzM{vrH_l3}4sYO{
zVjXk;Oh^Nl2ImJ3O~zGs{TCisaZH7uq1c)AQ1J5e{LCk_d#cWzUlXX!tKz_9+{pj4
WUOaf|jD@P85b<>Nb6Mw<&;$UybB<&H

diff --git a/components/tabbarComponent/icons/路径.png b/components/tabbarComponent/icons/路径.png
deleted file mode 100644
index 07de3e481e4c474b93051120ed427bb18c48243c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2910
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
DoW?r9

diff --git a/components/tabbarComponent/tabbar.js b/components/tabbarComponent/tabbar.js
deleted file mode 100644
index ef13b7e..0000000
--- a/components/tabbarComponent/tabbar.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// tabBarComponent/tabBar.js
-const app = getApp();
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    tabbar: {
-      type: Object,
-      value: {
-        "backgroundColor": "#ffffff",
-        "color": "#979795",
-        "selectedColor": "#1c1c1b",
-        "list": [
-          {
-            "pagePath": "pages/index/index",
-            "text": "首页",
-            "iconPath": "icons/home.png",
-            "selectedIconPath": "icons/homeActive.png",
-          },
-          {
-            "pagePath": "pages/insight/index",
-            "text": "洞查",
-            "iconPath": "icons/insight.png",
-            "selectedIconPath": "icons/insightActive.png",
-          },
-          {
-            "pagePath": "pages/brandSearch/index",
-            "text": "导航",
-            "iconPath": "icons/appSearch.png",
-            "selectedIconPath": "icons/appSearchActive.png",
-            "isSpecial": true,
-          },
-          {
-            "pagePath": "pages/varComm/index",
-            "text": "对比",
-            "iconPath": "icons/varComm.png",
-            "selectedIconPath": "icons/varCommActive.png",
-          },
-          {
-            "pagePath": "pages/mine/index",
-            "text": "我的",
-            "iconPath": "icons/mine.png",
-            "selectedIconPath": "icons/mineActive.png",
-          }
-        ]
-      }
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    isIphoneX: app.globalData.systemInfo.model.search('iPhone X') != -1 ? true : false
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
-})
diff --git a/components/tabbarComponent/tabbar.json b/components/tabbarComponent/tabbar.json
deleted file mode 100644
index e8cfaaf..0000000
--- a/components/tabbarComponent/tabbar.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}
\ No newline at end of file
diff --git a/components/tabbarComponent/tabbar.wxml b/components/tabbarComponent/tabbar.wxml
deleted file mode 100644
index 8a41c80..0000000
--- a/components/tabbarComponent/tabbar.wxml
+++ /dev/null
@@ -1,13 +0,0 @@
-<view class="tabbar_box {{isIphoneX?'iphoneX-height':''}}" style="background-color:{{tabbar.backgroundColor}}">
-  <block wx:for="{{tabbar.list}}" wx:key="index">
-    <navigator wx:if="{{item.isSpecial}}" class="tabbar_nav" hover-class="none" url="{{item.pagePath}}" style="color:{{tabbar.selectedColor}}" open-type="navigate">
-      <view class='special-wrapper'><image class="tabbar_icon" src="{{item.iconPath}}"></image></view>
-      <image class='special-text-wrapper'></image>
-      <text>{{item.text}}</text>
-    </navigator>
-    <navigator wx:else class="tabbar_nav" hover-class="none" url="{{item.pagePath}}" style="color:{{item.selected ? tabbar.selectedColor : tabbar.color}}" open-type="switchTab">
-      <image class="tabbar_icon" src="{{item.selected ? item.selectedIconPath : item.iconPath}}"></image>
-      <text>{{item.text}}</text>
-    </navigator>
-  </block>
-</view>
diff --git a/components/tabbarComponent/tabbar.wxss b/components/tabbarComponent/tabbar.wxss
deleted file mode 100644
index f5b3694..0000000
--- a/components/tabbarComponent/tabbar.wxss
+++ /dev/null
@@ -1,63 +0,0 @@
-.tabbar_box{
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    z-index: 999;
-    width: 100%;
-    height: 98rpx;
-    box-shadow: 0 0 2px rgba(0, 0, 0, 0.1);
-}
-.tabbar_box.iphoneX-height{
-    padding-bottom: 66rpx;
-}
-.middle-wrapper{
-  position: absolute;
-  right: 310rpx;
-  bottom: 0;
-  background-color: #fff;
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 50%;
-  border-top: 2rpx solid #f2f2f3;
-}
-.middle-wrapper.iphoneX-height{
-  bottom: 66rpx;
-}
-.tabbar_nav{
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    font-size: 20rpx;
-    height: 100%;
-    position: relative;
-}
-.tabbar_icon{
-    width: 56rpx;
-    height: 56rpx;
-}
-.special-wrapper{
-  position: absolute;
-  left: 77rpx;
-  top: -36rpx;
-  width: 96rpx;
-  height: 96rpx;
-  border-radius: 50%;
-  border-top: 2rpx solid #f2f2f3;
-  background-color: #fff;
-  text-align: center;
-  box-sizing: border-box;
-  padding: 6rpx;
-}
-.special-wrapper .tabbar_icon{
-    width: 84rpx;
-    height: 84rpx;
-}
-.special-text-wrapper{
-  width: 56rpx;
-  height: 56rpx;
-}
\ No newline at end of file
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
new file mode 100644
index 0000000..77d1cf0
--- /dev/null
+++ b/custom-tab-bar/index.js
@@ -0,0 +1,52 @@
+
+Component({
+    data: {
+      selected: 0,//当前选中的tab下标
+      color: "#1E1E1E",
+      selectedColor: "#646464",//tabbar选中字体颜色
+          list: [{
+            "pagePath": "pages/index/index",
+            "iconPath": "/components/tabbarComponent/icons/home.png",
+            "selectedIconPath": "/components/tabbarComponent/icons/homeActive.png",
+            "text": "首页"
+          },
+          {
+            "pagePath": "pages/insight/index",
+            "iconPath": "/components/tabbarComponent/icons/insight.png",
+            "selectedIconPath": "/components/tabbarComponent/icons/insightActive.png",
+            "text": "洞察"
+          },
+          {
+            "pagePath": "pages/brandSearch/index",
+            "iconPath": "/components/tabbarComponent/icons/appSearch.png",
+            "selectedIconPath": "/components/tabbarComponent/icons/appSearchActive.png",
+            "text": "品牌搜索"
+          },
+          {
+            "pagePath": "pages/varComm/index",
+            "iconPath": "/components/tabbarComponent/icons/varComm.png",
+            "selectedIconPath": "/components/tabbarComponent/icons/varCommActive.png",
+            "text": "对比"
+          },
+          {
+            "pagePath": "pages/mine/index",
+            "iconPath": "/components/tabbarComponent/icons/mine.png",
+            "selectedIconPath": "/components/tabbarComponent/icons/mineActive.png",
+            "text": "我的"
+          }
+        ],//tabbar循环数据集
+    },
+    attached() {
+    },
+    methods: {
+      switchTab(e) {
+        const data = e.currentTarget.dataset;
+        const url = data.path
+              this.setData({
+                selected: data.index 
+              })
+        wx.switchTab({url})
+      }
+    },
+  })
+  
\ No newline at end of file
diff --git a/custom-tab-bar/index.json b/custom-tab-bar/index.json
new file mode 100644
index 0000000..7a23245
--- /dev/null
+++ b/custom-tab-bar/index.json
@@ -0,0 +1,4 @@
+{
+    "component": true
+}
+  
\ No newline at end of file
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
new file mode 100644
index 0000000..0091896
--- /dev/null
+++ b/custom-tab-bar/index.wxml
@@ -0,0 +1,7 @@
+<view class="tab-bar">
+    <view wx:for="{{list}}" wx:key="index" class="tab-bar-item {{item.diyClass}}" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
+      <image src="{{selected === index ? item.selectedIconPath : item.iconPath}}" class="{{item.diyClass}}"  mode="aspectFit"/>
+      <view style="color: {{selected === index ? selectedColor : color}}" class="{{item.diyClass}}">{{item.text}}</view>
+    </view>
+  </view>
+  
\ No newline at end of file
diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss
new file mode 100644
index 0000000..5c6541c
--- /dev/null
+++ b/custom-tab-bar/index.wxss
@@ -0,0 +1,69 @@
+
+
+/*重新样式*/
+.tab-bar {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    box-shadow: 0px -2px 10px 0px rgba(0,0,0,0.05);
+    box-sizing: content-box;
+  }
+  
+  .tab-bar-border {
+    background-color: rgba(0, 0, 0, 0.33);
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 1px;
+    transform: scaleY(0.5);
+  }
+  
+  .tab-bar-item {
+    flex: auto;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    background: #fff;
+    height: 120rpx;
+  }
+  
+  .tab-bar-item.diy {
+    margin-top: 0!important;
+    background: transparent;
+    position: relative;
+    flex: inherit;
+    width: 134rpx;
+  }
+  
+  .tab-bar-item image {
+    width: 48rpx;
+    height: 48rpx;
+    overflow: initial;
+  }
+  
+  .tab-bar-item view {
+    font-size: 24rpx;
+  }
+  
+  .tab-bar-item image.diy {
+    position: absolute;
+    width: 134rpx;
+    height: 140rpx;
+    bottom: 25.6%;
+    z-index: 100;
+  }
+  
+  .tab-bar-item view.diy {
+    margin-top: 90rpx;
+    background: #fff;
+    width: 100%;
+    height: 100%;
+    padding-top: 58rpx;
+    z-index: 99;
+  }
+  
\ No newline at end of file
diff --git a/pages/index/index.json b/pages/index/index.json
index d8785a2..dd22d4b 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,6 +1,5 @@
 {
   "usingComponents": {
-    "tabbar": "../../components/tabbarComponent/tabbar"
   },
   "backgroundTextStyle": "light",
   "navigationBarBackgroundColor": "#006BFF",
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 903bcb5..76b35c9 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -14,5 +14,5 @@
       </view>
     </view>
   </view>
-  <tabbar tabbar="{{tabbar}}"></tabbar>
+  <tabbar />
 </view>
\ No newline at end of file