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

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

# Conflicts:
#	pages/index/index.wxml

pages/brandSearch/index.wxml

@@ -3,14 +3,6 @@
       <van-icon size="26px" color="#fff" name="arrow-left" style="background: #006BFF"/>
       <van-search style="width: 100%;" shape="round" background="#006BFF" value="{{ value }}" placeholder="请输入品牌" />
     </view>
-    <van-tabs active="{{ active }}">
-      <van-tab title="标签 1">内容 1</van-tab>
-      <van-tab title="标签 2">内容 2</van-tab>
-      <van-tab title="标签 3">内容 3</van-tab>
-      <van-tab title="标签 4">内容 4</van-tab>
-      <van-tab title="标签 5">内容 5</van-tab>
-      <van-tab title="标签 6">内容 6</van-tab>
-    </van-tabs>
     <van-index-bar>
       <view>
         <van-index-anchor index="A" />

pages/index/index.wxml

@@ -1,5 +1,6 @@
 <!--index.wxml-->
 <view class="container">
+<<<<<<< HEAD
   <van-tabs active="{{ active }}">
   <van-tab title="标签 1">内容 1</van-tab>
   <van-tab title="标签 2">内容 2</van-tab>
@@ -38,6 +39,17 @@
     </swiper-item>
   </swiper>
   <!-- <view class="mat">
+=======
+  <van-tabs class="menu-tabs" color="#fff" active="{{ active }}">
+    <van-tab title="标签 1">内容 1</van-tab>
+    <van-tab title="标签 2">内容 2</van-tab>
+    <van-tab title="标签 3">内容 3</van-tab>
+    <van-tab title="标签 4">内容 4</van-tab>
+    <van-tab title="标签 5">内容 5</van-tab>
+    <van-tab title="标签 6">内容 6</van-tab>
+  </van-tabs>
+  <view class="mat">
+>>>>>>> cc1e2beb786f0b8961bc6deeec9fff824d4464d1
     <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>

pages/index/index.wxss

@@ -4,35 +4,14 @@
   height: 100%;
   
 }
-.scrollList {
-  width: calc(100% - 48rpx);
-  display: flex;
-  text-align: center;
-  justify-content: center;
-  height: 80rpx;
-  background: #fff;
-  border-radius: 10rpx;
-}
-
-.scrollList text {
-  background: #F6F6F6;
-  border-radius: 2px;
-  font-size: 28rpx;
-  color: #999999;
-  margin: 0 8rpx;
-  padding: 18rpx 24rpx;
-  height: min-content;
-  flex-shrink: 0;
-}
-
-.scrollList .actived {
-  font-size: 12px;
-  font-weight: bold;
-  color: #027AFF;
-  background: #F0F5FF;
-}
-
-
+.menu-tabs .van-tab{
+  color: #A0A0A0; /* 字体颜色 */
+  background-color: #006BFF;/* 标签背景颜色 */
+ }
+
+ .menu-tabs .van-tab--active{
+  color: #FFFFFF; /* 字体颜色 */
+ }
 
 
 .nav {