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

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

# Conflicts:
#	components/tabbarComponent/tabbar.wxml

app.js

@@ -44,34 +44,34 @@ App({
       "backgroundColor": "#ffffff",
       "list": [
         {
-          "pagePath": "/pages/index/index",
+          "pagePath": "pages/index/index",
-          "text": "首页",
+          "iconPath": "/components/tabbarComponent/icons/home.png",
-          "iconPath": "/components/tabbarComponent/icon/home.png",
+          "selectedIconPath": "/components/tabbarComponent/icons/homeActive.png",
-          "selectedIconPath": "/component/tabbarComponent/icon/homeSel.png"
+          "text": "首页"
         },
         {
           "pagePath": "pages/insight/index",
-          "text": "服务",
+          "iconPath": "/components/tabbarComponent/icons/insight.png",
-          "iconPath": "/components/tabbarComponent/icon/service.png",
+          "selectedIconPath": "/components/tabbarComponent/icons/insightActive.png",
-          "selectedIconPath": "/component/tabbarComponent/icon/serviceSel.png"
+          "text": "洞察"
         },
         {
           "pagePath": "pages/brandSearch/index",
-          "text": "导航",
+          "iconPath": "/components/tabbarComponent/icons/appSearch.png",
-          "iconPath": "/components/tabbarComponent/icon/navagati.png",
+          "selectedIconPath": "/components/tabbarComponent/icons/appSearchActive.png",
-          "isSpecial": true,
+          "text": "品牌搜索"
         },
         {
           "pagePath": "pages/varComm/index",
-          "text": "订单",
+          "iconPath": "/components/tabbarComponent/icons/varComm.png",
-          "iconPath": "/components/tabbarComponent/icon/order.png",
+          "selectedIconPath": "/components/tabbarComponent/icons/varCommActive.png",
-          "selectedIconPath": "/component/tabbarComponent/icon/orderSel.png"
+          "text": "对比"
         },
         {
           "pagePath": "pages/mine/index",
-          "text": "我的",
+          "iconPath": "/components/tabbarComponent/icons/mine.png",
-          "iconPath": "/components/tabbarComponent/icon/my.png",
+          "selectedIconPath": "/components/tabbarComponent/icons/mineActive.png",
-          "selectedIconPath": "/component/tabbarComponent/icon/mySel.png"
+          "text": "我的"
         }
       ]
     }

app.json

@@ -17,32 +17,32 @@
   "tabBar": {
     "list": [{
         "pagePath": "pages/index/index",
-        "iconPath": "icons/home.png",
+        "iconPath": "/components/tabbarComponent/icons/home.png",
-        "selectedIconPath": "icons/homeActive.png",
+        "selectedIconPath": "/components/tabbarComponent/icons/homeActive.png",
         "text": "首页"
       },
       {
         "pagePath": "pages/insight/index",
-        "iconPath": "icons/insight.png",
+        "iconPath": "/components/tabbarComponent/icons/insight.png",
-        "selectedIconPath": "icons/insightActive.png",
+        "selectedIconPath": "/components/tabbarComponent/icons/insightActive.png",
         "text": "洞察"
       },
       {
         "pagePath": "pages/brandSearch/index",
-        "iconPath": "icons/appSearch.png",
+        "iconPath": "/components/tabbarComponent/icons/appSearch.png",
-        "selectedIconPath": "icons/appSearchActive.png",
+        "selectedIconPath": "/components/tabbarComponent/icons/appSearchActive.png",
         "text": "品牌搜索"
       },
       {
         "pagePath": "pages/varComm/index",
-        "iconPath": "icons/varComm.png",
+        "iconPath": "/components/tabbarComponent/icons/varComm.png",
-        "selectedIconPath": "icons/varCommActive.png",
+        "selectedIconPath": "/components/tabbarComponent/icons/varCommActive.png",
         "text": "对比"
       },
       {
         "pagePath": "pages/mine/index",
-        "iconPath": "icons/mine.png",
+        "iconPath": "/components/tabbarComponent/icons/mine.png",
-        "selectedIconPath": "icons/mineActive.png",
+        "selectedIconPath": "/components/tabbarComponent/icons/mineActive.png",
         "text": "我的"
       }
     ]

components/tabbarComponent/tabbar.js

@@ -13,22 +13,35 @@ Component({
         "selectedColor": "#1c1c1b",
         "list": [
           {
-            "pagePath": "/pages/index/index",
+            "pagePath": "pages/index/index",
-            "iconPath": "icon/icon_home.png",
+            "text": "首页",
-            "selectedIconPath": "icon/icon_home_HL.png",
+            "iconPath": "icons/home.png",
-            "text": "首页"
+            "selectedIconPath": "icons/homeActive.png",
           },
           {
-            "pagePath": "/pages/middle/middle",
+            "pagePath": "pages/insight/index",
-            "iconPath": "icon/icon_release.png",
+            "text": "洞查",
+            "iconPath": "icons/insight.png",
+            "selectedIconPath": "icons/insightActive.png",
+          },
+          {
+            "pagePath": "pages/brandSearch/index",
+            "text": "导航",
+            "iconPath": "icons/appSearch.png",
+            "selectedIconPath": "icons/appSearchActive.png",
             "isSpecial": true,
-            "text": "发布"
           },
           {
-            "pagePath": "/pages/mine/mine",
+            "pagePath": "pages/varComm/index",
-            "iconPath": "icon/icon_mine.png",
+            "text": "对比",
-            "selectedIconPath": "icon/icon_mine_HL.png",
+            "iconPath": "icons/varComm.png",
-            "text": "我的"
+            "selectedIconPath": "icons/varCommActive.png",
+          },
+          {
+            "pagePath": "pages/mine/index",
+            "text": "我的",
+            "iconPath": "icons/mine.png",
+            "selectedIconPath": "icons/mineActive.png",
           }
         ]
       }

components/tabbarComponent/tabbar.wxml

@@ -1,13 +1,13 @@
 <view class="tabbar_box {{isIphoneX?'iphoneX-height':''}}" style="background-color:{{tabbar.backgroundColor}}">
-    <block wx:for="{{tabbar.list}}" wx:key="{{item.pagePath}}">
+  <block wx:for="{{tabbar.list}}" wx:key="index">
-      <navigator wx:if="{{item.isSpecial}}" class="tabbar_nav" hover-class="none" url="{{item.pagePath}}" style="color:{{tabbar.selectedColor}}" open-type="navigate">
+    <navigator wx:if="{{item.isSpecial}}" class="tabbar_nav" hover-class="none" url="{{item.pagePath}}" style="color:{{tabbar.selectedColor}}" open-type="navigate">
-        <view class='special-wrapper'><image class="tabbar_icon" src="{{item.iconPath}}"></image></view>
+      <view class='special-wrapper'><image class="tabbar_icon" src="{{item.iconPath}}"></image></view>
-        <image class='special-text-wrapper'></image>
+      <image class='special-text-wrapper'></image>
-        <text>{{item.text}}</text>
+      <text>{{item.text}}</text>
-      </navigator>
+    </navigator>
-      <navigator wx:else class="tabbar_nav" hover-class="none" url="{{item.pagePath}}" style="color:{{item.selected ? tabbar.selectedColor : tabbar.color}}" open-type="switchTab">
+    <navigator wx:else class="tabbar_nav" hover-class="none" url="{{item.pagePath}}" style="color:{{item.selected ? tabbar.selectedColor : tabbar.color}}" open-type="switchTab">
-        <image class="tabbar_icon" src="{{item.selected ? item.selectedIconPath : item.iconPath}}"></image>
+      <image class="tabbar_icon" src="{{item.selected ? item.selectedIconPath : item.iconPath}}"></image>
-        <text>{{item.text}}</text>
+      <text>{{item.text}}</text>
-      </navigator>
+    </navigator>
-    </block>
+  </block>
-  </view>
+</view>

pages/index/index.wxml

@@ -1,7 +1,7 @@
 <!--index.wxml-->
 <view class="container">
   <scroll-view class="scrollList" scroll-x="true" enable-flex="true">
-    <text wx:for="{{condition}}" class="{{index === 0 ? 'actived' : ''}}">{{item}}</text>
+    <text wx:for="{{condition}}" class="{{index === 0 ? 'actived' : ''}}" wx:key="index">{{item}}</text>
   </scroll-view>
   <view class="top">
     <view wx:for="{{toplist}}" wx:key="url" class="top_box">

pages/index/index.wxss

@@ -23,26 +23,6 @@ font-weight: bold;
 color: #027AFF;
 background: #F0F5FF;
 }
-/* .condition{
-  height: 50rpx;
-  background-color: #027AFF;
-  margin: 32rpx 32rpx 48rpx 32rpx;
-    display: grid;
-    grid-template-columns: repeat(4,1fr);
-    grid-gap: 32rpx;
-} */
-.condition text{
-  text-align: center;
-  background: #FAFBFD;
-  border-radius: 4rpx;
-  font-size: 10px;
-  color: #333333;
-  padding: 16rpx 24rpx;
-}
-.condition .active{
-  color: #027AFF;
-}
-
 .top {
   /* background-color: #006BFF; */
   height: 556rpx;