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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 components/custom-tabbar.vue

@@ -47,7 +47,9 @@
            "key": 'index'
           },
           {
              "pagePath": "/pages/tabbar/category/category",
              // "pagePath": "/pages/tabbar/category/category",
            "pagePath": "/pages/commodity-square/commoditySquare",
				
              "iconPath": "/static/tabbar/category.png",
              "selectedIconPath": "/static/tabbar/category-s.png",
              "text": "商城",
@@ -55,8 +57,8 @@
           },
         {
            "pagePath": "/pages/tabbar/video/video",
            "iconPath": "/static/tabbar/video.png",
            "selectedIconPath": "/static/tabbar/video-selected.png",
            "iconPath": "/static/tabbar/video1.png",
            "selectedIconPath": "/static/tabbar/video1-selected.png",
            "key": 'video'
         },
           {