Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

app.wxss

@@ -3,3 +3,6 @@
   height: 100%;
   width: 100%;
 } 
+page{
+    padding-bottom: 100px;
+}

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
+            });
+        }
     },
 })

pages/brandSearch/index.wxss

@@ -1,3 +1,6 @@
+.view-page {
+
+}
 .container {
     width: 100%;
 }

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>