diff --git a/pages/index/Rankdetail/Rankdetail.js b/pages/index/Rankdetail/Rankdetail.js
index 7b51b38..aab31b7 100644
--- a/pages/index/Rankdetail/Rankdetail.js
+++ b/pages/index/Rankdetail/Rankdetail.js
@@ -7,10 +7,7 @@ Page({
        * 页面的初始数据
        */
       data: {
-<<<<<<< HEAD
-=======
        
->>>>>>> fa524a056647be127f1f9adfca7bfa91a61e8af4
           sortOpt: [
               {
                   text: '列表展示',
diff --git a/pages/index/Rankdetail/Rankdetail.wxml b/pages/index/Rankdetail/Rankdetail.wxml
index 44139c0..14c70e5 100644
--- a/pages/index/Rankdetail/Rankdetail.wxml
+++ b/pages/index/Rankdetail/Rankdetail.wxml
@@ -1,109 +1,7 @@
 <!--pages/index/Rankdetail/Rankdetail.wxml-->
-
 <view class="screen">
-    <van-tabs active="{{ active }}" bind:change="onChange">
-        <van-tab title="品牌">
-            <view class="list_event" wx:if="{{item.value1===1}}">
-                <view class="text">销量排行榜</view>
-                <chart-display></chart-display>
-            </view>
-            <view class="list_event" wx:else>
-                <view class="text">销量排行榜</view>
-                <view class="ranking">
-                    <view class="title">排名</view>
-                    <view class="title">品牌名称</view>
-                    <view class="title2">销量</view>
-                </view>
-                <view class="ranks" wx:for="{{ranking}}" wx:key="index" data-ranking='{{item}}'>
-                    <view style="display: flex;">
-                        <view class="dis_image">
-                            <image class="rank_num" wx:if="{{index === 0}}" src="/images/img_diyi.png"></image>
-                            <image class="rank_num" wx:if="{{index === 1}}" src="/images/img_dier.png"></image>
-                            <image class="rank_num" wx:if="{{index === 2}}" src="/images/img_disan.png"></image>
-                            <view class="num" wx:if="{{index !== 0 &&index !== 1 &&index !== 2 }}">{{index >= 9 ? index + 1 : '0' + (index + 1)}}</view>
-                        </view>
-                        <view class="medias">
-                            <view style="display: flex;">
-                                <view class="media_text">{{item.media}}</view>
-                                <view>
-                                    <view wx:if="{{item.energy==='新能源'}}" class="energy">{{item.energy}}</view>
-                                    <view wx:if="{{item.energy==='汽油'}}" class="energy1">{{item.energy}}</view>
-                                    <view wx:if="{{item.energy==='柴油'}}" class="energy2">{{item.energy}}</view>
-                                    <view wx:if="{{item.energy==='油电混合'}}" class="energy3">{{item.energy}}</view>
-                                    <view wx:if="{{item.energy==='轻混系统'}}" class="energy4">{{item.energy}}</view>
-                                </view>
-                            </view>
-                            <view class="price">{{item.num}}</view>
-                        </view>
-                        <view style="width: 30%;">
-                            <view class="volume">{{item.volume}}</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>
-                    </view>
-                </view>
-            </view>
-        </van-tab>
-        <van-tab title="车型">
-            <view class="list_event" wx:if="{{item.value1===1}}">
-                <view class="text">销量排行榜</view>
-                <chart-display></chart-display>
-            </view>
-            <view class="list_event" wx:else>
-                <view class="text">销量排行榜</view>
-                <view class="ranking">
-                    <view class="title">排名</view>
-                    <view class="title">品牌名称</view>
-                    <view class="title2">销量</view>
-                </view>
-                <view class="ranks" wx:for="{{ranking}}" wx:key="index" data-ranking='{{item}}'>
-                    <view style="display: flex;">
-                        <view class="dis_image">
-                            <image class="rank_num" wx:if="{{index === 0}}" src="/images/img_diyi.png"></image>
-                            <image class="rank_num" wx:if="{{index === 1}}" src="/images/img_dier.png"></image>
-                            <image class="rank_num" wx:if="{{index === 2}}" src="/images/img_disan.png"></image>
-                            <view class="num" wx:if="{{index !== 0 &&index !== 1 &&index !== 2 }}">{{index >= 9 ? index + 1 : '0' + (index + 1)}}</view>
-                        </view>
-                        <view class="medias">
-                            <view style="display: flex;">
-                                <view class="media_text">{{item.media}}</view>
-                                <view>
-                                    <view wx:if="{{item.energy==='新能源'}}" class="energy">{{item.energy}}</view>
-                                    <view wx:if="{{item.energy==='汽油'}}" class="energy1">{{item.energy}}</view>
-                                    <view wx:if="{{item.energy==='柴油'}}" class="energy2">{{item.energy}}</view>
-                                    <view wx:if="{{item.energy==='油电混合'}}" class="energy3">{{item.energy}}</view>
-                                    <view wx:if="{{item.energy==='轻混系统'}}" class="energy4">{{item.energy}}</view>
-                                </view>
-                            </view>
-                            <view class="price">{{item.num}}</view>
-                        </view>
-                        <view style="width: 30%;">
-                            <view class="volume">{{item.volume}}</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>
-                    </view>
-                </view>
-            </view>
-        </van-tab>
 
-    </van-tabs>
-    <!-- <van-dropdown-menu active-color="#027AFF">
+    <van-dropdown-menu active-color="#027AFF">
         <van-dropdown-item id="priceOpt" value="{{ value }}" title="2022年05月">
             <view class="condition">
                 <view wx:for="{{priceOpt}}" wx:key="index" class="{{index === priceSelected?'active':''}}" data-index="{{index}}" bindtap="priceSel">{{item}}</view>
@@ -111,7 +9,7 @@
         </van-dropdown-item>
         <van-dropdown-item value="{{ value1 }}" options="{{ sortOpt }}" title="列表展示" bind:change="dropdownSel" />
         <van-dropdown-item value="{{ value2 }}" options="{{ typeOpt }}" title="品牌">
-            <scroll-view >
+            <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" />
@@ -126,6 +24,8 @@
                         <van-cell title="文本" />
                     </view>
                 </van-index-bar>
+
+
             </scroll-view>
         </van-dropdown-item>
         <van-dropdown-item value="{{ value3 }}" options="{{ complexOpt }}" title="车型" />
@@ -135,9 +35,9 @@
         <van-dropdown-item value="{{ value4 }}" options="{{ level }}" title="按级别" bind:change="dropdownSel" />
         <van-dropdown-item value="{{ value5 }}" options="{{ Price }}" title="按价格" />
         <van-dropdown-item value="{{ value6 }}" options="{{ energy }}" title="按能源" />
-    </van-dropdown-menu> -->
+    </van-dropdown-menu>
 </view>
-<!-- <view class="list_event" wx:if="{{item.value1===1}}">
+<view class="list_event" wx:if="{{item.value1===1}}">
     <view class="text">销量排行榜</view>
     <chart-display></chart-display>
 </view>
@@ -176,7 +76,6 @@
                     <van-icon size="16px" name="arrow" />
                     <view>销量趋势</view>
                 </view>
-<<<<<<< HEAD
             </view>
         </view>
     </view>
@@ -189,32 +88,6 @@
         <view class="popContent-title">宏光MINIEV销量趋势</view>
         <view class="popContent-echars">
             <c-echars showChart="{{showChart}}" canvasId="rankbar-canvas" chartId="rankbar" chartOption="{{positiveOption}}" width="686rpx" height="100%"></c-echars>
-=======
-                <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>
-
-
-            </view>
-        </view>
-    </view>
-<<<<<<< HEAD
-</view> -->
-<!-- </view> -->
-    <!-- </view> -->
-    <van-popup show="{{ show }}" bind:close="onClose" position="bottom" closeable round close-icon-position="top-right" close-icon="cross" custom-style="height: 638rpx">
-        <view class="popContent">
-            <view class="popContent-text">销量趋势 </view>
-            <view class="popContent-title">宏光MINIEV销量趋势</view>
-            <view class="popContent-echars">
-                <c-echars showChart="{{showChart}}" canvasId="rankbar-canvas" chartId="rankbar" chartOption="{{positiveOption}}" width="100%" height="100%"></c-echars>
-            </view>
-
->>>>>>> fa524a056647be127f1f9adfca7bfa91a61e8af4
         </view>
     </view>
 </van-popup>
\ No newline at end of file