Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev

* 'dev' of https://git.oa00.com/xiaowen/swsWecat:
  no message

# Conflicts:
#	pages/index/index.wxml
#	pages/index/index.wxss

app.json

@@ -55,6 +55,11 @@
     "van-tabbar": "@vant/weapp/tabbar/index",
     "van-tabbar-item": "@vant/weapp/tabbar-item/index",
     "tabbar": "/custom-tab-bar/index",
+<<<<<<< HEAD
+    "van-icon": "@vant/weapp/icon/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-tab": "@vant/weapp/tab/index"
+=======
     "van-search": "@vant/weapp/search/index",
     "van-index-bar": "@vant/weapp/index-bar/index",
     "van-index-anchor": "@vant/weapp/index-anchor/index",
@@ -65,6 +70,7 @@
     "van-tabs": "@vant/weapp/tabs/index"
   
     
+>>>>>>> be011044707ad2d9a9275f0319ee52ed8eab13a0
   }
   
 }

pages/index/index.js

@@ -4,6 +4,21 @@ const app = getApp()
 
 Page({
   data: {
+    active:0,
+    arr:[
+      {
+        title:'点餐',
+        // path:'/shop/goods'
+      },
+      {
+        title:'评价',
+        // path:'/shop/ratings'
+      },
+      {
+        title:'商家信息',
+        // path:'/shop/info'
+      },
+    ],
     tabbar: {},
     condition: ['二十四小时', '最近七天', '最近三十天', '自定义'],
     toplist: [{
@@ -47,10 +62,13 @@ Page({
     ],
     navData:[
       {
-          text: '数据'
+          text: '数据',
+          path:'/pages/insight'
+
       },
       {
-          text: '事件'
+          text: '事件',
+          path:'/pages/insight'
       },
       {
           text: '传播媒体'
@@ -104,6 +122,21 @@ switchTab(event){
         currentTab: cur,
         navScrollLeft: (cur - 2) * singleNavWidth
     });
+},
+watch:{
+  active(newVal){
+    switch (newVal) {
+      case 0: 
+        // this.$router.push('/shop/goods')
+        break;
+      case 1: 
+        // this.$router.push('/shop/ratings')
+        break;
+      case 2:
+        // this.$router.push('/shop/info')
+        break;
+    }
+  }
 },
   onShow() {
    this.getTabBar().init();

pages/index/index.wxml

@@ -12,13 +12,13 @@
     <view class="mat_card" wx:for="{{toplist}}" wx:key="index" data-id="{{item.id}}" data-name="{{item.name}}" data-url="/pages/material/subpage/newest/newest" bindtap="to">
       <view class="mat_top">
         <image class="mat_image" src="/pages/images/ic_zhuanfa@3x.png"></image>
-        <view><van-icon name="arrow" />
-
+        <view>
+          <van-icon name="arrow" />
         </view>
       </view>
       <view class="mat_title">{{item.title}}</view>
       <view class="mat_num">{{item.num}}</view>
     </view>
-  </view>
+  </view> -->
   <tabbar />
 </view>

pages/index/index.wxss

@@ -2,6 +2,7 @@
 .container {
   width: 100%;
   height: 100%;
+  
 }
 .menu-tabs .van-tab{
   color: #A0A0A0; /* 字体颜色 */
@@ -31,7 +32,7 @@
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 99;
+  /* z-index: 99; */
 }
 
 .nav-item {
@@ -105,8 +106,9 @@
 
 .mat_card {
   background-color: white;
-  width: 328rpx;
+  width: 300rpx;
   height: 404rpx;
+  margin: 10rpx 15rpx;
   border-radius: 16rpx;
   margin-bottom: 32rpx;
 }
@@ -120,4 +122,21 @@
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
+}
+van-tabs {
+  color: #000;
+  width: 100%;
+  height: 50rpx;
+  line-height: 50rpx;
+  background-color: #027AFF;
+}
+van-tab {
+  background: #bb5050;
+  width: 50rpx;
+  height: 40rpx;
+}
+.van-tab__pane van-tab__pane--active{
+  background: #bb5050;
+  width: 50rpx;
+  height: 40rpx;
 }