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

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

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

.cloudbase/container/debug.json

@@ -0,0 +1 @@
+{"containers":[]}

pages/brandSearch/index.wxss

@@ -33,7 +33,7 @@
     align-items: center;
     padding: 15px 13px;
     font-size: 14px;
-  }
+  } 
   .bs-item-image {
     display: inline-block;
     width: 42px;

pages/index/Rankdetail/Rankdetail.js

@@ -4,7 +4,7 @@
        * 页面的初始数据
        */
       data: {
-          show:false,
+      
           sortOpt: [
               {
                   text: '列表展示',
@@ -15,7 +15,6 @@
                   value1: 1
               }
           ],
-
           value:0,
         //   时间  
           priceOpt: ['2022年5月','2022年4月','2022年3月',
@@ -27,14 +26,12 @@
 
             ],
           prcieInterval: [0, 10, 20, 30, 40, 50, '不限'],
-         
           value1: 0,
             //   品牌
           value2: '全部品牌',
           typeOpt: [
 
           ],
-  
         //   级别
           level:[
               {
@@ -291,14 +288,6 @@
           priceSelected: e.currentTarget.dataset.index
       })
      },
-  showPopup(){
-    this.setData({show:true});
-  },
-  onClose(){
-      this.setData({
-          show:false
-      });
-  },
   onclick() {
     this.setData({ show: true });
   },
@@ -312,6 +301,7 @@
       onLoad: function (options) {
           console.log('111',this.data.sortOpt[0].value1)
       },
+
       /**
        * 生命周期函数--监听页面初次渲染完成
        */
@@ -361,5 +351,6 @@
       onShareAppMessage: function () {
   
       }
+
   })
   

pages/index/Rankdetail/Rankdetail.wxml

@@ -1,5 +1,6 @@
 <!--pages/index/Rankdetail/Rankdetail.wxml-->
 <view class="screen">
+
     <van-dropdown-menu active-color="#027AFF">
         <van-dropdown-item id="priceOpt" value="{{ value }}" title="2022年05月">
             <view class="condition">
@@ -7,7 +8,26 @@
             </view>
         </van-dropdown-item>
         <van-dropdown-item value="{{ value1 }}" options="{{ sortOpt }}" title="列表展示" bind:change="dropdownSel" />
-        <van-dropdown-item value="{{ value2 }}" options="{{ typeOpt }}" title="品牌" />
+        <van-dropdown-item value="{{ value2 }}" options="{{ typeOpt }}" title="品牌">
+            <scroll-view style="height: clac(100vh-{{navHight}}px); " scroll-y bindscroll="onPageScroll" enhanced="true" scroll-into-view="contain">
+                <van-index-bar>
+                    <view>
+                        <van-index-anchor index="A" />
+                        <van-cell title="文本" />
+                        <van-cell title="文本" />
+                        <van-cell title="文本" />
+                    </view>
+                    <view>
+                        <van-index-anchor index="B" />
+                        <van-cell title="文本" />
+                        <van-cell title="文本" />
+                        <van-cell title="文本" />
+                    </view>
+                </van-index-bar>
+
+
+            </scroll-view>
+        </van-dropdown-item>
         <van-dropdown-item value="{{ value3 }}" options="{{ complexOpt }}" title="车型" />
     </van-dropdown-menu>
     <van-dropdown-menu active-color="#027AFF">
@@ -51,6 +71,7 @@
             </view>
             <view style="width: 30%;">
                 <view class="volume">{{item.volume}}</view>
+<<<<<<< HEAD
 
 
                 <!-- <view class="trend" bindtap="onclick"> -->
@@ -59,6 +80,20 @@
                         <view>销量趋势</view>
                     </view>
                 </view>
+=======
+                <view class="trend" bindtap="onclick">
+                    <van-icon size="16px" name="arrow" />
+                    <view>销量趋势</view>
+                </view>
+
+                <van-popup show="{{ show }}" position="bottom" custom-style="height: 638rpx;" bind:close="onClose" close-icon="close" close-icon-position="top-left">
+                    <view>
+                        <view> 销量趋势</view>
+                    </view>
+                </van-popup>
+
+            </view>
+>>>>>>> 87a74f85d9d55ccf735ddf74357499a809621a51
 
 
             </view>

pages/index/Rankdetail/Rankdetail.wxss

@@ -226,6 +226,20 @@
     color: #0084FF;
 }
 
+.bs-item {
+    display: flex;
+    justify-items: flex-start;
+    align-items: center;
+    padding: 15px 13px;
+    font-size: 14px;
+  } 
+.bs-item-image {
+    display: inline-block;
+    width: 42px;
+    height: 42px;
+    margin-right: 15px;
+  }
+
 .license{
     width: 200rpx;
     height: 200rpx;
@@ -254,4 +268,5 @@
     height: 386rpx;
     margin:0   32rpx;
 
-}
+}
+