diff --git a/app.wxss b/app.wxss
index 76579e0..4ab9250 100644
--- a/app.wxss
+++ b/app.wxss
@@ -3,3 +3,6 @@
   height: 100%;
   width: 100%;
 } 
+page{
+    padding-bottom: 100px;
+}
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 6b8a3a7..457430d 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -49,11 +49,11 @@ Component({
             })
         },
         init() {
-			const page = getCurrentPages().pop();
+            const page = getCurrentPages().pop();
             let n = this.data.list.findIndex(item => item.pagePath === `${page.route}`);
-			this.setData({
-				selected: n
-			});
-		}
+            this.setData({
+                selected: n
+            });
+        }
     },
 })
\ No newline at end of file
diff --git a/pages/brandSearch/index.wxss b/pages/brandSearch/index.wxss
index acf73b6..debfe94 100644
--- a/pages/brandSearch/index.wxss
+++ b/pages/brandSearch/index.wxss
@@ -1,3 +1,6 @@
+.view-page {
+
+}
 .container {
     width: 100%;
 }
diff --git a/pages/index/event/event.js b/pages/index/event/event.js
new file mode 100644
index 0000000..1861c94
--- /dev/null
+++ b/pages/index/event/event.js
@@ -0,0 +1,66 @@
+// pages/index/event/event.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/pages/index/event/event.json b/pages/index/event/event.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/pages/index/event/event.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/index/event/event.wxml b/pages/index/event/event.wxml
new file mode 100644
index 0000000..eebaab8
--- /dev/null
+++ b/pages/index/event/event.wxml
@@ -0,0 +1,2 @@
+<!--pages/index/event/event.wxml-->
+<text>pages/index/event/event.wxml</text>
diff --git a/pages/index/event/event.wxss b/pages/index/event/event.wxss
new file mode 100644
index 0000000..fa6cb55
--- /dev/null
+++ b/pages/index/event/event.wxss
@@ -0,0 +1 @@
+/* pages/index/event/event.wxss */
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 992ab5e..db2fdb3 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,13 +1,9 @@
 <!--index.wxml-->
 <view class="container">
-<<<<<<< HEAD
-=======
   <van-tabs class="menu-tabs" active="{{ active }}">
     <van-tab wx:for="{{navData}}" title="{{item.text}}">
       <data-child wx:if="{{item.component === 'data-child'}}"></data-child>
-      
     </van-tab>
   </van-tabs>
->>>>>>> 8a760f2a4358598cc5860f778e3cdf67eedae722
   <tabbar />
 </view>
\ No newline at end of file