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

* 'dev' of git.oa00.com:xiaowen/swsWecat:
  cxw-010203
  cxw-010203
  cxw-010203

# Conflicts:
#	pages/index/index.wxml

app.json

@@ -51,7 +51,7 @@
   },
   "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",

components/indexCom/dataChild/index.js

@@ -0,0 +1,8 @@
+Component({
+    data: {
+
+    },
+    methods: {
+        
+    }
+})

components/indexCom/dataChild/index.json

@@ -0,0 +1,3 @@
+{
+    "component": true
+}

components/indexCom/dataChild/index.wxml

@@ -0,0 +1,3 @@
+<view>
+    2222
+</view>

pages/index/index.js

@@ -4,142 +4,48 @@ const app = getApp()
 
 Page({
   data: {
-    active:0,
-    arr:[
-      {
-        title:'点餐',
-        // path:'/shop/goods'
-      },
-      {
-        title:'评价',
-        // path:'/shop/ratings'
-      },
-      {
-        title:'商家信息',
-        // path:'/shop/info'
-      },
-    ],
-    tabbar: {},
-    condition: ['二十四小时', '最近七天', '最近三十天', '自定义'],
-    toplist: [{
-        url: '',
-        title: '入库数据总量',
-        num: '1'
-      }, {
-        url: '',
-        title: '微博数据',
-        num: '2'
-      }, {
-        url: '',
-        title: '其他数据',
-        num: '0'
-      },
-      {
-        url: '',
-        title: '短视频数据',
-        num: '0'
-      },
-      {
-        url: '',
-        title: '微信数据',
-        num: '0'
+    active: 0,
+    navData: [{
+        text: '数据',
+        component: 'data-child'
       },
       {
-        url: '',
-        title: 'APP数据',
-        num: '0'
+        text: '事件',
+        component: 'data-child'
       },
       {
-        url: '',
-        title: '论坛数据',
-        num: '0'
+        text: '传播媒体',
+        component: 'data-child'
       },
       {
-        url: '',
-        title: '新闻数据',
-        num: '0'
-      },
-    ],
-    navData:[
-      {
-          text: '数据',
-          path:'/pages/insight'
-
-      },
-      {
-          text: '事件',
-          path:'/pages/insight'
+        text: '传播声量',
+        component: 'data-child'
       },
       {
-          text: '传播媒体'
+        text: '晴雨表',
+        component: 'data-child'
       },
       {
-          text: '传播声量'
+        text: '尾盘洞察',
+        component: 'data-child'
       },
       {
-          text: '晴雨表'
+        text: '热议图谱',
+        component: 'data-child'
       },
       {
-          text: '尾盘洞察'
+        text: '用户画像',
+        component: 'data-child'
       },
       {
-          text: '热议图谱'
+        text: '热销排行',
+        component: 'data-child'
       },
-      {
-          text: '用户画像'
-      },
-      {
-          text: '热销排行'
-      },
-  ],
-  currentTab: 0,
-  navScrollLeft: 0
-   
+    ],
   },
-  switchNav(event){
-    // 获取当前tab 的id
-    var cur = event.currentTarget.dataset.current; 
-    //每个tab选项宽度占1/5
-    var singleNavWidth = this.data.windowWidth / 5;
 
-    //tab选项居中                            
-    this.setData({
-        navScrollLeft: (cur - 2) * singleNavWidth
-    })   
-    // 判断id是否和点击的tab id 一致   
-    if (this.data.currentTab == cur) {
-        return false;
-    } else {
-        this.setData({
-            currentTab: cur
-        })
-    }
-},
-switchTab(event){
-    var cur = event.detail.current;
-    var singleNavWidth = this.data.windowWidth / 5;
-    this.setData({
-        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();
+    this.getTabBar().init();
   },
   onLoad: function (options) {
 

pages/index/index.json

@@ -1,4 +1,5 @@
 {
   "usingComponents": {
+      "data-child": "../../components/indexCom/dataChild/index"
   }
 }

pages/index/index.wxml

@@ -1,4 +1,13 @@
 <!--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>

pages/index/index.wxss

@@ -5,14 +5,17 @@
   
 }
 .menu-tabs .van-tab{
-  color: #A0A0A0; /* 字体颜色 */
+  color: #98CDFF; /* 字体颜色 */
   background-color: #006BFF;/* 标签背景颜色 */
  }
 
  .menu-tabs .van-tab--active{
   color: #FFFFFF; /* 字体颜色 */
+  font-size: 17px;
+ }
+ .menu-tabs .van-tabs__line {
+  background: transparent;
  }
-
 
 .nav {
   /* 设置tab-nav宽高度 */